From 1d97e4f343cdb34812bccff5f211fb60f4da453e Mon Sep 17 00:00:00 2001
From: zhouhao <zh.sqy@qq.com>
Date: Thu, 20 Oct 2016 11:32:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/mybatis/MyBatisAutoConfiguration.java |  3 +-
 .../web/service/impl/SchedulerProperties.java |  1 +
 .../spring-configuration-metadata.json        | 47 +++++++++++++++++++
 .../impl/user/UserServiceImplTest.java        |  1 -
 4 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 hsweb-web-service/hsweb-web-service-simple/src/main/resources/META-INF/spring-configuration-metadata.json

diff --git a/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/MyBatisAutoConfiguration.java b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/MyBatisAutoConfiguration.java
index 6ea639a68..7e456f950 100644
--- a/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/MyBatisAutoConfiguration.java
+++ b/hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/MyBatisAutoConfiguration.java
@@ -23,6 +23,7 @@ import org.hsweb.web.mybatis.dynamic.DynamicDataSourceSqlSessionFactoryBuilder;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -51,7 +52,7 @@ public class MyBatisAutoConfiguration {
     private DatabaseIdProvider databaseIdProvider;
 
     @Bean(name = "sqlSessionFactory")
-    public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception {
+    public SqlSessionFactory sqlSessionFactory(@Qualifier("dataSource") DataSource dataSource) throws Exception {
         SqlSessionFactoryBean factory = new SqlSessionFactoryBean();
         if (properties.isDynamicDatasource())
             factory.setSqlSessionFactoryBuilder(new DynamicDataSourceSqlSessionFactoryBuilder());
diff --git a/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/SchedulerProperties.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/SchedulerProperties.java
index 344482748..12c2816ef 100644
--- a/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/SchedulerProperties.java
+++ b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/SchedulerProperties.java
@@ -31,6 +31,7 @@ public class SchedulerProperties {
     private boolean waitOnShutdown = true;
 
     private int startupDelay = 0;
+
     private Properties properties;
 
     public boolean isAutoStartup() {
diff --git a/hsweb-web-service/hsweb-web-service-simple/src/main/resources/META-INF/spring-configuration-metadata.json b/hsweb-web-service/hsweb-web-service-simple/src/main/resources/META-INF/spring-configuration-metadata.json
new file mode 100644
index 000000000..83be42e95
--- /dev/null
+++ b/hsweb-web-service/hsweb-web-service-simple/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -0,0 +1,47 @@
+{
+  "groups": [
+    {
+      "name": "scheduler",
+      "type": "org.hsweb.web.service.impl.SchedulerProperties",
+      "sourceType": "org.hsweb.web.service.impl.SchedulerProperties"
+    }
+  ],
+  "properties": [
+    {
+      "name": "scheduler.auto-startup",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.hsweb.web.service.impl.SchedulerProperties",
+      "defaultValue": true
+    },
+    {
+      "name": "scheduler.overwrite-existing-jobs",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.hsweb.web.service.impl.SchedulerProperties",
+      "defaultValue": true
+    },
+    {
+      "name": "scheduler.beanName",
+      "type": "java.lang.String",
+      "sourceType": "org.hsweb.web.service.impl.SchedulerProperties"
+      "defaultValue": "scheduler"
+    },
+    {
+      "name": "scheduler.wait-on-shutdown",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.hsweb.web.service.impl.SchedulerProperties"
+      "defaultValue": true
+    },
+    {
+      "name": "scheduler.startup-delay",
+      "type": "java.lang.Integer",
+      "sourceType": "org.hsweb.web.service.impl.SchedulerProperties",
+      "defaultValue": 0
+    },
+    {
+      "name": "scheduler.properties",
+      "type": "java.util.Properties",
+      "sourceType": "org.hsweb.web.service.impl.SchedulerProperties"
+    }
+  ],
+  "hints": []
+}
\ No newline at end of file
diff --git a/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/user/UserServiceImplTest.java b/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/user/UserServiceImplTest.java
index df39430d1..1c7cfb866 100644
--- a/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/user/UserServiceImplTest.java
+++ b/hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/user/UserServiceImplTest.java
@@ -22,7 +22,6 @@ import org.hsweb.web.bean.common.UpdateParam;
 import org.hsweb.web.bean.po.user.User;
 import org.hsweb.web.dao.role.UserRoleMapper;
 import org.hsweb.web.dao.user.UserMapper;
-import org.hsweb.web.service.impl.AbstractTestCase;
 import org.hsweb.web.service.module.ModuleService;
 import org.hsweb.web.service.user.UserService;
 import org.junit.Assert;