From 6ea3d5caa30f460f1eb9c3880d90f41275c3c274 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期四, 03 七月 2025 09:25:08 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/resources/application.yml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/resources/application.yml b/zy-asrs-wms/src/main/resources/application.yml
index f9f08bf..0085485 100644
--- a/zy-asrs-wms/src/main/resources/application.yml
+++ b/zy-asrs-wms/src/main/resources/application.yml
@@ -13,9 +13,13 @@
validation-timeout: 3000
connection-test-query: select 1
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/wms_dev?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://127.0.0.1:3306/wms_dev_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+# url: jdbc:mysql://127.0.0.1:3306/ycdsasrs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: root
password: 34821015
+# url: jdbc:mysql://47.76.147.249:3306/wms_dev_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+# username: wms_dev_test
+# password: smjPbTrkmTMEGKaD
# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://47.97.1.152:51433;databasename=jkasrs
# username: sa
@@ -37,7 +41,7 @@
# global-config:
# field-strategy: 0
configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
global-config:
@@ -59,7 +63,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: wms_dev
+ subject: ycdsasrs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
@@ -71,7 +75,9 @@
rcs:
#RCS鍩虹API HOST
- baseHost: http://localhost:8080
+ baseHost: http://192.168.2.200:9046
+ #ESS鎺ユ敹浠诲姟涓嬪彂鎺ュ彛
+ essReceiveTask: /task/create
#RCS涓婃姤浠诲姟鐘舵��
issueTaskOfEvent: /task/create
#RCS閫氱煡浼犺緭绾挎祦鍔�
--
Gitblit v1.9.1