NorthLan 7 年 前
コミット
bd91e9fe41
31 ファイル変更309 行追加719 行削除
  1. 4 0
      .gitignore
  2. 2 2
      build.gradle
  3. 0 70
      doc/zen-sys.sql
  4. 0 345
      guns.log
  5. 0 29
      zen-admin/src/main/kotlin/com/gxzc/zen/ExampleController.kt
  6. 0 12
      zen-admin/src/main/kotlin/com/gxzc/zen/MainApplication.kt
  7. 20 0
      zen-admin/src/main/kotlin/com/gxzc/zen/persistence/MainApplication.kt
  8. 19 0
      zen-admin/src/main/kotlin/com/gxzc/zen/persistence/controller/ExampleController.kt
  9. 16 0
      zen-admin/src/main/kotlin/com/gxzc/zen/persistence/mapper/SysDeptDao.kt
  10. 19 0
      zen-admin/src/main/kotlin/com/gxzc/zen/persistence/mapper/xml/SysDeptDao.xml
  11. 28 0
      zen-admin/src/main/kotlin/com/gxzc/zen/persistence/model/SysDept.kt
  12. 14 0
      zen-admin/src/main/kotlin/com/gxzc/zen/persistence/service/ISysDeptService.kt
  13. 18 0
      zen-admin/src/main/kotlin/com/gxzc/zen/persistence/service/impl/SysDeptServiceImpl.kt
  14. 17 17
      zen-admin/src/main/resources/application.yml
  15. 28 0
      zen-admin/src/test/kotlin/com/gxzc/zen/Test.kt
  16. 39 0
      zen-admin/src/test/kotlin/com/gxzc/zen/base/BaseTestKt.kt
  17. 0 8
      zen-api/src/main/kotlin/com/gxzc/zen/sys/dao/TSysUserMapper.kt
  18. 0 11
      zen-api/src/main/kotlin/com/gxzc/zen/sys/dao/TestDao.kt
  19. 0 15
      zen-api/src/main/kotlin/com/gxzc/zen/sys/model/TSysUser.kt
  20. 0 8
      zen-api/src/main/kotlin/com/gxzc/zen/sys/model/Test.kt
  21. 0 9
      zen-api/src/main/kotlin/com/gxzc/zen/sys/service/TSysUserService.kt
  22. 0 19
      zen-api/src/main/kotlin/com/gxzc/zen/sys/service/TestService.kt
  23. 0 15
      zen-api/src/main/resources/com/gxzc/zen/mapping/sys/TSysUserMapper.xml
  24. 0 10
      zen-api/src/main/resources/com/gxzc/zen/mapping/sys/TestMapper.xml
  25. 7 7
      zen-common/src/main/kotlin/com/gxzc/zen/persistence/BaseModel.kt
  26. 0 12
      zen-common/src/main/kotlin/com/gxzc/zen/persistence/ZenBaseMapper.kt
  27. 0 29
      zen-common/src/main/kotlin/com/gxzc/zen/persistence/ZenBaseModel.kt
  28. 0 92
      zen-common/src/main/kotlin/com/gxzc/zen/persistence/ZenBaseService.kt
  29. 39 0
      zen-common/src/test/kotlin/com/gxzc/zen/base/BaseTestKt.kt
  30. 19 9
      zen-orm/src/main/kotlin/com/gxzc/zen/Generator.kt
  31. 20 0
      zen-orm/src/test/kotlin/com/gxzc/zen/generator/TestPathFinder.kt

+ 4 - 0
.gitignore

@@ -137,9 +137,13 @@ rebel.xml
 # log
 log/
 logs/
+*.log
 
 
 # IntelliJ IDEA
 *.iml
 .idea/
 .gradle/
+
+# Gradle
+/build/

+ 2 - 2
build.gradle

