Merge branch 'zhaoyue-dev4' into 'master'
Zhaoyue dev4 See merge request !51
Showing
4 changed files
with
25 additions
and
11 deletions
@@ -2,7 +2,7 @@ git pull | @@ -2,7 +2,7 @@ git pull | ||
2 | git add --all src/main/java/* | 2 | git add --all src/main/java/* |
3 | git add push.sh | 3 | git add push.sh |
4 | git add pom.xml | 4 | git add pom.xml |
5 | -git commit -m "FIX test items score =0; add yindao log" | 5 | +git commit -m "Add online config" |
6 | #git push origin master | 6 | #git push origin master |
7 | git push origin zhaoyue-dev4 | 7 | git push origin zhaoyue-dev4 |
8 | git status | 8 | git status |
@@ -178,7 +178,7 @@ public class DataShareController { | @@ -178,7 +178,7 @@ public class DataShareController { | ||
178 | if(!reportTypeMap.containsKey(Constants.testItemType)){ | 178 | if(!reportTypeMap.containsKey(Constants.testItemType)){ |
179 | //test项目一份 | 179 | //test项目一份 |
180 | ReportTypeModel reportTypeModel_test = new ReportTypeModel(); | 180 | ReportTypeModel reportTypeModel_test = new ReportTypeModel(); |
181 | - reportTypeModel_test.setTypeHealthScore(0);//测试项目没有打分 | 181 | + reportTypeModel_test.setTypeHealthScore(report.getScore().doubleValue());//测试项目没有打分 |
182 | reportTypeModel_test.setType(Constants.testItemType); | 182 | reportTypeModel_test.setType(Constants.testItemType); |
183 | List<ReportDetailModel> reportDetailModelList_test = new ArrayList<>(); | 183 | List<ReportDetailModel> reportDetailModelList_test = new ArrayList<>(); |
184 | reportDetailModelList_test.add(reportDetail); | 184 | reportDetailModelList_test.add(reportDetail); |
1 | server.port=8090 | 1 | server.port=8090 |
2 | 2 | ||
3 | #MySQL | 3 | #MySQL |
4 | -spring.datasource.url=jdbc:mysql://db.hanhezy.com:4096/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true | ||
5 | -spring.datasource.username=hanhe | ||
6 | -spring.datasource.password=HANhetest2016 | 4 | +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xkl_ams?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true |
5 | +spring.datasource.username=xklapi | ||
6 | +spring.datasource.password=xklapi123outfox | ||
7 | spring.datasource.validation-query=SELECT 1 | 7 | spring.datasource.validation-query=SELECT 1 |
8 | spring.datasource.test-on-borrow=false | 8 | spring.datasource.test-on-borrow=false |
9 | spring.datasource.test-while-idle=true | 9 | spring.datasource.test-while-idle=true |
10 | spring.datasource.time-between-eviction-runs-millis=18800 | 10 | spring.datasource.time-between-eviction-runs-millis=18800 |
11 | 11 | ||
12 | #Redis | 12 | #Redis |
13 | -#spring.redis.host=127.0.0.1 | ||
14 | -#spring.redis.password=foobared | ||
15 | -spring.redis.host=r-m5e7cedd3124afd4.redis.rds.aliyuncs.com | ||
16 | -spring.redis.password=r-m5e7cedd3124afd4:XIkaiLURedis2016 | ||
17 | - | ||
18 | -spring.redis.port=6379 | 13 | +spring.redis.host=127.0.0.1 |
14 | +pring.redis.port=6379 |
1 | +server.port=8090 | ||
2 | + | ||
3 | +#MySQL | ||
4 | +spring.datasource.url=jdbc:mysql://db.hanhezy.com:4096/hanhe_test?useUnicode=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=round&autoReconnect=true | ||
5 | +spring.datasource.username=hanhe | ||
6 | +spring.datasource.password=HANhetest2016 | ||
7 | +spring.datasource.validation-query=SELECT 1 | ||
8 | +spring.datasource.test-on-borrow=false | ||
9 | +spring.datasource.test-while-idle=true | ||
10 | +spring.datasource.time-between-eviction-runs-millis=18800 | ||
11 | + | ||
12 | +#Redis | ||
13 | +#spring.redis.host=127.0.0.1 | ||
14 | +#spring.redis.password=foobared | ||
15 | +spring.redis.host=r-m5e7cedd3124afd4.redis.rds.aliyuncs.com | ||
16 | +spring.redis.password=r-m5e7cedd3124afd4:XIkaiLURedis2016 | ||
17 | + | ||
18 | +spring.redis.port=6379 |
-
Please register or login to post a comment