Merge remote-tracking branch 'origin/master'

cash-api/account-server/src/main/java/com/czg/AccountApplication.java

@@ -1,11 +1,27 @@
 package com.czg;
 
+import com.czg.account.entity.SysMenu;
+import com.czg.account.entity.SysRolesMenus;
+import com.czg.account.service.SysMenuService;
+import com.czg.account.service.SysRolesMenusService;
+import com.czg.annotation.SaAdminCheckPermission;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+
 
 /**
  * @author ww
@@ -15,9 +31,42 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableTransactionManagement
 @MapperScan("com.czg.service.account.mapper")
 @EnableDubbo
-public class AccountApplication {
+@Slf4j
+public class AccountApplication implements CommandLineRunner {
     public static void main(String[] args) {
         SpringApplication.run(AccountApplication.class, args);
     }
+    @Autowired
+    private RequestMappingHandlerMapping requestMappingHandlerMapping;
+    @Autowired
+    private SysMenuService sysMenuService;
+    @Autowired
+    private SysRolesMenusService sysRolesMenusService;
+
+    public void run(String... args) {
+        Map<RequestMappingInfo, HandlerMethod> handlerMethods = this.requestMappingHandlerMapping.getHandlerMethods();
+        handlerMethods.forEach((key, value) -> {
+            Method method = value.getMethod();
+            SaAdminCheckPermission annotation = AnnotationUtils.getAnnotation(method, SaAdminCheckPermission.class);
+            if (annotation == null) return;
+            for (String s : annotation.value()) {
+                long count = sysMenuService.queryChain().eq(SysMenu::getPermission, s).count();
+                if (count > 0) {
+                    continue;
+                }
+                SysMenu sysMenu = new SysMenu();
+                sysMenu.setPermission(s);
+                sysMenu.setName(s);
+                sysMenu.setType(2);
+                sysMenuService.save(sysMenu);
+                SysRolesMenus sysRolesMenus = new SysRolesMenus();
+                sysRolesMenus.setMenuId(sysMenu.getMenuId());
+                sysRolesMenus.setRoleId(1L);
+                sysRolesMenusService.save(sysRolesMenus);
+                log.info("接口菜单添加成功, 菜单名称: {}, 菜单权限: {}", sysMenu.getName(), sysMenu.getPermission());
+            }
+        });
+
+    }
 
 }

cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java

@@ -8,11 +8,14 @@ import com.czg.account.entity.SysRole;
 import com.czg.account.service.SysRoleService;
 import com.czg.annotation.SaAdminCheckPermission;
 import com.czg.resp.CzgResult;
+import com.czg.sa.StpKit;
 import com.mybatisflex.core.paginate.Page;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  *
  * 角色管理
@@ -37,6 +40,18 @@ public class RoleController {
         return CzgResult.success(roleService.getList(pageDTO, key, startTime, endTime));
     }
 
+    /**
+     * 获取角色对应的菜单
+     * 权限标识: role:menu
+     * @param id 角色id
+     * @return 分页数据
+     */
+    @SaAdminCheckPermission(value = "role:menu")
+    @GetMapping("/menu")
+    public CzgResult<List<Long>> getRoleMenu(@RequestParam Integer id) {
+        return CzgResult.success(roleService.getRoleMenu(StpKit.USER.getLoginIdAsLong(), id));
+    }
+
     /**
      * 新增角色
      * 权限标识: role:add