@@ -65,12 +65,12 @@ subprojects {
         testCompile("junit:junit:4.12")
 
         compile("commons-io:commons-io:$commons_io_version")
-        compile("commons-logging:commons-logging:$commons_logging_version")
+//        compile("commons-logging:commons-logging:$commons_logging_version")
         compile("org.apache.commons:commons-lang3:$commons_lang3_version")
         compile group: 'commons-codec', name: 'commons-codec', version: '1.10'
         compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.2'
         compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.3'
-        compile group: 'log4j', name: 'log4j', version: '1.2.17'
+//        compile group: 'log4j', name: 'log4j', version: '1.2.17'
         compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
         // compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.25'
 

+ 0 - 70
doc/zen-sys.sql

@@ -1,70 +0,0 @@
-/*
- Navicat MySQL Data Transfer
-
- Source Server         : local
- Source Server Type    : MySQL
- Source Server Version : 50720
- Source Host           : localhost:3306
- Source Schema         : zen-sys
-
- Target Server Type    : MySQL
- Target Server Version : 50720
- File Encoding         : 65001
-
- Date: 23/01/2018 17:33:24
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for t_sys_user
--- ----------------------------
-DROP TABLE IF EXISTS `t_sys_user`;
-CREATE TABLE `t_sys_user`  (
-  `account` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `user_type` timestamp(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0),
-  `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `phone` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `dept_id` bigint(20) NULL DEFAULT NULL,
-  `avatar` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `staff_no` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '系统编号',
-  `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
-  `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
-  `enable` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '1' COMMENT '启用标记',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of t_sys_user
--- ----------------------------
-INSERT INTO `t_sys_user` VALUES ('root', '123456', NULL, '管理员', NULL, NULL, NULL, NULL, 1, NULL, '2018-01-23 17:33:13', NULL, '2018-01-23 17:33:13', NULL, '1');
-
--- ----------------------------
--- Table structure for test
--- ----------------------------
-DROP TABLE IF EXISTS `test`;
-CREATE TABLE `test`  (
-  `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `times` datetime(0) NULL DEFAULT NULL,
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '系统编号',
-  `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建者',
-  `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新者',
-  `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
-  `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
-  `enable` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '1' COMMENT '删除标记',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of test
--- ----------------------------
-INSERT INTO `test` VALUES ('root', '2018-01-23 17:19:28', 1, NULL, '2018-01-23 17:19:31', NULL, '2018-01-23 17:19:31', NULL, '0');
-
-SET FOREIGN_KEY_CHECKS = 1;

+ 0 - 345
guns.log

@@ -1,345 +0,0 @@
-2018-01-22 11:41:42.455  INFO 5489 --- [main] com.gxzc.zen.MainApplicationKt           : Starting MainApplicationKt on linyo-Lenovo-I2000 with PID 5489 (/home/mgr/ruisCenter/program/java/Zen/zen-admin/out/production/classes started by mgr in /home/mgr/ruisCenter/program/java/Zen)
-2018-01-22 11:41:42.458  INFO 5489 --- [main] com.gxzc.zen.MainApplicationKt           : The following profiles are active: dev
-2018-01-22 11:41:42.916 ERROR 5489 --- [main] o.s.boot.SpringApplication               : Application startup failed
-
-java.lang.IllegalArgumentException: Invalid source type class kotlin.reflect.jvm.internal.KClassImpl
-	at org.springframework.boot.BeanDefinitionLoader.load(BeanDefinitionLoader.java:146) ~[spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.BeanDefinitionLoader.load(BeanDefinitionLoader.java:127) ~[spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.load(SpringApplication.java:635) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.prepareContext(SpringApplication.java:355) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:301) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at com.gxzc.zen.MainApplicationKt.main(MainApplication.kt:11) [classes/:na]
-
-2018-01-22 11:42:00.814  INFO 5562 --- [main] com.gxzc.zen.MainApplicationKt           : Starting MainApplicationKt on linyo-Lenovo-I2000 with PID 5562 (/home/mgr/ruisCenter/program/java/Zen/zen-admin/out/production/classes started by mgr in /home/mgr/ruisCenter/program/java/Zen)
-2018-01-22 11:42:00.831  INFO 5562 --- [main] com.gxzc.zen.MainApplicationKt           : The following profiles are active: dev
-2018-01-22 11:42:01.183  INFO 5562 --- [main] ationConfigEmbeddedWebApplicationContext : Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@68ead359: startup date [Mon Jan 22 11:42:01 CST 2018]; root of context hierarchy
-2018-01-22 11:42:02.388  WARN 5562 --- [main] ationConfigEmbeddedWebApplicationContext : Exception encountered during context initialization - cancelling refresh attempt: org.springframework.beans.factory.parsing.BeanDefinitionParsingException: Configuration problem: @Configuration class 'MainApplication' may not be final. Remove the final modifier to continue.
-Offending resource: com.gxzc.zen.MainApplication
-2018-01-22 11:42:02.404  INFO 5562 --- [main] utoConfigurationReportLoggingInitializer : 
-
-Error starting ApplicationContext. To display the auto-configuration report re-run your application with 'debug' enabled.
-2018-01-22 11:42:02.429 ERROR 5562 --- [main] o.s.boot.SpringApplication               : Application startup failed
-
-org.springframework.beans.factory.parsing.BeanDefinitionParsingException: Configuration problem: @Configuration class 'MainApplication' may not be final. Remove the final modifier to continue.
-Offending resource: com.gxzc.zen.MainApplication
-	at org.springframework.beans.factory.parsing.FailFastProblemReporter.error(FailFastProblemReporter.java:70) ~[spring-beans-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClass.validate(ConfigurationClass.java:214) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassParser.validate(ConfigurationClassParser.java:207) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.processConfigBeanDefinitions(ConfigurationClassPostProcessor.java:309) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.postProcessBeanDefinitionRegistry(ConfigurationClassPostProcessor.java:228) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanDefinitionRegistryPostProcessors(PostProcessorRegistrationDelegate.java:272) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanFactoryPostProcessors(PostProcessorRegistrationDelegate.java:92) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.invokeBeanFactoryPostProcessors(AbstractApplicationContext.java:687) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:525) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122) ~[spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at com.gxzc.zen.MainApplicationKt.main(MainApplication.kt:11) [classes/:na]
-
-2018-01-22 11:43:26.533  INFO 5698 --- [main] com.gxzc.zen.MainApplicationKt           : Starting MainApplicationKt on linyo-Lenovo-I2000 with PID 5698 (/home/mgr/ruisCenter/program/java/Zen/zen-admin/out/production/classes started by mgr in /home/mgr/ruisCenter/program/java/Zen)
-2018-01-22 11:43:26.542  INFO 5698 --- [main] com.gxzc.zen.MainApplicationKt           : The following profiles are active: dev
-2018-01-22 11:43:27.025  INFO 5698 --- [main] ationConfigEmbeddedWebApplicationContext : Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@584f54e6: startup date [Mon Jan 22 11:43:27 CST 2018]; root of context hierarchy
-2018-01-22 11:43:28.319  WARN 5698 --- [main] ationConfigEmbeddedWebApplicationContext : Exception encountered during context initialization - cancelling refresh attempt: org.springframework.beans.factory.parsing.BeanDefinitionParsingException: Configuration problem: @Configuration class 'MainApplication' may not be final. Remove the final modifier to continue.
-Offending resource: com.gxzc.zen.MainApplication
-2018-01-22 11:43:28.332  INFO 5698 --- [main] utoConfigurationReportLoggingInitializer : 
-
-Error starting ApplicationContext. To display the auto-configuration report re-run your application with 'debug' enabled.
-2018-01-22 11:43:28.358 ERROR 5698 --- [main] o.s.boot.SpringApplication               : Application startup failed
-
-org.springframework.beans.factory.parsing.BeanDefinitionParsingException: Configuration problem: @Configuration class 'MainApplication' may not be final. Remove the final modifier to continue.
-Offending resource: com.gxzc.zen.MainApplication
-	at org.springframework.beans.factory.parsing.FailFastProblemReporter.error(FailFastProblemReporter.java:70) ~[spring-beans-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClass.validate(ConfigurationClass.java:214) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassParser.validate(ConfigurationClassParser.java:207) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.processConfigBeanDefinitions(ConfigurationClassPostProcessor.java:309) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.postProcessBeanDefinitionRegistry(ConfigurationClassPostProcessor.java:228) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanDefinitionRegistryPostProcessors(PostProcessorRegistrationDelegate.java:272) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanFactoryPostProcessors(PostProcessorRegistrationDelegate.java:92) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.invokeBeanFactoryPostProcessors(AbstractApplicationContext.java:687) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:525) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122) ~[spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at com.gxzc.zen.MainApplicationKt.main(MainApplication.kt:11) [classes/:na]
-
-2018-01-22 11:46:00.936  INFO 5947 --- [main] com.gxzc.zen.MainApplicationKt           : Starting MainApplicationKt on linyo-Lenovo-I2000 with PID 5947 (/home/mgr/ruisCenter/program/java/Zen/zen-admin/out/production/classes started by mgr in /home/mgr/ruisCenter/program/java/Zen)
-2018-01-22 11:46:00.948  INFO 5947 --- [main] com.gxzc.zen.MainApplicationKt           : The following profiles are active: dev
-2018-01-22 11:46:01.474  INFO 5947 --- [main] ationConfigEmbeddedWebApplicationContext : Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@2525ff7e: startup date [Mon Jan 22 11:46:01 CST 2018]; root of context hierarchy
-2018-01-22 11:46:02.484  WARN 5947 --- [main] ationConfigEmbeddedWebApplicationContext : Exception encountered during context initialization - cancelling refresh attempt: org.springframework.beans.factory.parsing.BeanDefinitionParsingException: Configuration problem: @Configuration class 'MainApplication' may not be final. Remove the final modifier to continue.
-Offending resource: com.gxzc.zen.MainApplication
-2018-01-22 11:46:02.499  INFO 5947 --- [main] utoConfigurationReportLoggingInitializer : 
-
-Error starting ApplicationContext. To display the auto-configuration report re-run your application with 'debug' enabled.
-2018-01-22 11:46:02.516 ERROR 5947 --- [main] o.s.boot.SpringApplication               : Application startup failed
-
-org.springframework.beans.factory.parsing.BeanDefinitionParsingException: Configuration problem: @Configuration class 'MainApplication' may not be final. Remove the final modifier to continue.
-Offending resource: com.gxzc.zen.MainApplication
-	at org.springframework.beans.factory.parsing.FailFastProblemReporter.error(FailFastProblemReporter.java:70) ~[spring-beans-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClass.validate(ConfigurationClass.java:214) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassParser.validate(ConfigurationClassParser.java:207) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.processConfigBeanDefinitions(ConfigurationClassPostProcessor.java:309) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.postProcessBeanDefinitionRegistry(ConfigurationClassPostProcessor.java:228) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanDefinitionRegistryPostProcessors(PostProcessorRegistrationDelegate.java:272) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanFactoryPostProcessors(PostProcessorRegistrationDelegate.java:92) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.invokeBeanFactoryPostProcessors(AbstractApplicationContext.java:687) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:525) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122) ~[spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at com.gxzc.zen.MainApplicationKt.main(MainApplication.kt:11) [classes/:na]
-
-2018-01-22 11:52:56.690  INFO 6330 --- [main] com.gxzc.zen.MainApplicationKt           : Starting MainApplicationKt on linyo-Lenovo-I2000 with PID 6330 (/home/mgr/ruisCenter/program/java/Zen/zen-admin/out/production/classes started by mgr in /home/mgr/ruisCenter/program/java/Zen)
-2018-01-22 11:52:56.702  INFO 6330 --- [main] com.gxzc.zen.MainApplicationKt           : The following profiles are active: dev
-2018-01-22 11:52:57.326  INFO 6330 --- [main] ationConfigEmbeddedWebApplicationContext : Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@152aa092: startup date [Mon Jan 22 11:52:57 CST 2018]; root of context hierarchy
-2018-01-22 11:52:58.157 ERROR 6330 --- [main] o.s.boot.SpringApplication               : Application startup failed
-
-java.lang.NoSuchMethodError: org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource.<init>(Lorg/springframework/core/type/AnnotationMetadata;Ljava/lang/Class;Lorg/springframework/core/io/ResourceLoader;Lorg/springframework/core/env/Environment;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)V
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport$1.<init>(AbstractRepositoryConfigurationSourceSupport.java:68) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport.getConfigurationSource(AbstractRepositoryConfigurationSourceSupport.java:67) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport.registerBeanDefinitions(AbstractRepositoryConfigurationSourceSupport.java:58) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitionsFromRegistrars(ConfigurationClassBeanDefinitionReader.java:359) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitionsForConfigurationClass(ConfigurationClassBeanDefinitionReader.java:143) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitions(ConfigurationClassBeanDefinitionReader.java:116) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.processConfigBeanDefinitions(ConfigurationClassPostProcessor.java:320) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.postProcessBeanDefinitionRegistry(ConfigurationClassPostProcessor.java:228) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanDefinitionRegistryPostProcessors(PostProcessorRegistrationDelegate.java:272) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanFactoryPostProcessors(PostProcessorRegistrationDelegate.java:92) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.invokeBeanFactoryPostProcessors(AbstractApplicationContext.java:687) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:525) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122) ~[spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at com.gxzc.zen.MainApplicationKt.main(MainApplication.kt:11) [classes/:na]
-
-2018-01-22 11:52:58.159  INFO 6330 --- [main] ationConfigEmbeddedWebApplicationContext : Closing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@152aa092: startup date [Mon Jan 22 11:52:57 CST 2018]; root of context hierarchy
-2018-01-22 11:53:55.533  INFO 6502 --- [main] com.gxzc.zen.MainApplicationKt           : Starting MainApplicationKt on linyo-Lenovo-I2000 with PID 6502 (/home/mgr/ruisCenter/program/java/Zen/zen-admin/out/production/classes started by mgr in /home/mgr/ruisCenter/program/java/Zen)
-2018-01-22 11:53:55.550  INFO 6502 --- [main] com.gxzc.zen.MainApplicationKt           : The following profiles are active: dev
-2018-01-22 11:53:56.007  INFO 6502 --- [main] ationConfigEmbeddedWebApplicationContext : Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@776b83cc: startup date [Mon Jan 22 11:53:56 CST 2018]; root of context hierarchy
-2018-01-22 11:53:57.005 ERROR 6502 --- [main] o.s.boot.SpringApplication               : Application startup failed
-
-java.lang.NoSuchMethodError: org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource.<init>(Lorg/springframework/core/type/AnnotationMetadata;Ljava/lang/Class;Lorg/springframework/core/io/ResourceLoader;Lorg/springframework/core/env/Environment;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)V
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport$1.<init>(AbstractRepositoryConfigurationSourceSupport.java:68) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport.getConfigurationSource(AbstractRepositoryConfigurationSourceSupport.java:67) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport.registerBeanDefinitions(AbstractRepositoryConfigurationSourceSupport.java:58) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitionsFromRegistrars(ConfigurationClassBeanDefinitionReader.java:359) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitionsForConfigurationClass(ConfigurationClassBeanDefinitionReader.java:143) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitions(ConfigurationClassBeanDefinitionReader.java:116) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.processConfigBeanDefinitions(ConfigurationClassPostProcessor.java:320) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.postProcessBeanDefinitionRegistry(ConfigurationClassPostProcessor.java:228) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanDefinitionRegistryPostProcessors(PostProcessorRegistrationDelegate.java:272) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanFactoryPostProcessors(PostProcessorRegistrationDelegate.java:92) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.invokeBeanFactoryPostProcessors(AbstractApplicationContext.java:687) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:525) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122) ~[spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at com.gxzc.zen.MainApplicationKt.main(MainApplication.kt:11) [classes/:na]
-
-2018-01-22 11:53:57.007  INFO 6502 --- [main] ationConfigEmbeddedWebApplicationContext : Closing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@776b83cc: startup date [Mon Jan 22 11:53:56 CST 2018]; root of context hierarchy
-2018-01-22 11:54:20.175  INFO 6618 --- [main] com.gxzc.zen.MainApplicationKt           : Starting MainApplicationKt on linyo-Lenovo-I2000 with PID 6618 (/home/mgr/ruisCenter/program/java/Zen/zen-admin/out/production/classes started by mgr in /home/mgr/ruisCenter/program/java/Zen)
-2018-01-22 11:54:20.186  INFO 6618 --- [main] com.gxzc.zen.MainApplicationKt           : The following profiles are active: dev
-2018-01-22 11:54:20.695  INFO 6618 --- [main] ationConfigEmbeddedWebApplicationContext : Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@7e5d9a50: startup date [Mon Jan 22 11:54:20 CST 2018]; root of context hierarchy
-2018-01-22 11:54:22.102 ERROR 6618 --- [main] o.s.boot.SpringApplication               : Application startup failed
-
-java.lang.NoSuchMethodError: org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource.<init>(Lorg/springframework/core/type/AnnotationMetadata;Ljava/lang/Class;Lorg/springframework/core/io/ResourceLoader;Lorg/springframework/core/env/Environment;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)V
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport$1.<init>(AbstractRepositoryConfigurationSourceSupport.java:68) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport.getConfigurationSource(AbstractRepositoryConfigurationSourceSupport.java:67) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport.registerBeanDefinitions(AbstractRepositoryConfigurationSourceSupport.java:58) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitionsFromRegistrars(ConfigurationClassBeanDefinitionReader.java:359) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitionsForConfigurationClass(ConfigurationClassBeanDefinitionReader.java:143) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitions(ConfigurationClassBeanDefinitionReader.java:116) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.processConfigBeanDefinitions(ConfigurationClassPostProcessor.java:320) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.postProcessBeanDefinitionRegistry(ConfigurationClassPostProcessor.java:228) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanDefinitionRegistryPostProcessors(PostProcessorRegistrationDelegate.java:272) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanFactoryPostProcessors(PostProcessorRegistrationDelegate.java:92) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.invokeBeanFactoryPostProcessors(AbstractApplicationContext.java:687) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:525) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122) ~[spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at com.gxzc.zen.MainApplicationKt.main(MainApplication.kt:11) [classes/:na]
-
-2018-01-22 11:54:22.105  INFO 6618 --- [main] ationConfigEmbeddedWebApplicationContext : Closing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@7e5d9a50: startup date [Mon Jan 22 11:54:20 CST 2018]; root of context hierarchy
-2018-01-22 11:58:43.602  INFO 7301 --- [main] com.gxzc.zen.MainApplicationKt           : Starting MainApplicationKt on linyo-Lenovo-I2000 with PID 7301 (/home/mgr/ruisCenter/program/java/Zen/zen-admin/out/production/classes started by mgr in /home/mgr/ruisCenter/program/java/Zen)
-2018-01-22 11:58:43.617  INFO 7301 --- [main] com.gxzc.zen.MainApplicationKt           : The following profiles are active: dev
-2018-01-22 11:58:44.185  INFO 7301 --- [main] ationConfigEmbeddedWebApplicationContext : Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@3724af13: startup date [Mon Jan 22 11:58:44 CST 2018]; root of context hierarchy
-2018-01-22 11:58:44.819 ERROR 7301 --- [main] o.s.boot.SpringApplication               : Application startup failed
-
-java.lang.NoSuchMethodError: org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource.<init>(Lorg/springframework/core/type/AnnotationMetadata;Ljava/lang/Class;Lorg/springframework/core/io/ResourceLoader;Lorg/springframework/core/env/Environment;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)V
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport$1.<init>(AbstractRepositoryConfigurationSourceSupport.java:68) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport.getConfigurationSource(AbstractRepositoryConfigurationSourceSupport.java:67) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport.registerBeanDefinitions(AbstractRepositoryConfigurationSourceSupport.java:58) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitionsFromRegistrars(ConfigurationClassBeanDefinitionReader.java:359) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitionsForConfigurationClass(ConfigurationClassBeanDefinitionReader.java:143) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitions(ConfigurationClassBeanDefinitionReader.java:116) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.processConfigBeanDefinitions(ConfigurationClassPostProcessor.java:320) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.postProcessBeanDefinitionRegistry(ConfigurationClassPostProcessor.java:228) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanDefinitionRegistryPostProcessors(PostProcessorRegistrationDelegate.java:272) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanFactoryPostProcessors(PostProcessorRegistrationDelegate.java:92) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.invokeBeanFactoryPostProcessors(AbstractApplicationContext.java:687) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:525) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122) ~[spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at com.gxzc.zen.MainApplicationKt.main(MainApplication.kt:11) [classes/:na]
-
-2018-01-22 11:58:44.820  INFO 7301 --- [main] ationConfigEmbeddedWebApplicationContext : Closing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@3724af13: startup date [Mon Jan 22 11:58:44 CST 2018]; root of context hierarchy
-2018-01-22 12:00:41.051  INFO 7480 --- [main] com.gxzc.zen.MainApplicationKt           : Starting MainApplicationKt on linyo-Lenovo-I2000 with PID 7480 (/home/mgr/ruisCenter/program/java/Zen/zen-admin/out/production/classes started by mgr in /home/mgr/ruisCenter/program/java/Zen)
-2018-01-22 12:00:41.063  INFO 7480 --- [main] com.gxzc.zen.MainApplicationKt           : The following profiles are active: dev
-2018-01-22 12:00:41.925  INFO 7480 --- [main] ationConfigEmbeddedWebApplicationContext : Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@18b0930f: startup date [Mon Jan 22 12:00:41 CST 2018]; root of context hierarchy
-2018-01-22 12:00:44.329 ERROR 7480 --- [main] o.s.boot.SpringApplication               : Application startup failed
-
-java.lang.NoSuchMethodError: org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource.<init>(Lorg/springframework/core/type/AnnotationMetadata;Ljava/lang/Class;Lorg/springframework/core/io/ResourceLoader;Lorg/springframework/core/env/Environment;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)V
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport$1.<init>(AbstractRepositoryConfigurationSourceSupport.java:68) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport.getConfigurationSource(AbstractRepositoryConfigurationSourceSupport.java:67) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport.registerBeanDefinitions(AbstractRepositoryConfigurationSourceSupport.java:58) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitionsFromRegistrars(ConfigurationClassBeanDefinitionReader.java:359) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitionsForConfigurationClass(ConfigurationClassBeanDefinitionReader.java:143) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitions(ConfigurationClassBeanDefinitionReader.java:116) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.processConfigBeanDefinitions(ConfigurationClassPostProcessor.java:320) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.postProcessBeanDefinitionRegistry(ConfigurationClassPostProcessor.java:228) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanDefinitionRegistryPostProcessors(PostProcessorRegistrationDelegate.java:272) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanFactoryPostProcessors(PostProcessorRegistrationDelegate.java:92) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.invokeBeanFactoryPostProcessors(AbstractApplicationContext.java:687) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:525) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122) ~[spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at com.gxzc.zen.MainApplicationKt.main(MainApplication.kt:11) [classes/:na]
-
-2018-01-22 12:00:44.340  INFO 7480 --- [main] ationConfigEmbeddedWebApplicationContext : Closing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@18b0930f: startup date [Mon Jan 22 12:00:41 CST 2018]; root of context hierarchy
-2018-01-22 12:03:08.531  INFO 7826 --- [main] com.gxzc.zen.MainApplicationKt           : Starting MainApplicationKt on linyo-Lenovo-I2000 with PID 7826 (/home/mgr/ruisCenter/program/java/Zen/zen-admin/out/production/classes started by mgr in /home/mgr/ruisCenter/program/java/Zen)
-2018-01-22 12:03:08.544  INFO 7826 --- [main] com.gxzc.zen.MainApplicationKt           : The following profiles are active: dev
-2018-01-22 12:03:09.042  INFO 7826 --- [main] ationConfigEmbeddedWebApplicationContext : Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@53142455: startup date [Mon Jan 22 12:03:09 CST 2018]; root of context hierarchy
-2018-01-22 12:03:10.057 ERROR 7826 --- [main] o.s.boot.SpringApplication               : Application startup failed
-
-java.lang.NoSuchMethodError: org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource.<init>(Lorg/springframework/core/type/AnnotationMetadata;Ljava/lang/Class;Lorg/springframework/core/io/ResourceLoader;Lorg/springframework/core/env/Environment;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)V
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport$1.<init>(AbstractRepositoryConfigurationSourceSupport.java:68) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport.getConfigurationSource(AbstractRepositoryConfigurationSourceSupport.java:67) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport.registerBeanDefinitions(AbstractRepositoryConfigurationSourceSupport.java:58) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitionsFromRegistrars(ConfigurationClassBeanDefinitionReader.java:359) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitionsForConfigurationClass(ConfigurationClassBeanDefinitionReader.java:143) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitions(ConfigurationClassBeanDefinitionReader.java:116) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.processConfigBeanDefinitions(ConfigurationClassPostProcessor.java:320) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.postProcessBeanDefinitionRegistry(ConfigurationClassPostProcessor.java:228) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanDefinitionRegistryPostProcessors(PostProcessorRegistrationDelegate.java:272) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanFactoryPostProcessors(PostProcessorRegistrationDelegate.java:92) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.invokeBeanFactoryPostProcessors(AbstractApplicationContext.java:687) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:525) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122) ~[spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at com.gxzc.zen.MainApplicationKt.main(MainApplication.kt:11) [classes/:na]
-
-2018-01-22 12:03:10.058  INFO 7826 --- [main] ationConfigEmbeddedWebApplicationContext : Closing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@53142455: startup date [Mon Jan 22 12:03:09 CST 2018]; root of context hierarchy
-2018-01-22 12:07:11.774  INFO 8917 --- [main] com.gxzc.zen.MainApplicationKt           : Starting MainApplicationKt on linyo-Lenovo-I2000 with PID 8917 (/home/mgr/ruisCenter/program/java/Zen/zen-admin/out/production/classes started by mgr in /home/mgr/ruisCenter/program/java/Zen)
-2018-01-22 12:07:11.779  INFO 8917 --- [main] com.gxzc.zen.MainApplicationKt           : The following profiles are active: dev
-2018-01-22 12:07:12.234  INFO 8917 --- [main] ationConfigEmbeddedWebApplicationContext : Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@2d96543c: startup date [Mon Jan 22 12:07:12 CST 2018]; root of context hierarchy
-2018-01-22 12:07:13.826 ERROR 8917 --- [main] o.s.boot.SpringApplication               : Application startup failed
-
-java.lang.NoSuchMethodError: org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource.<init>(Lorg/springframework/core/type/AnnotationMetadata;Ljava/lang/Class;Lorg/springframework/core/io/ResourceLoader;Lorg/springframework/core/env/Environment;Lorg/springframework/beans/factory/support/BeanDefinitionRegistry;)V
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport$1.<init>(AbstractRepositoryConfigurationSourceSupport.java:68) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport.getConfigurationSource(AbstractRepositoryConfigurationSourceSupport.java:67) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport.registerBeanDefinitions(AbstractRepositoryConfigurationSourceSupport.java:58) ~[spring-boot-autoconfigure-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitionsFromRegistrars(ConfigurationClassBeanDefinitionReader.java:359) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitionsForConfigurationClass(ConfigurationClassBeanDefinitionReader.java:143) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitions(ConfigurationClassBeanDefinitionReader.java:116) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.processConfigBeanDefinitions(ConfigurationClassPostProcessor.java:320) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.annotation.ConfigurationClassPostProcessor.postProcessBeanDefinitionRegistry(ConfigurationClassPostProcessor.java:228) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanDefinitionRegistryPostProcessors(PostProcessorRegistrationDelegate.java:272) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanFactoryPostProcessors(PostProcessorRegistrationDelegate.java:92) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.invokeBeanFactoryPostProcessors(AbstractApplicationContext.java:687) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:525) ~[spring-context-4.3.13.RELEASE.jar:4.3.13.RELEASE]
-	at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122) ~[spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:693) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:360) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:303) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1118) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1107) [spring-boot-1.5.9.RELEASE.jar:1.5.9.RELEASE]
-	at com.gxzc.zen.MainApplicationKt.main(MainApplication.kt:11) [classes/:na]
-
-2018-01-22 12:07:13.829  INFO 8917 --- [main] ationConfigEmbeddedWebApplicationContext : Closing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@2d96543c: startup date [Mon Jan 22 12:07:12 CST 2018]; root of context hierarchy
-2018-01-22 12:12:39.290  INFO 9872 --- [main] com.gxzc.zen.MainApplicationKt           : Starting MainApplicationKt on linyo-Lenovo-I2000 with PID 9872 (/home/mgr/ruisCenter/program/java/Zen/zen-admin/out/production/classes started by mgr in /home/mgr/ruisCenter/program/java/Zen)
-2018-01-22 12:12:39.293  INFO 9872 --- [main] com.gxzc.zen.MainApplicationKt           : The following profiles are active: dev
-2018-01-22 12:12:39.402  INFO 9872 --- [main] ationConfigEmbeddedWebApplicationContext : Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@59b38691: startup date [Mon Jan 22 12:12:39 CST 2018]; root of context hierarchy
-2018-01-22 12:12:41.258  INFO 9872 --- [main] s.b.c.e.t.TomcatEmbeddedServletContainer : Tomcat initialized with port(s): 8080 (http)
-2018-01-22 12:12:41.271  INFO 9872 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
-2018-01-22 12:12:41.272  INFO 9872 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet Engine: Apache Tomcat/8.5.23
-2018-01-22 12:12:41.406  INFO 9872 --- [localhost-startStop-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
-2018-01-22 12:12:41.407  INFO 9872 --- [localhost-startStop-1] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 2009 ms
-2018-01-22 12:12:41.680  INFO 9872 --- [localhost-startStop-1] o.s.b.w.servlet.ServletRegistrationBean  : Mapping servlet: 'dispatcherServlet' to [/]
-2018-01-22 12:12:41.686  INFO 9872 --- [localhost-startStop-1] o.s.b.w.servlet.FilterRegistrationBean   : Mapping filter: 'characterEncodingFilter' to: [/*]
-2018-01-22 12:12:41.686  INFO 9872 --- [localhost-startStop-1] o.s.b.w.servlet.FilterRegistrationBean   : Mapping filter: 'hiddenHttpMethodFilter' to: [/*]
-2018-01-22 12:12:41.687  INFO 9872 --- [localhost-startStop-1] o.s.b.w.servlet.FilterRegistrationBean   : Mapping filter: 'httpPutFormContentFilter' to: [/*]
-2018-01-22 12:12:41.687  INFO 9872 --- [localhost-startStop-1] o.s.b.w.servlet.FilterRegistrationBean   : Mapping filter: 'requestContextFilter' to: [/*]
-2018-01-22 12:12:42.004  INFO 9872 --- [main] s.w.s.m.m.a.RequestMappingHandlerAdapter : Looking for @ControllerAdvice: org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@59b38691: startup date [Mon Jan 22 12:12:39 CST 2018]; root of context hierarchy
-2018-01-22 12:12:42.055  INFO 9872 --- [main] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/]}" onto public java.lang.String com.gxzc.zen.ExampleController.home()
-2018-01-22 12:12:42.057  INFO 9872 --- [main] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/hello/{myName}]}" onto public java.lang.String com.gxzc.zen.ExampleController.index(java.lang.String)
-2018-01-22 12:12:42.060  INFO 9872 --- [main] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/error],produces=[text/html]}" onto public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)
-2018-01-22 12:12:42.061  INFO 9872 --- [main] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/error]}" onto public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)
-2018-01-22 12:12:42.089  INFO 9872 --- [main] o.s.w.s.handler.SimpleUrlHandlerMapping  : Mapped URL path [/webjars/**] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler]
-2018-01-22 12:12:42.089  INFO 9872 --- [main] o.s.w.s.handler.SimpleUrlHandlerMapping  : Mapped URL path [/static/**] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler]
-2018-01-22 12:12:42.123  INFO 9872 --- [main] o.s.w.s.handler.SimpleUrlHandlerMapping  : Mapped URL path [/**/favicon.ico] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler]
-2018-01-22 12:12:42.288  INFO 9872 --- [main] o.s.j.e.a.AnnotationMBeanExporter        : Registering beans for JMX exposure on startup
-2018-01-22 12:12:42.329  INFO 9872 --- [main] s.b.c.e.t.TomcatEmbeddedServletContainer : Tomcat started on port(s): 8080 (http)
-2018-01-22 12:12:42.334  INFO 9872 --- [main] com.gxzc.zen.MainApplicationKt           : Started MainApplicationKt in 3.701 seconds (JVM running for 4.677)
-2018-01-22 16:26:32.463  INFO 9872 --- [http-nio-8080-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring FrameworkServlet 'dispatcherServlet'
-2018-01-22 16:26:32.463  INFO 9872 --- [http-nio-8080-exec-1] o.s.web.servlet.DispatcherServlet        : FrameworkServlet 'dispatcherServlet': initialization started
-2018-01-22 16:26:32.477  INFO 9872 --- [http-nio-8080-exec-1] o.s.web.servlet.DispatcherServlet        : FrameworkServlet 'dispatcherServlet': initialization completed in 14 ms
-2018-01-22 16:26:39.588  INFO 9872 --- [Thread-10] ationConfigEmbeddedWebApplicationContext : Closing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@59b38691: startup date [Mon Jan 22 12:12:39 CST 2018]; root of context hierarchy
-2018-01-22 16:26:39.590  INFO 9872 --- [Thread-10] o.s.j.e.a.AnnotationMBeanExporter        : Unregistering JMX-exposed beans on shutdown
-2018-01-22 16:28:18.841  INFO 12837 --- [main] com.gxzc.zen.MainApplicationKt           : Starting MainApplicationKt on linyo-Lenovo-I2000 with PID 12837 (/home/mgr/ruisCenter/program/java/Zen/zen-admin/out/production/classes started by mgr in /home/mgr/ruisCenter/program/java/Zen)
-2018-01-22 16:28:18.872  INFO 12837 --- [main] com.gxzc.zen.MainApplicationKt           : The following profiles are active: dev
-2018-01-22 16:28:19.903  INFO 12837 --- [main] ationConfigEmbeddedWebApplicationContext : Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@1817f1eb: startup date [Mon Jan 22 16:28:19 CST 2018]; root of context hierarchy
-2018-01-22 16:28:23.192  INFO 12837 --- [main] s.b.c.e.t.TomcatEmbeddedServletContainer : Tomcat initialized with port(s): 8080 (http)
-2018-01-22 16:28:23.205  INFO 12837 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
-2018-01-22 16:28:23.207  INFO 12837 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet Engine: Apache Tomcat/8.5.23
-2018-01-22 16:28:23.442  INFO 12837 --- [localhost-startStop-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
-2018-01-22 16:28:23.442  INFO 12837 --- [localhost-startStop-1] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 3544 ms
-2018-01-22 16:28:24.146  INFO 12837 --- [localhost-startStop-1] o.s.b.w.servlet.ServletRegistrationBean  : Mapping servlet: 'dispatcherServlet' to [/]
-2018-01-22 16:28:24.157  INFO 12837 --- [localhost-startStop-1] o.s.b.w.servlet.FilterRegistrationBean   : Mapping filter: 'characterEncodingFilter' to: [/*]
-2018-01-22 16:28:24.157  INFO 12837 --- [localhost-startStop-1] o.s.b.w.servlet.FilterRegistrationBean   : Mapping filter: 'hiddenHttpMethodFilter' to: [/*]
-2018-01-22 16:28:24.157  INFO 12837 --- [localhost-startStop-1] o.s.b.w.servlet.FilterRegistrationBean   : Mapping filter: 'httpPutFormContentFilter' to: [/*]
-2018-01-22 16:28:24.158  INFO 12837 --- [localhost-startStop-1] o.s.b.w.servlet.FilterRegistrationBean   : Mapping filter: 'requestContextFilter' to: [/*]
-2018-01-22 16:28:25.314  INFO 12837 --- [main] s.w.s.m.m.a.RequestMappingHandlerAdapter : Looking for @ControllerAdvice: org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@1817f1eb: startup date [Mon Jan 22 16:28:19 CST 2018]; root of context hierarchy
-2018-01-22 16:28:25.392  INFO 12837 --- [main] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/]}" onto public java.lang.String com.gxzc.zen.ExampleController.home()
-2018-01-22 16:28:25.395  INFO 12837 --- [main] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/hello/{myName}]}" onto public java.lang.String com.gxzc.zen.ExampleController.index(java.lang.String)
-2018-01-22 16:28:25.399  INFO 12837 --- [main] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/error],produces=[text/html]}" onto public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)
-2018-01-22 16:28:25.400  INFO 12837 --- [main] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/error]}" onto public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)
-2018-01-22 16:28:25.437  INFO 12837 --- [main] o.s.w.s.handler.SimpleUrlHandlerMapping  : Mapped URL path [/webjars/**] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler]
-2018-01-22 16:28:25.438  INFO 12837 --- [main] o.s.w.s.handler.SimpleUrlHandlerMapping  : Mapped URL path [/static/**] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler]
-2018-01-22 16:28:25.482  INFO 12837 --- [main] o.s.w.s.handler.SimpleUrlHandlerMapping  : Mapped URL path [/**/favicon.ico] onto handler of type [class org.springframework.web.servlet.resource.ResourceHttpRequestHandler]
-2018-01-22 16:28:26.115  INFO 12837 --- [main] o.s.j.e.a.AnnotationMBeanExporter        : Registering beans for JMX exposure on startup
-2018-01-22 16:28:26.157  INFO 12837 --- [main] s.b.c.e.t.TomcatEmbeddedServletContainer : Tomcat started on port(s): 8080 (http)
-2018-01-22 16:28:26.161  INFO 12837 --- [main] com.gxzc.zen.MainApplicationKt           : Started MainApplicationKt in 8.213 seconds (JVM running for 9.386)
-2018-01-22 16:52:23.975  INFO 12837 --- [Thread-17] ationConfigEmbeddedWebApplicationContext : Closing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@1817f1eb: startup date [Mon Jan 22 16:28:19 CST 2018]; root of context hierarchy
-2018-01-22 16:52:23.977  INFO 12837 --- [Thread-17] o.s.j.e.a.AnnotationMBeanExporter        : Unregistering JMX-exposed beans on shutdown

+ 0 - 29
zen-admin/src/main/kotlin/com/gxzc/zen/ExampleController.kt

@@ -1,29 +0,0 @@
-package com.gxzc.zen
-
-import com.gxzc.zen.sys.service.TestService
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.ui.Model
-import org.springframework.web.bind.annotation.PathVariable
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-
-@RestController
-class ExampleController {
-
-    @Autowired
-    private val service: TestService?=null
-
-    @RequestMapping("/")
-    fun home(model:Model): String {
-//        val one=service?.findOne(1)
-        val list=service?.findList(mapOf())
-        val html="size:"+list?.size
-        return "Hello World!"+html
-    }
-
-    @RequestMapping("/hello/{myName}")
-    fun index(@PathVariable myName: String): String {
-        return "Hello $myName!!!"
-    }
-}

+ 0 - 12
zen-admin/src/main/kotlin/com/gxzc/zen/MainApplication.kt

@@ -1,12 +0,0 @@
-package com.gxzc.zen
-
-import org.springframework.boot.SpringApplication
-import org.springframework.boot.autoconfigure.SpringBootApplication
-
-
-@SpringBootApplication
-class MainApplication
-
-fun main(args:Array<String>){
-    SpringApplication.run(MainApplication::class.java, *args)
-}

+ 20 - 0
zen-admin/src/main/kotlin/com/gxzc/zen/persistence/MainApplication.kt

@@ -0,0 +1,20 @@
+package com.gxzc.zen.persistence
+
+import org.mybatis.spring.annotation.MapperScan
+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
+@MapperScan("com.gxzc.zen.*.mapper")
+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)
+}

