From ce7cb0fccbe662ef58ff201c1ad8038c89af82bf Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 25 十一月 2024 16:18:55 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/resources/application.yml | 6 +-----
zy-acs-gateway/src/main/resources/application.yml | 2 +-
zy-acs-gateway/pom.xml | 1 +
zy-acs-manager/pom.xml | 2 +-
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/zy-acs-gateway/pom.xml b/zy-acs-gateway/pom.xml
index dd68dcd..7400551 100644
--- a/zy-acs-gateway/pom.xml
+++ b/zy-acs-gateway/pom.xml
@@ -46,6 +46,7 @@
</dependencies>
<build>
+ <finalName>rcs-gateway</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/zy-acs-gateway/src/main/resources/application.yml b/zy-acs-gateway/src/main/resources/application.yml
index 79ccaa8..d906b82 100644
--- a/zy-acs-gateway/src/main/resources/application.yml
+++ b/zy-acs-gateway/src/main/resources/application.yml
@@ -28,7 +28,7 @@
logging:
file:
- path: /stock/out/acs-gateway/logs
+ path: /stock/out/rcs-gateway/logs
agv-tcp:
#tcp/ip鍗忚绔彛
diff --git a/zy-acs-manager/pom.xml b/zy-acs-manager/pom.xml
index a7cdadc..af1e3a7 100644
--- a/zy-acs-manager/pom.xml
+++ b/zy-acs-manager/pom.xml
@@ -149,7 +149,7 @@
</dependencies>
<build>
- <finalName>acs-manager</finalName>
+ <finalName>rcs-manager</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/zy-acs-manager/src/main/resources/application.yml b/zy-acs-manager/src/main/resources/application.yml
index f0726e7..0047810 100644
--- a/zy-acs-manager/src/main/resources/application.yml
+++ b/zy-acs-manager/src/main/resources/application.yml
@@ -9,7 +9,6 @@
datasource:
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://localhost:3306/zy_rcs1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-# url: jdbc:mysql://192.168.2.46:3306/zy_acs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: xltys1995
type: com.alibaba.druid.pool.DruidDataSource
@@ -41,7 +40,6 @@
maxRequestSize: 100MB
jmx:
enabled: false
- # 閭欢鏈嶅姟鍣ㄩ厤缃�
mail:
host: smtp.qq.com
username:
@@ -62,7 +60,6 @@
defaultZone: http://192.168.2.46:8765/eureka/
mybatis-plus:
-# mapper-locations: classpath:mapper/*.xml
mapper-locations: classpath:mapper/*/*.xml
# global-config:
# field-strategy: 0
@@ -79,12 +76,11 @@
logging:
file:
- path: /stock/out/acs-manager/logs
+ path: /stock/out/rcs-manager/logs
#redis鐨勭浉鍏抽厤缃�
redis:
host: localhost
-# host: 192.168.2.46
password: xltys1995
port: 6379
max: 30
--
Gitblit v1.9.1