Home Explore Help
Sign In
tuonq
/
SpringCloudBase
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

逻辑删除测试ok

NorthLan 7 years ago
parent
3be802e730
commit
4ad7d93a16
26 changed files with 89 additions and 451 deletions
Split View Show Diff Stats
  1. 1 1
      settings.gradle
  2. 0 7
      zen-admin/build.gradle
  3. 0 18
      zen-admin/src/main/kotlin/com/gxzc/zen/MainApplication.kt
  4. 0 64
      zen-admin/src/main/kotlin/com/gxzc/zen/controller/ExampleController.kt
  5. 0 24
      zen-admin/src/main/resources/application.yml
  6. 0 16
      zen-admin/src/main/webapp/index.jsp
  7. 0 39
      zen-admin/src/test/kotlin/com/gxzc/zen/base/BaseTestKt.kt
  8. 0 15
      zen-api/src/main/java/com/gxzc/zen/api/bus/mapper/SysDicMapper.java
  9. 0 63
      zen-api/src/main/java/com/gxzc/zen/api/bus/model/SysDic.java
  10. 0 15
      zen-api/src/main/java/com/gxzc/zen/api/bus/service/ISysDicService.java
  11. 0 20
      zen-api/src/main/java/com/gxzc/zen/api/bus/service/impl/SysDicServiceImpl.java
  12. 0 13
      zen-api/src/main/kotlin/com/gxzc/zen/api/bus/mapper/SysDicMapper.kt
  13. 0 27
      zen-api/src/main/kotlin/com/gxzc/zen/api/bus/model/SysDic.kt
  14. 0 13
      zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/ISysDicService.kt
  15. 0 20
      zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/impl/SysDicServiceImpl.kt
  16. 3 8
      zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysDeptMapper.kt
  17. 5 4
      zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysDept.kt
  18. 5 8
      zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysDeptService.kt
  19. 7 10
      zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysDeptServiceImpl.kt
  20. 0 19
      zen-api/src/main/resources/mapping/bus/SysDicMapper.xml
  21. 10 14
      zen-api/src/main/resources/mapping/sys/SysDeptMapper.xml
  22. 3 3
      zen-common/src/main/kotlin/com/gxzc/zen/common/base/BaseModel.kt
  23. 14 14
      zen-orm/src/main/kotlin/com/gxzc/zen/Generator.kt
  24. 1 6
      zen-orm/src/main/kotlin/com/gxzc/zen/orm/aspect/DataSourceSwitchAspect.kt
  25. 8 10
      zen-orm/src/main/resources/application-orm.yml
  26. 32 0
      zen-web/src/test/kotlin/com/gxzc/zen/fun/TestLogicDelete.kt

+ 1 - 1
settings.gradle
View File 

@@ -3,6 +3,6 @@ include 'zen-common'
 
 include 'zen-umps'
 
 include 'zen-orm'
 
 include 'zen-api'
 
-include 'zen-admin'
 
 include 'zen-ui'
 
+include 'zen-web'

+ 0 - 7
zen-admin/build.gradle
View File 

@@ -1,7 +0,0 @@
 
-apply plugin: 'war'
 
-
 
-dependencies {
 
-    compile project(":zen-ui")
 
-    compile project(":zen-orm")
 
-    compile project(":zen-api")
 
-}

+ 0 - 18
zen-admin/src/main/kotlin/com/gxzc/zen/MainApplication.kt
View File 

@@ -1,18 +0,0 @@
 
-package com.gxzc.zen
 
-
 
-import org.springframework.boot.SpringApplication
 
-import org.springframework.boot.autoconfigure.SpringBootApplication
 
-import org.springframework.boot.builder.SpringApplicationBuilder
 
-import org.springframework.boot.web.support.SpringBootServletInitializer
 
-
 
-
 
-@SpringBootApplication//(exclude = [DataSourceAutoConfiguration::class])
 
-class MainApplication : SpringBootServletInitializer() {
 
-    override fun configure(builder: SpringApplicationBuilder?): SpringApplicationBuilder? {
 
-        return builder?.sources(MainApplication::class.java)
 
-    }
 
-}
 
-
 
-fun main(args: Array<String>) {
 
-    SpringApplication.run(MainApplication::class.java, *args)
 
-}

+ 0 - 64
zen-admin/src/main/kotlin/com/gxzc/zen/controller/ExampleController.kt
View File 