+ 19 - 0
zen-admin/src/main/kotlin/com/gxzc/zen/persistence/controller/ExampleController.kt

@@ -0,0 +1,19 @@
+package com.gxzc.zen.persistence.controller
+
+import com.gxzc.zen.persistence.service.ISysDeptService
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.stereotype.Controller
+import org.springframework.web.bind.annotation.RequestMapping
+
+
+@Controller
+@RequestMapping("example")
+class ExampleController {
+    @Autowired
+    lateinit var sysDeptService: ISysDeptService
+
+    @RequestMapping("/test")
+    fun test() {
+
+    }
+}

+ 16 - 0
zen-admin/src/main/kotlin/com/gxzc/zen/persistence/mapper/SysDeptDao.kt

@@ -0,0 +1,16 @@
+package com.gxzc.zen.persistence.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper
+import com.gxzc.zen.persistence.model.SysDept
+import org.springframework.stereotype.Repository
+
+/**
+ * <p>
+ * 部门管理 Mapper 接口
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-01-26
+ */
+@Repository
+interface SysDeptDao : BaseMapper<SysDept>

+ 19 - 0
zen-admin/src/main/kotlin/com/gxzc/zen/persistence/mapper/xml/SysDeptDao.xml

@@ -0,0 +1,19 @@
+<?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.persistence.mapper.SysDeptDao">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gxzc.zen.persistence.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"/>
+    </resultMap>
+
+</mapper>

