代码优化

pom.xml

@@ -17,7 +17,7 @@
 
     <properties>
         <uc-api.version>1.0.0-SNAPSHOT</uc-api.version>
-        <trade-api.version>1.0.0-SNAPSHOT</trade-api.version>
+        <vehicle-api.version>1.0.0-SNAPSHOT</vehicle-api.version>
         <framework-redis.version>1.0.0-RELEASE</framework-redis.version>
         <framework-security.version>1.0.0-RELEASE</framework-security.version>
     </properties>
@@ -31,8 +31,8 @@
         </dependency>
         <dependency>
             <groupId>com.chelvc.cloud</groupId>
-            <artifactId>trade-api</artifactId>
-            <version>${trade-api.version}</version>
+            <artifactId>vehicle-api</artifactId>
+            <version>${vehicle-api.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>

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

@@ -0,0 +1,69 @@
+package com.chelvc.cloud.admin.controller;
+
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+
+import com.chelvc.cloud.vehicle.api.dto.CategoryDTO;
+import com.chelvc.cloud.vehicle.api.param.CategoryModifyParam;
+import com.chelvc.cloud.vehicle.api.param.CategoryPagingParam;
+import com.chelvc.cloud.vehicle.api.service.CategoryService;
+import com.chelvc.framework.base.annotation.UnifiedResponseBody;
+import com.chelvc.framework.base.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 七仔
+ * @Date 2023/4/4
+ **/
+@Validated
+@RestController
+@UnifiedResponseBody
+@PreAuthorize("isBusiness('EMPLOYEE')")
+public class CategoryController {
+    @DubboReference
+    private CategoryService categoryService;
+
+    /**
+     * 新增分类
+     *
+     * @param param 新增参数
+     * @return 分类主键
+     */
+    @PostMapping("/category")
+    public Long addCategory(@RequestBody @Valid CategoryModifyParam param) {
+        return this.categoryService.addCategory(param);
+    }
+
+    /**
+     * 修改分类
+     *
+     * @param id    分类主键
+     * @param param 修改参数
+     */
+    @PutMapping("/category/{id}")
+    public void updateCategory(@PathVariable("id") @Min(value = 1, message = "分类主键不能小于1") Long id,
+                               @RequestBody @Valid CategoryModifyParam param) {
+        this.categoryService.updateCategory(id, param);
+    }
+
+    /**
+     * 查询分类分页
+     *
+     * @param param 查询参数
+     * @return 分类分页信息
+     */
+    @GetMapping("/category/paging")
+    public Pagination<CategoryDTO> getCategoryPaging(@Valid CategoryPagingParam param) {
+        return this.categoryService.getCategoryPaging(param);
+    }
+}

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

@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 @RestController
 @UnifiedResponseBody
-@PreAuthorize("isType('ADMIN')")
+@PreAuthorize("isBusiness('EMPLOYEE')")
 public class ClientController {
     @DubboReference
     private ClientService clientService;

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

@@ -1,83 +0,0 @@
-package com.chelvc.cloud.admin.controller;
-
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-
-import com.chelvc.cloud.trade.api.dto.CouponDTO;
-import com.chelvc.cloud.trade.api.param.CouponModifyParam;
-import com.chelvc.cloud.trade.api.param.CouponPagingParam;
-import com.chelvc.cloud.trade.api.service.CouponService;
-import com.chelvc.framework.base.annotation.UnifiedResponseBody;
-import com.chelvc.framework.base.model.Pagination;
-import com.chelvc.framework.base.util.ErrorUtils;
-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 七仔
- * @Date 2023/4/3
- **/
-@Validated
-@RestController
-@UnifiedResponseBody
-@PreAuthorize("isType('ADMIN')")
-public class CouponController {
-    @DubboReference
-    private CouponService couponService;
-
-    /**
-     * 新增优惠券
-     *
-     * @param param 新增参数
-     * @return 优惠券主键
-     */
-    @PostMapping("/coupon")
-    public Long addCoupon(@RequestBody @Valid CouponModifyParam param) {
-        return this.couponService.addCoupon(param);
-    }
-
-    /**
-     * 修改优惠券
-     *
-     * @param id    优惠券主键
-     * @param param 修改参数
-     */
-    @PutMapping("/coupon/{id}")
-    public void updateCoupon(@PathVariable("id") @Min(value = 1, message = "优惠券主键不能小于1") Long id,
-                             @RequestBody @Valid CouponModifyParam param) {
-        this.couponService.updateCoupon(id, param);
-    }
-
-    /**
-     * 获取优惠券信息
-     *
-     * @param id 商品分类主键
-     * @return 商品分类信息
-     */
-    @GetMapping("/coupon/{id}")
-    public CouponDTO getCoupon(@PathVariable("id") @Min(value = 1, message = "优惠券主键不能小于1") Long id) {
-        CouponDTO coupon = this.couponService.getCoupon(id);
-        ErrorUtils.requireResource(coupon, "优惠券不存在");
-        return coupon;
-    }
-
-    /**
-     * 查询优惠券分页
-     *
-     * @param param 查询参数
-     * @return 优惠券分页信息
-     */
-    @GetMapping("/coupon/paging")
-    public Pagination<CouponDTO> getCouponPaging(@Valid CouponPagingParam param) {
-        return this.couponService.getCouponPaging(param);
-    }
-}

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

@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 @RestController
 @UnifiedResponseBody
-@PreAuthorize("isType('ADMIN')")
+@PreAuthorize("isBusiness('EMPLOYEE')")
 public class DepartmentController {
     @DubboReference
     private DepartmentService departmentService;

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

@@ -4,7 +4,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.Min;
 
 import com.chelvc.cloud.admin.copier.EmployeeCopier;
-import com.chelvc.cloud.admin.vo.MineVO;
+import com.chelvc.cloud.admin.vo.EmployeePersonalVO;
 import com.chelvc.cloud.uc.api.dto.EmployeeDTO;
 import com.chelvc.cloud.uc.api.dto.EmployeeDetailDTO;
 import com.chelvc.cloud.uc.api.param.EmployeeModifyParam;
@@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 @RestController
 @UnifiedResponseBody
-@PreAuthorize("isType('ADMIN')")
+@PreAuthorize("isBusiness('EMPLOYEE')")
 public class EmployeeController {
     @DubboReference
     private EmployeeService employeeService;
@@ -87,14 +87,14 @@ public class EmployeeController {
     }
 
     /**
-     * 获取当前员工信息
+     * 获取当前员工个人信息
      *
-     * @return 员工信息
+     * @return 员工个人信息
      */
     @GetMapping("/employee/mine")
-    public MineVO getMine() {
+    public EmployeePersonalVO getMine() {
         EmployeeDetailDTO employee = this.employeeService.getMine();
-        return EmployeeCopier.INSTANCE.employee2mine(employee);
+        return EmployeeCopier.INSTANCE.employee2personal(employee);
     }
 
     /**

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

@@ -1,111 +0,0 @@
-package com.chelvc.cloud.admin.controller;
-
-import com.chelvc.cloud.trade.api.dto.GoodsCategoryDTO;
-import com.chelvc.cloud.trade.api.param.GoodsCategoryModifyParam;
-import com.chelvc.cloud.trade.api.param.GoodsCategoryPagingParam;
-import com.chelvc.cloud.trade.api.param.GoodsCategoryQueryParam;
-import com.chelvc.cloud.trade.api.service.GoodsCategoryService;
-import com.chelvc.framework.base.annotation.UnifiedResponseBody;
-import com.chelvc.framework.base.model.Pagination;
-import com.chelvc.framework.base.util.ErrorUtils;
-import org.apache.dubbo.config.annotation.DubboReference;
-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 七仔
- * @Date 2023/4/4
- **/
-@Validated
-@RestController
-@UnifiedResponseBody
-public class GoodsCategoryController {
-    @DubboReference
-    private GoodsCategoryService goodsCategoryService;
-
-    /**
-     * 新增商品分类
-     *
-     * @param param 新增参数
-     * @return 商品分类主键
-     */
-    @PostMapping("/goodsCategory")
-    public Long addGoodsCategory(@RequestBody @Valid GoodsCategoryModifyParam param) {
-        return this.goodsCategoryService.addGoodsCategory(param);
-    }
-
-    /**
-     * 修改商品分类
-     *
-     * @param id    商品分类主键
-     * @param param 修改参数
-     */
-    @PutMapping("/goodsCategory/{id}")
-    public void updateGoodsCategory(@PathVariable("id") @Min(value = 1, message = "商品分类主键不能小于1") Long id,
-                                    @RequestBody @Valid GoodsCategoryModifyParam param) {
-        this.goodsCategoryService.updateGoodsCategory(id, param);
-    }
-
-    /**
-     * 获取商品分类信息
-     *
-     * @param id 商品分类主键
-     * @return 商品分类信息
-     */
-    @GetMapping("/goodsCategory/{id}")
-    public GoodsCategoryDTO getGoodsCategory(@PathVariable("id") @Min(value = 1, message = "商品分类主键不能小于1")
-                                                        Long id) {
-        GoodsCategoryDTO goodsCategory = this.goodsCategoryService.getGoodsCategory(id);
-        ErrorUtils.requireResource(goodsCategory, "商品分类不存在");
-        return goodsCategory;
-    }
-
-    /**
-     * 查询商品分类分页
-     *
-     * @param param 查询参数
-     * @return 商品分类分页信息
-     */
-    @GetMapping("/goodsCategory/paging")
-    public Pagination<GoodsCategoryDTO> getGoodsCategoryPaging(@Valid GoodsCategoryPagingParam param) {
-        return this.goodsCategoryService.getGoodsCategoryPaging(param);
-    }
-
-    /**
-     * 查询商品分类树列表
-     *
-     * @param param 查询参数
-     * @return 商品分类树列表
-     */
-    @GetMapping("/goodsCategory/trees")
-    public List<GoodsCategoryDTO> listGoodsCategoryTrees(@Valid GoodsCategoryQueryParam param) {
-        return this.goodsCategoryService.listGoodsCategoryTrees(param);
-    }
-
-    /**
-     * 删除商品分类
-     *
-     * @param id    商品分类主键
-     */
-    @DeleteMapping("/goodsCategory/{id}")
-    public void deleteGoodsCategory(@PathVariable("id") @Min(value = 1, message = "商品分类主键不能小于1") Long id) {
-        this.goodsCategoryService.deleteGoodsCategory(id);
-    }
-
-    /**
-     * 启用/禁用商品分类
-     *
-     * @param id    商品分类主键
-     */
-    @PutMapping("/goodsCategory/{id}")
-    public void enableGoodsCategory(@PathVariable("id") @Min(value = 1, message = "商品分类主键不能小于1") Long id,
-                                     @RequestParam Boolean enableOperation) {
-        this.goodsCategoryService.enableGoodsCategory(id, enableOperation);
-    }
-}

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

@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 @RestController
 @UnifiedResponseBody
-@PreAuthorize("isType('ADMIN')")
+@PreAuthorize("isBusiness('EMPLOYEE')")
 public class MenuController {
     @DubboReference
     private MenuService menuService;

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

@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 @RestController
 @UnifiedResponseBody
-@PreAuthorize("isType('ADMIN')")
+@PreAuthorize("isBusiness('EMPLOYEE')")
 public class ResourceController {
     @DubboReference
     private ResourceService resourceService;

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

@@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 @RestController
 @UnifiedResponseBody
-@PreAuthorize("isType('ADMIN')")
+@PreAuthorize("isBusiness('EMPLOYEE')")
 public class RoleController {
     @DubboReference
     private RoleService roleService;

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

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.admin.copier;
 
-import com.chelvc.cloud.admin.vo.MineVO;
+import com.chelvc.cloud.admin.vo.EmployeePersonalVO;
 import com.chelvc.cloud.uc.api.dto.EmployeeDetailDTO;
 import org.mapstruct.Builder;
 import org.mapstruct.Mapper;
@@ -20,10 +20,10 @@ public interface EmployeeCopier {
     EmployeeCopier INSTANCE = Mappers.getMapper(EmployeeCopier.class);
 
     /**
-     * 我的信息拷贝
+     * 个人信息拷贝
      *
      * @param employee 员工详细信息
-     * @return 我的信息
+     * @return 个人信息
      */
-    MineVO employee2mine(EmployeeDetailDTO employee);
+    EmployeePersonalVO employee2personal(EmployeeDetailDTO employee);
 }

src/main/java/com/chelvc/cloud/admin/vo/MineVO.java → src/main/java/com/chelvc/cloud/admin/vo/EmployeePersonalVO.java

@@ -12,7 +12,7 @@ import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
 /**
- * 我的信息
+ * 员工个人信息
  *
  * @author Woody
  * @date 2021/11/1
@@ -21,7 +21,7 @@ import lombok.experimental.SuperBuilder;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class MineVO implements Serializable {
+public class EmployeePersonalVO implements Serializable {
     /**
      * 主键
      */

src/main/resources/application-dev.yml

@@ -2,18 +2,19 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
+        server-addr: 47.108.128.78:6848
   redis:
-    host: localhost
-    port: 6379
+    host: 47.108.128.78
+    port: 7031
+    password: Chelvc@2023
 
 dubbo:
   registry:
-    address: nacos://localhost:8848
+    address: nacos://47.108.128.78:6848
 
 nacos:
   config:
-    server-addr: localhost:8848
+    server-addr: 47.108.128.78:6848
 
 platform:
   security:

src/main/resources/application-pre.yml

@@ -2,19 +2,19 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 172.17.0.3:8848
+        server-addr: 127.0.0.1:6848
   redis:
-    host: 172.17.0.2
-    port: 6379
+    host: 127.0.0.1
+    port: 7031
     password: Chelvc@2023
 
 dubbo:
   registry:
-    address: nacos://172.17.0.3:8848
+    address: nacos://127.0.0.1:6848
 
 nacos:
   config:
-    server-addr: 172.17.0.3:8848
+    server-addr: 127.0.0.1:6848
 
 platform:
   security:

src/main/resources/application-prod.yml

@@ -2,19 +2,19 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 172.17.0.3:8848
+        server-addr: 127.0.0.1:6848
   redis:
-    host: 172.17.0.2
-    port: 6379
+    host: 127.0.0.1
+    port: 7031
     password: Chelvc@2023
 
 dubbo:
   registry:
-    address: nacos://172.17.0.3:8848
+    address: nacos://127.0.0.1:6848
 
 nacos:
   config:
-    server-addr: 172.17.0.3:8848
+    server-addr: 127.0.0.1:6848
 
 platform:
   security:

src/main/resources/application-test.yml

@@ -2,19 +2,19 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 172.17.0.3:8848
+        server-addr: 127.0.0.1:6848
   redis:
-    host: 172.17.0.2
-    port: 6379
+    host: 127.0.0.1
+    port: 7031
     password: Chelvc@2023
 
 dubbo:
   registry:
-    address: nacos://172.17.0.3:8848
+    address: nacos://127.0.0.1:6848
 
 nacos:
   config:
-    server-addr: 172.17.0.3:8848
+    server-addr: 127.0.0.1:6848
 
 platform:
   security:

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 10080
+  port: 10100
 
 spring:
   main:
@@ -29,7 +29,7 @@ nacos:
 dubbo:
   protocol:
     name: dubbo
-    port: 20080
+    port: 20100
   application:
     name: ${spring.application.name}
     register-mode: instance