From d8c6b9f7dac473ca1684eff210e29f2c83bff8e7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 19 九月 2025 09:19:54 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_timer/src/main/resources/bootstrap-dev.yml | 2
server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml | 2
server/visits/dmvisit_service/src/main/resources/application-dev.yml | 2
server/system_service/src/main/java/com/doumee/dao/system/vo/SystemMenuNodeVO.java | 2 +
server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java | 4 +-
server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml | 2
server/meeting/meeting_service/src/main/resources/application-dev.yml | 5 --
server/system_service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java | 4 +
server/system_service/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java | 4 +-
server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml | 2
server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java | 2 +
server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java | 23 ++++++++++-
server/system_gateway/src/main/resources/bootstrap-dev.yml | 2
server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java | 9 ++++
server/system_gateway/src/main/resources/application-dev.yml | 2
server/system_gateway/src/main/resources/bootstrap-self.yml | 2
server/system_timer/src/main/resources/application-dev.yml | 2
server/system_service/src/main/resources/mappers/SystemMenuMapper.xml | 9 ++--
server/system_service/src/main/java/com/doumee/service/system/SystemMenuService.java | 2
server/system_timer/src/main/resources/bootstrap-self.yml | 2
server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml | 4 +-
server/system_service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java | 2
22 files changed, 59 insertions(+), 31 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
index b96ac17..7cb826c 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
@@ -15,7 +15,7 @@
password: nacos
config:
server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
- namespace: dmvisit_dev
+ namespace: wuhu_visit_dev
# namespace: dev_renkang
username: nacos
password: nacos
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
index 7da4e9c..e7893a9 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
@@ -15,7 +15,7 @@
password: nacos
config:
server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
- namespace: dmvisit_dev
+ namespace: wuhu_visit_dev
# namespace: dev_renkang
username: nacos
password: nacos
@@ -24,7 +24,7 @@
# data-id: com.doumee.meeting.admin
discovery:
server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
-# namespace: dev_renkang
+# namespace: wuhu_visit_dev
namespace: dmvisit_dev
username: nacos
password: nacos
diff --git a/server/meeting/meeting_service/src/main/resources/application-dev.yml b/server/meeting/meeting_service/src/main/resources/application-dev.yml
index be2062f..7020783 100644
--- a/server/meeting/meeting_service/src/main/resources/application-dev.yml
+++ b/server/meeting/meeting_service/src/main/resources/application-dev.yml
@@ -1,10 +1,7 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
-# url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
-# username: doumee
-# password: rtjgfEr@&0c0m
- url: jdbc:mysql://10.50.250.178:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://10.50.250.178:3306/wuhuyancao?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
username: root
password: Atwl@2024
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/server/system_gateway/src/main/resources/application-dev.yml b/server/system_gateway/src/main/resources/application-dev.yml
index 1a6b977..c4cb500 100644
--- a/server/system_gateway/src/main/resources/application-dev.yml
+++ b/server/system_gateway/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://192.168.0.211:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.0.211:3306/wuhuyancao?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
username: root
password: Doumee@168
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/server/system_gateway/src/main/resources/bootstrap-dev.yml b/server/system_gateway/src/main/resources/bootstrap-dev.yml
index 76eb38a..b5dfadd 100644
--- a/server/system_gateway/src/main/resources/bootstrap-dev.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-dev.yml
@@ -7,7 +7,7 @@
discovery:
server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
- namespace: dmvisit_dev
+ namespace: wuhu_visit_dev
username: nacos
password: nacos
gateway:
diff --git a/server/system_gateway/src/main/resources/bootstrap-self.yml b/server/system_gateway/src/main/resources/bootstrap-self.yml
index 76eb38a..b5dfadd 100644
--- a/server/system_gateway/src/main/resources/bootstrap-self.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-self.yml
@@ -7,7 +7,7 @@
discovery:
server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
- namespace: dmvisit_dev
+ namespace: wuhu_visit_dev
username: nacos
password: nacos
gateway:
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java
index e8ae9da..ee8ecb2 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java
@@ -50,8 +50,8 @@
@ApiOperation("鏌ヨ鍒楄〃鏍�")
@PostMapping("/treeList")
@CloudRequiredPermission("system:menu:query")
- public ApiResponse<List<SystemMenuListVO>> findTree (@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- return ApiResponse.success(systemMenuBiz.findTree());
+ public ApiResponse<List<SystemMenuListVO>> findTree (@RequestBody SystemMenu param,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(systemMenuBiz.findTree(param ));
}
@PreventRepeat
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java
index d9efe76..1590d46 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemMenuController.java
@@ -47,11 +47,18 @@
return ApiResponse.success(systemMenuBiz.findTree(this.getLoginUser(null).getId()));
}
+ @ApiOperation("鏌ヨ椤堕儴瀵艰埅鏍�")
+ @PostMapping("/topList")
+ @RequiresPermissions("system:menu:query")
+ public ApiResponse<List<SystemMenu>> findTopList () {
+ return ApiResponse.success(systemMenuBiz.findTopList());
+ }
+
@ApiOperation("鏌ヨ鍒楄〃鏍�")
@PostMapping("/treeList")
@RequiresPermissions("system:menu:query")
public ApiResponse<List<SystemMenuListVO>> findTree () {
- return ApiResponse.success(systemMenuBiz.findTree());
+ return ApiResponse.success(systemMenuBiz.findTree(new SystemMenu()));
}
@PreventRepeat
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java b/server/system_service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java
index 8234f66..a0d9800 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/SystemMenuBiz.java
@@ -47,7 +47,7 @@
* @author Eva.Caesar Liu
* @date 2023/03/21 14:49
*/
- List<SystemMenuListVO> findTree();
+ List<SystemMenuListVO> findTree(SystemMenu param);
/**
* 鍒犻櫎
@@ -62,4 +62,6 @@
* @date 2023/03/21 14:49
*/
void deleteByIdInBatch(List<Integer> ids);
+
+ List<SystemMenu> findTopList();
}
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
index 958a24f..7bcf824 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
@@ -3,6 +3,7 @@
import com.doumee.biz.system.SystemMenuBiz;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.UpdateSystemMenuSortDTO;
import com.doumee.dao.system.model.SystemMenu;
import com.doumee.dao.system.vo.SystemMenuListVO;
@@ -93,11 +94,19 @@
}
@Override
- public List<SystemMenuListVO> findTree() {
- List<SystemMenuListVO> menus = systemMenuService.findList();
+ public List<SystemMenu> findTopList() {
+ SystemMenu param =new SystemMenu();
+ param.setDeleted(Boolean.FALSE);
+ param.setType(Constants.ONE);
+ List<SystemMenu> menus = systemMenuService.findList(param);
+ return menus;
+ }
+ @Override
+ public List<SystemMenuListVO> findTree(SystemMenu param) {
+ List<SystemMenuListVO> menus = systemMenuService.findManageList(param);
List<SystemMenuListVO> rootMenus = new ArrayList<>();
// 娣诲姞鏍硅彍鍗�
- for (SystemMenu menu : menus) {
+ for (SystemMenuListVO menu : menus) {
if (menu.getParentId() == null) {
SystemMenuListVO rootMenu = new SystemMenuListVO();
BeanUtils.copyProperties(menu, rootMenu, "children");
@@ -127,6 +136,7 @@
nodeVO.setLabel(menu.getName());
nodeVO.setUrl(menu.getPath());
nodeVO.setParams(menu.getParams());
+ nodeVO.setType(menu.getType());
nodeVO.setIcon(menu.getIcon());
nodeVO.setChildren(new ArrayList<>());
rootNodes.add(nodeVO);
@@ -177,6 +187,9 @@
}
List<Integer> handledIds = new ArrayList<>();
for (SystemMenu menu : menus) {
+ if(!Constants.equalsInteger(menu.getType(),Constants.ZERO)){
+ continue;
+ }
if (parent.getId().equals(menu.getParentId())) {
SystemMenuListVO child = new SystemMenuListVO();
BeanUtils.copyProperties(menu, child, "children");
@@ -206,6 +219,9 @@
}
List<Integer> handledIds = new ArrayList<>();
for (SystemMenu menu : menus) {
+ if(!Constants.equalsInteger(menu.getType(),Constants.ZERO)){
+ continue;
+ }
if (parent.getId().equals(menu.getParentId())) {
SystemMenuNodeVO child = new SystemMenuNodeVO();
child.setId(menu.getId());
@@ -213,6 +229,7 @@
child.setUrl(menu.getPath());
child.setParams(menu.getParams());
child.setIcon(menu.getIcon());
+ child.setType(menu.getType());
child.setIndex("menu_" + menu.getId());
child.setChildren(new ArrayList<>());
parent.getChildren().add(child);
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java b/server/system_service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java
index e5aa72a..3219334 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/SystemMenuMapper.java
@@ -13,7 +13,7 @@
* @author Eva.Caesar Liu
* @date 2023/03/21 14:49
*/
- List<SystemMenuListVO> selectManageList();
+ List<SystemMenuListVO> selectManageList(SystemMenu menu);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java
index ee8587f..774734c 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java
@@ -32,6 +32,8 @@
@ApiModelProperty(value = "涓婁竴绾ц彍鍗�", example = "1")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer parentId;
+ @ApiModelProperty(value = "绫诲瀷 0鏈嶅姟涓績鑿滃崟 1椤堕儴瀵艰埅,榛樿 0", example = "1")
+ private Integer type;
@ApiModelProperty(value = "鑿滃崟鍚嶇О")
@NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖", groups = {OperaType.Create.class, OperaType.Update.class})
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/vo/SystemMenuNodeVO.java b/server/system_service/src/main/java/com/doumee/dao/system/vo/SystemMenuNodeVO.java
index c2f2483..49fecd4 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/vo/SystemMenuNodeVO.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/vo/SystemMenuNodeVO.java
@@ -23,6 +23,8 @@
@ApiModelProperty(value = "鑿滃崟鍞竴鏍囪瘑锛堝墠绔笓鐢級")
private String index;
+ @ApiModelProperty(value = "鑿滃崟绫诲瀷 0鏈嶅姟涓績 1椤堕儴瀵艰埅")
+ private Integer type;
@ApiModelProperty(value = "鍥炬爣")
private String icon;
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemMenuService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemMenuService.java
index 108a492..3b2a417 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemMenuService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemMenuService.java
@@ -73,7 +73,7 @@
* @author Eva.Caesar Liu
* @date 2023/03/21 14:49
*/
- List<SystemMenuListVO> findList();
+ List<SystemMenuListVO> findManageList(SystemMenu param);
/**
* 鏌ヨ涓�绾ц彍鍗曞垪琛�
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java
index 91756db..c961b50 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemMenuServiceImpl.java
@@ -83,8 +83,8 @@
}
@Override
- public List<SystemMenuListVO> findList() {
- return systemMenuMapper.selectManageList();
+ public List<SystemMenuListVO> findManageList(SystemMenu menu) {
+ return systemMenuMapper.selectManageList(menu);
}
@Override
diff --git a/server/system_service/src/main/resources/mappers/SystemMenuMapper.xml b/server/system_service/src/main/resources/mappers/SystemMenuMapper.xml
index 9aad846..e8f7431 100644
--- a/server/system_service/src/main/resources/mappers/SystemMenuMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemMenuMapper.xml
@@ -14,9 +14,9 @@
<result column="UPDATE_USER_NAME" property="username"/>
</association>
</resultMap>
- <select id="selectManageList" resultMap="SystemMenuListVO">
+ <select id="selectManageList" resultMap="SystemMenuListVO" parameterType="com.doumee.dao.system.model.SystemMenu">
SELECT
- menu.`ID`, menu.`PARENT_ID`,menu.params, menu.`NAME`, menu.`PATH`, menu.`FIXED`, menu.`REMARK`, menu.`DISABLED`, menu.SORT, menu.`ICON`, menu.`CREATE_TIME`, menu.`UPDATE_TIME`, menu.`CREATE_USER`, menu.`UPDATE_USER`, menu.`DELETED`,
+ menu.`ID`, menu.`type`, menu.`PARENT_ID`,menu.params, menu.`NAME`, menu.`PATH`, menu.`FIXED`, menu.`REMARK`, menu.`DISABLED`, menu.SORT, menu.`ICON`, menu.`CREATE_TIME`, menu.`UPDATE_TIME`, menu.`CREATE_USER`, menu.`UPDATE_USER`, menu.`DELETED`,
create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
FROM SYSTEM_MENU menu
@@ -24,6 +24,7 @@
LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = menu.UPDATE_USER
<where>
menu.DELETED = 0
+ <if test="type!=null"> and menu.type=#{type}</if>
</where>
ORDER BY menu.SORT
</select>
@@ -31,7 +32,7 @@
<!-- 鏌ヨ鑿滃崟鏍� -->
<select id="selectByUserId" parameterType="java.lang.Integer" resultType="com.doumee.dao.system.model.SystemMenu">
SELECT
- DISTINCT menu.`ID`, menu.`PARENT_ID`,menu.params, menu.`NAME`, menu.`PATH`, menu.`REMARK`, menu.`DISABLED`, menu.SORT, menu.`ICON`, menu.`CREATE_TIME`, menu.`UPDATE_TIME`, menu.`CREATE_USER`, menu.`UPDATE_USER`, menu.`DELETED`
+ DISTINCT menu.`ID`, menu.`type`,menu.`PARENT_ID`,menu.params, menu.`NAME`, menu.`PATH`, menu.`REMARK`, menu.`DISABLED`, menu.SORT, menu.`ICON`, menu.`CREATE_TIME`, menu.`UPDATE_TIME`, menu.`CREATE_USER`, menu.`UPDATE_USER`, menu.`DELETED`
FROM `SYSTEM_MENU` menu
INNER JOIN SYSTEM_ROLE_MENU role_menu ON role_menu.MENU_ID = menu.ID AND role_menu.DELETED = 0
INNER JOIN SYSTEM_USER_ROLE user_role ON user_role.ROLE_ID = role_menu.ROLE_ID AND user_role.DELETED = 0
@@ -46,7 +47,7 @@
<!-- 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鍒楄〃 -->
<select id="selectByRoleId" parameterType="java.lang.Integer" resultType="com.doumee.dao.system.model.SystemMenu">
SELECT
- menu.`ID`, menu.`PARENT_ID`, menu.`NAME`,menu.params, menu.`PATH`, menu.`REMARK`, menu.`DISABLED`, menu.SORT, menu.`ICON`, menu.`CREATE_TIME`, menu.`UPDATE_TIME`, menu.`CREATE_USER`, menu.`UPDATE_USER`, menu.`DELETED`
+ menu.`ID`, menu.`type`,menu.`PARENT_ID`, menu.`NAME`,menu.params, menu.`PATH`, menu.`REMARK`, menu.`DISABLED`, menu.SORT, menu.`ICON`, menu.`CREATE_TIME`, menu.`UPDATE_TIME`, menu.`CREATE_USER`, menu.`UPDATE_USER`, menu.`DELETED`
FROM `SYSTEM_MENU` menu
INNER JOIN `SYSTEM_ROLE_MENU` role_menu ON role_menu.MENU_ID = menu.ID AND role_menu.DELETED = 0
<where>
diff --git a/server/system_timer/src/main/resources/application-dev.yml b/server/system_timer/src/main/resources/application-dev.yml
index 6847d76..32ebed1 100644
--- a/server/system_timer/src/main/resources/application-dev.yml
+++ b/server/system_timer/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://112.26.66.25:3306/antaiwuliu?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://112.26.66.25:3306/wuhuyancao?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
username: root
password: Doumee@168&QWERT
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/server/system_timer/src/main/resources/bootstrap-dev.yml b/server/system_timer/src/main/resources/bootstrap-dev.yml
index 83ecb0f..ad3bb37 100644
--- a/server/system_timer/src/main/resources/bootstrap-dev.yml
+++ b/server/system_timer/src/main/resources/bootstrap-dev.yml
@@ -25,6 +25,6 @@
# data-id: com.doumee.meeting.admin
discovery:
server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
- namespace: dmvisit_dev
+ namespace: wuhu_visit_dev
username: nacos
password: nacos
\ No newline at end of file
diff --git a/server/system_timer/src/main/resources/bootstrap-self.yml b/server/system_timer/src/main/resources/bootstrap-self.yml
index f8f89f6..28a6e0a 100644
--- a/server/system_timer/src/main/resources/bootstrap-self.yml
+++ b/server/system_timer/src/main/resources/bootstrap-self.yml
@@ -23,6 +23,6 @@
# data-id: com.doumee.meeting.admin
discovery:
server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
- namespace: dmvisit_dev
+ namespace: wuhu_visit_dev
username: nacos
password: nacos
\ No newline at end of file
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
index 4847601..1f1080d 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
@@ -16,7 +16,7 @@
discovery:
server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
- namespace: dmvisit_dev
+ namespace: wuhu_visit_dev
username: nacos
password: nacos
knife4j:
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml
index c0eee46..c810f26 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml
@@ -24,7 +24,7 @@
discovery:
server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
- namespace: dmvisit_dev
+ namespace: wuhu_visit_dev
username: nacos
password: nacos
knife4j:
diff --git a/server/visits/dmvisit_service/src/main/resources/application-dev.yml b/server/visits/dmvisit_service/src/main/resources/application-dev.yml
index db41960..8dd392d 100644
--- a/server/visits/dmvisit_service/src/main/resources/application-dev.yml
+++ b/server/visits/dmvisit_service/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://192.168.0.211:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.0.211:3306/wuhuyancao?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
username: root
password: Doumee@168
driver-class-name: com.mysql.cj.jdbc.Driver
--
Gitblit v1.9.3