+ 28 - 0
zen-admin/src/main/kotlin/com/gxzc/zen/persistence/model/SysDept.kt

@@ -0,0 +1,28 @@
+package com.gxzc.zen.persistence.model
+
+import com.baomidou.mybatisplus.annotations.TableName
+import com.gxzc.zen.persistence.BaseModel
+
+/**
+ * <p>
+ * 部门管理
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-01-26
+ */
+@TableName("sys_dept")
+data class SysDept(
+        /**
+         * 部门名称
+         */
+        var deptName: String? = null,
+        /**
+         * 负责人
+         */
+        var principal: String? = null,
+        /**
+         * 排序号
+         */
+        var sort: Int? = null
+) : BaseModel()

+ 14 - 0
zen-admin/src/main/kotlin/com/gxzc/zen/persistence/service/ISysDeptService.kt

@@ -0,0 +1,14 @@
+package com.gxzc.zen.persistence.service;
+
+import com.baomidou.mybatisplus.service.IService
+import com.gxzc.zen.persistence.model.SysDept
+
+/**
+ * <p>
+ * 部门管理 服务类
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-01-26
+ */
+interface ISysDeptService : IService<SysDept>

+ 18 - 0
zen-admin/src/main/kotlin/com/gxzc/zen/persistence/service/impl/SysDeptServiceImpl.kt

