Merge branch 'zhaoyue-dev4' into 'master'

Zhaoyue dev4



See merge request !51

@@ -2,7 +2,7 @@ git pull
 git add --all src/main/java/*
 git add --all src/main/java/*
 git add push.sh
 git add push.sh
 git add pom.xml
 git add pom.xml
-git commit -m "FIX test items score =0; add yindao log"
+git commit -m "Add online config"
 #git push origin master
 #git push origin master
 git push origin zhaoyue-dev4
 git push origin zhaoyue-dev4
 git status
 git status

@@ -178,7 +178,7 @@ public class DataShareController {
                         if(!reportTypeMap.containsKey(Constants.testItemType)){
                         if(!reportTypeMap.containsKey(Constants.testItemType)){
                             //test项目一份
                             //test项目一份
                             ReportTypeModel reportTypeModel_test = new ReportTypeModel();
                             ReportTypeModel reportTypeModel_test = new ReportTypeModel();
-                            reportTypeModel_test.setTypeHealthScore(0);//测试项目没有打分
+                            reportTypeModel_test.setTypeHealthScore(report.getScore().doubleValue());//测试项目没有打分
                             reportTypeModel_test.setType(Constants.testItemType);
                             reportTypeModel_test.setType(Constants.testItemType);
                             List<ReportDetailModel> reportDetailModelList_test = new ArrayList<>();
                             List<ReportDetailModel> reportDetailModelList_test = new ArrayList<>();
                             reportDetailModelList_test.add(reportDetail);
                             reportDetailModelList_test.add(reportDetail);

 server.port=8090
 server.port=8090
 
 
 #MySQL
 #MySQL
-spring.datasource.url=jdbc:mysql://db.hanhezy.com:4096/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true
-spring.datasource.username=hanhe
-spring.datasource.password=HANhetest2016
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xkl_ams?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true
+spring.datasource.username=xklapi
+spring.datasource.password=xklapi123outfox
 spring.datasource.validation-query=SELECT 1
 spring.datasource.validation-query=SELECT 1
 spring.datasource.test-on-borrow=false
 spring.datasource.test-on-borrow=false
 spring.datasource.test-while-idle=true
 spring.datasource.test-while-idle=true
 spring.datasource.time-between-eviction-runs-millis=18800
 spring.datasource.time-between-eviction-runs-millis=18800
 
 
 #Redis
 #Redis
-#spring.redis.host=127.0.0.1
-#spring.redis.password=foobared
-spring.redis.host=r-m5e7cedd3124afd4.redis.rds.aliyuncs.com
-spring.redis.password=r-m5e7cedd3124afd4:XIkaiLURedis2016
-
-spring.redis.port=6379
+spring.redis.host=127.0.0.1
+pring.redis.port=6379

+server.port=8090
+
+#MySQL
+spring.datasource.url=jdbc:mysql://db.hanhezy.com:4096/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true
+spring.datasource.username=hanhe
+spring.datasource.password=HANhetest2016
+spring.datasource.validation-query=SELECT 1
+spring.datasource.test-on-borrow=false
+spring.datasource.test-while-idle=true
+spring.datasource.time-between-eviction-runs-millis=18800
+
+#Redis
+#spring.redis.host=127.0.0.1
+#spring.redis.password=foobared
+spring.redis.host=r-m5e7cedd3124afd4.redis.rds.aliyuncs.com
+spring.redis.password=r-m5e7cedd3124afd4:XIkaiLURedis2016
+
+spring.redis.port=6379