From a2ef34a807b1f88ac9b18dae51adbf61ce821595 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 三月 2026 11:31:40 +0800
Subject: [PATCH] RCS对接优化

---
 rsf-server/src/main/resources/application-dev.yml |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index a817733..4a1f465 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -1,23 +1,24 @@
 server:
-  port: 8080
+  port: 8086
   servlet:
     context-path: /@pom.artifactId@
 spring:
   application:
     name: @pom.artifactId@
+  cloud:
+    openfeign:
+      circuitbreaker:
+        enabled: true   # Feign 璋冪敤澶辫触鏃惰蛋 Fallback锛屽湪 Feign 鍐呯粺涓�杩斿洖閿欒鍝嶅簲
   mvc:
     static-path-pattern: /**
     path match:
       matching-strategy: ANT_PATH_MATCHER
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://47.76.147.249:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-#    username: rsf
     username: root
-    url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-    password: xltys1995
-#    url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-#    password: 34821015
+    url: jdbc:mysql://127.0.0.1:3306/rsf_jdxaj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://127.0.0.1:3306/jdxajwms?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+    password: 12345
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       initial-size: 5
@@ -79,17 +80,20 @@
     #绔彛鍙�
     port: 8080
     #鎺ュ搧閾炬帴鍓嶇紑
-    pre-path: rsf-server
-    #鎺ュ彛鏄庣粏
+    pre-path: ""
+    # Feign 璋冪敤浜戜粨鏃剁殑鏍瑰湴鍧�銆備簯浠撴湭鎻愪緵 URL 鏃跺彲鐢ㄦ湰鏈烘ā鎷燂細http://127.0.0.1:8086/rsf-server锛堟湰鏈嶅姟鎻愪緵鐨� CloudWmsMockController锛�
+    base-url: http://127.0.0.1:8086/rsf-server
+    #鎺ュ彛鏄庣粏锛堢珛搴撲晶璇锋眰浜戜粨鏃朵娇鐢ㄧ殑璺緞锛�
     api:
-      #璐ㄦ涓婃姤鎺ュ彛
       notify-inspect: /report/inspect
+      in-out-result-path: /api/report/inOutResult
+      inventory-adjust-path: /api/report/inventoryAdjust
+      mat-sync-path: /api/mat/sync
   rcs:
     #閾炬帴
-    host: http://127.0.0.1
+    host: http://10.10.10.200
     #绔彛
-    port: 8081
-
+    port: 8088
 #浠撳簱鍔熻兘鍙傛暟閰嶇疆
 stock:
   #鏄惁鍏佽鎵撳嵃璐х墿鏍囩锛� 榛樿鍏佽鎵撳嵃锛屼篃鍙敱渚涘簲鍟嗘彁渚涙爣绛�

--
Gitblit v1.9.1