@@ -1,64 +0,0 @@
 
-package com.gxzc.zen.controller
 
-
 
-import com.gxzc.zen.api.bus.model.SysDic
 
-import com.gxzc.zen.api.bus.service.ISysDicService
 
-import com.gxzc.zen.api.sys.mapper.SysDeptMapper
 
-import com.gxzc.zen.api.sys.model.SysDept
 
-import com.gxzc.zen.api.sys.service.ISysDeptService
 
-import com.gxzc.zen.orm.annotation.DynamicDataSource
 
-import com.gxzc.zen.orm.contants.DSKey
 
-import org.slf4j.LoggerFactory
 
-import org.springframework.beans.factory.annotation.Autowired
 
-import org.springframework.stereotype.Controller
 
-import org.springframework.web.bind.annotation.RequestMapping
 
-
 
-
 
-@Controller
 
-@RequestMapping("example")
 
-class ExampleController {
 
-    companion object {
 
-        private val logger = LoggerFactory.getLogger(ExampleController::class.java)
 
-    }
 
-
 
-    @Autowired
 
-    lateinit var sysDeptService: ISysDeptService
 
-
 
-    @Autowired
 
-    lateinit var sysDicService: ISysDicService
 
-
 
-    @Autowired
 
-    lateinit var sysDeptMapper: SysDeptMapper
 
-
 
-//    @Autowired
 
-//    lateinit var sysParamService: ISysParamService
 
-
 
-    @RequestMapping("/test")
 
-    fun test() {
 
-        val dept = SysDept().also {
 
-            it.deptName = "test"
 
-            it.principal = "create"
 
-            it.sort = Integer(1)
 
-        }
 
-//        for (i in 1..1000) {
 
-//            sysDeptService.insert(dept)
 
-//        }
 
-        sysDeptMapper.insert(dept)
 
-
 
-        logger.info("count: {}", sysDeptService.custom())
 
-    }
 
-
 
-    @RequestMapping("/test2")
 
-    @DynamicDataSource(DSKey.DSKEY_SYS)
 
-    fun test2() {
 
-        val sysDic = SysDic().also {
 
-            it.key = "hehe"
 
-            it.value = "hehe"
 
-            it.sort = Integer(1)
 
-        }
 
-//        for (i in 1..1000) {
 
-//            sysDicService.insert(sysDic)
 
-//        }
 
-        // sysDicService.insert(sysDic)
 
-        logger.info("count: {}", sysDicService.custom())
 
-    }
 
-}

+ 0 - 24
zen-admin/src/main/resources/application.yml
View File 

@@ -1,24 +0,0 @@
 
-server:
 
-  port: 8082
 
-
 
-
 
-###################  spring配置  ###################
 
-spring:
 
-  profiles:
 
-    active: dev
 
-    include: orm
 
-#  redis:
 
-#    host: localhost
 
-#    port: 6379
 
-#    password:
 
-  http:
 
-    converters:
 
-      preferred-json-mapper: fastjson
 
-    multipart:
 
-      max-request-size: 100MB #最大请求大小
 
-      max-file-size: 100MB #最大文件大小
 
-  aop:
 
-    proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理
 
-    auto: true
 
-logging:
 
-  level: info

+ 0 - 16
zen-admin/src/main/webapp/index.jsp
View File 

@@ -1,16 +0,0 @@
 
-<%--
 
-  Created by IntelliJ IDEA.
 
-  User: mgr
 
-  Date: 18-1-20
 
-  Time: 上午11:23
 
-  To change this template use File | Settings | File Templates.
 
---%>
 
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
 
-<html>
 
-  <head>
 
-    <title>$Title$</title>
 
-  </head>
 
-  <body>
 
-  $END$s
 
-  </body>
 
-</html>

+ 0 - 39
zen-admin/src/test/kotlin/com/gxzc/zen/base/BaseTestKt.kt
View File 

@@ -1,39 +0,0 @@
 
-package com.gxzc.zen.base
 
-
 
-import org.junit.Before
 
-import org.junit.runner.RunWith
 
-import org.springframework.beans.factory.annotation.Autowired
 
-import org.springframework.boot.test.context.SpringBootTest
 
-import org.springframework.test.context.junit4.SpringRunner
 
-import org.springframework.test.context.web.WebAppConfiguration
 
