wangwei 7 лет назад
Родитель
Сommit
41d280d1c5

+ 1 - 16
examcloud-exchange-starter/src/main/resources/application-dev.properties

@@ -1,16 +1 @@
-spring.datasource.url=jdbc:mysql://192.168.10.30:3306/exam_cloud_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=root
-
-
-spring.redis.host=192.168.10.30
-spring.redis.port=6379
-
-
-eureka.client.serviceUrl.defaultZone=http://localhost:8761/eureka/
-
-spring.rabbitmq.host=192.168.10.30
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=examcloud
-spring.rabbitmq.password=examcloud
-spring.rabbitmq.listener.acknowledgeMode=MANUAL
+eureka.client.serviceUrl.defaultZone=http://localhost:8761/eureka/

+ 0 - 16
examcloud-exchange-starter/src/main/resources/application-prac.properties

@@ -1,16 +0,0 @@
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/exam_cloud_test?useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=root
-spring.datasource.password=root
-
-
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-
-
-eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
-
-spring.rabbitmq.host=127.0.0.1
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=examcloud
-spring.rabbitmq.password=examcloud
-spring.rabbitmq.listener.acknowledgeMode=MANUAL

+ 0 - 23
examcloud-exchange-starter/src/main/resources/application-prod.properties

@@ -1,23 +0,0 @@
-spring.datasource.url=jdbc:mysql://qmthmysql.mysql.rds.aliyuncs.com:3306/exam_cloud?useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=exam_cloud
-spring.datasource.password=examcloud123!@#
-
-
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-
-
-eureka.client.serviceUrl.defaultZone=http://127.0.0.1:1111/eureka/
-hystrix.command.default.execution.timeout.enabled=false
-hystrix.threadpool.default.coreSize = 500
-
-
-spring.rabbitmq.host=localhost
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=examcloud
-spring.rabbitmq.password=examcloud123
-spring.rabbitmq.listener.acknowledgeMode=MANUAL
-
-spring.redis.host=r-wz97e520d2701e54.redis.rds.aliyuncs.com
-spring.redis.port=6379
-spring.redis.password=Qmth87863577

+ 0 - 19
examcloud-exchange-starter/src/main/resources/application-prodvpc.properties

@@ -1,19 +0,0 @@
-spring.datasource.url=jdbc:mysql://rds7b2sll8un5kz99s0i122.mysql.rds.aliyuncs.com:3306/exam_cloud?useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=exam_cloud
-spring.datasource.password=examcloud123!@#
-
-
-eureka.client.serviceUrl.defaultZone=http://127.0.0.1:1111/eureka/
-hystrix.command.default.execution.timeout.enabled=false
-hystrix.threadpool.default.coreSize = 500
-
-
-spring.rabbitmq.host=localhost
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=examcloud
-spring.rabbitmq.password=examcloud123
-spring.rabbitmq.listener.acknowledgeMode=MANUAL
-
-spring.redis.host=r-wz97e520d2701e54555.redis.rds.aliyuncs.com
-spring.redis.port=6379
-spring.redis.password=Qmth87863577

+ 0 - 16
examcloud-exchange-starter/src/main/resources/application-test.properties

@@ -1,16 +0,0 @@
-spring.datasource.url=jdbc:mysql://localhost:3306/exam_cloud_test?useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=root
-spring.datasource.password=root
-
-
-spring.redis.host=localhost
-spring.redis.port=6379
-
-
-eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
-
-spring.rabbitmq.host=localhost
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=examcloud
-spring.rabbitmq.password=examcloud
-spring.rabbitmq.listener.acknowledgeMode=MANUAL

+ 7 - 32
examcloud-exchange-starter/src/main/resources/application.properties

@@ -1,42 +1,17 @@
 spring.profiles.active=dev
