From 38e67bc036cbd9625bebd923c6754622c65f39fc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期二, 18 三月 2025 10:46:25 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/resources/application.yml | 6 +++---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AgvAreaDispatcher.java | 4 ++--
zy-acs-gateway/src/main/resources/application.yml | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/zy-acs-gateway/src/main/resources/application.yml b/zy-acs-gateway/src/main/resources/application.yml
index d906b82..4cf6b60 100644
--- a/zy-acs-gateway/src/main/resources/application.yml
+++ b/zy-acs-gateway/src/main/resources/application.yml
@@ -6,7 +6,7 @@
name: @pom.artifactId@
datasource:
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://localhost:3306/zy_acs1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://localhost:3306/jbly?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: xltys1995
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AgvAreaDispatcher.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AgvAreaDispatcher.java
index 5c093c2..bb6fdd6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AgvAreaDispatcher.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AgvAreaDispatcher.java
@@ -24,7 +24,7 @@
public void initEnableArea() {
AGV_AREA.put("1", FAR_LEFT_AREA);
- AGV_AREA.put("2", FAR_LEFT_AREA);
+ AGV_AREA.put("102", FAR_LEFT_AREA);
AGV_AREA.put("3", FAR_LEFT_AREA);
AGV_AREA.put("4", FAR_LEFT_AREA);
AGV_AREA.put("5", FAR_LEFT_AREA);
@@ -77,7 +77,7 @@
public void initDisableArea() {
AGV_DISABLE_AREA.put("1", FAR_LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("2", FAR_LEFT_DISABLE_AREA);
+ AGV_DISABLE_AREA.put("102", FAR_LEFT_DISABLE_AREA);
AGV_DISABLE_AREA.put("3", FAR_LEFT_DISABLE_AREA);
AGV_DISABLE_AREA.put("4", FAR_LEFT_DISABLE_AREA);
AGV_DISABLE_AREA.put("5", FAR_LEFT_DISABLE_AREA);
diff --git a/zy-acs-manager/src/main/resources/application.yml b/zy-acs-manager/src/main/resources/application.yml
index 1b29b0a..994414c 100644
--- a/zy-acs-manager/src/main/resources/application.yml
+++ b/zy-acs-manager/src/main/resources/application.yml
@@ -7,7 +7,7 @@
static-path-pattern: /**
datasource:
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/zy_rcs_jbly?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://localhost:3306/jbly?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: xltys1995
type: com.alibaba.druid.pool.DruidDataSource
@@ -42,13 +42,13 @@
enabled: false
redis:
- host: 127.0.0.1
+ host: localhost
password: xltys1995
port: 6379
max: 30
min: 10
timeout: 5000
- index: 9
+ index: 3
floyd:
enable: false
--
Gitblit v1.9.1