From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/resources/application-prod.yml | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/resources/application-prod.yml b/rsf-server/src/main/resources/application-prod.yml
index ecc2fc2..8d37532 100644
--- a/rsf-server/src/main/resources/application-prod.yml
+++ b/rsf-server/src/main/resources/application-prod.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 8085
servlet:
context-path: /@pom.artifactId@
@@ -10,9 +10,9 @@
static-path-pattern: /**
datasource:
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://192.168.4.24:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: 34821015
+ password: xltys1995
type: com.alibaba.druid.pool.DruidDataSource
druid:
initial-size: 5
@@ -62,4 +62,29 @@
password: xltys1995
port: 6379
timeout: 5000
- index: 11
\ No newline at end of file
+ index: 11
+
+stock:
+ flagAvailable: true
+
+
+
+ #骞冲彴鎺ュ彛淇℃伅閰嶇疆(濡傦細ERP, QMS, WCS绛�)
+ platform:
+ #浼佷笟ERP骞冲彴
+ erp:
+ #localhost
+ host: http://127.0.0.1
+ #绔彛鍙�
+ port: 8085
+ #鎺ュ搧閾炬帴鍓嶇紑
+ pre-path: rsf-server
+ #鎺ュ彛鏄庣粏
+ api:
+ #璐ㄦ涓婃姤鎺ュ彛
+ notify-inspect: /report/inspect
+ rcs:
+ #閾炬帴
+ host: http://127.0.0.1
+ #绔彛
+ port: 8081
--
Gitblit v1.9.1