Bladeren bron

提交印刷代码

weiwenhai 6 jaren geleden
bovenliggende
commit
ebee4b5e6a

+ 2 - 2
src/main/java/cn/com/qmth/examcloud/app/ApiApplication.java

@@ -19,8 +19,8 @@ import org.springframework.scheduling.annotation.EnableAsync;
 public class ApiApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
-        SpringApplication.run(ApiApplication.class, args);
-//        ExamCloudApp.run(ApiApplication.class, "app-api", args);
+        //SpringApplication.run(ApiApplication.class, args);
+        ExamCloudApp.run(ApiApplication.class, "app-api", args);
     }
 
     @Override

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

@@ -1,41 +0,0 @@
-# mvc config
-server.port=8090
-server.context-path=/
-server.tomcat.uri-encoding=UTF-8
-spring.freemarker.request-context-attribute=request
-spring.freemarker.settings.number_format=#
-spring.freemarker.suffix=.ftl
-spring.http.multipart.max-file-size=50Mb
-spring.http.multipart.max-request-size=50Mb
-# logs config
-logging.config=classpath:logback-spring.xml
-# mysql config
-spring.datasource.url=jdbc:mysql://192.168.10.30:3306/app_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=root
-spring.jpa.show-sql=false
-spring.jpa.hibernate.ddl-auto=update
-#redis config
-spring.redis.port=6379
-spring.redis.host=192.168.10.39
-spring.redis.password=
-spring.redis.database=0
-spring.redis.timeout=15000
-# 基础信息服务地址
-examcloud.base.info.url=http://192.168.10.39:8000
-# 考务服务地址
-examcloud.exam.admin.url=http://192.168.10.39:8001
-# 网考服务地址
-examcloud.net.exam.url=http://192.168.10.39:8003
-# 网考后端
-examcloud.admin.exam.url=http://192.168.10.39:8013
-# 题库服务地址
-examcloud.question.pool.url=http://192.168.10.39:8868
-# 认证中心服务地址
-examcloud.user.auth.url=http://192.168.10.39
-# 又拍云文件服务地址
-examcloud.upyun.url=https://ecs-test-static.qmth.com.cn
-# 短信服务配置
-examcloud.sms.url=http://192.168.10.30:8007
-examcloud.sms.sign=\u8003\u8BD5\u4E91\u5E73\u53F0
-examcloud.sms.template=SMS_138073780

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

@@ -1,32 +0,0 @@
-# mvc config
-server.port=8090
-server.context-path=/
-server.tomcat.uri-encoding=UTF-8
-spring.freemarker.request-context-attribute=request
-spring.freemarker.settings.number_format=#
-spring.freemarker.suffix=.ftl
-spring.http.multipart.max-file-size=50Mb
-spring.http.multipart.max-request-size=50Mb
-# logs config
-logging.config=classpath:logback-spring.xml
-# 基础信息服务地址
-examcloud.base.info.url=http://192.168.1.72:8000
-# 考务服务地址
-examcloud.exam.admin.url=http://192.168.1.72:8001
-# 网考服务地址
-examcloud.net.exam.url=http://192.168.1.72:8003
-# 网考后端
-examcloud.admin.exam.url=http://192.168.1.72:8013
-# 题库服务地址
-examcloud.question.pool.url=http://192.168.1.71:8868
-# 认证中心服务地址
-examcloud.user.auth.url=http://192.168.1.72
-# 又拍云文件服务地址
-examcloud.upyun.url=https://ecs-static.qmth.com.cn
-# 短信服务配置
-examcloud.sms.url=http://192.168.1.72:8007
-examcloud.sms.sign=\u8003\u8BD5\u4E91\u5E73\u53F0
-examcloud.sms.template=SMS_138073780
-$test=test
-$dir=dir
-$tempDir=tempDir

+ 0 - 41
src/main/resources/application-test.properties

@@ -1,41 +0,0 @@
-# mvc config
-server.port=8090
-server.context-path=/
-server.tomcat.uri-encoding=UTF-8
-spring.freemarker.request-context-attribute=request
-spring.freemarker.settings.number_format=#
-spring.freemarker.suffix=.ftl
-spring.http.multipart.max-file-size=50Mb
-spring.http.multipart.max-request-size=50Mb
-# logs config
-logging.config=classpath:logback-spring.xml
-# mysql config
-spring.datasource.url=jdbc:mysql://192.168.10.30:3306/app_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=root
-spring.jpa.show-sql=false
-spring.jpa.hibernate.ddl-auto=update
-#redis config
-spring.redis.port=6379
-spring.redis.host=192.168.10.39
-spring.redis.password=
-spring.redis.database=0
-spring.redis.timeout=15000
-# 基础信息服务地址
-examcloud.base.info.url=http://192.168.10.39:8000
-# 考务服务地址
-examcloud.exam.admin.url=http://192.168.10.39:8001
-# 网考服务地址
-examcloud.net.exam.url=http://192.168.10.39:8003
-# 网考后端
-examcloud.admin.exam.url=http://192.168.10.39:8013
-# 题库服务地址
-examcloud.question.pool.url=http://192.168.10.39:8868
-# 认证中心服务地址
-examcloud.user.auth.url=http://192.168.10.39
-# 又拍云文件服务地址
-examcloud.upyun.url=https://ecs-test-static.qmth.com.cn
-# 短信服务配置
-examcloud.sms.url=http://192.168.10.30:8007
-examcloud.sms.sign=\u8003\u8BD5\u4E91\u5E73\u53F0
-examcloud.sms.template=SMS_138073780

+ 1 - 1
src/main/resources/application.properties

@@ -1,3 +1,3 @@
 #debug=true
 spring.profiles.active=dev
-eureka.client.serviceUrl.defaultZone=http://192.168.10.39:1111/eureka/
+config.server.host=config-host