From 16a09540001bd00f01b848f0ca125d16bf314450 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 29 八月 2025 15:45:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-open-api/src/main/resources/application-dev.yml | 48 ++++++------------------------------------------
1 files changed, 6 insertions(+), 42 deletions(-)
diff --git a/rsf-open-api/src/main/resources/application-dev.yml b/rsf-open-api/src/main/resources/application-dev.yml
index 85e4cc3..ba2ddcb 100644
--- a/rsf-open-api/src/main/resources/application-dev.yml
+++ b/rsf-open-api/src/main/resources/application-dev.yml
@@ -44,23 +44,6 @@
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
@@ -70,33 +53,14 @@
#骞冲彴鎺ュ彛淇℃伅閰嶇疆(濡傦細ERP, QMS, WCS绛�)
platform:
- #浼佷笟ERP骞冲彴
- erp:
- #localhost
- host: http://127.0.0.1
- #绔彛鍙�
- port: 8080
- #鎺ュ搧閾炬帴鍓嶇紑
- pre-path: rsf-server
- #鎺ュ彛鏄庣粏
- api:
- #璐ㄦ涓婃姤鎺ュ彛
- notify-inspect: /report/inspect
+ #RCS閾炬帴
rcs:
#閾炬帴
host: http://192.168.4.84
#绔彛
port: 8088
-
-#浠撳簱鍔熻兘鍙傛暟閰嶇疆
-stock:
- #鏄惁鍏佽鎵撳嵃璐х墿鏍囩锛� 榛樿鍏佽鎵撳嵃锛屼篃鍙敱渚涘簲鍟嗘彁渚涙爣绛�
- flagPrinter: false
- #鏄惁鑷姩鐢熸垚ASN鍗曪紙榛樿锛氭槸锛夛紝涓恒�庡惁銆忓垯寮�鍚疨O鍗曟墜鍔ㄧ敓鎴怉SN鍗曞姛鑳�
- flagAutoAsn: false
- #璐ㄦ鍔熻兘 鏄惁鏍￠獙涓婃灦锛堥粯璁わ細鏄級锛屾槸鍚︽牎楠屾敹璐э紙榛樿锛氬惁锛�
- inspect:
- #鍒ゆ柇鏄悗妫�楠屽悎鏍煎悗锛屾墠鍏佽涓婃灦
- flagAvailable: true
- #鍒ゆ柇鏄惁鏍￠獙鍚堟牸鍚庯紝鎵嶅厑璁告敹璐�
- flagReceiving: false
\ No newline at end of file
+ wms:
+ #閾炬帴
+ host: http://127.0.0.1
+ #绔彛
+ port: 8080
\ No newline at end of file
--
Gitblit v1.9.1