1
0
Kaynağa Gözat

修改配置

yangbo 4 yıl önce
ebeveyn
işleme
d6a638266b

+ 2 - 2
eccs-admin/src/main/resources/application-prod.yml

@@ -33,14 +33,14 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://out-rm-wz92efl25x02n44xego.mysql.rds.aliyuncs.com:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://out-rm-wz92efl25x02n44xego.mysql.rds.aliyuncs.com:3306/eccs_cw?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: eccs_cw
         password: 2KYkenCFH8
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
         enabled: false
-        url: jdbc:mysql://out-rm-wz92efl25x02n44xego.mysql.rds.aliyuncs.com:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://out-rm-wz92efl25x02n44xego.mysql.rds.aliyuncs.com:3306/eccs_cw?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: eccs_cw
         password: 2KYkenCFH8
       # 初始连接数

+ 25 - 2
eccs-admin/src/main/resources/logback.xml

@@ -11,6 +11,28 @@
 			<pattern>${log.pattern}</pattern>
 		</encoder>
 	</appender>
+
+    <appender name="file_debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/eccs-sys-debug.log</file>
+        <!-- 循环政策:基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/eccs-sys-debug.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>DEBUG</level>
+            <!-- 匹配时的操作:接收(记录) -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作:拒绝(不记录) -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
 	
 	<!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -76,13 +98,14 @@
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="info" />
 
-	<root level="info">
+	<root level="debug">
 		<appender-ref ref="console" />
 	</root>
 	
 	<!--系统操作日志-->
-    <root level="info">
+    <root level="debug">
         <appender-ref ref="file_info" />
+        <appender-ref ref="file_debug" />
         <appender-ref ref="file_error" />
     </root>
 	

+ 11 - 11
eccs-biz/src/main/resources/kmall-config.yml

@@ -6,17 +6,17 @@ kmall:
 #  queryAllShopInveMngUrl: http://127.0.0.1:8080/ktoeccs/queryAllStoreProductInfo
 #  # 发送请求
 #  requestToKmall: http://127.0.0.1:8080/ktoeccs/sendToEccs
-  # 测试环境地址
-  # 查询所有库存接口
-  queryAllInveMngUrl: http://183.62.225.124:8080/ktoeccs/queryAllGoodsInfo
-  # 查询门店库存接口
-  queryAllShopInveMngUrl: http://183.62.225.124:8080/ktoeccs/queryAllStoreProductInfo
-  # 发送请求
-  requestToKmall: http://183.62.225.124:8080/ktoeccs/sendToEccs
-#   生产环境地址
-#  queryAllInveMngUrl: http://8.135.102.238:8080/ktoeccs/queryAllGoodsInfo
+#  # 测试环境地址
+#  # 查询所有库存接口
+#  queryAllInveMngUrl: http://183.62.225.124:8080/ktoeccs/queryAllGoodsInfo
 #  # 查询门店库存接口
-#  queryAllShopInveMngUrl: http://8.135.102.238:8080/ktoeccs/queryAllStoreProductInfo
+#  queryAllShopInveMngUrl: http://183.62.225.124:8080/ktoeccs/queryAllStoreProductInfo
 #  # 发送请求
-#  requestToKmall: http://8.135.102.238:8080/ktoeccs/sendToEccs
+#  requestToKmall: http://183.62.225.124:8080/ktoeccs/sendToEccs
+#   生产环境地址
+  queryAllInveMngUrl: http://8.135.102.238:8080/ktoeccs/queryAllGoodsInfo
+  # 查询门店库存接口
+  queryAllShopInveMngUrl: http://8.135.102.238:8080/ktoeccs/queryAllStoreProductInfo
+  # 发送请求
+  requestToKmall: http://8.135.102.238:8080/ktoeccs/sendToEccs
 

+ 40 - 38
eccs-biz/src/main/resources/oms-config.yml

@@ -37,57 +37,59 @@ oms:
 #  queryShopOutUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopOut
 #  # 查询门店转移接口
 #  queryShopMoveUrl: http://127.0.0.1:8680/al/queryOmsInfo/queryShopMove