-import org.springframework.test.web.servlet.MockMvc
 
-import org.springframework.test.web.servlet.setup.MockMvcBuilders
 
-import org.springframework.web.context.WebApplicationContext
 
-
 
-/**
 
- * Spring单元测试基类
 
- * @author NorthLan
 
- * @date 2018/1/26
 
- * @url https://noahlan.com
 
- */
 
-@RunWith(SpringRunner::class)
 
-@SpringBootTest
 
-@WebAppConfiguration
 
-//@Transactional  // 事物支持
 
-class BaseTestKt {
 
-
 
-    @Autowired
 
-    lateinit var webApplicationContext: WebApplicationContext
 
-
 
-    lateinit var mockMvc: MockMvc
 
-
 
-    @Before
 
-    fun setupMockMvc() {
 
-        mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build()
 
-    }
 
-
 
-    @Before
 
-    fun initDataBase() {
 
-        // Nothing
 
-    }
 
-}

+ 0 - 15
zen-api/src/main/java/com/gxzc/zen/api/bus/mapper/SysDicMapper.java
View File 

@@ -1,15 +0,0 @@
 
-package com.gxzc.zen.api.bus.mapper;
 
-
 
-import com.gxzc.zen.api.bus.model.SysDic;
 
-import com.gxzc.zen.common.base.BaseMapper;
 
-/**
 
- * <p>
 
- * 字典表 Mapper 接口
 
- * </p>
 
- *
 
- * @author NorthLan123
 
- * @since 2018-01-30
 
- */
 
-public interface SysDicMapper extends BaseMapper<SysDic> {
 
-
 
-}

+ 0 - 63
zen-api/src/main/java/com/gxzc/zen/api/bus/model/SysDic.java
View File 

@@ -1,63 +0,0 @@
 
-package com.gxzc.zen.api.bus.model;
 
-
 
-import com.gxzc.zen.common.base.BaseModel;
 
-
 
-/**
 
- * <p>
 
- * 字典表
 
- * </p>
 
- *
 
- * @author NorthLan123
 
- * @since 2018-01-30
 
- */
 
-public class SysDic extends BaseModel {
 
-
 
-    private static final long serialVersionUID = 1L;
 
-
 
-    /**
 
-     * 字典代码
 
-     */
 
-    private String key;
 
-    /**
 
-     * 字典值
 
-     */
 
-    private String value;
 
-    /**
 
-     * 排序号
 
-     */
 
-    private Integer sort;
 
-
 
-
 
-    public String getKey() {
 
-        return key;
 
-    }
 
-
 
-    public void setKey(String key) {
 
-        this.key = key;
 
-    }
 
-
 
-    public String getValue() {
 
-        return value;
 
-    }
 
-
 
-    public void setValue(String value) {
 
-        this.value = value;
 
-    }
 
-
 
-    public Integer getSort() {
 
-        return sort;
 
-    }
 
-
 
-    public void setSort(Integer sort) {
 
-        this.sort = sort;
 
-    }
 
-
 
-    @Override
 
-    public String toString() {
 
-        return "SysDic{" +
 
-        ", key=" + key +
 
-        ", value=" + value +
 
-        ", sort=" + sort +
 
-        "}";
 
-    }
 
-}

+ 0 - 15
zen-api/src/main/java/com/gxzc/zen/api/bus/service/ISysDicService.java
View File 

@@ -1,15 +0,0 @@
 
-package com.gxzc.zen.api.bus.service;
 
-
 
-import com.gxzc.zen.api.bus.model.SysDic;
 
-import com.gxzc.zen.common.base.BaseService;
 
-/**
 
- * <p>
 
- * 字典表 服务类
 
- * </p>
 
- *
 
- * @author NorthLan123
 
- * @since 2018-01-30
 
- */
 
-public interface ISysDicService extends BaseService<SysDic> {
 
-
 
-}

+ 0 - 20
zen-api/src/main/java/com/gxzc/zen/api/bus/service/impl/SysDicServiceImpl.java
View File 

@@ -1,20 +0,0 @@
 
-package com.gxzc.zen.api.bus.service.impl;
 
-
 
-import com.gxzc.zen.api.bus.model.SysDic;
 
-import com.gxzc.zen.api.bus.mapper.SysDicMapper;
 
