合并2.0分支

pom.xml

@@ -18,6 +18,7 @@
     <properties>
         <uc-api.version>1.0.0-SNAPSHOT</uc-api.version>
         <vehicle-api.version>1.0.0-SNAPSHOT</vehicle-api.version>
+        <framework-sms.version>1.0.0-RELEASE</framework-sms.version>
         <framework-redis.version>1.0.0-RELEASE</framework-redis.version>
         <framework-oauth.version>1.0.0-RELEASE</framework-oauth.version>
         <framework-security.version>1.0.0-RELEASE</framework-security.version>
@@ -34,6 +35,11 @@
             <artifactId>vehicle-api</artifactId>
             <version>${vehicle-api.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.chelvc.framework</groupId>
+            <artifactId>framework-sms</artifactId>
+            <version>${framework-sms.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.chelvc.framework</groupId>
             <artifactId>framework-redis</artifactId>

src/main/java/com/chelvc/cloud/admin/controller/AuthorizeController.java

@@ -0,0 +1,89 @@
+package com.chelvc.cloud.admin.controller;
+
+import javax.validation.Valid;
+
+import com.chelvc.cloud.admin.param.MobileParam;
+import com.chelvc.cloud.uc.api.AuthorizeClient;
+import com.chelvc.cloud.uc.api.model.Authorization;
+import com.chelvc.cloud.uc.api.param.AuthorizeParam;
+import com.chelvc.framework.base.annotation.ResponseWrapping;
+import com.chelvc.framework.oauth.annotation.Authorize;
+import com.chelvc.framework.sms.CaptchaSmsHandler;
+import com.chelvc.framework.sms.SmsSession;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 登陆接口
+ *
+ * @author Woody
+ * @date 2024/1/31
+ */
+@RestController
+@ResponseWrapping
+@Authorize(enabled = false)
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class AuthorizeController {
+    private final AuthorizeClient authorizeClient;
+    private final CaptchaSmsHandler captchaSmsHandler;
+
+    /**
+     * 短信登陆
+     *
+     * @param param 登陆参数
+     * @return 认证信息
+     */
+    @Authorize(enabled = false)
+    @PostMapping("/login/sms")
+    public Authorization loginWithSms(@RequestBody @Valid AuthorizeParam.Sms param) {
+        return this.authorizeClient.authorize(param);
+    }
+
+    /**
+     * 发送短信登陆验证码
+     *
+     * @param param 手机号参数
+     * @return 短信会话信息
+     */
+    @Authorize(enabled = false)
+    @PostMapping("/login/sms/captcha")
+    public SmsSession sendCaptcha(@RequestBody @Valid MobileParam param) {
+        return this.captchaSmsHandler.send(param.getMobile());
+    }
+
+    /**
+     * 账号密码登陆
+     *
+     * @param param 登陆参数
+     * @return 认证信息
+     */
+    @Authorize(enabled = false)
+    @PostMapping("/login/password")
+    public Authorization loginWithPassword(@RequestBody @Valid AuthorizeParam.Password param) {
+        return this.authorizeClient.authorize(param);
+    }
+
+    /**
+     * 令牌刷新
+     *
+     * @param param 刷新参数
+     * @return 认证信息
+     */
+    @PostMapping("/token/refresh")
+    public Authorization refreshToken(@RequestBody @Valid AuthorizeParam.Refresh param) {
+        return this.authorizeClient.authorize(param);
+    }
+
+    /**
+     * 退出登陆
+     *
+     * @param param 认证参数
+     */
+    @PostMapping("/logout")
+    public void logout(@RequestBody @Valid AuthorizeParam param) {
+        this.authorizeClient.logout(param);
+    }
+}

src/main/java/com/chelvc/cloud/admin/controller/CarouselImagesController.java

@@ -28,7 +28,6 @@ import javax.validation.constraints.Min;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class CarouselImagesController {
     @DubboReference
     private CarouselImagesService carouselImagesService;

src/main/java/com/chelvc/cloud/admin/controller/CategoryController.java

@@ -30,7 +30,6 @@ import java.util.List;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class CategoryController {
     @DubboReference
     private CategoryService categoryService;

src/main/java/com/chelvc/cloud/admin/controller/ClientController.java

@@ -1,81 +0,0 @@
-package com.chelvc.cloud.admin.controller;
-
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-
-import com.chelvc.cloud.uc.api.dto.ClientDTO;
-import com.chelvc.cloud.uc.api.param.ClientModifyParam;
-import com.chelvc.cloud.uc.api.param.ClientPagingParam;
-import com.chelvc.cloud.uc.api.service.ClientService;
-import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.base.util.ResourceUtils;
-import com.chelvc.framework.common.model.Pagination;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 客户端接口
- *
- * @author Woody
- * @date 2021/10/20
- */
-@Validated
-@RestController
-@ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
-public class ClientController {
-    @DubboReference
-    private ClientService clientService;
-
-    /**
-     * 新增客户端
-     *
-     * @param param 新增参数
-     * @return 客户端主键
-     */
-    @PostMapping("/client")
-    public Long addClient(@RequestBody @Valid ClientModifyParam param) {
-        return this.clientService.addClient(param);
-    }
-
-    /**
-     * 修改客户端
-     *
-     * @param id    客户端主键
-     * @param param 修改参数
-     */
-    @PutMapping("/client/{id}")
-    public void updateClient(@PathVariable("id") @Min(value = 1, message = "客户端主键不能小于1") Long id,
-                             @RequestBody @Valid ClientModifyParam param) {
-        this.clientService.updateClient(id, param);
-    }
-
-    /**
-     * 获取客户端信息
-     *
-     * @param id 客户端主键
-     * @return 客户端信息
-     */
-    @GetMapping("/client/{id}")
-    public ClientDTO getClient(@PathVariable("id") @Min(value = 1, message = "客户端主键不能小于1") Long id) {
-        return ResourceUtils.required(this.clientService.getClient(id), "客户端不存在");
-    }
-
-    /**
-     * 查询客户端分页
-     *
-     * @param param 查询参数
-     * @return 客户端分页信息
-     */
-    @GetMapping("/client/paging")
-    public Pagination<ClientDTO> getClientPaging(@Valid ClientPagingParam param) {
-        return this.clientService.getClientPaging(param);
-    }
-}

src/main/java/com/chelvc/cloud/admin/controller/CommissionConfigController.java

@@ -28,7 +28,6 @@ import javax.validation.constraints.Min;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class CommissionConfigController {
     @DubboReference
     private CommissionConfigService commissionConfigService;

src/main/java/com/chelvc/cloud/admin/controller/CouponController.java

@@ -22,7 +22,6 @@ import javax.validation.constraints.Min;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class CouponController {
     @DubboReference
     private CouponService couponService;

src/main/java/com/chelvc/cloud/admin/controller/DepartmentController.java

@@ -1,81 +0,0 @@
-package com.chelvc.cloud.admin.controller;
-
-import java.util.List;
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-
-import com.chelvc.cloud.uc.api.dto.DepartmentDTO;
-import com.chelvc.cloud.uc.api.param.DepartmentModifyParam;
-import com.chelvc.cloud.uc.api.param.DepartmentQueryParam;
-import com.chelvc.cloud.uc.api.service.DepartmentService;
-import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.base.util.ResourceUtils;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 组织接口
- *
- * @author Woody
- * @date 2021/10/20
- */
-@Validated
-@RestController
-@ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
-public class DepartmentController {
-    @DubboReference
-    private DepartmentService departmentService;
-
-    /**
-     * 新增部门
-     *
-     * @param param 新增参数
-     * @return 部门主键
-     */
-    @PostMapping("/department")
-    public Long addDepartment(@RequestBody @Valid DepartmentModifyParam param) {
-        return this.departmentService.addDepartment(param);
-    }
-
-    /**
-     * 修改部门
-     *
-     * @param id    部门主键
-     * @param param 修改参数
-     */
-    @PutMapping("/department/{id}")
-    public void updateDepartment(@PathVariable("id") @Min(value = 1, message = "部门主键不能小于1") Long id,
-                                 @RequestBody @Valid DepartmentModifyParam param) {
-        this.departmentService.updateDepartment(id, param);
-    }
-
-    /**
-     * 获取部门信息
-     *
-     * @param id 部门主键
-     * @return 部门信息
-     */
-    @GetMapping("/department/{id}")
-    public DepartmentDTO getDepartment(@PathVariable("id") @Min(value = 1, message = "部门主键不能小于1") Long id) {
-        return ResourceUtils.required(this.departmentService.getDepartment(id), "部门不存在");
-    }
-
-    /**
-     * 查询部门树列表
-     *
-     * @param param 查询参数
-     * @return 部门树列表
-     */
-    @GetMapping("/department/trees")
-    public List<DepartmentDTO> listDepartmentTrees(@Valid DepartmentQueryParam param) {
-        return this.departmentService.listDepartmentTrees(param);
-    }
-}

src/main/java/com/chelvc/cloud/admin/controller/DictEntryController.java

@@ -1,77 +0,0 @@
-package com.chelvc.cloud.admin.controller;
-
-import com.chelvc.cloud.uc.api.dto.DictEntryDTO;
-import com.chelvc.cloud.uc.api.param.DictEntryModifyParam;
-import com.chelvc.cloud.uc.api.param.DictPagingParam;
-import com.chelvc.cloud.uc.api.service.DictEntryService;
-import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.common.model.Pagination;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import java.util.List;
-
-/**
- * 码表条目控制层
- * @author valley
- * @date 2024/01/11 22:20
- **/
-
-@Validated
-@RestController
-@ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
-public class DictEntryController {
-
-    @DubboReference
-    private DictEntryService dictEntryService;
-
-    /**
-     * 新增码表条目
-     * @param param 码表条目修改参数
-     * @return 码表条目id
-     */
-    @PostMapping("/dict/entry/add")
-    public Long addDictEntry(@RequestBody @Valid DictEntryModifyParam param) {
-        return this.dictEntryService.addDictEntry(param);
-    }
-
-    /**
-     * 根据id修改码表条目
-     * @param id 码表条目id
-     * @param param 码表条目修改参数
-     */
-    @PutMapping("/dict/entry/update/{id}")
-    public void updateDictEntry(@PathVariable("id") @Min(value = 1, message = "id不能小于1") Long id, @RequestBody @Valid DictEntryModifyParam param) {
-        this.dictEntryService.updateDictEntry(id, param);
-    }
-
-    /**
-     * 根据id移除码表条目
-     * @param id 码表条目id
-     */
-    @PostMapping("/dict/entry/remove/{id}")
-    public void removeDictItem(@PathVariable @Min(value = 1, message = "id不能小于1") Long id) {
-        this.dictEntryService.removeDictEntry(id);
-    }
-
-    /**
-     * 分页查询码表信息
-     */
-    @GetMapping("/dict/entry/page")
-    public Pagination<DictEntryDTO> dictEntryPaging(@RequestBody @Valid DictPagingParam param) {
-        return this.dictEntryService.dictEntryPaging(param);
-    }
-
-    /**
-     * 获取所有码表信息
-     */
-    @GetMapping("/dict/entry/all")
-    public List<List<DictEntryDTO>> dictEntryAll() {
-        return this.dictEntryService.dictEntryGetAll();
-    }
-}

src/main/java/com/chelvc/cloud/admin/controller/DictItemController.java

@@ -1,72 +0,0 @@
-package com.chelvc.cloud.admin.controller;
-
-import com.chelvc.cloud.uc.api.dto.DictItemDTO;
-import com.chelvc.cloud.uc.api.param.DictEntryModifyParam;
-import com.chelvc.cloud.uc.api.param.DictItemModifyParam;
-import com.chelvc.cloud.uc.api.service.DictItemService;
-import com.chelvc.framework.base.annotation.ResponseWrapping;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import java.util.List;
-
-/**
- * 码表元素控制层
- * @author valley
- * @date 2024/01/17 00:01
- **/
-@Validated
-@RestController
-@ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
-public class DictItemController {
-
-    @DubboReference
-    DictItemService dictItemService;
-
-    /**
-     * 码表元素新增
-     * @param param 码表元素修改参数
-     * @return 码表元素id
-     */
-    @PostMapping("/dict/item/add")
-    public Long addDictItem(@RequestBody @Valid DictItemModifyParam param) {
-        return this.dictItemService.addDictItem(param);
-    }
-
-    /**
-     * 懒加载码表条目所有元素信息
-     * @param entryId 条目id
-     * @return 元素列表
-     */
-    @GetMapping("/dict/item/{entryId}")
-    public List<DictItemDTO> getDictItem(@PathVariable @Min(value = 1,message = "entryId不能小于1") Long entryId) {
-        return this.dictItemService.getDictItem(entryId);
-    }
-
-    /**
-     * 修改码表子元素信息
-     * @param id 子元素id
-     * @param param 码表元素修改参数
-     */
-    @PutMapping("/dict/item/update/{id}")
-    public void updateDictEntry(@PathVariable("id") @Min(value = 1, message = "id不能小于1") Long id, @RequestBody @Valid DictItemModifyParam param) {
-        this.dictItemService.updateDictItem(id, param);
-    }
-
-
-    /**
-     * 删除码表子元素
-     * @param id 子元素id
-     */
-    @PostMapping("/dict/item/remove/{id}")
-    public void removeDictItem(@PathVariable @Min(value = 1, message = "id不能小于1") Long id) {
-         this.dictItemService.removeDictItem(id);
-    }
-
-}

src/main/java/com/chelvc/cloud/admin/controller/DynamicCommentController.java

@@ -4,8 +4,8 @@ import com.chelvc.cloud.vehicle.api.dto.DynamicCommentDTO;
 import com.chelvc.cloud.vehicle.api.param.ExamineDynamicParam;
 import com.chelvc.cloud.vehicle.api.param.QueryAdminDynamicParam;
 import com.chelvc.cloud.vehicle.api.service.DynamicCommentService;
-import com.chelvc.framework.common.model.PagedDTO;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.validation.annotation.Validated;
@@ -33,8 +33,8 @@ public class DynamicCommentController {
    * @date 2023/8/9 17:25
    */
   @GetMapping("/list")
-  public Pagination<DynamicCommentDTO> list(QueryAdminDynamicParam param, PagedDTO page) {
-    return this.dynamicCommentService.queryAdminPageList(param, page.getPageCode(), page.getPageSize());
+  public Pagination<DynamicCommentDTO> list(QueryAdminDynamicParam param, Paging page) {
+    return this.dynamicCommentService.queryAdminPageList(param, (long) page.getNumber(), (long) page.getSize());
   }
 
   /**

src/main/java/com/chelvc/cloud/admin/controller/DynamicContentController.java

@@ -5,8 +5,8 @@ import com.chelvc.cloud.vehicle.api.param.EditShieldDynamicParam;
 import com.chelvc.cloud.vehicle.api.param.ExamineDynamicParam;
 import com.chelvc.cloud.vehicle.api.param.QueryAdminDynamicParam;
 import com.chelvc.cloud.vehicle.api.service.DynamicContentService;
-import com.chelvc.framework.common.model.PagedDTO;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.validation.annotation.Validated;
@@ -37,8 +37,8 @@ public class DynamicContentController {
      * @date 2023/8/9 17:25
      */
     @GetMapping("/list")
-    public Pagination<DynamicContentDTO> list(QueryAdminDynamicParam param, PagedDTO page) {
-        return this.iDynamicContentService.queryAdminPageList(param, page.getPageCode(), page.getPageSize());
+    public Pagination<DynamicContentDTO> list(QueryAdminDynamicParam param, Paging page) {
+        return this.iDynamicContentService.queryAdminPageList(param, (long) page.getNumber(), (long) page.getSize());
     }
 
     /**

src/main/java/com/chelvc/cloud/admin/controller/EmployeeController.java

@@ -10,13 +10,9 @@ import com.chelvc.cloud.uc.api.dto.EmployeeDetailDTO;
 import com.chelvc.cloud.uc.api.param.EmployeeModifyParam;
 import com.chelvc.cloud.uc.api.param.EmployeePagingParam;
 import com.chelvc.cloud.uc.api.service.EmployeeService;
-import com.chelvc.cloud.vehicle.api.service.MerchantService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.base.util.ResourceUtils;
 import com.chelvc.framework.common.model.Pagination;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -34,14 +30,10 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class EmployeeController {
     @DubboReference
     private EmployeeService employeeService;
 
-    @DubboReference
-    private MerchantService merchantService;
-
     /**
      * 新增员工
      *
@@ -72,22 +64,19 @@ public class EmployeeController {
      */
     @GetMapping("/employee/mine")
     public PersonalVO getPersonal() {
-        EmployeeDetailDTO employee = this.employeeService.getMine();
-        Long userId = SessionContextHolder.getSession().getId();
-        PersonalVO personalVO = EmployeeCopier.INSTANCE.employee2personal(employee);
-        personalVO.setMerchantList(this.merchantService.getMerchantIdsByUserId());
-        return personalVO;
+        return EmployeeCopier.INSTANCE.copying(this.employeeService.getPersonal());
     }
 
     /**
-     * 获取员工信息
+     * 获取员工详情
      *
      * @param id 员工主键
-     * @return 员工信息
+     * @return 员工详情
      */
-    @GetMapping("/employee/{id}")
-    public EmployeeDTO getEmployee(@PathVariable("id") @Min(value = 1, message = "员工主键不能小于1") Long id) {
-        return ResourceUtils.required(this.employeeService.getEmployee(id), "员工不存在");
+    @GetMapping("/employee/{id}/detail")
+    public EmployeeDetailDTO getEmployeeDetail(
+            @PathVariable("id") @Min(value = 1, message = "员工主键不能小于1") Long id) {
+        return this.employeeService.getEmployeeDetail(id);
     }
 
     /**

src/main/java/com/chelvc/cloud/admin/controller/GoodsController.java

@@ -22,7 +22,6 @@ import javax.validation.constraints.Min;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class GoodsController {
     @DubboReference
     private GoodsService goodsService;

src/main/java/com/chelvc/cloud/admin/controller/MenuController.java

@@ -9,7 +9,6 @@ import com.chelvc.cloud.uc.api.param.MenuModifyParam;
 import com.chelvc.cloud.uc.api.param.MenuQueryParam;
 import com.chelvc.cloud.uc.api.service.MenuService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.base.util.ResourceUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -29,7 +28,6 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class MenuController {
     @DubboReference
     private MenuService menuService;
@@ -65,7 +63,7 @@ public class MenuController {
      */
     @GetMapping("/menu/{id}")
     public MenuDTO getMenu(@PathVariable("id") @Min(value = 1, message = "菜单主键不能小于1") Long id) {
-        return ResourceUtils.required(this.menuService.getMenu(id), "菜单不存在");
+        return this.menuService.getMenu(id);
     }
 
     /**

src/main/java/com/chelvc/cloud/admin/controller/MerchantAuthController.java

@@ -27,7 +27,6 @@ import javax.validation.constraints.Min;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class MerchantAuthController {
     @DubboReference
     private MerchantAuthService merchantAuthService;

src/main/java/com/chelvc/cloud/admin/controller/MerchantController.java

@@ -1,5 +1,10 @@
 package com.chelvc.cloud.admin.controller;
 
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
+
 import com.chelvc.cloud.vehicle.api.constant.GoodsStatus;
 import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
 import com.chelvc.cloud.vehicle.api.dto.MerchantRankDTO;
@@ -12,14 +17,13 @@ import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 商家接口
@@ -30,7 +34,6 @@ import java.util.List;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class MerchantController {
     @DubboReference
     private MerchantService merchantService;
@@ -85,7 +88,7 @@ public class MerchantController {
     /**
      * 上架商品
      *
-     * @param goodsIds    商品ID集合
+     * @param goodsIds 商品ID集合
      */
     @PutMapping("/merchant/list-goods/{goodsIds}")
     public void listGoods(@PathVariable("goodsIds") @NotEmpty(message = "商品ID不能为空") List<Long> goodsIds) {
@@ -95,7 +98,7 @@ public class MerchantController {
     /**
      * 下架商品
      *
-     * @param goodsIds    商品ID集合
+     * @param goodsIds 商品ID集合
      */
     @PutMapping("/merchant/delist-goods/{goodsIds}")
     public void delistGoods(@PathVariable("goodsIds") @NotEmpty(message = "商品ID不能为空") List<Long> goodsIds) {
@@ -106,13 +109,13 @@ public class MerchantController {
     /**
      * 修改商家营业状态
      *
-     * @param id    商家主键
+     * @param id             商家主键
      * @param businessStatus 修改参数  营业状态 0-营业中，1-休息中
      */
     @PutMapping("/merchant/updateBusinessStatus/{id}")
     public void updateMerchant(@PathVariable("id") @Min(value = 1, message = "商家主键不能小于1") Long id,
                                String businessStatus) {
-        this.merchantService.updateMerchantBusinessStatus(id,businessStatus);
+        this.merchantService.updateMerchantBusinessStatus(id, businessStatus);
     }
 
     /**

src/main/java/com/chelvc/cloud/admin/controller/NoticeController.java

@@ -28,7 +28,6 @@ import javax.validation.constraints.Min;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class NoticeController {
     @DubboReference
     private NoticeService noticeService;

src/main/java/com/chelvc/cloud/admin/controller/OrderController.java

@@ -20,7 +20,6 @@ import javax.validation.Valid;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class OrderController {
     @DubboReference
     private IOmsOrderService orderService;

src/main/java/com/chelvc/cloud/admin/controller/ProfitRatioConfigController.java

@@ -1,20 +1,26 @@
 package com.chelvc.cloud.admin.controller;
 
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
 import com.chelvc.cloud.vehicle.api.dto.ProfitRatioConfigDTO;
-import com.chelvc.cloud.vehicle.api.param.*;
+import com.chelvc.cloud.vehicle.api.param.AddProfitRatioConfigParams;
+import com.chelvc.cloud.vehicle.api.param.EditProfitRatioConfigParams;
+import com.chelvc.cloud.vehicle.api.param.QueryProfitRatioConfigParam;
 import com.chelvc.cloud.vehicle.api.service.ProfitRatioConfigService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.common.model.PagedDTO;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.apache.ibatis.annotations.Delete;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 分佣比例配置管理接口
@@ -22,7 +28,6 @@ import javax.validation.constraints.NotNull;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class ProfitRatioConfigController {
 
     @DubboReference
@@ -52,22 +57,24 @@ public class ProfitRatioConfigController {
 
     /**
      * 删除
+     *
      * @param id
      */
-    @Delete("/profit-ratio/del/{id}")
+    @DeleteMapping("/profit-ratio/del/{id}")
     public void delete(@NotNull(message = "主键不能为空") @PathVariable Long id) {
         this.profitRatioConfigService.delete(id, SessionContextHolder.getId());
     }
 
     /**
      * 查询列表
+     *
      * @param param
      * @param page
      * @author igl
      * @date 2024/2/23 17:25
      */
     @GetMapping("/profit-ratio/list")
-    public Pagination<ProfitRatioConfigDTO> list(QueryProfitRatioConfigParam param, PagedDTO page) {
-        return this.profitRatioConfigService.queryPageList(param, page.getPageCode(), page.getPageSize());
+    public Pagination<ProfitRatioConfigDTO> list(QueryProfitRatioConfigParam param, Paging page) {
+        return this.profitRatioConfigService.queryPageList(param, page);
     }
 }

src/main/java/com/chelvc/cloud/admin/controller/ProfitRatioController.java

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class ProfitRatioController {
 
     @DubboReference

src/main/java/com/chelvc/cloud/admin/controller/ReservationController.java

@@ -22,7 +22,6 @@ import javax.validation.Valid;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class ReservationController {
     @DubboReference
     private ReservationService reservationService;

src/main/java/com/chelvc/cloud/admin/controller/ResourceController.java

@@ -1,104 +0,0 @@
-package com.chelvc.cloud.admin.controller;
-
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-
-import com.chelvc.cloud.uc.api.dto.ResourceDTO;
-import com.chelvc.cloud.uc.api.param.ResourceModifyParam;
-import com.chelvc.cloud.uc.api.param.ResourcePagingParam;
-import com.chelvc.cloud.uc.api.service.ResourceService;
-import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.base.util.ResourceUtils;
-import com.chelvc.framework.common.model.Pagination;
-import com.chelvc.framework.common.util.FileUtils;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.io.IOException;
-
-/**
- * 资源接口
- *
- * @author Woody
- * @date 2021/10/20
- */
-@Validated
-@RestController
-@ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
-public class ResourceController {
-    @DubboReference
-    private ResourceService resourceService;
-
-    /**
-     * 新增资源
-     *
-     * @param param 新增参数
-     * @return 资源主键
-     */
-    @PostMapping("/resource")
-    public Long addResource(@RequestBody @Valid ResourceModifyParam param) {
-        return this.resourceService.addResource(param);
-    }
-
-    /**
-     * 修改资源
-     *
-     * @param id    资源主键
-     * @param param 修改参数
-     */
-    @PutMapping("/resource/{id}")
-    public void updateResource(@PathVariable("id") @Min(value = 1, message = "资源主键不能小于1") Long id,
-                               @RequestBody @Valid ResourceModifyParam param) {
-        this.resourceService.updateResource(id, param);
-    }
-
-    /**
-     * 获取资源信息
-     *
-     * @param id 资源主键
-     * @return 资源信息
-     */
-    @GetMapping("/resource/{id}")
-    public ResourceDTO getResource(@PathVariable("id") @Min(value = 1, message = "资源主键不能小于1") Long id) {
-        return ResourceUtils.required(this.resourceService.getResource(id), "资源不存在");
-    }
-
-    /**
-     * 查询资源分页
-     *
-     * @param param 查询参数
-     * @return 资源分页信息
-     */
-    @GetMapping("/resource/paging")
-    public Pagination<ResourceDTO> getResourcePaging(@Valid ResourcePagingParam param) {
-        return this.resourceService.getResourcePaging(param);
-    }
-
-    /**
-     * 获取前后端通信相关的配置
-     *
-     * @return 配置信息
-     */
-    @GetMapping("/resource/portal")
-    public String getPortalConfig() {
-        String jsonContent = null;
-        Resource resource = new ClassPathResource("config/config.json");
-        try {
-            jsonContent = FileUtils.read(resource.getFile());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonContent;
-    }
-
-}

src/main/java/com/chelvc/cloud/admin/controller/RoleController.java

@@ -1,16 +1,15 @@
 package com.chelvc.cloud.admin.controller;
 
+import java.util.List;
 import javax.validation.Valid;
 import javax.validation.constraints.Min;
 
 import com.chelvc.cloud.uc.api.dto.RoleDTO;
 import com.chelvc.cloud.uc.api.dto.RoleDetailDTO;
-import com.chelvc.cloud.uc.api.param.PermissionModifyParam;
 import com.chelvc.cloud.uc.api.param.RoleModifyParam;
 import com.chelvc.cloud.uc.api.param.RolePagingParam;
 import com.chelvc.cloud.uc.api.service.RoleService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.base.util.ResourceUtils;
 import com.chelvc.framework.common.model.Pagination;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -22,8 +21,6 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * 角色接口
  *
@@ -33,7 +30,6 @@ import java.util.List;
 @Validated
 @RestController
 @ResponseWrapping
-@PreAuthorize("isScope('EMPLOYEE')")
 public class RoleController {
     @DubboReference
     private RoleService roleService;
@@ -61,38 +57,25 @@ public class RoleController {
         this.roleService.updateRole(id, param);
     }
 
-    /**
-     * 修改角色权限
-     *
-     * @param id    角色主键
-     * @param param 修改参数
-     */
-    @PutMapping("/role/{id}/permission")
-    public void updateRolePermission(@PathVariable("id") @Min(value = 1, message = "角色主键不能小于1") Long id,
-                                     @RequestBody @Valid PermissionModifyParam param) {
-        this.roleService.updateRolePermission(id, param);
-    }
-
     /**
      * 获取角色信息
      *
      * @param id 角色主键
      * @return 角色信息
      */
-    @GetMapping("/role/{id}")
-    public RoleDTO getRole(@PathVariable("id") @Min(value = 1, message = "角色主键不能小于1") Long id) {
-        return ResourceUtils.required(this.roleService.getRole(id), "角色不存在");
+    @GetMapping("/role/{id}/detail")
+    public RoleDetailDTO getRoleDetail(@PathVariable("id") @Min(value = 1, message = "角色主键不能小于1") Long id) {
+        return this.roleService.getRoleDetail(id);
     }
 
     /**
-     * 获取角色详细信息
+     * 获取启用角色列表
      *
-     * @param id 角色主键
-     * @return 角色信息
+     * @return 角色列表信息
      */
-    @GetMapping("/role/{id}/detail")
-    public RoleDetailDTO getRoleDetail(@PathVariable("id") @Min(value = 1, message = "角色主键不能小于1") Long id) {
-        return ResourceUtils.required(this.roleService.getRoleDetail(id), "角色不存在");
+    @GetMapping("/role/enables")
+    public List<RoleDTO> listEnableRoles() {
+        return this.roleService.listEnableRoles();
     }
 
     /**
@@ -105,14 +88,4 @@ public class RoleController {
     public Pagination<RoleDTO> getRolePaging(@Valid RolePagingParam param) {
         return this.roleService.getRolePaging(param);
     }
-
-    /**
-     * 查询角色列表
-     *
-     * @return 角色列表信息
-     */
-    @GetMapping("/role/list")
-    public List<RoleDTO> listRoles() {
-        return this.roleService.listRoles();
-    }
 }

src/main/java/com/chelvc/cloud/admin/controller/UserController.java

@@ -0,0 +1,34 @@
+package com.chelvc.cloud.admin.controller;
+
+import com.chelvc.cloud.admin.copier.UserCopier;
+import com.chelvc.cloud.admin.vo.PersonalVO;
+import com.chelvc.cloud.uc.api.service.UserService;
+import com.chelvc.framework.base.annotation.ResponseWrapping;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 用户接口
+ *
+ * @author Woody
+ * @date 2023/4/30
+ */
+@Validated
+@RestController
+@ResponseWrapping
+public class UserController {
+    @DubboReference
+    private UserService userService;
+
+    /**
+     * 获取个人信息
+     *
+     * @return 用户信息
+     */
+    @GetMapping("/user/mine")
+    public PersonalVO getPersonal() {
+        return UserCopier.INSTANCE.copying(this.userService.getPersonal());
+    }
+}

src/main/java/com/chelvc/cloud/admin/copier/EmployeeCopier.java

@@ -1,7 +1,7 @@
 package com.chelvc.cloud.admin.copier;
 
 import com.chelvc.cloud.admin.vo.PersonalVO;
-import com.chelvc.cloud.uc.api.dto.EmployeeDetailDTO;
+import com.chelvc.cloud.uc.api.dto.EmployeePersonalDTO;
 import org.mapstruct.Builder;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -22,8 +22,8 @@ public interface EmployeeCopier {
     /**
      * 个人信息拷贝
      *
-     * @param employee 员工详细信息
+     * @param personal 员工个人信息
      * @return 个人信息
      */
-    PersonalVO employee2personal(EmployeeDetailDTO employee);
+    PersonalVO copying(EmployeePersonalDTO personal);
 }

src/main/java/com/chelvc/cloud/admin/copier/UserCopier.java

@@ -0,0 +1,34 @@
+package com.chelvc.cloud.admin.copier;
+
+import com.chelvc.cloud.admin.vo.PersonalVO;
+import com.chelvc.cloud.uc.api.dto.UserPersonalDTO;
+import org.mapstruct.Builder;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * 用户对象拷贝接口
+ *
+ * @author qizai
+ * @Date 2023/9/8
+ **/
+@Mapper(builder = @Builder(disableBuilder = true))
+public interface UserCopier {
+    /**
+     * 对象拷贝接口实例
+     */
+    UserCopier INSTANCE = Mappers.getMapper(UserCopier.class);
+
+    /**
+     * 用户个人信息拷贝
+     *
+     * @param personal 用户个人信息
+     * @return 用户个人信息
+     */
+    @Mappings({
+            @Mapping(source = "nickname", target = "name")
+    })
+    PersonalVO copying(UserPersonalDTO personal);
+}

src/main/java/com/chelvc/cloud/admin/param/MobileParam.java

@@ -0,0 +1,30 @@
+package com.chelvc.cloud.admin.param;
+
+import java.io.Serializable;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Pattern;
+
+import com.chelvc.framework.common.util.StringUtils;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 手机号参数
+ *
+ * @author Woody
+ * @date 2021/11/23
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MobileParam implements Serializable {
+    /**
+     * 手机号
+     */
+    @NotEmpty(message = "手机号不能为空")
+    @Pattern(regexp = StringUtils.MOBILE_REGEX, message = "手机号格式不正确")
+    private String mobile;
+}

src/main/java/com/chelvc/cloud/admin/vo/PersonalVO.java

@@ -3,7 +3,6 @@ package com.chelvc.cloud.admin.vo;
 import java.io.Serializable;
 import java.util.List;
 
-import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
 import com.chelvc.framework.common.model.Tree;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,7 +12,7 @@ import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
 /**
- * 员工个人信息
+ * 个人信息
  *
  * @author Woody
  * @date 2021/11/1
@@ -24,24 +23,19 @@ import lombok.experimental.SuperBuilder;
 @AllArgsConstructor
 public class PersonalVO implements Serializable {
     /**
-     * 主键
+     * 用户ID
      */
     private Long id;
 
     /**
-     * 员工姓名
+     * 用户名称
      */
     private String name;
 
     /**
-     * 电子邮箱
+     * 是否是超级管理员
      */
-    private String email;
-
-    /**
-     * 电话号码
-     */
-    private String mobile;
+    private boolean administrator;
 
     /**
      * 角色列表
@@ -53,34 +47,6 @@ public class PersonalVO implements Serializable {
      */
     private List<MenuVO> menus;
 
-    /**
-     * 所属部门
-     */
-    private DepartmentVO department;
-    /**-
-     * 商家信息
-     */
-    private List<MerchantDTO> merchantList;
-
-    /**
-     * 部门信息
-     */
-    @Data
-    @SuperBuilder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class DepartmentVO implements Serializable {
-        /**
-         * 组织主键
-         */
-        private Long id;
-
-        /**
-         * 组织名称
-         */
-        private String name;
-    }
-
     /**
      * 角色信息
      */
@@ -90,9 +56,9 @@ public class PersonalVO implements Serializable {
     @AllArgsConstructor
     public static class RoleVO implements Serializable {
         /**
-         * 主键
+         * 角色编号
          */
-        private Long id;
+        private String code;
 
         /**
          * 角色名称

src/main/resources/application-dev.yml

@@ -17,6 +17,13 @@ nacos:
     server-addr: 47.108.128.78:6848
 
 oauth:
-  token:
-    secret: oauth.token.secret@chelvc!@#2023
-    recheck: true
+  secret: oauth.token.secret@chelvc!@#2023
+
+sms:
+  captcha:
+    template: SMS_274640619
+  clients:
+    - id: LTAI5tAnS3tQqjpHdT1KqeUw
+      secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
+      signature: 车旅程
+      channel: ALIYUN

src/main/resources/application-pre.yml

@@ -17,6 +17,13 @@ nacos:
     server-addr: 127.0.0.1:6848
 
 oauth:
-  token:
-    secret: oauth.token.secret@chelvc!@#2023
-    recheck: true
+  secret: oauth.token.secret@chelvc!@#2023
+
+sms:
+  captcha:
+    template: SMS_274640619
+  clients:
+    - id: LTAI5tAnS3tQqjpHdT1KqeUw
+      secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
+      signature: 车旅程
+      channel: ALIYUN

src/main/resources/application-prod.yml

@@ -17,6 +17,13 @@ nacos:
     server-addr: 127.0.0.1:6848
 
 oauth:
-  token:
-    secret: oauth.token.secret@chelvc!@#2023
-    recheck: true
+  secret: oauth.token.secret@chelvc!@#2023
+
+sms:
+  captcha:
+    template: SMS_274640619
+  clients:
+    - id: LTAI5tAnS3tQqjpHdT1KqeUw
+      secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
+      signature: 车旅程
+      channel: ALIYUN

src/main/resources/application-test.yml

@@ -17,6 +17,13 @@ nacos:
     server-addr: 127.0.0.1:6848
 
 oauth:
-  token:
-    secret: oauth.token.secret@chelvc!@#2023
-    recheck: true
+  secret: oauth.token.secret@chelvc!@#2023
+
+sms:
+  captcha:
+    template: SMS_274640619
+  clients:
+    - id: LTAI5tAnS3tQqjpHdT1KqeUw
+      secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
+      signature: 车旅程
+      channel: ALIYUN