-  # 测试环境
-  # 查询商户信息接口
-  queryMerchantInfoUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryMerchantInfoUrl
-  # 查询第三方商户信息接口
-  queryThirdMerchantInfoUrl:
-  # 查询库存接口
-  queryMngInveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveMng
-  # 查询门店库存接口
-  queryShopMngInveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopInveMng
-  # 查询入库单接口
-  queryInveReceiptUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveReceiptGoods
-  # 查询入库单明细接口
-  queryInveReceiptDetailUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveReceiptGoods
-  # 查询结转接口
-  queryAdjustmentUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryAdjustmentRecord
-  # 查询结转明细接口
-  queryAdjustmentDetailUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryAdjustmentDetail
-  # 查询出区接口
-  queryInveShipmentUrl:
-  # 查询出区明细接口
-  queryInveShipmentDetailUrl:
-  # 查询门店进货接口
-  queryShopInUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopIn
-  # 查询门店出场接口
-  queryShopOutUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopOut
-  # 查询门店转移接口
-  queryShopMoveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopMove
-  # 生产环境 ws.ds-bay.com
+#  # 测试环境
 #  # 查询商户信息接口
-#  queryMerchantInfoUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryMerchantInfoUrl
+#  queryMerchantInfoUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryMerchantInfoUrl
 #  # 查询第三方商户信息接口
 #  queryThirdMerchantInfoUrl:
 #  # 查询库存接口
-#  queryMngInveUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryInveMng
+#  queryMngInveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveMng
 #  # 查询门店库存接口
-#  queryShopMngInveUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryShopInveMng
+#  queryShopMngInveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopInveMng
 #  # 查询入库单接口
-#  queryInveReceiptUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryInveReceiptGoods
+#  queryInveReceiptUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveReceiptGoods
 #  # 查询入库单明细接口
-#  queryInveReceiptDetailUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryInveReceiptGoods
+#  queryInveReceiptDetailUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryInveReceiptGoods
 #  # 查询结转接口
-#  queryAdjustmentUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryAdjustmentRecord
+#  queryAdjustmentUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryAdjustmentRecord
 #  # 查询结转明细接口
-#  queryAdjustmentDetailUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryAdjustmentDetail
+#  queryAdjustmentDetailUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryAdjustmentDetail
 #  # 查询出区接口
 #  queryInveShipmentUrl:
 #  # 查询出区明细接口
 #  queryInveShipmentDetailUrl:
 #  # 查询门店进货接口
-#  queryShopInUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryShopIn
+#  queryShopInUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopIn
 #  # 查询门店出场接口
-#  queryShopOutUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryShopOut
+#  queryShopOutUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopOut
 #  # 查询门店转移接口
-#  queryShopMoveUrl: http://ws.ds-bay.com:8680/al/queryOmsInfo/queryShopMove
+
+
+#  queryShopMoveUrl: http://183.3.221.143:8680/al/queryOmsInfo/queryShopMove
+  # 生产环境 ws.ds-bay.com
+  # 查询商户信息接口
+  queryMerchantInfoUrl: http://ws.ds-bay.com/al/queryOmsInfo/queryMerchantInfoUrl
+  # 查询第三方商户信息接口
+  queryThirdMerchantInfoUrl:
+  # 查询库存接口
+  queryMngInveUrl: http://ws.ds-bay.com/al/queryOmsInfo/queryInveMng
+  # 查询门店库存接口
+  queryShopMngInveUrl: http://ws.ds-bay.com/al/queryOmsInfo/queryShopInveMng
+  # 查询入库单接口
+  queryInveReceiptUrl: http://ws.ds-bay.com/al/queryOmsInfo/queryInveReceiptGoods
+  # 查询入库单明细接口
+  queryInveReceiptDetailUrl: http://ws.ds-bay.com/al/queryOmsInfo/queryInveReceiptGoods
+  # 查询结转接口
+  queryAdjustmentUrl: http://ws.ds-bay.com/al/queryOmsInfo/queryAdjustmentRecord
+  # 查询结转明细接口
+  queryAdjustmentDetailUrl: http://ws.ds-bay.com/al/queryOmsInfo/queryAdjustmentDetail
+  # 查询出区接口
+  queryInveShipmentUrl:
+  # 查询出区明细接口
+  queryInveShipmentDetailUrl:
+  # 查询门店进货接口
+  queryShopInUrl: http://ws.ds-bay.com/al/queryOmsInfo/queryShopIn
+  # 查询门店出场接口
+  queryShopOutUrl: http://ws.ds-bay.com/al/queryOmsInfo/queryShopOut
+  # 查询门店转移接口
+  queryShopMoveUrl: http://ws.ds-bay.com/al/queryOmsInfo/queryShopMove