-import com.gxzc.zen.api.bus.service.ISysDicService;
 
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 
-import org.springframework.stereotype.Service;
 
-
 
-/**
 
- * <p>
 
- * 字典表 服务实现类
 
- * </p>
 
- *
 
- * @author NorthLan123
 
- * @since 2018-01-30
 
- */
 
-@Service
 
-public class SysDicServiceImpl extends ServiceImpl<SysDicMapper, SysDic> implements ISysDicService {
 
-
 
-}

+ 0 - 13
zen-api/src/main/kotlin/com/gxzc/zen/api/bus/mapper/SysDicMapper.kt
View File 

@@ -1,13 +0,0 @@
 
-package com.gxzc.zen.api.bus.mapper
 
-
 
-import com.gxzc.zen.api.bus.model.SysDic
 
-import com.gxzc.zen.common.base.BaseMapper
 
-/**
 
- * <p>
 
- * 字典表 Mapper 接口
 
- * </p>
 
- *
 
- * @author NorthLan123
 
- * @since 2018-01-30
 
- */
 
-interface SysDicMapper : BaseMapper<SysDic>

+ 0 - 27
zen-api/src/main/kotlin/com/gxzc/zen/api/bus/model/SysDic.kt
View File 

@@ -1,27 +0,0 @@
 
-package com.gxzc.zen.api.bus.model
 
-
 
-import com.gxzc.zen.common.base.BaseModel
 
-
 
-/**
 
- * <p>
 
- * 字典表
 
- * </p>
 
- *
 
- * @author NorthLan123
 
- * @since 2018-01-30
 
- */
 
-data class SysDic(
 
-        /**
 
-         * 字典代码
 
-         */
 
-        var key: String? = null,
 
-        /**
 
-         * 字典值
 
-         */
 
-        var value: String? = null,
 
-        /**
 
-         * 排序号
 
-         */
 
-        var sort: Int? = null
 
-) : BaseModel() {
 
-}

+ 0 - 13
zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/ISysDicService.kt
View File 

@@ -1,13 +0,0 @@
 
-package com.gxzc.zen.api.bus.service
 
-
 
-import com.gxzc.zen.api.bus.model.SysDic
 
-import com.gxzc.zen.common.base.BaseService
 
-/**
 
- * <p>
 
- * 字典表 服务类
 
- * </p>
 
- *
 
- * @author NorthLan123
 
- * @since 2018-01-30
 
- */
 
-interface ISysDicService : BaseService<SysDic>

+ 0 - 20
zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/impl/SysDicServiceImpl.kt
View File 

@@ -1,20 +0,0 @@
 
-package com.gxzc.zen.api.bus.service.impl
 
-
 
-import com.gxzc.zen.api.bus.model.SysDic
 
-import com.gxzc.zen.api.bus.mapper.SysDicMapper
 
-import com.gxzc.zen.api.bus.service.ISysDicService
 
-import com.baomidou.mybatisplus.service.impl.ServiceImpl
 
-import org.springframework.stereotype.Service
 
-
 
-/**
 
- * <p>
 
- * 字典表 服务实现类
 
- * </p>
 
- *
 
- * @author NorthLan123
 
- * @since 2018-01-30
 
- */
 
-@Service
 
-open class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {
 
-
 
-}

+ 3 - 8
zen-api/src/main/kotlin/com/gxzc/zen/api/sys/mapper/SysDeptMapper.kt
View File 

@@ -1,18 +1,13 @@
 
-package com.gxzc.zen.api.sys.mapper;
 
+package com.gxzc.zen.api.sys.mapper
 
 
 import com.gxzc.zen.api.sys.model.SysDept
 
 import com.gxzc.zen.common.base.BaseMapper
 
-import org.springframework.stereotype.Repository
 
-
 
 /**
 
  * <p>
 
  * 部门管理 Mapper 接口
 
  * </p>
 
  *
 
  * @author NorthLan123
 
- * @since 2018-01-27
 
+ * @since 2018-01-30
 
  */
 
-@Repository
 
-interface SysDeptMapper : BaseMapper<SysDept> {
 
-    fun custom(): Long
 
-}
 
+interface SysDeptMapper : BaseMapper<SysDept>

+ 5 - 4
zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysDept.kt
View File 

@@ -1,6 +1,6 @@
 
-package com.gxzc.zen.api.sys.model;
 
