From 83fac17fe1966ac1e64078d9a354c8f10072cad8 Mon Sep 17 00:00:00 2001
From: luyya <luya0519>
Date: Mon, 30 Jun 2025 16:05:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=B3=E5=B7=9E=E4=BD=8D=E7=BD=AE=E6=B1=87?=
 =?UTF-8?q?=E8=81=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                     | 6 +++---
 .../stwzhj-common-dubbo/src/main/resources/common-dubbo.yml | 2 +-
 .../org/dromara/location/controller/LocationController.java | 2 +-
 .../java/org/dromara/websocket/schedule/DeviceSchedule.java | 4 ++--
 .../stwzhj-nacos/src/main/resources/application.properties  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index b6d5e180..478bbf43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,12 +89,12 @@
             <id>prod</id>
             <properties>
                 <profiles.active>prod</profiles.active>
-                <nacos.server>53.176.146.99:8848</nacos.server>
+                <nacos.server>10.129.221.10:8848</nacos.server>
                 <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                 <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
                 <nacos.username>nacos</nacos.username>
-                <nacos.password>nacos</nacos.password>
-                <logstash.address>53.176.146.99:4560</logstash.address>
+                <nacos.password>Ycgis!2509</nacos.password>
+                <logstash.address>10.129.221.10:4560</logstash.address>
             </properties>
         </profile>
     </profiles>
diff --git a/stwzhj-common/stwzhj-common-dubbo/src/main/resources/common-dubbo.yml b/stwzhj-common/stwzhj-common-dubbo/src/main/resources/common-dubbo.yml
index 70227a0a..349a911d 100644
--- a/stwzhj-common/stwzhj-common-dubbo/src/main/resources/common-dubbo.yml
+++ b/stwzhj-common/stwzhj-common-dubbo/src/main/resources/common-dubbo.yml
@@ -25,7 +25,7 @@ dubbo:
     username: dubbo
     password: ruoyi123
     # 集群开关
-    sentinel: true
+    sentinel: false
     parameters:
       namespace: ${spring.profiles.active}
       database: ${spring.data.redis.database}
diff --git a/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/LocationController.java b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/LocationController.java
index eb2731a6..354e332a 100644
--- a/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/LocationController.java
+++ b/stwzhj-modules/wzhj-location/src/main/java/org/dromara/location/controller/LocationController.java
@@ -252,7 +252,7 @@ public class LocationController {
         if (null != params.get("deviceType")){
             device.setDeviceType(params.get("deviceType").toString());
         }
-        if (null != params.get("zzjgdm") && !"341800000000".equals(params.get("zzjgdm").toString())){
+        if (null != params.get("zzjgdm") && !"341600000000".equals(params.get("zzjgdm").toString())){
             String[] zzjgdms = params.get("zzjgdm").toString().split(",");
             device.setZzjgdms(zzjgdms);
         }
diff --git a/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/schedule/DeviceSchedule.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/schedule/DeviceSchedule.java
index 20dc081f..44cc77b1 100644
--- a/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/schedule/DeviceSchedule.java
+++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/schedule/DeviceSchedule.java
@@ -85,8 +85,8 @@ public class DeviceSchedule {
                 Timestamp updateTime = originDevice.getUpdateTime();
 //                DateTime dateTime = DateUtil.offsetHour(updateTime, 13);
                 newDevice.setUpdateTime(DateUtil.formatDateTime(updateTime) );
-                newDevice.setZzjgdm("341300000000");
-                newDevice.setZzjgmc("宿州市公安局");
+                newDevice.setZzjgdm("341600000000");
+                newDevice.setZzjgmc("亳州市公安局");
 //                setZzjgdm(newDevice,originDevice);
 
             }
diff --git a/stwzhj-visual/stwzhj-nacos/src/main/resources/application.properties b/stwzhj-visual/stwzhj-nacos/src/main/resources/application.properties
index e6658aa5..37ac1679 100644
--- a/stwzhj-visual/stwzhj-nacos/src/main/resources/application.properties
+++ b/stwzhj-visual/stwzhj-nacos/src/main/resources/application.properties
@@ -41,7 +41,7 @@ db.num=1
 
 ### Connect URL of DB:
 #db.url.0=jdbc:mysql://127.0.0.1:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
-db.url.0=jdbc:mysql://53.176.146.102:3306/wzhj-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+db.url.0=jdbc:mysql://10.129.221.10:3306/wzhj-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
 db.user.0=root
 db.password.0=Ycgis!2509