Merge remote-tracking branch 'origin/master' into prod

authorize-api-service/src/main/java/com/xy/service/impl/AuthorizeServiceImpl.java

@@ -3,6 +3,7 @@ package com.xy.service.impl;
 import cn.dev33.satoken.stp.StpUtil;
 import com.xy.consts.CommConsts;
 import com.xy.dto.AuthorizeDto;
+import com.xy.dto.SysMenuDto;
 import com.xy.redis.RedisCache;
 import com.xy.service.AuthorizeService;
 import com.xy.utils.R;
@@ -17,6 +18,7 @@ import java.util.List;
 @Service
 @AllArgsConstructor
 public class AuthorizeServiceImpl implements AuthorizeService {
+    private SysMenuServiceImpl sysMenuService;
 
     @Override
     @ApiOperation("获取所有系统ID")
@@ -94,4 +96,10 @@ public class AuthorizeServiceImpl implements AuthorizeService {
         String clientType = RedisCache.getClientType();
         return R.ok(clientType);
     }
+
+    @Override
+    @ApiOperation("获取登录用户菜单")
+    public R<List<SysMenuDto.MenuVo>> getUserMenus(SysMenuDto.WorkMenuList workMenu) {
+        return R.ok(R.feignCheckData(sysMenuService.workMenuList(workMenu)));
+    }
 }

authorize-api-service/src/main/java/com/xy/service/impl/SysWorkUserServiceImpl.java

@@ -81,7 +81,13 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
             return R.fail("账号已存在");
         }
         long count2 = count(new LambdaQueryWrapper<SysWorkUser>().eq(SysWorkUser::getPhone, addDto.getPhone()));
+        if (count2 > 0) {
+            return R.fail("手机号已存在");
+        }
         long count3 = count(new LambdaQueryWrapper<SysWorkUser>().eq(SysWorkUser::getEmail, addDto.getEmail()));
+        if (count3 > 0) {
+            return R.fail("邮箱已存在");
+        }
         // 新增业务用户
         SysWorkUser sysWorkUser = Beans.copy(SysWorkUser.class, addDto)
                 .create(RedisCache.getLoginId(Long.class))

authorize-api/src/main/java/com/xy/service/AuthorizeService.java

@@ -2,7 +2,9 @@ package com.xy.service;
 
 import com.xy.annotate.RestMappingController;
 import com.xy.dto.AuthorizeDto;
+import com.xy.dto.SysMenuDto;
 import com.xy.utils.R;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -105,4 +107,13 @@ public interface AuthorizeService {
      */
     @PostMapping("getClientType")
     R<String> getClientType();
+
+    /**
+     * 获取登录用户菜单
+     *
+     * @param workMenu
+     * @return
+     */
+    @PostMapping("getUserMenus")
+    public R<List<SysMenuDto.MenuVo>> getUserMenus(@RequestBody @Validated SysMenuDto.WorkMenuList workMenu);
 }