+package com.gxzc.zen.api.sys.model
 
 
-import com.gxzc.zen.common.base.BaseModel;
 
+import com.gxzc.zen.common.base.BaseModel
 
 
 /**
 
  * <p>
 
@@ -8,7 +8,7 @@ import com.gxzc.zen.common.base.BaseModel;
 
  * </p>
 
  *
 
  * @author NorthLan123
 
- * @since 2018-01-27
 
+ * @since 2018-01-30
 
  */
 
 data class SysDept(
 
         /**
 
@@ -23,4 +23,5 @@ data class SysDept(
 
          * 排序号
 
          */
 
         var sort: Integer? = null
 
-) : BaseModel()
 
+) : BaseModel() {
 
+}

+ 5 - 8
zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/ISysDeptService.kt
View File 

@@ -1,16 +1,13 @@
 
-package com.gxzc.zen.api.sys.service;
 
-
 
-import com.gxzc.zen.api.sys.model.SysDept;
 
-import com.gxzc.zen.common.base.BaseService;
 
+package com.gxzc.zen.api.sys.service
 
 
+import com.gxzc.zen.api.sys.model.SysDept
 
+import com.gxzc.zen.common.base.BaseService
 
 /**
 
  * <p>
 
  * 部门管理 服务类
 
  * </p>
 
  *
 
  * @author NorthLan123
 
- * @since 2018-01-27
 
+ * @since 2018-01-30
 
  */
 
-interface ISysDeptService : BaseService<SysDept> {
 
-    fun custom(): Long
 
-}
 
+interface ISysDeptService : BaseService<SysDept>

+ 7 - 10
zen-api/src/main/kotlin/com/gxzc/zen/api/sys/service/impl/SysDeptServiceImpl.kt
View File 

@@ -1,10 +1,10 @@
 
-package com.gxzc.zen.api.sys.service.impl;
 
+package com.gxzc.zen.api.sys.service.impl
 
 
-import com.gxzc.zen.api.sys.model.SysDept;
 
-import com.gxzc.zen.api.sys.mapper.SysDeptMapper;
 
-import com.gxzc.zen.api.sys.service.ISysDeptService;
 
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 
-import org.springframework.stereotype.Service;
 
+import com.gxzc.zen.api.sys.model.SysDept
 
+import com.gxzc.zen.api.sys.mapper.SysDeptMapper
 
+import com.gxzc.zen.api.sys.service.ISysDeptService
 
+import com.baomidou.mybatisplus.service.impl.ServiceImpl
 
+import org.springframework.stereotype.Service
 
 
 /**
 
  * <p>
 
@@ -12,12 +12,9 @@ import org.springframework.stereotype.Service;
 
  * </p>
 
  *
 
  * @author NorthLan123
 
- * @since 2018-01-27
 
+ * @since 2018-01-30
 
  */
 
 @Service
 
 open class SysDeptServiceImpl : ServiceImpl<SysDeptMapper, SysDept>(), ISysDeptService {
 
-    override fun custom(): Long {
 
-        return baseMapper.custom()
 
-    }
 
 
 }

+ 0 - 19
zen-api/src/main/resources/mapping/bus/SysDicMapper.xml
View File 

@@ -1,19 +0,0 @@
 
-<?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.gxzc.zen.api.bus.mapper.SysDicMapper">
 
-
 
-    <!-- 通用查询映射结果 -->
 
-    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.bus.model.SysDic">
 
-    <result column="id" property="id" />
 
-    <result column="enable" property="enable" />
 
-    <result column="remark" property="remark" />
 
-    <result column="create_time" property="createTime" />
 
-    <result column="create_by" property="createBy" />
 
-    <result column="update_time" property="updateTime" />
 
-    <result column="update_by" property="updateBy" />
 
-        <result column="key" property="key" />
 
-        <result column="value" property="value" />
 
-        <result column="sort" property="sort" />
 
-    </resultMap>
 
-
 
-</mapper>

+ 10 - 14
zen-api/src/main/resources/mapping/sys/SysDeptMapper.xml
View File 

@@ -4,20 +4,16 @@
 
 
     <!-- 通用查询映射结果 -->
 
     <resultMap id="BaseResultMap" type="com.gxzc.zen.api.sys.model.SysDept">
 
-        <result column="id" property="id"/>
 
-        <result column="enable" property="enable"/>
 
