Browse Source

更新物理试卷,简化配置

4228306 5 years ago
parent
commit
a3ac4f0951

BIN
doc/物理中考专项诊断.docx


+ 1 - 1
src/main/java/com/yaoxiang/diagnosis/config/MinioConfig.java

@@ -65,7 +65,7 @@ public class MinioConfig {
 
     @Bean
     MinioClient minioClient(MinioProperties properties) throws Exception {
-        logger.info("init MinioClient,url is {} , accessKey is {} , secretKey is {}", properties.getUrl(), properties.getAccessKey(), properties.getSecretKey());
+        logger.info("init MinioClient,url is {} , accessKey is {} , secretKey is ***", properties.getUrl(), properties.getAccessKey());
         MinioClient client = null;
         if (properties.isSecure()) {
              client = new MinioClient(properties.getUrl(), properties.getSecurePort(), properties.getAccessKey(), properties.getSecretKey(), null, true, okHttpClient());

+ 0 - 15
src/main/resources/application-cloud.properties

@@ -1,16 +1,6 @@
 server.port=8080
-#serverAddress=172.18.129.124
-#serverAddress=119.23.22.31
-#serverOutsideAddress=www.yaoxiangedu.com
-
-#uploadPattern=/upload/**
-#baseLocation=/opt/diagnosis/${server.port}
-#baseLocation=/tmp/diagnosis/data
-#uploadLocation=${baseLocation}/upload/
-#spring.servlet.multipart.location=${baseLocation}/uploadTemp/
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/
 
-#spring.datasource.url=jdbc:mysql://47.104.200.54:3306/OnlinePapers?useUnicode=true&characterEncoding=utf-8
 spring.datasource.url=jdbc:mysql://mysql:3306/OnlinePapers?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
 spring.datasource.username=onlinepapers
 spring.datasource.password=134679258Aa_
@@ -20,11 +10,6 @@ spring.redis.password=134679258Aa_
 spring.redis.host=redis-master
 spring.redis.port=6379
 
-#不使用localFileService
-#docpath=/root/doc/
-#local.uploadUrl=http://${serverOutsideAddress}:9000/file/upload
-#local.downloadUrl=http://${serverOutsideAddress}:9000/file/download/
-
 #外部要使用,所以不能为内部地址
 minio.url=https://minio.yaoxiangedu.com/
 minio.secure=true

+ 0 - 9
src/main/resources/application-dev.properties

@@ -1,12 +1,6 @@
 server.port=8085
 serverAddress=119.23.22.31
 
-#uploadPattern=/upload/**
-#baseLocation=diagnosis
-#baseLocation=/Users/feick/IdeaProjects/yaoxiang/diagnosis
-#baseLocation=/d:/diagnosis
-#uploadLocation=${baseLocation}/upload/
-#spring.servlet.multipart.location=${baseLocation}/uploadTemp/
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/
 
 
@@ -31,11 +25,8 @@ spring.redis.database=0
 spring.redis.password=134679258Aa_
 spring.redis.host=${serverAddress}
 spring.redis.port=32578
-#local.uploadUrl=http://${serverAddress}:9001/file/upload
-#local.downloadUrl=http://${serverAddress}:9001/file/download/
 
 minio.url=http://${serverAddress}:30240/
-#minio.url=https://minio.yaoxiangedu.com/
 minio.secure=false
 minio.buckets=dev
 minio.defaultBucket=dev

+ 0 - 8
src/main/resources/application-docker.properties

@@ -1,13 +1,8 @@
 server.port=8080
 serverAddress=119.23.22.31
 
-#uploadPattern=/upload/**
-#baseLocation=/tmp/diagnosis/data
-#uploadLocation=${baseLocation}/upload/
-#spring.servlet.multipart.location=${baseLocation}/uploadTemp/
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/
 
-#spring.datasource.url=jdbc:mysql://47.104.200.54:3306/OnlinePapers?useUnicode=true&characterEncoding=utf-8
 spring.datasource.url=jdbc:mysql://${serverAddress}:30875/OnlinePapers?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
 spring.datasource.username=onlinepapers
 spring.datasource.password=134679258Aa_
@@ -16,9 +11,6 @@ spring.redis.database=0
 spring.redis.password=134679258Aa_
 spring.redis.host=redis-master
 spring.redis.port=6379
-#local.uploadUrl=http://${serverAddress}:9001/file/upload
-#local.downloadUrl=http://${serverAddress}:9001/file/download/
-
 
 minio.url=http://${serverAddress}:30240/
 minio.secure=false

+ 0 - 11
src/main/resources/application-prod.properties

@@ -1,16 +1,9 @@
 server.port=8080
-#serverAddress=172.18.129.124
 serverAddress=119.23.22.31
 serverOutsideAddress=www.yaoxiangedu.com
 
-#uploadPattern=/upload/**
-#baseLocation=/opt/diagnosis/${server.port}
-#baseLocation=d:/diagnosis
-#uploadLocation=${baseLocation}/upload/
-#spring.servlet.multipart.location=${baseLocation}/uploadTemp/
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/
 
-#spring.datasource.url=jdbc:mysql://47.104.200.54:3306/OnlinePapers?useUnicode=true&characterEncoding=utf-8
 spring.datasource.url=jdbc:mysql://${serverAddress}:3306/OnlinePapers?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=134679258Aa_
@@ -20,10 +13,6 @@ spring.redis.password=134679258Aa_
 spring.redis.host=${serverAddress}
 spring.redis.port=6379
 
-#docpath=/root/doc/
-local.uploadUrl=http://${serverOutsideAddress}:9000/file/upload
-local.downloadUrl=http://${serverOutsideAddress}:9000/file/download/
-
 minio.url=http://${serverAddress}:30240/
 minio.secure=false
 minio.buckets=prod

+ 0 - 4
src/main/resources/application.properties

@@ -1,8 +1,6 @@
 spring.profiles.active=dev
 logging.level.* = info
 logging.file=log/log.log
-#logging.pattern.console= %d{yyyy-MM-dd HH:mm:ss} - %msg%n
-#logging.pattern.file= %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
 
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.max-file-size=50MB
@@ -37,7 +35,5 @@ spring.data.redis.repositories.enabled=false
 #server.tomcat.accesslog.suffix=.log
 
 #ÆôÓÃswagger
-swagger.enabled=true
 web.loginPage=/login
 web.logoutUrl=/logout
-#web.permitUrls=/login,/logout,/**/*.js,/**/*.png,/**/*.jpg,/**/*.css