@@ -0,0 +1,18 @@
+package com.gxzc.zen.persistence.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl
+import com.gxzc.zen.persistence.mapper.SysDeptDao
+import com.gxzc.zen.persistence.model.SysDept
+import com.gxzc.zen.persistence.service.ISysDeptService
+import org.springframework.stereotype.Service
+
+/**
+ * <p>
+ * 部门管理 服务实现类
+ * </p>
+ *
+ * @author NorthLan
+ * @since 2018-01-26
+ */
+@Service
+class SysDeptServiceImpl : ISysDeptService, ServiceImpl<SysDeptDao, SysDept>()

+ 17 - 17
zen-admin/src/main/resources/application.yml

@@ -1,19 +1,17 @@
-
 server:
   port: 8081
 
-
-###################  druid配置  ###################
+#druid配置
 druid:
   view:
-#    enable: false无效
+#    enable: false
     username: root
     password: 123456
-    slowsql: true
+    slowSql: true
   datasource-sys:
-    url: jdbc:mysql://127.0.0.1:3306/zen-sys?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
-    username: root
-    password: 123456
+    url: jdbc:mysql://192.168.1.124:3307/archives_sys?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
+    username: archives
+    password: archives
     filters: log4j,wall,mergeStat
     driver-class-name: com.mysql.jdbc.Driver
     initialSize: 5
