Merge remote-tracking branch 'origin/liude' into V1.0.1

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

@@ -66,4 +66,15 @@ public class CategoryController {
     public Pagination<CategoryDTO> getCategoryPaging(@Valid CategoryPagingParam param) {
         return this.categoryService.getCategoryPaging(param);
     }
+
+
+    /**
+     * 删除分类
+     *
+     * @param id    分类主键
+     */
+    @GetMapping("/category/delete/{id}")
+    public void deleteCategory(@PathVariable("id") @Min(value = 1, message = "分类主键不能小于1") Long id) {
+        this.categoryService.deleteCategory(id);
+    }
 }

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

@@ -0,0 +1,73 @@
+package com.chelvc.cloud.admin.controller;
+
+import com.chelvc.cloud.vehicle.api.dto.CouponDTO;
+import com.chelvc.cloud.vehicle.api.param.CouponModifyParam;
+import com.chelvc.cloud.vehicle.api.param.CouponPagingParam;
+import com.chelvc.cloud.vehicle.api.service.CouponService;
+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;
+
+/**
+ * 商品优惠券接口
+ *
+ * @author liude
+ * @Date 2023/8/29
+ **/
+@Validated
+@RestController
+@ResponseWrapping
+@PreAuthorize("isBusiness('EMPLOYEE')")
+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    商品优惠券主键
+     */
+    @PutMapping("/coupon/delete/{id}")
+    public void deleteCoupon(@PathVariable("id") @Min(value = 1, message = "商品优惠券主键不能小于1") Long id) {
+        this.couponService.deleteCoupon(id);
+    }
+
+    /**
+     * 查询商品优惠券分页
+     *
+     * @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/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.EmployeePersonalVO;
+import com.chelvc.cloud.admin.vo.PersonalVO;
 import com.chelvc.cloud.uc.api.dto.EmployeeDTO;
 import com.chelvc.cloud.uc.api.dto.EmployeeDetailDTO;
 import com.chelvc.cloud.uc.api.param.EmployeeModifyParam;
@@ -66,7 +66,7 @@ public class EmployeeController {
      * @return 员工个人信息
      */
     @GetMapping("/employee/mine")
-    public EmployeePersonalVO getMine() {
+    public PersonalVO getPersonal() {
         EmployeeDetailDTO employee = this.employeeService.getMine();
         return EmployeeCopier.INSTANCE.employee2personal(employee);
     }

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

@@ -0,0 +1,73 @@
+package com.chelvc.cloud.admin.controller;
+import com.chelvc.cloud.vehicle.api.dto.GoodsDTO;
+import com.chelvc.cloud.vehicle.api.param.GoodsModifyParam;
+import com.chelvc.cloud.vehicle.api.param.GoodsPagingParam;
+import com.chelvc.cloud.vehicle.api.service.GoodsService;
+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;
+
+/**
+ * 商品接口
+ *
+ * @author liude
+ * @Date 2023/8/29
+ **/
+@Validated
+@RestController
+@ResponseWrapping
+@PreAuthorize("isBusiness('EMPLOYEE')")
+public class GoodsController {
+    @DubboReference
+    private GoodsService goodsService;
+
+    /**
+     * 新增商品
+     *
+     * @param param 新增参数
+     * @return 商品主键
+     */
+    @PostMapping("/goods")
+    public Long addGoods(@RequestBody @Valid GoodsModifyParam param) {
+        return this.goodsService.addGoods(param);
+    }
+
+    /**
+     * 修改商品
+     *
+     * @param id    商品主键
+     * @param param 修改参数
+     */
+    @PutMapping("/goods/{id}")
+    public void updateGoods(@PathVariable("id") @Min(value = 1, message = "商品主键不能小于1") Long id,
+                               @RequestBody @Valid GoodsModifyParam param) {
+        this.goodsService.updateGoods(id, param);
+    }
+
+    /**
+     * 删除商品
+     *
+     * @param id    商品主键
+     */
+    @PutMapping("/goods/delete/{id}")
+    public void deleteGoods(@PathVariable("id") @Min(value = 1, message = "商品主键不能小于1") Long id) {
+        this.goodsService.deleteGoods(id);
+    }
+
+    /**
+     * 查询商品分页
+     *
+     * @param param 查询参数
+     * @return 商品分页信息
+     */
+    @GetMapping("/goods/paging")
+    public Pagination<GoodsDTO> getGoodsPaging(@Valid GoodsPagingParam param) {
+        return this.goodsService.getGoodsPaging(param);
+    }
+}

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

@@ -57,6 +57,16 @@ public class MenuController {
         this.menuService.updateMenu(id, param);
     }
 
+    /**
+     * 删除菜单
+     *
+     * @param id    菜单主键
+     */
+    @GetMapping("/menu/delete/{id}")
+    public void deleteMenu(@PathVariable("id") @Min(value = 1, message = "菜单主键不能小于1") Long id) {
+        this.menuService.deleteMenu(id);
+    }
+
     /**
      * 获取菜单信息
      *

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

@@ -59,6 +59,16 @@ public class RoleController {
         this.roleService.updateRole(id, param);
     }
 
+    /**
+     * 删除角色
+     *
+     * @param id    角色主键
+     */
+    @PutMapping("/role/delete/{id}")
+    public void deleteRole(@PathVariable("id") @Min(value = 1, message = "角色主键不能小于1") Long id) {
+        this.roleService.deleteRole(id);
+    }
+
     /**
      * 修改角色权限
      *

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.EmployeePersonalVO;
+import com.chelvc.cloud.admin.vo.PersonalVO;
 import com.chelvc.cloud.uc.api.dto.EmployeeDetailDTO;
 import org.mapstruct.Builder;
 import org.mapstruct.Mapper;
@@ -25,5 +25,5 @@ public interface EmployeeCopier {
      * @param employee 员工详细信息
      * @return 个人信息
      */
-    EmployeePersonalVO employee2personal(EmployeeDetailDTO employee);
+    PersonalVO employee2personal(EmployeeDetailDTO employee);
 }

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

@@ -21,7 +21,7 @@ import lombok.experimental.SuperBuilder;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class EmployeePersonalVO implements Serializable {
+public class PersonalVO implements Serializable {
     /**
      * 主键
      */

src/main/resources/application-dev.yml

@@ -20,3 +20,4 @@ platform:
   oauth:
     token:
       secret: oauth.token.secret@chelvc!@#2023
+      recheck: true

src/main/resources/application-pre.yml

@@ -20,3 +20,4 @@ platform:
   oauth:
     token:
       secret: oauth.token.secret@chelvc!@#2023
+      recheck: true

src/main/resources/application-prod.yml

@@ -20,3 +20,4 @@ platform:
   oauth:
     token:
       secret: oauth.token.secret@chelvc!@#2023
+      recheck: true

src/main/resources/application-test.yml

@@ -20,3 +20,4 @@ platform:
   oauth:
     token:
       secret: oauth.token.secret@chelvc!@#2023
+      recheck: true

src/main/resources/logback-spring.xml

@@ -34,7 +34,6 @@
 
 	<root level="info">
 		<appender-ref ref="CONSOLE_APPENDER"/>
-		<appender-ref ref="FILE_APPENDER"/>
 		<appender-ref ref="ASYNC_FILE_APPENDER"/>
 	</root>
 </configuration>