-spring.datasource.validation-query=SELECT 1 FROM DUAL
-spring.datasource.test-on-borrow=true
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-#\u7981\u7528\u670d\u52a1\u6ce8\u518c
-eureka.client.register-with-eureka=false
-eureka.client.fetch-registry=true
-
-#redis
-#spring.redis.host=192.168.199.102
-#spring.redis.port=32768
-
-#server.port=8080
-
-
-#logging.file=d:/gkwb/logs/gkwb.log
-logging.level.org.springframework=ERROR
-logging.level.org.hibernate=ERROR
-
-spring.jpa.show-sql=false
-spring.jpa.hibernate.ddl-auto=update
 
+spring.application.name=examcloud-exchange
+server.port=9006
 
 spring.http.multipart.max-file-size=10Mb
+eureka.client.register-with-eureka=true
+eureka.client.fetch-registry=true
 
-spring.application.name=examcloud-logic-basic
-server.port=8008
-eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
 hystrix.command.default.execution.timeout.enabled=false
-# Increase the Hystrix timeout to 600s (globally)
 hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 600000
+
 ribbon.ReadTimeout=800000
 ribbon.ConnectTimeout=800000
 
-app.api.root=/api/logic/basic
-app.api.core=/api/ecs_core
-app.api.oe=/api/ecs_oe
-#\u5b66\u751f\u7167\u7247\u4e0a\u4f20\u5730\u5740
-app.em.photo.path=/Users/ting.yin/Downloads
-app.em.facepp.key=e94d4a6a1ea8749144328be96a40e388
-app.em.facepp.secret=H65RT9miQqCal00jpxdUAreAufxxusUv
+outer.url.prefix=/exchange/webservice
+inner.url.prefix=/exchange/api

+ 17 - 0
examcloud-exchange-starter/src/main/resources/config.properties

@@ -0,0 +1,17 @@
+spring.profiles.active=dev
+
+spring.application.name=examcloud-exchange
+server.port=9006
+
+spring.http.multipart.max-file-size=10Mb
+eureka.client.register-with-eureka=true
+eureka.client.fetch-registry=true
+
+hystrix.command.default.execution.timeout.enabled=false
+hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 600000
+
+ribbon.ReadTimeout=800000
+ribbon.ConnectTimeout=800000
+
+outer.url.prefix=/exchange/webservice
+inner.url.prefix=/exchange/api

+ 50 - 0
examcloud-exchange-starter/src/main/resources/logback-spring.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="true" scan="true" scanPeriod="30 seconds">
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}| %level | %X{TRACE_ID} - %X{LOGIN_NAME} | %m | [%class:%line]%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- debug 日志 -->
+	<appender name="DEBUG_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>./logs/debug/exchange.debug.log</file>
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}| %level | %X{TRACE_ID} - %X{LOGIN_NAME} | %m | [%class:%line]%n</pattern>
+		</encoder>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>./logs/debug/exchange.debug.log.%d{yyyy-MM-dd}.%i.zip</fileNamePattern>
+			<maxHistory>100</maxHistory>
+			<maxFileSize>50MB</maxFileSize>
+		</rollingPolicy>
+	</appender>
+
+	<!-- 接口日志 -->
+	<appender name="INTERFACE_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>./logs/interface/exchange.interface.log</file>
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}| %level | %X{TRACE_ID} - %X{LOGIN_NAME} | %m%n</pattern>
+		</encoder>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>./logs/interface/exchange.interface.log.%d{yyyy-MM-dd}.%i.zip</fileNamePattern>
+			<maxHistory>100</maxHistory>
+			<maxFileSize>50MB</maxFileSize>
+		</rollingPolicy>
+	</appender>
+
+	<logger name="cn.com.qmth.examcloud" level="DEBUG" additivity="false">
+		<appender-ref ref="DEBUG_APPENDER" />
+		<appender-ref ref="STDOUT" />
+	</logger>
+
+	<logger name="INTERFACE_LOGGER" level="DEBUG" additivity="false">
+		<appender-ref ref="INTERFACE_APPENDER" />
+	</logger>
+
+	<root level="INFO">
+		<appender-ref ref="DEBUG_APPENDER" />
+		<appender-ref ref="STDOUT" />
+	</root>
+
+</configuration>