@@ -28,13 +26,15 @@ druid:
 
 ###################  mybatis-plus配置  ###################
 mybatis-plus:
-  mapper-locations: classpath*:com/gxzc/zen/mapping/*/*.xml
-  typeAliasesPackage: com.gxzc.zen.persistence.model
-  global-configs:
+  mapper-locations: classpath*:com/gxzc/zen/*/mapper/*/*.xml
+  typeAliasesPackage: com.gxzc.zen.*.mapper
+  global-config:
     id-type: 0  #0:数据库ID自增   1:用户输入id  2:全局唯一id(IdWorker)  3:全局唯一ID(uuid)
-    db-column-underline: false
+    db-column-underline: true
     refresh-mapper: true
-  configurations:
+    logic-delete-value: 0
+    logic-not-delete-value: 1
+  configuration:
     map-underscore-to-camel-case: true
     cache-enabled: true #配置的缓存的全局开关
     lazyLoadingEnabled: true #延时加载的开关
@@ -46,10 +46,10 @@ mybatis-plus:
 spring:
   profiles:
     active: dev
-  redis:
-    host: localhost
-    port: 6379
-    password:
+#  redis:
+#    host: localhost
+#    port: 6379
+#    password:
   http:
     converters:
       preferred-json-mapper: fastjson

+ 28 - 0
zen-admin/src/test/kotlin/com/gxzc/zen/Test.kt

@@ -0,0 +1,28 @@
+package com.gxzc.zen
+
+import com.gxzc.zen.base.BaseTestKt
+import org.junit.Test
+import org.springframework.beans.factory.annotation.Autowired
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/1/26
+ * @url https://noahlan.com
+ */
+class Test: BaseTestKt() {
+
+    @Autowired
+    private lateinit var iSysDicService: ISysDicService
+
+
+    @Test
+    fun test(){
+        val sysDic = SysDic().also {
+            it.key = "haha"
+            it.value = "hehe"
+            it.sort = Integer(1)
+        }
+        iSysDicService.insert(sysDic)
+    }
+}

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

