1. 完成 auth 鉴权逻辑

2. 完成 admin 获取 Admin 上下文
3. 完成 user 获取 User 上下文

system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/datadict/AdminsDataDictController.java

@@ -0,0 +1,74 @@
+package cn.iocoder.mall.system.rest.controller.datadict;
+
+import cn.iocoder.common.framework.constant.MallConstants;
+import cn.iocoder.common.framework.vo.CommonResult;
+import cn.iocoder.mall.security.core.annotation.RequiresPermissions;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(MallConstants.ROOT_PATH_ADMIN + "/data-dict")
+@Api(tags = "管理员 - 数据字典 API")
+public class AdminsDataDictController {
+
+//    @Reference(validation = "true", version = "${dubbo.provider.DataDictService.version}")
+//    private DataDictService dataDictService;
+
+    @GetMapping("/demo")
+    @ApiOperation(value = "数据字典全列表")
+    @RequiresPermissions("system.dataDict.list")
+    public CommonResult<Boolean> list() {
+        return CommonResult.success(true);
+    }
+
+//    @GetMapping("/list")
+//    @ApiOperation(value = "数据字典全列表")
+//    @RequiresPermissions("system.dataDict.list")
+//    public CommonResult<List<DataDictBO>> list() {
+//        return success( dataDictService.selectDataDictList());
+//    }
+//
+//    @GetMapping("/tree")
+//    @RequiresPermissions // 因为是通用的接口，所以无需权限标识
+//    @ApiOperation(value = "数据字典树结构", notes = "该接口返回的信息更为精简。一般用于前端缓存数据字典到本地。")
+//    public CommonResult<List<DataDictEnumVO>> tree() {
+//        // 查询数据字典全列表
+//        List<DataDictBO> dataDicts = dataDictService.selectDataDictList();
+//        // 构建基于 enumValue 聚合的 Multimap
+//        ImmutableListMultimap<String, DataDictBO> dataDictMap = Multimaps.index(dataDicts, DataDictBO::getEnumValue); // KEY 是 enumValue ，VALUE 是 DataDictBO 数组
+//        // 构建返回结果
+//        List<DataDictEnumVO> dataDictEnumVOs = new ArrayList<>(dataDictMap.size());
+//        dataDictMap.keys().forEach(enumValue -> {
+//            DataDictEnumVO dataDictEnumVO = new DataDictEnumVO().setEnumValue(enumValue)
+//                    .setValues(DataDictConvert.INSTANCE.convert2(dataDictMap.get(enumValue)));
+//            dataDictEnumVOs.add(dataDictEnumVO);
+//        });
+//        return success(dataDictEnumVOs);
+//    }
+//
+//    @PostMapping("/add")
+//    @RequiresPermissions("system.dataDict.add")
+//    @ApiOperation(value = "创建数据字典")
+//    public CommonResult<DataDictBO> add(DataDictAddDTO dataDictAddDTO) {
+//        return success(dataDictService.addDataDict(AdminSecurityContextHolder.getContext().getAdminId(), dataDictAddDTO));
+//    }
+//
+//    @PostMapping("/update")
+//    @RequiresPermissions("system.dataDict.update")
+//    @ApiOperation(value = "更新数据字典")
+//    public CommonResult<Boolean> update(DataDictUpdateDTO dataDictUpdateDTO) {
+//        return success(dataDictService.updateDataDict(AdminSecurityContextHolder.getContext().getAdminId(), dataDictUpdateDTO));
+//    }
+//
+//    @PostMapping("/delete")
+//    @RequiresPermissions("system.dataDict.delete")
+//    @ApiOperation(value = "删除数据字典")
+//    @ApiImplicitParam(name = "id", value = "编号", required = true, example = "100")
+//    public CommonResult<Boolean> delete(@RequestParam("id") Integer id) {
+//        return success(dataDictService.deleteDataDict(AdminSecurityContextHolder.getContext().getAdminId(), id));
+//    }
+
+}

system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/oauth2/AdminsOAuth2Controller.java

@@ -39,7 +39,7 @@ public class AdminsOAuth2Controller {
         OAuth2UsernameAuthenticateDTO authenticateDTO = AdminsOAuth2Convert.INSTANCE.convert(request);
         OAuth2AccessTokenBO accessTokenBO = oauth2Service.authenticate(authenticateDTO);
         // 获得 Admin 信息
-        AdminBO adminBO = adminService.get(accessTokenBO.getAccountId());
+        AdminBO adminBO = adminService.getAdmin(accessTokenBO.getAccountId());
         if (adminBO == null) {
             throw ServiceExceptionUtil.exception(ADMIN_NOT_FOUND);
         }

system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/admin/AdminsAdminConvert.java

@@ -10,6 +10,6 @@ public interface AdminsAdminConvert {
 
     AdminsAdminConvert INSTANCE = Mappers.getMapper(AdminsAdminConvert.class);
 
-    AccountUsernameAuthorizeBO convert(AdminsOAuth2UsernameAuthenticateRequest request);
+    AccountUsernameAuthorizeBO convert(AdminsOAuth2UsernameAuthenticateRequest bean);
 
 }

system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/oauth2/AdminsOAuth2Convert.java

@@ -14,7 +14,7 @@ public interface AdminsOAuth2Convert {
 
     AdminsOAuth2Convert INSTANCE = Mappers.getMapper(AdminsOAuth2Convert.class);
 
-    OAuth2UsernameAuthenticateDTO convert(AdminsOAuth2UsernameAuthenticateRequest request);
+    OAuth2UsernameAuthenticateDTO convert(AdminsOAuth2UsernameAuthenticateRequest bean);
 
     @Mapping(source = "adminBO", target = "admin")
     @Mapping(source = "accessTokenBO.id", target = "token.accessToken")

system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/oauth2/UsersOAuth2Convert.java

@@ -13,9 +13,9 @@ public interface UsersOAuth2Convert {
 
     UsersOAuth2Convert INSTANCE = Mappers.getMapper(UsersOAuth2Convert.class);
 
-    OAuth2MobileCodeAuthenticateDTO convert(UsersOAuth2MobileCodeAuthenticateRequest request);
+    OAuth2MobileCodeAuthenticateDTO convert(UsersOAuth2MobileCodeAuthenticateRequest bean);
 
     @Mapping(source = "token.id", target = "token.accessToken")
-    UsersOAuth2AuthenticateResponse convert(UserAuthenticateBO userAuthenticateBO);
+    UsersOAuth2AuthenticateResponse convert(UserAuthenticateBO bean);
 
 }

system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/sms/AdminsSmsConvert.java

@@ -22,11 +22,11 @@ public interface AdminsSmsConvert {
     AdminsSmsConvert INSTANCE = Mappers.getMapper(AdminsSmsConvert.class);
 
     @Mappings({})
-    AddSignDTO convert(AddSignRequest addSignRequest);
+    AddSignDTO convert(AddSignRequest bean);
 
     @Mappings({})
-    UpdateSignDTO convert(UpdateSignRequest updateSignRequest);
+    UpdateSignDTO convert(UpdateSignRequest bean);
 
     @Mappings({})
-    ListSmsTemplateDTO convert(ListSmsTemplateRequest listSmsTemplateRequest);
+    ListSmsTemplateDTO convert(ListSmsTemplateRequest bean);
 }