From f21530d33ca23aeeba2ef073ac6b64422e4e26ca Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 12:17:55 +0800
Subject: [PATCH] 库位编号规则和和CTU保持一致
---
rsf-server/src/main/resources/application-dev.yml | 125 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 110 insertions(+), 15 deletions(-)
diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index 87745e5..b2a3f66 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -1,28 +1,34 @@
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.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ driver-class-name: com.mysql.cj.jdbc.Driver
username: root
- password: xltys1995
+ 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
- min-idle: 5
- max-active: 20
- max-wait: 30000
+ initial-size: 3
+ min-idle: 8
+ max-active: 40
+ max-wait: 10000
time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000
test-while-idle: true
- test-on-borrow: true
+ test-on-borrow: false
test-on-return: false
remove-abandoned: true
remove-abandoned-timeout: 1800
@@ -37,18 +43,107 @@
login-username: admin
login-password: admin
enabled: true
+ # 澶氭暟鎹簮锛氶紟鎹�
+ dj-cloud-wms:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ username: root
+ password: 12345
+ url: jdbc:mysql://127.0.0.1:3306/ilc_wms_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ initial-size: 1
+ min-idle: 2
+ max-active: 12
+ max-wait: 10000
+# erp:
+# type: com.alibaba.druid.pool.DruidDataSource
+# driver-class-name: com.mysql.cj.jdbc.Driver
+# username: root
+# password: 12345
+# url: jdbc:mysql://127.0.0.1:3306/rsf_jdxaj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+# initial-size: 1
+# min-idle: 2
+# max-active: 12
+# max-wait: 10000
servlet:
multipart:
maxFileSize: 100MB
maxRequestSize: 100MB
jmx:
enabled: false
-
+ mail:
+ from: t1731253606@163.com
+ host: smtp.163.com
+ port: 465
+ username: t1731253606@163.com
+ password: FCqETysH8TfuPqkY
+ properties:
+ mail:
+ smtp:
+ auth: true
+ ssl: true
+ connectiontimeout: 5000
+ timeout: 5000
+ socketFactory:
+ class: javax.net.ssl.SSLSocketFactory
redis:
host: 127.0.0.1
- password: xltys1995
+ password:
port: 6379
- max: 30
- min: 10
timeout: 5000
- index: 11
+ index: 15
+
+
+#骞冲彴鎺ュ彛淇℃伅閰嶇疆(濡傦細ERP, QMS, WCS绛�)
+platform:
+ #浼佷笟ERP骞冲彴
+ erp:
+ #localhost
+ host: http://127.0.0.1
+ #绔彛鍙�
+ port: 8080
+ #鎺ュ搧閾炬帴鍓嶇紑
+ pre-path: ""
+ # Feign 璋冪敤浜戜粨鏃剁殑鏍瑰湴鍧�銆傛湰鏈烘ā鎷燂細http://127.0.0.1:8086/rsf-server锛圕loudWmsMockController锛欼CusStockService stockIn/Out/TransferCompleted锛�
+ # base-url: http://127.0.0.1:8086/rsf-server
+ base-url: http://192.168.10.108:8180
+ # 榧庢嵎 DAP ilcwmsplus 瀹屾垚鍙嶉锛�9.1/9.2 缁勫寘鐢級
+ dap:
+ org-no: ""
+ doc-type-in: ""
+ doc-type-out: ""
+ doc-type-adj: ""
+ unit-no: PCS
+ #鎺ュ彛鏄庣粏锛堣川妫�绛夛紱Feign 宸插浐瀹� ICusStockService stockInCompleted銆乻tockOutCompleted锛涜皟鎷� changeType=3 涓� stockTransferCompleted锛�
+ api:
+ notify-inspect: /report/inspect
+ stock-in-completed-path: /dapilc/restful/service/ilcwmsplus/ICusStockService/stockInCompleted
+ stock-out-completed-path: /dapilc/restful/service/ilcwmsplus/ICusStockService/stockOutCompleted
+# in-out-result-path: /dapilc/restful/service/ilcwmsplus/IKWebService/cusInventoryCompletionReport
+ inventory-adjust-path: /api/report/inventoryAdjust
+ mat-sync-path: /api/mat/sync
+ rcs:
+ #閾炬帴
+ host: http://10.10.10.200
+ #绔彛
+ port: 8088
+#浠撳簱鍔熻兘鍙傛暟閰嶇疆
+stock:
+ #鏄惁鍏佽鎵撳嵃璐х墿鏍囩锛� 榛樿鍏佽鎵撳嵃锛屼篃鍙敱渚涘簲鍟嗘彁渚涙爣绛�
+ flagPrinter: false
+ #鏄惁鑷姩鐢熸垚ASN鍗曪紙榛樿锛氭槸锛夛紝涓恒�庡惁銆忓垯寮�鍚疨O鍗曟墜鍔ㄧ敓鎴怉SN鍗曞姛鑳�
+ flagAutoAsn: false
+ #璐ㄦ鍔熻兘 鏄惁鏍￠獙涓婃灦锛堥粯璁わ細鏄級锛屾槸鍚︽牎楠屾敹璐э紙榛樿锛氬惁锛�
+ inspect:
+ #鍒ゆ柇鏄悗妫�楠屽悎鏍煎悗锛屾墠鍏佽涓婃灦
+ flagAvailable: true
+ #鍒ゆ柇鏄惁鏍￠獙鍚堟牸鍚庯紝鎵嶅厑璁告敹璐�
+ flagReceiving: false
+
+# HTTP 鎺ュ彛瀹¤锛坮sf-http-audit锛屽紩鍏ヤ緷璧栧嵆鐢熸晥锛屽彲 enabled=false 鍏抽棴锛�
+# whitelist-only=true锛氫粎 sys_http_audit_rule 鍛戒腑瑙勫垯鎵嶅啓瀹¤锛涙棤瑙勫垯鏃朵笉钀藉簱銆俧alse锛氭帓闄よ矾寰勫鍏ㄩ噺璁板綍銆�
+# rule-cache-refresh-ms锛氳鍒欒〃缂撳瓨鍒锋柊闂撮殧锛堟绉掞級
+http-audit:
+ # enabled: true
+ enabled: false
+ # 瀹¤鏁版嵁婧愶細primary / dj-cloud-wms
+ datasource: primary
\ No newline at end of file
--
Gitblit v1.9.1