@@ -0,0 +1,39 @@
+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 - 8
zen-api/src/main/kotlin/com/gxzc/zen/sys/dao/TSysUserMapper.kt

@@ -1,8 +0,0 @@
-package com.gxzc.zen.sys.dao
-
-import com.gxzc.zen.persistence.ZenBaseMapper
-import com.gxzc.zen.sys.model.TSysUser
-import org.springframework.stereotype.Repository
-
-@Repository
-interface TSysUserMapper : ZenBaseMapper<TSysUser>

+ 0 - 11
zen-api/src/main/kotlin/com/gxzc/zen/sys/dao/TestDao.kt

@@ -1,11 +0,0 @@
-package com.gxzc.zen.sys.dao
-
-import com.baomidou.mybatisplus.mapper.BaseMapper
-import com.gxzc.zen.sys.model.Test
-import org.apache.ibatis.annotations.Param
-import org.springframework.stereotype.Repository
-
-@Repository
-interface TestDao: BaseMapper<Test> {
-    fun findList(@Param("cm") params:Map<String, Any?>): List<Test>
-}

+ 0 - 15
zen-api/src/main/kotlin/com/gxzc/zen/sys/model/TSysUser.kt

@@ -1,15 +0,0 @@
-package com.gxzc.zen.sys.model
-
-import com.gxzc.zen.persistence.ZenBaseModel
-import java.util.*
-
-class TSysUser:ZenBaseModel(){
-    var account:String?=null
-    var password:String?=null
-    var userType:Date?=null
-    var name:String?=null
-    var phone:String?=null
-    var deptId:Long?=null
-    var avatar:String?=null
-    var staffNo:String?=null
-}

+ 0 - 8
zen-api/src/main/kotlin/com/gxzc/zen/sys/model/Test.kt

@@ -1,8 +0,0 @@
-package com.gxzc.zen.sys.model
-
-import java.util.*
-
-class Test{
-    val name:String?=null
-    val times: Date?=null
-}

+ 0 - 9
zen-api/src/main/kotlin/com/gxzc/zen/sys/service/TSysUserService.kt

@@ -1,9 +0,0 @@
-package com.gxzc.zen.sys.service
-
-import com.gxzc.zen.persistence.ZenBaseService
-import com.gxzc.zen.sys.dao.TSysUserMapper
-import com.gxzc.zen.sys.model.TSysUser
-import org.springframework.stereotype.Service
-
-@Service
-class TSysUserService:ZenBaseService<TSysUser, TSysUserMapper>()

+ 0 - 19
zen-api/src/main/kotlin/com/gxzc/zen/sys/service/TestService.kt

@@ -1,19 +0,0 @@
-package com.gxzc.zen.sys.service
-
-import com.gxzc.zen.sys.dao.TestDao
-import com.gxzc.zen.sys.model.Test
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
-
-@Service
-class TestService {
-    @Autowired
-    private val dao:TestDao?=null
-
-    fun findList(params:Map<String, Any?>):List<Test>?{
-        return dao?.findList(params)
-    }
-    fun findOne(id:Long):Test?{
-        return dao?.selectById(id)
-    }
-}

+ 0 - 15
zen-api/src/main/resources/com/gxzc/zen/mapping/sys/TSysUserMapper.xml

@@ -1,15 +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.sys.dao.TSysUserMapper">
-
-    <select id="findList" resultType="com.gxzc.zen.sys.model.TSysUser">
-        SELECT *
-        FROM t_sys_user
-        <where>
-            <if test="cm.account!=null and cm.account!=''">
-                and account=#{cm.account}
-            </if>
-        </where>
-    </select>
-
-</mapper>

+ 0 - 10
zen-api/src/main/resources/com/gxzc/zen/mapping/sys/TestMapper.xml

@@ -1,10 +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.sys.dao.TestDao">
-
-    <select id="findList" resultType="com.gxzc.zen.sys.model.Test">
-        SELECT *
-        FROM test
-    </select>
-
-</mapper>

+ 7 - 7
zen-common/src/main/kotlin/com/gxzc/zen/persistence/BaseModel.kt

@@ -14,27 +14,27 @@ import java.util.*
  * @author NorthLan at 2017/12/8
  */
 //@JsonInclude(JsonInclude.Include.NON_NULL) // jackson 忽略空值
