From af2cad7097f44db98ce97959b49cd5783e54650e Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期日, 31 一月 2021 14:41:24 +0800
Subject: [PATCH] 升级nacos版本
---
febs-server/febs-server-system/src/main/resources/mapper/MenuMapper.xml | 6 +++---
febs-server/febs-server-system/src/main/resources/mapper/RoleMapper.xml | 6 +++---
febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml | 4 ++--
febs-cloud/pom.xml | 13 ++++++++++++-
4 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/febs-cloud/pom.xml b/febs-cloud/pom.xml
index f3a33e0..90049f3 100644
--- a/febs-cloud/pom.xml
+++ b/febs-cloud/pom.xml
@@ -64,8 +64,19 @@
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>${com-alibaba-cloud.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.alibaba.nacos</groupId>
+ <artifactId>nacos-client</artifactId>
+ </exclusion>
+ </exclusions>
<type>pom</type>
<scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba.nacos</groupId>
+ <artifactId>nacos-client</artifactId>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>com.codingapi.txlcn</groupId>
@@ -84,4 +95,4 @@
</dependency>
</dependencies>
</dependencyManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/febs-server/febs-server-system/src/main/resources/mapper/MenuMapper.xml b/febs-server/febs-server-system/src/main/resources/mapper/MenuMapper.xml
index a57f23a..3a5eac9 100644
--- a/febs-server/febs-server-system/src/main/resources/mapper/MenuMapper.xml
+++ b/febs-server/febs-server-system/src/main/resources/mapper/MenuMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.server.system.mapper.MenuMapper">
- <select id="findUserPermissions" resultType="menu">
+ <select id="findUserPermissions" resultType="cc.mrbird.febs.common.core.entity.system.Menu">
select distinct m.perms
from t_role r
left join t_user_role ur on (r.role_id = ur.role_id)
@@ -14,7 +14,7 @@
and m.perms <> ''
</select>
- <select id="findUserMenus" resultType="menu">
+ <select id="findUserMenus" resultType="cc.mrbird.febs.common.core.entity.system.Menu">
select m.*
from t_menu m
where m.type <> 1
@@ -27,4 +27,4 @@
where u.username = #{userName})
order by m.order_num
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/febs-server/febs-server-system/src/main/resources/mapper/RoleMapper.xml b/febs-server/febs-server-system/src/main/resources/mapper/RoleMapper.xml
index 0781ba4..52d25e5 100644
--- a/febs-server/febs-server-system/src/main/resources/mapper/RoleMapper.xml
+++ b/febs-server/febs-server-system/src/main/resources/mapper/RoleMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.server.system.mapper.RoleMapper">
- <resultMap id="roleMap" type="role">
+ <resultMap id="roleMap" type="cc.mrbird.febs.common.core.entity.system.Role">
<!--
WARNING - @mbg.generated
-->
@@ -23,7 +23,7 @@
u.username = #{username}
</select>
- <select id="findRolePage" parameterType="role" resultType="role">
+ <select id="findRolePage" parameterType="cc.mrbird.febs.common.core.entity.system.Role" resultType="cc.mrbird.febs.common.core.entity.system.Role">
SELECT
r.role_id roleId,
r.role_name roleName,
@@ -42,4 +42,4 @@
r.role_id
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml b/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
index 9e0e51e..f8589a9 100644
--- a/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
+++ b/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.server.system.mapper.UserMapper">
- <select id="findUserDetailPage" parameterType="systemUser" resultType="systemUser">
+ <select id="findUserDetailPage" parameterType="cc.mrbird.febs.common.core.entity.system.SystemUser" resultType="cc.mrbird.febs.common.core.entity.system.SystemUser">
SELECT
u.user_id userId,
u.username,
@@ -52,7 +52,7 @@
u.dept_id,u.last_login_time,u.modify_time,u.description,u.avatar
</select>
- <select id="findUserDetail" parameterType="systemUser" resultType="systemUser">
+ <select id="findUserDetail" parameterType="cc.mrbird.febs.common.core.entity.system.SystemUser" resultType="cc.mrbird.febs.common.core.entity.system.SystemUser">
SELECT
u.user_id userId,
u.username,
--
Gitblit v1.8.0