diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index bef5b255..e026b827 100644 --- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -105,7 +105,7 @@ public class SysDeptServiceImpl implements ISysDeptService { return TreeBuildUtils.build(depts, (dept, tree) -> tree.setId(dept.getDeptId()) .setParentId(dept.getParentId()) - .setName(dept.getDeptName()) + .setName(dept.getShortName()) .setWeight(dept.getOrderNum())); } diff --git a/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/handler/MyApplicationContextRefreshedListener.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/handler/MyApplicationContextRefreshedListener.java index 3f2673c2..4a707008 100644 --- a/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/handler/MyApplicationContextRefreshedListener.java +++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/handler/MyApplicationContextRefreshedListener.java @@ -33,7 +33,7 @@ public class MyApplicationContextRefreshedListener implements ApplicationListene //滁州 // public static final String WEBSOCKET_URL = "ws://53.193.3.5:32090/vms/websocket/socketServer.do"; //铜陵 - public static final String WEBSOCKET_URL = "ws://53.176.146.97:32090/vms/websocket/socketServer.do"; + public static final String WEBSOCKET_URL = "ws://10.129.128.68:32090/vms/websocket/socketServer.do"; /** * 定义websocket配置