-abstract class BaseModel {
+open class BaseModel {
     // 主键
     @TableId(type = IdType.AUTO)
-    private var id: Long? = null
+    var id: Long? = null
 
     // 创建时间
     @TableField(fill = FieldFill.INSERT, strategy = FieldStrategy.NOT_NULL)
     @ApiModelProperty(hidden = true)
-    private var createTime: Date? = null
+    var createTime: Date? = null
 
     // 创建人id
     @TableField(fill = FieldFill.INSERT, strategy = FieldStrategy.NOT_NULL)
-    private var createBy: Long? = null
+    var createBy: Long? = null
 
     // 更新时间
     @TableField(fill = FieldFill.UPDATE, strategy = FieldStrategy.NOT_NULL)
-    private var updateTime: Date? = null
+    var updateTime: Date? = null
 
     // 更新人id
     @TableField(fill = FieldFill.UPDATE, strategy = FieldStrategy.NOT_NULL)
-    private var updateBy: Long? = null
+    var updateBy: Long? = null
 
 //    @TableField(exist = false)
 //    private var createdByName: String? = null
@@ -43,5 +43,5 @@ abstract class BaseModel {
 //    private var updatedByName: String? = null
 
     @TableLogic(value = "true", delval = "false")
-    private var enable: Boolean? = null
+    var enable: Boolean? = null
 }

+ 0 - 12
zen-common/src/main/kotlin/com/gxzc/zen/persistence/ZenBaseMapper.kt

@@ -1,12 +0,0 @@
-package com.gxzc.zen.persistence
-
-import com.baomidou.mybatisplus.mapper.BaseMapper
-import org.apache.ibatis.annotations.Param
-
-/**
- * Created by mgr on 2018/1/23.
- */
-interface ZenBaseMapper<T> : BaseMapper<T> {
-    fun finds(@Param("cm") params: Map<String, Any?>): List<Long>
-    fun findList(@Param("cm") params: Map<String, Any?>): List<T>
-}

+ 0 - 29
zen-common/src/main/kotlin/com/gxzc/zen/persistence/ZenBaseModel.kt

@@ -1,29 +0,0 @@
-package com.gxzc.zen.persistence
-
-import com.baomidou.mybatisplus.annotations.TableField
-import com.baomidou.mybatisplus.annotations.TableId
-import com.baomidou.mybatisplus.enums.IdType
-import com.fasterxml.jackson.databind.annotation.JsonSerialize
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer
-import java.io.Serializable
-import java.util.*
-
-/**
- * Created by mgr on 2018/1/23.
- */
-abstract class ZenBaseModel : Serializable {
-    @JsonSerialize(using = ToStringSerializer::class)
-    @TableId(type = IdType.ID_WORKER)
-    var id: Long? = null
-    var createBy: String? = null
-    var createTime: Date? = null
-    var updateBy: String? = null
-    var updateTime: Date? = null
-    var remark: String? = null
-    var enable: Int? = null
-
-    @TableField(exist = false)
-    var map: Map<String, Any?>? = null
-
-    open fun preHandle() {}
-}

+ 0 - 92
zen-common/src/main/kotlin/com/gxzc/zen/persistence/ZenBaseService.kt

@@ -1,92 +0,0 @@
-package com.gxzc.zen.persistence
-
-import com.baomidou.kisso.SSOHelper
-import com.baomidou.kisso.security.token.SSOToken
-import com.baomidou.mybatisplus.plugins.Page
-import com.baomidou.mybatisplus.service.IService
-import org.apache.commons.lang3.StringUtils
-import org.springframework.beans.factory.annotation.Autowired
-import java.util.*
-import javax.servlet.http.HttpServletRequest
-
-/**
- * Created by mgr on 2018/1/23.
- */
-//interface ZenBaseService<T> : IService<T>
-abstract class ZenBaseService<T: ZenBaseModel,D: ZenBaseMapper<T>> {
-
-    @Autowired
-    protected val dao:D?=null
-
-    fun finds(params:Map<String, Any?>): List<Long>?{
-        return dao?.finds(params)
-    }
-    fun findList(params:Map<String, Any?>): List<T>?{
-        return dao?.findList(params)
-    }
-
-    fun findOne(params:Map<String, Any?>):T?{
-        val list=findList(params)
-        if(list!!.size>0)
-            return list.get(0)
-        return null
-    }
-
-    fun findID(id:String?):T?{
-        if(StringUtils.isBlank(id))return null
-        return dao?.selectById(id)
-//        return findOne(mapOf("id" to id))
-    }
-    fun findIDNum(idnum:Long?):T?{
-        if(idnum==null)return null
-        return findOne(mapOf("idnum" to idnum))
-    }
-
-    fun findPage(params: Map<String, Any?>): Page<T> {
-        val page=getPage(params)
-        val list=findList(params)
-        page.setRecords(list).setTotal(list!!.size)
-        return page
-    }
-
-    fun save(entity:T?):Int?{
-        return save(entity,null)
-    }
-    fun save(entity:T?,req: HttpServletRequest):Int?{
-        val token= SSOHelper.attrToken<SSOToken>(req)
-        return save(entity,token?.id)
-    }
-    fun save(entity:T?,ren:String?):Int?{
-        entity?.preHandle()
-        if(entity?.id==null||entity.id!!<=0) {
-            entity?.createBy=ren
-            entity?.createTime= Date()
-            return dao?.insert(entity) ?: -1
-        }else {
-            entity.updateBy=ren
-            entity.updateTime= Date()
-            return dao?.updateById(entity) ?: -1
-        }
-    }
-
-
-    /** 分页查询  */
-    fun getPage(params: Map<String, Any?>): Page<T> {
-        var current = 1
-        var size = 10
-        try {
-            if (params.containsKey("pageNum"))
-                current = params["pageNum"] as Int
-            if (params.containsKey("pageSize"))
-                size = params["pageSize"] as Int
-        }catch (e:Exception) { }
-        if (size < 0) {
-            val page = Page<T>()
-            page.isAsc = false
-            return page
-        }
-        val page = Page<T>(current, size)
-        page.isAsc = false
-        return page
-    }
-}

+ 39 - 0
zen-common/src/test/kotlin/com/gxzc/zen/base/BaseTestKt.kt

@@ -0,0 +1,39 @@
+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.SpringJUnit4ClassRunner
+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(SpringJUnit4ClassRunner::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
+    }
+}

+ 19 - 9
zen-orm/src/main/kotlin/com/gxzc/zen/Generator.kt

@@ -3,10 +3,14 @@ package com.gxzc.zen
 import com.baomidou.mybatisplus.generator.AutoGenerator
 import com.baomidou.mybatisplus.generator.config.DataSourceConfig
 import com.baomidou.mybatisplus.generator.config.GlobalConfig
+import com.baomidou.mybatisplus.generator.config.ITypeConvert
 import com.baomidou.mybatisplus.generator.config.PackageConfig
 import com.baomidou.mybatisplus.generator.config.StrategyConfig
+import com.baomidou.mybatisplus.generator.config.rules.DbColumnType
 import com.baomidou.mybatisplus.generator.config.rules.DbType
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy
+import com.gxzc.zen.persistence.BaseModel
+import java.io.File
 
 /**
  *
@@ -17,10 +21,12 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy
 fun main(args: Array<String>) {
     val mpg = AutoGenerator()
 
+    val path = File("zen-api").absolutePath
+
     // 全局配置
     val gc = GlobalConfig()
     with(gc) {
-        outputDir = "D://Test"
+        outputDir = path + "/src/main/kotlin"
         isFileOverride = true
         isActiveRecord = false
         isEnableCache = false
@@ -39,11 +45,15 @@ fun main(args: Array<String>) {
     val dataSource = DataSourceConfig()
     with(dataSource) {
         dbType = DbType.MYSQL
-        // typeConvert
+//        typeConvert = object: ITypeConvert {
+//            override fun processTypeConvert(fieldType: String?): DbColumnType {
+//
+//            }
+//        }
         driverName = "com.mysql.jdbc.Driver"
-        username = "root"
-        password = "root"
-        url = "jdbc:mysql://127.0.0.1:3306/rest?characterEncoding=utf8"
+        username = "archives"
+        password = "archives"
+        url = "jdbc:mysql://192.168.1.124:3307/archives_sys?characterEncoding=utf8"
     }
     mpg.dataSource = dataSource
 
@@ -55,12 +65,12 @@ fun main(args: Array<String>) {
         naming = NamingStrategy.underline_to_camel
         //            setTablePrefix()
         superEntityClass = "com.gxzc.zen.persistence.BaseModel"
-        setSuperEntityColumns("id", "createBy", "createTime", "updateBy", "updateTime", "remark", "enable")
+        setSuperEntityColumns("id", "create_by", "create_time", "update_by", "update_time", "remark", "enable")
         superMapperClass = "com.gxzc.zen.persistence.BaseMapper"
         superServiceClass = "com.gxzc.zen.persistence.BaseService"
         superServiceImplClass = "com.baomidou.mybatisplus.service.impl.ServiceImpl"
 //            superControllerClass = ""
-        setInclude("user")
+//        setInclude("user")
         isEntityBooleanColumnRemoveIsPrefix = true
         logicDeleteFieldName = "enable"
 //            setExclude("")
@@ -70,8 +80,8 @@ fun main(args: Array<String>) {
     // 包配置
     val pc = PackageConfig()
     with(pc) {
-        parent = "com.gxzc.zen.persistence"
-//            moduleName = "test"
+        parent = "com.gxzc.zen.sys.persistence"
+//        moduleName = "zen-orm"
         entity = "model"
     }
     mpg.packageInfo = pc

+ 20 - 0
zen-orm/src/test/kotlin/com/gxzc/zen/generator/TestPathFinder.kt

@@ -0,0 +1,20 @@
+package com.gxzc.zen.generator
+
+import org.junit.Test
+import java.io.File
+
+/**
+ *
+ * @author NorthLan
+ * @date 2018/1/26
+ * @url https://noahlan.com
+ */
+class TestPathFinder{
+    @Test
+    fun pathFinder() {
+        val moduleName = "zen-orm"
+        val file = File(moduleName)
+        val path = file.absolutePath
+        System.out.println(path)
+    }
+}