From 8f7e96826630099270a788ee606e662fa5a14430 Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Wed, 28 Apr 2021 18:13:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E7=AB=99=E6=AD=A3=E5=BC=8F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AchievementManagementController.java | 7 +-- .../resources/application-prod.properties | 52 ++++++++++++++++++ .../resources/application-test.properties | 53 +++++++++++++++++++ src/main/resources/application.properties | 2 + 4 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/application-prod.properties create mode 100644 src/main/resources/application-test.properties create mode 100644 src/main/resources/application.properties diff --git a/src/main/java/com/msdw/tms/controller/AchievementManagementController.java b/src/main/java/com/msdw/tms/controller/AchievementManagementController.java index 269de60..9e7e683 100644 --- a/src/main/java/com/msdw/tms/controller/AchievementManagementController.java +++ b/src/main/java/com/msdw/tms/controller/AchievementManagementController.java @@ -2,14 +2,15 @@ package com.msdw.tms.controller; import com.github.pagehelper.PageInfo; import com.msdw.tms.api.AchievementManagementApi; -import com.msdw.tms.common.utils.PageUtils; import com.msdw.tms.common.utils.R; -import com.msdw.tms.entity.*; +import com.msdw.tms.entity.ExperimentalReportEntity; +import com.msdw.tms.entity.ProjectRecordEntity; +import com.msdw.tms.entity.ReportEntity; +import com.msdw.tms.entity.ResultsEntity; import com.msdw.tms.entity.vo.AchievementManagementVO; import com.msdw.tms.entity.vo.ResultsVo; import com.msdw.tms.service.AchievementManagementService; import com.msdw.tms.service.ProjectRecordService; -import com.msdw.tms.util.ListPageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties new file mode 100644 index 0000000..5f04b88 --- /dev/null +++ b/src/main/resources/application-prod.properties @@ -0,0 +1,52 @@ +server.port=9090 +server.servlet.context-path=/evaluation + +#\u6B63\u5F0F\u6570\u636E\u5E93\u8FDE\u63A5 +spring.datasource.url=jdbc:mysql://rm-wz90d92p0pf083nxzno.mysql.rds.aliyuncs.com:3306/huoran?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai +spring.datasource.username=root +spring.datasource.password=HuoRan@2021 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +spring.jackson.default-property-inclusion=non_null + +# \u8FD9\u4E2A\u914D\u7F6E\u4F1A\u5C06\u6267\u884C\u7684sql\u6253\u5370\u51FA\u6765\uFF0C\u5728\u5F00\u53D1\u6216\u6D4B\u8BD5\u7684\u65F6\u5019\u53EF\u4EE5\u7528 +mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl +mybatis-plus.mapper-locations=classpath:/mapper/**/*.xml +mybatis-plus.global-config.db-config.id-type=auto +mybatis-plus.global-config.db-config.logic-delete-field=is_del +mybatis-plus.global-config.db-config.logic-delete-value=0 +mybatis-plus.global-config.db-config.logic-not-delete-value=1 + +tms.thread.core-size=20 +tms.thread.max-size=200 +tms.thread.keep-alive-time=10 + +#redis\u914D\u7F6E +spring.redis.database=0 +spring.redis.host=127.0.0.1 +spring.redis.password= +spring.redis.port=6379 +spring.redis.timeout=3000 +spring.redis.jedis.pool.max-idle=500 +spring.redis.jedis.pool.min-idle=50 +spring.redis.jedis.pool.max-active=2000 +spring.redis.jedis.pool.max-wait=1000 + +#\u65E5\u5FD7\u7EA7\u522B +logging.level.jdbc=OFF +logging.level.jdbc.sqltiming=DEBUG +logging.level.jdbc.resultsettable=DEBUG +logging.level.com.yipin.liuwar.mapper=DEBUG +logging.level.com.yipin.liuwanr.mapper=DEBUG + +spring.elasticsearch.rest.uris=http://es-cn-v641e944a0006xtwy.elasticsearch.aliyuncs.com:9200 +spring.elasticsearch.rest.username=elastic +spring.elasticsearch.rest.password=1qaz@WSX + +# maxFileSize \u5355\u4E2A\u6570\u636E\u5927\u5C0F +spring.servlet.multipart.maxFileSize = 1024MB +# maxRequestSize \u662F\u603B\u6570\u636E\u5927\u5C0F +spring.servlet.multipart.maxRequestSize=10240MB + +pagehelper.reasonable=false + diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties new file mode 100644 index 0000000..90f87dd --- /dev/null +++ b/src/main/resources/application-test.properties @@ -0,0 +1,53 @@ +server.port=9090 +server.servlet.context-path=/evaluation + +#\u6D4B\u8BD5\u6570\u636E\u5E93\u8FDE\u63A5 +spring.datasource.url=jdbc:mysql://rm-wz9y13wf7u8q8610fwo.mysql.rds.aliyuncs.com:3306/huoran?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai +spring.datasource.username=super +spring.datasource.password=huoran888 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +spring.jackson.default-property-inclusion=non_null + +# \u8FD9\u4E2A\u914D\u7F6E\u4F1A\u5C06\u6267\u884C\u7684sql\u6253\u5370\u51FA\u6765\uFF0C\u5728\u5F00\u53D1\u6216\u6D4B\u8BD5\u7684\u65F6\u5019\u53EF\u4EE5\u7528 +mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl +mybatis-plus.mapper-locations=classpath:/mapper/**/*.xml +mybatis-plus.global-config.db-config.id-type=auto +mybatis-plus.global-config.db-config.logic-delete-field=is_del +mybatis-plus.global-config.db-config.logic-delete-value=0 +mybatis-plus.global-config.db-config.logic-not-delete-value=1 + +#\u591A\u7EBF\u7A0B\u914D\u7F6E +tms.thread.core-size=20 +tms.thread.max-size=200 +tms.thread.keep-alive-time=10 + +#redis\u914D\u7F6E +spring.redis.database=0 +spring.redis.host=www.liuwanr.cn +spring.redis.password=huoran +spring.redis.port=6379 +spring.redis.timeout=3000 +spring.redis.jedis.pool.max-idle=500 +spring.redis.jedis.pool.min-idle=50 +spring.redis.jedis.pool.max-active=2000 +spring.redis.jedis.pool.max-wait=1000 + +#\u65E5\u5FD7\u7EA7\u522B +logging.level.jdbc=OFF +logging.level.jdbc.sqltiming=DEBUG +logging.level.jdbc.resultsettable=DEBUG +logging.level.com.yipin.liuwar.mapper=DEBUG +logging.level.com.yipin.liuwanr.mapper=DEBUG + +spring.elasticsearch.rest.uris=http://es-cn-v641e944a0006xtwy.elasticsearch.aliyuncs.com:9200 +spring.elasticsearch.rest.username=elastic +spring.elasticsearch.rest.password=1qaz@WSX + +# maxFileSize \u5355\u4E2A\u6570\u636E\u5927\u5C0F +spring.servlet.multipart.maxFileSize = 1024MB +# maxRequestSize \u662F\u603B\u6570\u636E\u5927\u5C0F +spring.servlet.multipart.maxRequestSize=10240MB + +pagehelper.reasonable=false + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..bab924b --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,2 @@ +#\u9009\u62E9\u6307\u5B9A\u73AF\u5883,\u76EE\u524D\u53EA\u6709\u6D4B\u8BD5\u548C\u6B63\u5F0F\u73AF\u5883 +spring.profiles.active=prod \ No newline at end of file