123

src/main/java/org/springblade/common/config/BladeConfiguration.java

@@ -55,6 +55,7 @@ public class BladeConfiguration implements WebMvcConfigurer {
 		secureRegistry.setEnabled(true);
 		secureRegistry.excludePathPatterns("/blade-auth/**");
 		secureRegistry.excludePathPatterns("/blade-system/tenant/info");
+		secureRegistry.excludePathPatterns("/blade-auth/oauth/token");
 		secureRegistry.excludePathPatterns("/blade-flow/process/resource-view");
 		secureRegistry.excludePathPatterns("/blade-flow/process/diagram-view");
 		secureRegistry.excludePathPatterns("/blade-flow/manager/check-upload");

src/main/java/org/springblade/modules/system/controller/MenuController.java

@@ -116,7 +116,8 @@ public class MenuController extends BladeController {
 	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 3)
 	@Operation(summary = "懒加载列表", description = "传入menu")
-	public R<List<MenuVO>> lazyList(Long parentId, @Parameter(hidden = true) @RequestParam Map<String, Object> menu) {
+	public R<List<MenuVO>> lazyList(Long parentId, @Parameter(hidden = true) @RequestParam Map<String, Object> menu,BladeUser bladeUser) {
+		menu.put("clientId",bladeUser.getClientId());
 		List<MenuVO> list = menuService.lazyList(parentId, menu);
 		return R.data(MenuWrapper.build().listNodeLazyVO(list));
 	}
@@ -160,7 +161,12 @@ public class MenuController extends BladeController {
 	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
 	@ApiOperationSupport(order = 6)
 	@Operation(summary = "新增或修改", description = "传入menu")
-	public R submit(@Valid @RequestBody Menu menu) {
+	public R submit(@Valid @RequestBody Menu menu,BladeUser bladeUser) {
+		if(Func.isNull(bladeUser.getClientId()) && Func.isEmpty(bladeUser.getClientId())){
+			bladeUser.setClientId("saber3");
+		}else{
+			menu.setSysType(bladeUser.getClientId());
+		}
 		if (menuService.submit(menu)) {
 			CacheUtil.clear(MENU_CACHE);
 			CacheUtil.clear(MENU_CACHE, Boolean.FALSE);
@@ -224,8 +230,8 @@ public class MenuController extends BladeController {
 	@GetMapping("/tree")
 	@ApiOperationSupport(order = 11)
 	@Operation(summary = "树形结构", description = "树形结构")
-	public R<List<TreeNode>> tree() {
-		List<TreeNode> tree = menuService.tree();
+	public R<List<TreeNode>> tree(BladeUser bladeUser) {
+		List<TreeNode> tree = menuService.tree(bladeUser.getClientId());
 		return R.data(tree);
 	}
 

src/main/java/org/springblade/modules/system/mapper/MenuMapper.java

@@ -64,7 +64,7 @@ public interface MenuMapper extends BaseMapper<Menu> {
 	 *
 	 * @return
 	 */
-	List<TreeNode> tree();
+	List<TreeNode> tree(String clientId);
 
 	/**
 	 * 授权树形结构

src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml

@@ -17,6 +17,7 @@
         <result column="is_open" property="isOpen"/>
         <result column="remark" property="remark"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="sys_type" property="sysType"/>
     </resultMap>
 
     <resultMap id="menuVOResultMap" type="org.springblade.modules.system.pojo.vo.MenuVO">
@@ -33,6 +34,7 @@
         <result column="is_open" property="isOpen"/>
         <result column="remark" property="remark"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="sys_type" property="sysType"/>
         <result column="has_children" property="hasChildren"/>
     </resultMap>
 
@@ -71,6 +73,9 @@
         <if test="param2.alias!=null and param2.alias!=''">
             and menu.alias like concat(concat('%', #{param2.alias}),'%')
         </if>
+        <if test="param2.clientId!=null and param2.clientId!=''">
+            and menu.sys_type = #{param2.clientId}
+        </if>
         ORDER BY menu.sort
     </select>
 
@@ -105,6 +110,9 @@
 
     <select id="tree" resultMap="treeNodeResultMap">
         select id, parent_id, name as title, id as "value", id as "key" from blade_menu where is_deleted = 0 and category = 1
+        <if test="param1!=null">
+           and sys_type = #{param1}
+        </if>
     </select>
 
     <select id="allMenu" resultMap="menuResultMap">

src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -25,6 +25,7 @@
         <result column="role_id" property="roleId"/>
         <result column="dept_id" property="deptId"/>
         <result column="post_id" property="postId"/>
+        <result column="pass_text" property="passText"/>
     </resultMap>
 
     <select id="selectUserPage" resultMap="userResultMap">

src/main/java/org/springblade/modules/system/pojo/entity/Menu.java

@@ -140,6 +140,11 @@ public class Menu implements Serializable {
 	@Schema(description = "是否已删除")
 	private Integer isDeleted;
 
+	/**
+	 * 客户端所属
+	 */
+	@Schema(description = "客户端所属")
+	private String sysType;
 
 	@Override
 	public boolean equals(Object obj) {

src/main/java/org/springblade/modules/system/pojo/entity/User.java

@@ -103,5 +103,9 @@ public class User extends TenantEntity {
 	 */
 	private String postId;
 
+	/**
+	 * 岗位id
+	 */
+	private String passText;
 
 }

src/main/java/org/springblade/modules/system/service/IMenuService.java

@@ -91,7 +91,7 @@ public interface IMenuService extends IService<Menu> {
 	 *
 	 * @return
 	 */
-	List<TreeNode> tree();
+	List<TreeNode> tree(String clientId);
 
 	/**
 	 * 授权树形结构

src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java

@@ -156,8 +156,8 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 	}
 
 	@Override
-	public List<TreeNode> tree() {
-		return ForestNodeMerger.merge(baseMapper.tree());
+	public List<TreeNode> tree(String clientId) {
+		return ForestNodeMerger.merge(baseMapper.tree(clientId));
 	}
 
 	@Override

src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -104,6 +104,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 				throw new ServiceException("当前租户已到最大账号额度!");
 			}
 		}
+		user.setPassText(user.getPassText());
 		if (Func.isNotEmpty(user.getPassword())) {
 			user.setPassword(DigestUtil.encrypt(user.getPassword()));
 		}
@@ -111,7 +112,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		if (userCount > 0L && Func.isEmpty(user.getId())) {
 			throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
 		}
-		return save(user) && submitUserDept(user);
+		//System.out.println(save(user));
+		//System.out.println(submitUserDept(user));
+		return save(user);
 	}
 
 	@Override

src/main/resources/application.yml

@@ -181,7 +181,7 @@ powerjob:
 
 #blade配置
 blade:
-  #token配置
+  #token配置.token.sign-key
   token:
     #是否有状态
     state: false
@@ -190,9 +190,9 @@ blade:
     #单用户登录范围
     single-level: all
     #token签名 使用 @org.springblade.test.SignKeyGenerator 获取
-    sign-key: 请配置32位签名
+    sign-key: tuRhT0O2GlbE9CtFQPdCt35EmPBQLNWq
     #token加密 使用 @org.springblade.test.CryptoKeyGenerator 获取
-    crypto-key: 请配置cryptoKey
+    crypto-key: eg1hfmfKMzu3hFTT
   #接口配置
   api:
     #报文加密配置
@@ -243,6 +243,7 @@ blade:
     #接口放行
     skip-url:
       - /blade-test/**
+      - /blade-auth/oauth/token
     #授权认证配置
     auth:
       - method: ALL