zyh自用

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

@@ -2,24 +2,26 @@
 #=============================================
 # 数据库配置
 #=============================================
+# dev config
+#=============================================
+# 数据库配置
+#=============================================
 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+#spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
-#spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
 spring.datasource.username = root
 spring.datasource.password = root
 
-
-
 #==============================================
 # 应用设置
-spring.application.name=FotonLAWSSystem
+spring.application.name=FotonLAWSSystem-zyh
 application.code=20200101
 application.center=1
 #==============================================
 #Eruept
 eureka.client.allow-redirects=true
 eureka.client.register-with-eureka=true
-eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/
+eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/
 
 #==============================================
 # 邮箱配置1
@@ -44,10 +46,16 @@ spring.mail.port=587
 #spring.rabbitmq.username=uat_pcms
 #spring.rabbitmq.password=VxsBLL5bJruwzXfS
 # spring.rabbitmq.publisher-confirms=true
-spring.rabbitmq.host=62.234.118.181
+
+#spring.rabbitmq.host=192.168.10.248
+#spring.rabbitmq.port=5672
+#spring.rabbitmq.username=ca
+#spring.rabbitmq.password=cs986432
+spring.rabbitmq.host=localhost
 spring.rabbitmq.port=5672
-spring.rabbitmq.username=admin
+spring.rabbitmq.virtual-host=/
-spring.rabbitmq.password=admin
+spring.rabbitmq.username=guest
+spring.rabbitmq.password=guest
 # ==============================================
 # 文档存储路径指向
 # ==============================================

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

@@ -1,6 +1,3 @@
-##############################################
-#  项目启动模式
-##############################################
 spring.profiles.active=dev
 
 ##############################################
@@ -39,7 +36,7 @@ eureka.client.fetch-registry=true
 #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/
 #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
 
-eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/
+eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/
 
 # 请求连接的超时时间 默认的时间为 1 秒
 ribbon.ConnectTimeout=500000
@@ -137,13 +134,13 @@ file.path=D:/uploadfile/bus
 # 文件下载地址参数
 file.downloadUrl=http://39.98.140.126:10001/uploadPath
 #上传文件白名单-以,分隔
-upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt
+upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg
 
 # =============================================================================
 # elasticsearch 配置
 # =============================================================================
 elasticsearch.clustername=elasticsearch
-elasticsearch.ip=172.17.0.1
+elasticsearch.ip=192.168.10.47
 elasticsearch.port=9300
 elasticsearch.poolSize=5
 elas.flag=true

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -404,7 +404,7 @@
     </select>
 
     <!-- 查询SAR_STAND_ITEMS列表 -->
-    <select id="queryByPage" resuCOMPLIANCE_REQUIRltMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
+    <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
         select
         <include refid="Base_Column_List"/>
         from