Merge remote-tracking branch 'origin/master'

 iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/user/AdminUserApi.java

@@ -1,6 +1,7 @@
package com.iailab.module.system.api.user;

import cn.hutool.core.convert.Convert;
import com.fhs.core.trans.anno.AutoTrans;
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.framework.common.util.collection.CollectionUtils;
import com.iailab.module.system.api.user.dto.AdminUserRespDTO;
@@ -14,12 +15,13 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import static com.iailab.module.system.api.user.AdminUserApi.PREFIX;

import java.util.*;

@FeignClient(name = ApiConstants.NAME)
@Tag(name = "RPC 服务 - 管理员用户")
//@AutoTrans(namespace = PREFIX, fields = {"nickname"}) // TODO @iailab：需要 easy-trans 做个 bugfix
@AutoTrans(namespace = PREFIX, fields = {"nickname"}) // TODO @iailab：需要 easy-trans 做个 bugfix
public interface AdminUserApi extends AutoTransable<AdminUserRespDTO> {

    String PREFIX = ApiConstants.PREFIX + "/user";

 iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/auth/AuthController.java

@@ -136,7 +136,7 @@
        Set<Long> menuIds = permissionService.getRoleMenuListByRoleId(convertSet(roles, RoleDO::getId));
        List<MenuDO> menuList = menuService.getMenuList(menuIds);
        menuList = menuService.filterDisableMenus(menuList);
        menuList = menuService.filterMenus(menuList, "system");
//        menuList = menuService.filterMenus(menuList, "system");

        // 2. 拼接结果返回
        return success(AuthConvert.INSTANCE.convert(user, roles, menuList));

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/framework/sms/core/client/impl/AliyunSmsClientTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/framework/sms/core/client/impl/TencentSmsClientTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/auth/AdminAuthServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/dept/DeptServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/dept/PostServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/dict/DictDataServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/dict/DictTypeServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/logger/LoginLogServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/logger/OperateLogServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/mail/MailAccountServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/mail/MailLogServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/mail/MailSendServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/mail/MailTemplateServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/notice/NoticeServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/notify/NotifyMessageServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/notify/NotifySendServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/notify/NotifyTemplateServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/oauth2/OAuth2ClientServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/oauth2/OAuth2CodeServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/oauth2/OAuth2GrantServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/oauth2/OAuth2TokenServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/permission/MenuServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/permission/PermissionServiceTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/permission/RoleServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/sms/SmsChannelServiceTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/sms/SmsCodeServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/sms/SmsLogServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/sms/SmsSendServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/sms/SmsTemplateServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/social/SocialClientServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/social/SocialUserServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/tenant/TenantPackageServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/tenant/TenantServiceImplTest.java

文件已删除

 iailab-module-system/iailab-module-system-biz/src/test/java/com/iailab/module/system/service/user/AdminUserServiceImplTest.java

文件已删除