-        <result column="remark" property="remark"/>
 
-        <result column="create_time" property="createTime"/>
 
-        <result column="create_by" property="createBy"/>
 
-        <result column="update_time" property="updateTime"/>
 
-        <result column="update_by" property="updateBy"/>
 
-        <result column="dept_name" property="deptName"/>
 
-        <result column="principal" property="principal"/>
 
-        <result column="sort" property="sort"/>
 
+    <result column="id" property="id" />
 
+    <result column="enable" property="enable" />
 
+    <result column="remark" property="remark" />
 
+    <result column="create_time" property="createTime" />
 
+    <result column="create_by" property="createBy" />
 
+    <result column="update_time" property="updateTime" />
 
+    <result column="update_by" property="updateBy" />
 
+        <result column="dept_name" property="deptName" />
 
+        <result column="principal" property="principal" />
 
+        <result column="sort" property="sort" />
 
     </resultMap>
 
 
-    <select id="custom" resultType="java.lang.Long">
 
-        SELECT count(*) FROM sys_dept
 
-    </select>
 
-
 
 </mapper>

+ 3 - 3
zen-common/src/main/kotlin/com/gxzc/zen/common/base/BaseModel.kt
View File 

@@ -26,7 +26,7 @@ open class BaseModel {
 
 
     // 创建人id
 
     @TableField(fill = FieldFill.INSERT, strategy = FieldStrategy.NOT_NULL)
 
-    var createBy: Long? = null
 
+    var createBy: String? = null
 
 
     // 更新时间
 
     @TableField(fill = FieldFill.UPDATE, strategy = FieldStrategy.NOT_NULL)
 
@@ -34,7 +34,7 @@ open class BaseModel {
 
 
     // 更新人id
 
     @TableField(fill = FieldFill.UPDATE, strategy = FieldStrategy.NOT_NULL)
 
-    var updateBy: Long? = null
 
+    var updateBy: String? = null
 
 
 //    @TableField(exist = false)
 
 //    private var createdByName: String? = null
 
@@ -42,6 +42,6 @@ open class BaseModel {
 
 //    @TableField(exist = false)
 
 //    private var updatedByName: String? = null
 
 
-    @TableLogic(value = "true", delval = "false")
 
+    @TableLogic(value = "1", delval = "0")
 
     var enable: Boolean? = null
 
 }

+ 14 - 14
zen-orm/src/main/kotlin/com/gxzc/zen/Generator.kt
View File 

@@ -16,6 +16,20 @@ import java.io.File
 
  * @date 2018/1/24
 
  * @url https://noahlan.me
 
  */
 
+fun main(args: Array<String>) {
 
+    generate(true, "NorthLan", "sys", DataSourceConfig().also {
 
+        it.dbType = DbType.MYSQL
 
+        it.typeConvert = object : MySqlTypeConvert() {
 
+            override fun processTypeConvert(fieldType: String?): DbColumnType {
 
+                return super.processTypeConvert(fieldType)
 
+            }
 
+        }
 
+        it.driverName = "com.mysql.jdbc.Driver"
 
+        it.username = "archives"
 
+        it.password = "archives"
 
+        it.url = "jdbc:mysql://192.168.1.124:3307/archives_sys?characterEncoding=utf8"
 
+    })
 
+}
 
 
 fun generate(isKotlin: Boolean, author: String, pkgType: String, dataSourceConfig: DataSourceConfig) {
 
     val mpg = AutoGenerator()
 
@@ -94,18 +108,4 @@ fun generate(isKotlin: Boolean, author: String, pkgType: String, dataSourceConfi
 
     mpg.execute()
 
 }
 
 
-fun main(args: Array<String>) {
 
-    generate(false, "NorthLan", "bus", DataSourceConfig().also {
 
-        it.dbType = DbType.MYSQL
 
-        it.typeConvert = object : MySqlTypeConvert() {
 
-            override fun processTypeConvert(fieldType: String?): DbColumnType {
 
 
-                return super.processTypeConvert(fieldType)
 
-            }
 
-        }
 
-        it.driverName = "com.mysql.jdbc.Driver"
 
-        it.username = "root"
 
-        it.password = "root"
 
-        it.url = "jdbc:mysql://127.0.0.1:3306/archives_rec?characterEncoding=utf8"
 
-    })
 
-}

+ 1 - 6
zen-orm/src/main/kotlin/com/gxzc/zen/orm/aspect/DataSourceSwitchAspect.kt
View File 

@@ -1,7 +1,7 @@
 
 package com.gxzc.zen.orm.aspect
 
 
-import com.gxzc.zen.orm.annotation.DynamicDataSource
 
 import com.gxzc.zen.orm.DynamicMultipleDataSource
 
+import com.gxzc.zen.orm.annotation.DynamicDataSource
 
 import com.gxzc.zen.orm.contants.DSKey
 
 import org.aspectj.lang.JoinPoint
 
 import org.aspectj.lang.annotation.Aspect
 
@@ -26,8 +26,6 @@ class DataSourceSwitchAspect {
 
         private val logger = LoggerFactory.getLogger(DataSourceSwitchAspect::class.java)
 
     }
 
 
-    var isControllerDataSourceAnnotation = false
 
-
 
     @Pointcut("execution(* com.gxzc.zen.api..*Service.*(..))")
 
     fun zenServicePointCut() {
 
     }
 
@@ -45,9 +43,6 @@ class DataSourceSwitchAspect {
 
 
     @Before("zenServicePointCut() || mpServicePointCut() || mpMapperPointCut()")
 
     fun dynamicDataSource(joinPoint: JoinPoint) {
 
-        if (isControllerDataSourceAnnotation) {
 
-            return
 
-        }
 
         val target = joinPoint.target
 
 
         val packageName: String = try {

+ 8 - 10
zen-orm/src/main/resources/application-orm.yml
View File 

@@ -19,7 +19,7 @@ mybatis-plus:
 
     lazyLoadingEnabled: true #延时加载的开关
 
     multipleResultSetsEnabled: true #延时加载一个属性时会加载该对象全部属性，否则按需加载属性
 
     interceptors: com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor
 
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
 
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
 
 
 
 ################## Alibaba Druid 配置 ##################
 
@@ -34,11 +34,10 @@ spring:
 
 
 datasource:
 
   sys:
 
-    mapper-location: classpath:mapping/sys/*.xml
 
     name: archives_sys
 
-    url: jdbc:mysql://127.0.0.1:3306/archives_sys?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
 
-    username: root
 
-    password: root
 
+    url: jdbc:mysql://192.168.1.124:3307/archives_sys?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
 
+    username: archives
 
+    password: archives
 
     testWhileIdle: true
 
     testOnBorrow: false
 
     testOnReturn: false
 
@@ -54,11 +53,10 @@ datasource:
 
     timeBetweenEvictionRunsMillis: 60000
 
     minEvictableIdleTimeMillis: 30000
 
   bus:
 
-    mapper-location: classpath:mapping/bus/*.xml
 
-    name: archives_rec
 
-    url: jdbc:mysql://127.0.0.1:3306/archives_rec?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
 
-    username: root
 
-    password: root
 
+    name: archives_receive
 
+    url: jdbc:mysql://192.168.1.124:3307/archives_receive?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
 
+    username: archives
 
+    password: archives
 
     testWhileIdle: true
 
     testOnBorrow: false
 
     testOnReturn: false

+ 32 - 0
zen-web/src/test/kotlin/com/gxzc/zen/fun/TestLogicDelete.kt
View File 

@@ -0,0 +1,32 @@
 
+package com.gxzc.zen.`fun`
 
+
 
+import com.gxzc.zen.api.sys.model.SysDic
 
+import com.gxzc.zen.api.sys.service.ISysDicService
 
+import com.gxzc.zen.base.BaseTestKt
 
+import org.junit.Test
 
+import org.springframework.beans.factory.annotation.Autowired
 
+
 
+/**
 
+ *
 
+ * @author NorthLan
 
+ * @date 2018/1/30
 
+ * @url https://noahlan.com
 
+ */
 
+class TestLogicDelete : BaseTestKt() {
 
+    @Autowired
 
+    private lateinit var sysDicService: ISysDicService
 
+
 
+    @Test
 
+    fun insertSysData() {
 
+        sysDicService.insert(SysDic().also {
 
+            it.key = "test"
 
+            it.value = "testValue"
 
+            it.sort = Integer(1)
 
+        })
 
+    }
 
+
 
+    @Test
 
+    fun testLogicDelete() {
 
+        sysDicService.deleteById(1000L)
 
+    }
 
+}