From bc6b4800b495147fd508b972963cea354bfc2b28 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 07 八月 2024 16:17:10 +0800
Subject: [PATCH] 新增加管理后台合作商接口
---
ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java | 9 ++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 10 +++++
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 9 ++++
ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java | 42 ++++++++++----------
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 15 +++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java | 10 ++++-
7 files changed, 72 insertions(+), 24 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 4918e8c..7104897 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -2,3 +2,4 @@
com.ruoyi.system.api.factory.RemoteLogFallbackFactory
com.ruoyi.system.api.factory.RemoteFileFallbackFactory
com.ruoyi.system.api.factory.SysUserFallbackFactory
+com.ruoyi.system.api.factory.SysRoleFallbackFactory
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
index 3b4a17d..d59c735 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java
@@ -52,24 +52,24 @@
if (StringUtils.matches(url, ignoreWhite.getWhites())) {
return chain.filter(exchange);
}
-// String token = getToken(request);
-// if (StringUtils.isEmpty(token)) {
-// return unauthorizedResponse(exchange, "令牌不能为空");
-// }
-// Claims claims = JwtUtils.parseToken(token);
-// if (claims == null) {
-// return unauthorizedResponse(exchange, "令牌已过期或验证不正确！");
-// }
-// String userkey = JwtUtils.getUserKey(claims);
-// boolean islogin = redisService.hasKey(getTokenKey(userkey));
-// if (!islogin) {
-// return unauthorizedResponse(exchange, "登录状态已过期");
-// }
-// String userid = JwtUtils.getUserId(claims);
-// String username = JwtUtils.getUserName(claims);
-// if (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username)) {
-// return unauthorizedResponse(exchange, "令牌验证失败");
-// }
+ String token = getToken(request);
+ if (StringUtils.isEmpty(token)) {
+ return unauthorizedResponse(exchange, "令牌不能为空");
+ }
+ Claims claims = JwtUtils.parseToken(token);
+ if (claims == null) {
+ return unauthorizedResponse(exchange, "令牌已过期或验证不正确！");
+ }
+ String userkey = JwtUtils.getUserKey(claims);
+ boolean islogin = redisService.hasKey(getTokenKey(userkey));
+ if (!islogin) {
+ return unauthorizedResponse(exchange, "登录状态已过期");
+ }
+ String userid = JwtUtils.getUserId(claims);
+ String username = JwtUtils.getUserName(claims);
+ if (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username)) {
+ return unauthorizedResponse(exchange, "令牌验证失败");
+ }
if(parameter_signature){
String sign = request.getHeaders().getFirst(TokenConstants.SING);
String nonce_str = request.getHeaders().getFirst(TokenConstants.NONCE_STR);
@@ -80,9 +80,9 @@
}
// 设置用户信息到请求
-// addHeader(mutate, SecurityConstants.USER_KEY, userkey);
-// addHeader(mutate, SecurityConstants.DETAILS_USER_ID, userid);
-// addHeader(mutate, SecurityConstants.DETAILS_USERNAME, username);
+ addHeader(mutate, SecurityConstants.USER_KEY, userkey);
+ addHeader(mutate, SecurityConstants.DETAILS_USER_ID, userid);
+ addHeader(mutate, SecurityConstants.DETAILS_USERNAME, username);
// 内部请求来源参数清除
removeHeader(mutate, SecurityConstants.FROM_SOURCE);
return chain.filter(exchange.mutate().request(mutate.build()).build());
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index cb0705f..59337ac 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -12,7 +12,9 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.system.api.model.GetSysRoleByIds;
import com.ruoyi.system.domain.SysMenus;
import com.ruoyi.system.domain.SysRoleMenu;
import com.ruoyi.system.domain.SysUserRole;
@@ -484,4 +486,17 @@
ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
return ajax;
}
+
+
+ /**
+ * 根据id集合获取数据
+ * @param ids
+ * @return
+ */
+ @ResponseBody
+ @GetMapping(value = "/getSysRoleByIds")
+ public R<List<SysRole>> getSysRoleByIds(@RequestBody GetSysRoleByIds ids){
+ List<SysRole> sysRoleByIds = roleService.getSysRoleByIds(ids.getIds());
+ return R.ok(sysRoleByIds);
+ }
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
index a06f172..7fbf45e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
@@ -109,6 +109,12 @@
public int deleteRoleByIds(Long[] roleIds);
List<SysRole> isExitUpdate(@Param("roleName") String roleName, @Param("roleId") Long roleId, @Param("companyId") Integer companyId);
-
-
+
+
+ /**
+ * 根据id获取数据
+ * @param ids
+ * @return
+ */
+ List<SysRole> getSysRoleByIds(@Param("ids") List<Integer> ids);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
index 157b779..049a4b2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
@@ -174,5 +174,12 @@
public int insertAuthUsers(Long roleId, Long[] userIds);
List<SysRole> isExitUpdate(String roleName, Long roleId,Integer companyId);
-
+
+
+ /**
+ * 根据id获取数据
+ * @param ids 数据id集合
+ * @return
+ */
+ List<SysRole> getSysRoleByIds(List<Integer> ids);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index 7840000..fea5840 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -443,4 +443,14 @@
public List<SysRole> isExitUpdate(String roleName, Long roleId,Integer companyId) {
return roleMapper.isExitUpdate(roleName,roleId,companyId);
}
+
+ /**
+ * 根据id获取数据
+ * @param ids 数据id集合
+ * @return
+ */
+ @Override
+ public List<SysRole> getSysRoleByIds(List<Integer> ids) {
+ return this.baseMapper.getSysRoleByIds(ids);
+ }
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 5984eaa..a22d9b5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -163,4 +163,13 @@
</foreach>
</delete>
+
+
+ <select id="getSysRoleByIds" resultMap="SysRoleResult">
+ <include refid="selectRoleVo"/>
+ where id in
+ <foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1