Merge branch 'FOTON' into 'develop_master'

# Conflicts:
#   adc-da-main/src/main/resources/application.properties

adc-da-main/src/main/resources/application-dev.properties

@@ -3,22 +3,22 @@
 # 数据库配置
 #=============================================
 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://121.36.69.172:3307/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
-spring.datasource.username = root
-spring.datasource.password = hzwlsoft.com
+spring.datasource.url = jdbc:mysql://10.100.5.111:3306/foton_slrs?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+spring.datasource.username = tempuser
+spring.datasource.password = Fting&8g35g#geg2
 
 
 
 #==============================================
 # 应用设置
-spring.application.name=FotonLAWSSystem-test
+spring.application.name=FotonLAWSSystem
 application.code=20200101
 application.center=1
 #==============================================
 #Eureka
 eureka.client.allow-redirects=true
 eureka.client.register-with-eureka=true
-eureka.client.service-url.defaultZone=http://127.0.0.1:8123/eureka/
+eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/
 
 #==============================================
 # 邮箱配置1
@@ -37,10 +37,10 @@ spring.mail.port=587
 #==============================================
 # MQ配置
 #==============================================
-spring.rabbitmq.host=121.36.69.172
+spring.rabbitmq.host=10.100.5.119
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=admin
-spring.rabbitmq.password=hzwlsoft.com
+spring.rabbitmq.password=foton@admin
 spring.rabbitmq.listener.simple.acknowledge-mode= manual
 # 生产者 默认关闭 发版 需改为 true
 spring.rabbitmq.listener.direct.auto-startup=true

adc-da-main/src/main/resources/application.properties

@@ -8,9 +8,9 @@ spring.profiles.active=dev
 ##############################################
 server.compression.enabled=true
 server.compression.mime-types=application/json,application/xml,text/html,text/plain,text/css,application/x-javascript
-# \u7AEF\u53E3\u53F7\u8BBE\u7F6E
-server.port=10086
-#\u4E3B\u670D\u52A1session\u8D85\u65F6
+# 端口号设置
+server.port=4202
+#主服务session超时
 server.servlet.session.timeout =600
 
 #tomcat /resource/local/version-manager \u521B\u5EFAtomcat\u6307\u5B9A\u4E34\u65F6\u76EE\u5F55
@@ -145,8 +145,8 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt,pdg,rar,zip
 # elasticsearch \u914D\u7F6E
 # =============================================================================
 elasticsearch.clustername=elasticsearch
-elasticsearch.ip=127.0.0.1
-elasticsearch.port=9306
+elasticsearch.ip=10.100.5.122
+elasticsearch.port=9300
 elasticsearch.poolSize=5
 elas.flag=true
 

adc-da-main/src/main/resources/logback-spring.xml

@@ -8,7 +8,9 @@
     <!-- 项目名称 -->
     <property name="PROJECT_NAME" value="adc-da" />
     <!-- 定义日志文件的存储地址,勿在 LogBack的配置中使用相对路径 -->
-    <property name="LOG_HOME" value="/tmp/applog/pcms-rest-system" />
+<!--    <property name="LOG_HOME" value="/data/slrs/system-server/logs" />-->
+    <property name="LOG_HOME" value="./logs" />
+
     <!--    <property name="LOG_HOME" value="../logs/pcms-rest" />-->
     <!-- 定义系统日志文件的存储地址,勿在 LogBack的配置中使用相对路径 -->
     <property name="LOG_HOME_SYSTEM" value="system" />