瀏覽代碼

move config to config-server.

deason 6 年之前
父節點
當前提交
cbce122977

+ 1 - 1
examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/CoursePaperServiceImpl.java

@@ -60,7 +60,7 @@ public class CoursePaperServiceImpl implements CoursePaperService {
     @Autowired
     private UpYunClient upYunClient;
 
-    @Value("${question.url.prefix}")
+    @Value("${$question.url.prefix}")
     private String QUESTION_URL_PREFIX;//题库访问地址前缀
 
     @Override

+ 1 - 1
examcloud-core-print-starter/shell/start.args

@@ -1 +1 @@
---spring.profiles.active=test
+--spring.profiles.active=dev

+ 3 - 2
examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/PrintApplication.java

@@ -10,8 +10,8 @@ package cn.com.qmth.examcloud.core.print;
 import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
 import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.base.logging.SLF4JImpl;
+import cn.com.qmth.examcloud.commons.web.boot.ExamCloudApp;
 import org.slf4j.MDC;
-import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
@@ -44,7 +44,8 @@ public class PrintApplication extends SpringBootServletInitializer {
         if (LOG instanceof SLF4JImpl) {
             MDC.put("TRACE_ID", Thread.currentThread().getName());
         }
-        SpringApplication.run(PrintApplication.class, args);
+        //SpringApplication.run(PrintApplication.class, args);
+        ExamCloudApp.run(PrintApplication.class, "print", args);
     }
 
     //@Bean(name = "multipartResolver")

+ 0 - 28
examcloud-core-print-starter/src/main/resources/application-dev.properties

@@ -1,28 +0,0 @@
-# datasource config
-spring.datasource.url=jdbc:mysql://db-host:3306/exam_cloud_kf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2b8&rewriteBatchedStatements=true
-spring.datasource.username=root
-spring.datasource.password=root
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.show-sql=false
-# mongodb config
-spring.data.mongodb.uri=mongodb://db-host:27017/examcloud-core-print
-spring.data.mongodb.grid-fs-database=examcloud-core-print
-spring.data.mongodb.database=examcloud-core-print
-# redis config
-spring.redis.host=redis-host
-spring.redis.port=6379
-# spring cloud config
-spring.application.name=EC-CORE-PRINT
-eureka.client.serviceUrl.defaultZone=http://192.168.10.39:1111/eureka/
-# upyun config
-upyun.operator=examcloud
-upyun.psw=ecs87863577!@#
-upyun.bucket=exam-cloud-test
-upyun.bucketUrl=https://v0.api.upyun.com/exam-cloud-test
-upyun.fileUrl=https://ecs-test-static.qmth.com.cn
-upyun.uploadUrl=/ecs-print/test/
-# question url prefix config
-question.url.prefix=http://192.168.10.39:8008
-# file dir config
-$dir=/home/qmth/project/examcloud/examcloud-core-print
-$tempDir=/home/qmth/project/examcloud/examcloud-core-print/temps

+ 0 - 28
examcloud-core-print-starter/src/main/resources/application-prod.properties

@@ -1,28 +0,0 @@
-# datasource config
-spring.datasource.url=jdbc:mysql://db-host:3306/exam_cloud_kf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2b8&rewriteBatchedStatements=true
-spring.datasource.username=root
-spring.datasource.password=root
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.show-sql=false
-# mongodb config
-spring.data.mongodb.uri=mongodb://db-host:27017/examcloud-core-print
-spring.data.mongodb.grid-fs-database=examcloud-core-print
-spring.data.mongodb.database=examcloud-core-print
-# redis config
-spring.redis.host=redis-host
-spring.redis.port=6379
-# spring cloud config
-spring.application.name=EC-CORE-PRINT
-eureka.client.serviceUrl.defaultZone=http://192.168.10.39:1111/eureka/
-# upyun config
-upyun.operator=examcloud
-upyun.psw=ecs87863577!@#
-upyun.bucket=exam-cloud-test
-upyun.bucketUrl=https://v0.api.upyun.com/exam-cloud-test
-upyun.fileUrl=https://ecs-test-static.qmth.com.cn
-upyun.uploadUrl=/ecs-print/test/
-# question url prefix config
-question.url.prefix=http://192.168.10.39:8008
-# file dir config
-$dir=/home/qmth/project/examcloud/examcloud-core-print
-$tempDir=/home/qmth/project/examcloud/examcloud-core-print/temps

+ 0 - 28
examcloud-core-print-starter/src/main/resources/application-test.properties

@@ -1,28 +0,0 @@
-# datasource config
-spring.datasource.url=jdbc:mysql://db-host:3306/exam_cloud_kf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2b8&rewriteBatchedStatements=true
-spring.datasource.username=root
-spring.datasource.password=root
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.show-sql=false
-# mongodb config
-spring.data.mongodb.uri=mongodb://db-host:27017/examcloud-core-print
-spring.data.mongodb.grid-fs-database=examcloud-core-print
-spring.data.mongodb.database=examcloud-core-print
-# redis config
-spring.redis.host=redis-host
-spring.redis.port=6379
-# spring cloud config
-spring.application.name=EC-CORE-PRINT
-eureka.client.serviceUrl.defaultZone=http://192.168.10.39:1111/eureka/
-# upyun config
-upyun.operator=examcloud
-upyun.psw=ecs87863577!@#
-upyun.bucket=exam-cloud-test
-upyun.bucketUrl=https://v0.api.upyun.com/exam-cloud-test
-upyun.fileUrl=https://ecs-test-static.qmth.com.cn
-upyun.uploadUrl=/ecs-print/test/
-# question url prefix config
-question.url.prefix=http://192.168.10.39:8008
-# file dir config
-$dir=/home/qmth/project/examcloud/examcloud-core-print
-$tempDir=/home/qmth/project/examcloud/examcloud-core-print/temps

+ 2 - 21
examcloud-core-print-starter/src/main/resources/application.properties

@@ -1,22 +1,3 @@
 #debug=true
-spring.profiles.active=test
-#mvc config
-server.port=8009
-spring.http.multipart.max-file-size=100Mb
-spring.http.multipart.max-request-size=100Mb
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.jackson.time-zone=GMT+8
-logging.config=classpath:logback-spring.xml
-#eureka config
-eureka.instance.lease-renewal-interval-in-seconds=1
-eureka.instance.lease-expiration-duration-in-seconds=2
-eureka.instance.prefer-ip-address=true
-eureka.instance.instance-id=${spring.cloud.client.ipAddress}:${server.port}
-eureka.client.healthcheck.enabled=true
-#feign config
-feign.httpclient.enabled=false
-feign.okhttp.enabled=true
-#api config
-$rmp.cloud.print=/api/core/prt
-$rmp.ctrl.print=/api/ecs_prt
-$test=test
+spring.profiles.active=dev
+config.server.host=config-host