From 2b823268a0e3c9a5cdfe6c76194878657e648e29 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Wed, 16 Feb 2022 11:48:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AD=90=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=A4=9A=E8=A7=92=E8=89=B2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oauth2/client/remote/menu/IMenuRemoteService.java      | 6 +++---
 .../oauth2/client/service/menu/impl/MenuServiceImpl.java   | 2 +-
 .../resources/OAuth2ClientResourceController.java          | 7 ++++---
 .../main/resources/mybatis/mapper/oauth2-client-mapper.xml | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/menu/IMenuRemoteService.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/menu/IMenuRemoteService.java
index 7ab09b6b..0393c9af 100644
--- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/menu/IMenuRemoteService.java
+++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/menu/IMenuRemoteService.java
@@ -24,14 +24,14 @@ public interface IMenuRemoteService {
      *
      * @param server      服务地址
      * @param clientId    客户端ID
-     * @param userId      用户ID
+     * @param roleIds     角色ID列表（下划线分割）
      * @param accessToken token
      * @return
      */
-    @RemoteGetMethod("/resource/oauth2client/list-all/{clientId}/{userId}")
+    @RemoteGetMethod("/resource/oauth2client/list-all/{clientId}/{roleIds}")
     List<MenuDTO> listAll(@RemoteServerParams String server,
                           @RemotePathParams("clientId") String clientId,
-                          @RemotePathParams("userId") String userId,
+                          @RemotePathParams("roleIds") String roleIds,
                           @RemoteQueryParams("access_token") String accessToken);
 
 }
diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/menu/impl/MenuServiceImpl.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/menu/impl/MenuServiceImpl.java
index 5018d715..aa708758 100644
--- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/menu/impl/MenuServiceImpl.java
+++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/menu/impl/MenuServiceImpl.java
@@ -38,7 +38,7 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService
         StringBuilder roleIdsSB = new StringBuilder();
         for (RoleSimpleDTO role : roles) {
             if (roleIdsSB.length() > 0) {
-                roleIdsSB.append(",");
+                roleIdsSB.append("_");
             }
             roleIdsSB.append(role.getRoleId());
         }
diff --git a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/controller/resources/OAuth2ClientResourceController.java b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/controller/resources/OAuth2ClientResourceController.java
index 1b2c7489..e6c97ab4 100644
--- a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/controller/resources/OAuth2ClientResourceController.java
+++ b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/controller/resources/OAuth2ClientResourceController.java
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -34,12 +35,12 @@ public class OAuth2ClientResourceController extends DefaultBaseController {
     @ApiOperation(value = "Oauth2客户端菜单列表", notes = "Oauth2客户端菜单列表接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "clientId", value = "客户端ID", paramType = "path"),
-            @ApiImplicitParam(name = "roleIds", value = "角色ID列表，逗号分割", paramType = "path")
+            @ApiImplicitParam(name = "roleIds", value = "角色ID列表，下划线分割", paramType = "path")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @GetMapping("list-all/{clientId}/{roleIds}")
-    public List<MenuDTO> list(@PathVariable("clientId") String clientId, @PathVariable("roleIds") List<String> roleIds) throws SearchException {
-        return oAuth2ClientMenuService.listAll(clientId, roleIds);
+    public List<MenuDTO> list(@PathVariable("clientId") String clientId, @PathVariable("roleIds") String roleIds) throws SearchException {
+        return oAuth2ClientMenuService.listAll(clientId, Arrays.asList(roleIds.split("\\_")));
     }
 
 
diff --git a/login-oauth2-server/src/main/resources/mybatis/mapper/oauth2-client-mapper.xml b/login-oauth2-server/src/main/resources/mybatis/mapper/oauth2-client-mapper.xml
index 902a9759..020e2602 100644
--- a/login-oauth2-server/src/main/resources/mybatis/mapper/oauth2-client-mapper.xml
+++ b/login-oauth2-server/src/main/resources/mybatis/mapper/oauth2-client-mapper.xml
@@ -162,7 +162,7 @@
             gmt_modified = #{gmtModified}
         WHERE
             client_id IN
-        <foreach collection="secretIds" index="index" open="(" separator="," close=")">
+        <foreach collection="clientIds" index="index" open="(" separator="," close=")">
             #{secretIds[${index}]}
         </foreach>
     </delete>