Merge remote-tracking branch 'origin/master'

pom.xml

@@ -20,10 +20,10 @@
         <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-upload.version>1.0.0-RELEASE</framework-upload.version>
         <framework-oauth.version>1.0.0-RELEASE</framework-oauth.version>
-        <framework-security.version>1.0.0-RELEASE</framework-security.version>
+        <framework-upload.version>1.0.0-RELEASE</framework-upload.version>
         <framework-location.version>1.0.0-RELEASE</framework-location.version>
+        <framework-security.version>1.0.0-RELEASE</framework-security.version>
     </properties>
 
     <dependencies>
@@ -47,11 +47,6 @@
             <artifactId>framework-redis</artifactId>
             <version>${framework-redis.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.chelvc.framework</groupId>
-            <artifactId>framework-upload</artifactId>
-            <version>${framework-upload.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.chelvc.framework</groupId>
             <artifactId>framework-oauth</artifactId>
@@ -59,13 +54,18 @@
         </dependency>
         <dependency>
             <groupId>com.chelvc.framework</groupId>
-            <artifactId>framework-security</artifactId>
-            <version>${framework-security.version}</version>
+            <artifactId>framework-upload</artifactId>
+            <version>${framework-upload.version}</version>
         </dependency>
         <dependency>
             <groupId>com.chelvc.framework</groupId>
             <artifactId>framework-location</artifactId>
             <version>${framework-location.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.chelvc.framework</groupId>
+            <artifactId>framework-security</artifactId>
+            <version>${framework-security.version}</version>
+        </dependency>
     </dependencies>
 </project>

src/main/java/com/chelvc/cloud/maintain/MaintainServer.java

@@ -2,6 +2,8 @@ package com.chelvc.cloud.maintain;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * 车辆服务启动类
@@ -9,6 +11,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @author 七仔
  * @date 2023/4/4
  */
+@EnableDiscoveryClient
+@EnableFeignClients(basePackages = "com.chelvc")
 @SpringBootApplication(scanBasePackages = "com.chelvc")
 public class MaintainServer {
     public static void main(String[] args) {

src/main/java/com/chelvc/cloud/maintain/controller/AttentionController.java

@@ -5,8 +5,8 @@ import com.chelvc.cloud.vehicle.api.dto.AttentionUserDTO;
 import com.chelvc.cloud.vehicle.api.param.QueryAttentionParam;
 import com.chelvc.cloud.vehicle.api.service.AttentionService;
 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 lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,7 +51,7 @@ public class AttentionController {
    * @date 2023/8/14 12:42
    */
   @GetMapping("/list")
-  public Pagination<AttentionUserDTO> page(PagedDTO page, @Validated QueryAttentionParam param) {
+  public Pagination<AttentionUserDTO> page(Paging page, @Validated QueryAttentionParam param) {
     return attentionService.page(page, param, SessionContextHolder.getId());
   }
 

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

@@ -0,0 +1,103 @@
+package com.chelvc.cloud.maintain.controller;
+
+import javax.validation.Valid;
+
+import com.chelvc.cloud.maintain.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.cloud.uc.api.service.UserService;
+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.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class AuthorizeController {
+    private final AuthorizeClient authorizeClient;
+    private final CaptchaSmsHandler captchaSmsHandler;
+
+    @DubboReference
+    private UserService userService;
+
+    /**
+     * 发送验证码短信
+     *
+     * @param param 手机号参数
+     * @return 短信会话信息
+     */
+    @Authorize(enabled = false)
+    @PostMapping("/sms/captcha")
+    public SmsSession sendCaptcha(@RequestBody @Valid MobileParam param) {
+        return this.captchaSmsHandler.send(param.getMobile());
+    }
+
+    /**
+     * 短信登陆
+     *
+     * @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/wechat")
+    public Authorization loginWithWechat(@RequestBody @Valid AuthorizeParam.Wechat param) {
+        return this.authorizeClient.authorize(param);
+    }
+
+    /**
+     * 令牌刷新
+     *
+     * @param param 刷新参数
+     * @return 认证信息
+     */
+    @Authorize(enabled = false)
+    @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);
+    }
+
+    /**
+     * 用户注销
+     */
+    @DeleteMapping("/unregister")
+    public void unregister() {
+        this.userService.unregister();
+    }
+}

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

@@ -4,13 +4,18 @@ import java.util.List;
 
 import com.chelvc.cloud.maintain.copier.CategoryCopier;
 import com.chelvc.cloud.maintain.vo.CategoryVO;
+import com.chelvc.cloud.vehicle.api.param.CategoryListParam;
 import com.chelvc.cloud.vehicle.api.service.CategoryService;
 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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+
 /**
  * 分类接口
  *
@@ -29,8 +34,8 @@ public class CategoryController {
      *
      * @return 分类信息列表
      */
-    @GetMapping("/categories")
-    public List<CategoryVO> listCategories() {
-        return CategoryCopier.INSTANCE.copying(this.categoryService.listActiveCategories());
+    @PostMapping("/categories")
+    public List<CategoryVO> listCategories(@RequestBody @Valid CategoryListParam param) {
+        return CategoryCopier.INSTANCE.copying(this.categoryService.listActiveCategories(param));
     }
 }

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

@@ -1,5 +1,9 @@
 package com.chelvc.cloud.maintain.controller;
 
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+
 import com.chelvc.cloud.maintain.copier.CouponCopier;
 import com.chelvc.cloud.maintain.vo.CouponVO;
 import com.chelvc.cloud.vehicle.api.constant.CouponClaimType;
@@ -21,11 +25,6 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * 优惠券接口
  *
@@ -70,7 +69,7 @@ public class CouponController {
      */
     @GetMapping("/coupon/{id}")
     public CouponVO getCoupon(@PathVariable("id") @Min(value = 1, message = "优惠券主键不能小于1") Long id) {
-        return this.convert(this.couponService.getCoupon(id));
+        return CouponCopier.INSTANCE.copying(this.couponService.getCoupon(id));
     }
 
     /**
@@ -88,15 +87,14 @@ public class CouponController {
         }
 
         // 构建优惠券信息
-        List<CouponVO> coupons = records.stream().map(this::convert).collect(Collectors.toList());
-        return pagination.convert(coupons);
+        return pagination.convert(CouponCopier.INSTANCE::copying);
     }
 
     /**
      * 根据商家ID查询优惠券分页
      *
      * @param merchantId 商家ID
-     * @param param 查询参数
+     * @param param      查询参数
      * @return 优惠券分页信息
      */
     @GetMapping("/coupon/{merchantId}/paging")
@@ -109,8 +107,7 @@ public class CouponController {
         }
 
         // 构建优惠券信息
-        List<CouponVO> coupons = records.stream().map(this::convert).collect(Collectors.toList());
-        return pagination.convert(coupons);
+        return pagination.convert(CouponCopier.INSTANCE::copying);
     }
 
     /**
@@ -129,20 +126,10 @@ public class CouponController {
     /**
      * 删除优惠券
      *
-     * @param id    优惠券主键
+     * @param id 优惠券主键
      */
     @DeleteMapping("/coupon/{id}")
     public void deleteCoupon(@PathVariable("id") @Min(value = 1, message = "优惠券主键不能小于1") Long id) {
 
     }
-
-    /**
-     * 转换优惠券
-     *
-     * @param coupon 优惠券DTO
-     * @return 优惠券VO
-     */
-    private CouponVO convert(CouponDTO coupon) {
-        return CouponCopier.INSTANCE.copying(coupon);
-    }
 }

src/main/java/com/chelvc/cloud/maintain/controller/DynamicEvaluateRecordController.java

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class DynamicEvaluateRecordController {
 
     @DubboReference
-    private final DynamicEvaluateRecordService iDynamicEvaluateRecordService;
+    private DynamicEvaluateRecordService iDynamicEvaluateRecordService;
 
     /**
      * 新增内容评价(点赞/踩)
@@ -36,6 +36,6 @@ public class DynamicEvaluateRecordController {
      */
     @PostMapping("/add")
     public void updateRecord(@Validated @RequestBody AddDynamicEvaluateRecordParam param) {
-        iDynamicEvaluateRecordService.updateRecord(param, SessionContextHolder.getId());
+        this.iDynamicEvaluateRecordService.updateRecord(param, SessionContextHolder.getId());
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/FileController.java

@@ -45,9 +45,7 @@ public class FileController {
         try {
             type = StringUtils.ifEmpty(file.getContentType(), MediaType::parseMediaType);
         } catch (Exception e) {
-            if (log.isDebugEnabled()) {
-                log.debug("Media type parse failed: {}", e.getMessage());
-            }
+            log.debug("Media type parse failed: {}", e.getMessage());
         }
         String value = StringUtils.ifEmpty(StringUtils.ifEmpty(type, MediaType::getType), String::toUpperCase);
         return ObjectUtils.ifNull(StringUtils.ifEmpty(value, Media::parse), Media.NORMAL);

src/main/java/com/chelvc/cloud/maintain/controller/IndexController.java

@@ -17,6 +17,7 @@ import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.location.Address;
 import com.chelvc.framework.location.LocationHandler;
+import com.chelvc.framework.oauth.annotation.Authorize;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -56,6 +57,7 @@ public class IndexController {
      *
      * @return 配置信息
      */
+    @Authorize(enabled = false)
     @GetMapping("/configuration")
     public ConfigurationVO getConfiguration() {
         return ConfigurationVO.builder().build();
@@ -67,6 +69,7 @@ public class IndexController {
      * @param point 经纬度（如：30.563443,104.009457），如果为空则根据IP获取位置信息
      * @return 位置信息
      */
+    @Authorize(enabled = false)
     @GetMapping("/location")
     public Address getLocation(@RequestParam(value = "point", required = false) String point) {
         if (StringUtils.isEmpty(point)) {
@@ -89,6 +92,7 @@ public class IndexController {
      * @param param 首页参数
      * @return 首页信息
      */
+    @Authorize(enabled = false)
     @GetMapping("/customer/index")
     public CustomerIndexVO getCustomerIndex(@Valid LocationQueryParam param) {
         CustomerIndexVO index = CustomerIndexVO.builder().build();

src/main/java/com/chelvc/cloud/maintain/controller/InformController.java

@@ -5,7 +5,7 @@ import com.chelvc.cloud.vehicle.api.dto.*;
 import com.chelvc.cloud.vehicle.api.service.InformService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.base.exception.ResourceUnavailableException;
+import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
 import lombok.RequiredArgsConstructor;

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

@@ -2,6 +2,7 @@ package com.chelvc.cloud.maintain.controller;
 
 import com.chelvc.cloud.maintain.copier.MerchantCopier;
 import com.chelvc.cloud.maintain.vo.SimpleMerchantVO;
+import com.chelvc.cloud.vehicle.api.constant.GoodsStatus;
 import com.chelvc.cloud.vehicle.api.dto.BalanceDetailDTO;
 import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
 import com.chelvc.cloud.vehicle.api.dto.MerchantDetailDTO;
@@ -9,6 +10,7 @@ import com.chelvc.cloud.vehicle.api.dto.MerchantRankDTO;
 import com.chelvc.cloud.vehicle.api.param.*;
 import com.chelvc.cloud.vehicle.api.service.BalanceDetailService;
 import com.chelvc.cloud.vehicle.api.service.FavoriteService;
+import com.chelvc.cloud.vehicle.api.service.GoodsService;
 import com.chelvc.cloud.vehicle.api.service.MerchantService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import com.chelvc.framework.base.context.SessionContextHolder;
@@ -18,10 +20,12 @@ 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.RestController;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 /**
@@ -42,6 +46,8 @@ public class MerchantController {
 
     @DubboReference
     private BalanceDetailService balanceDetailService;
+    @DubboReference
+    private GoodsService goodsService;
 
     /**
      * 获取商家列表
@@ -118,4 +124,38 @@ public class MerchantController {
         return this.merchantService.getUserMineCartPaging(param);
     }
 
+
+    /**
+     * 上架商品
+     *
+     * @param goodsIds    商品ID集合
+     */
+    @PutMapping("/merchant/list-goods/{goodsIds}")
+    public void listGoods(@PathVariable("goodsIds") @NotEmpty(message = "商品ID不能为空") List<Long> goodsIds) {
+        this.goodsService.updateGoodsStatus(goodsIds, GoodsStatus.ONLINE);
+    }
+
+    /**
+     * 下架商品
+     *
+     * @param goodsIds    商品ID集合
+     */
+    @PutMapping("/merchant/delist-goods/{goodsIds}")
+    public void delistGoods(@PathVariable("goodsIds") @NotEmpty(message = "商品ID不能为空") List<Long> goodsIds) {
+        this.goodsService.updateGoodsStatus(goodsIds, GoodsStatus.OFFLINE);
+    }
+
+
+    /**
+     * 修改商家营业状态
+     *
+     * @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);
+    }
+
 }

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

@@ -80,4 +80,28 @@ public class ReservationController {
     public void deleteReservation(@PathVariable("id") @Min(value = 1, message = "预约主键不能小于1") Long id) {
         this.reservationService.deleteReservation(id);
     }
+
+
+
+    /**
+     * 查询商家被预约列表
+     *
+     * @param param 查询参数
+     * @return 商家被预约列表
+     */
+    @PostMapping("/listMerchantReservations")
+    public List<ReservationVO> listMerchantReservations(@RequestBody @Valid ReservationQueryParam param) {
+        List<ReservationDTO> reservations = this.reservationService.listMerchantReservations(param);
+        if (CollectionUtils.isEmpty(reservations)) {
+            return Collections.emptyList();
+        }
+        return reservations
+                .stream()
+                .map(o -> {
+                    ReservationVO reservationVO = ReservationCopier.INSTANCE.copying(o);
+                    reservationVO.setSimpleMerchantVO(MerchantCopier.INSTANCE
+                            .merchantDTOToSimpleMerchantVO(o.getMerchant()));
+                    return reservationVO;
+                }).collect(Collectors.toList());
+    }
 }

src/main/java/com/chelvc/cloud/maintain/controller/ScoreController.java

@@ -1,52 +0,0 @@
-package com.chelvc.cloud.maintain.controller;
-
-import com.chelvc.cloud.maintain.copier.ScoreCopier;
-import com.chelvc.cloud.maintain.vo.ScoreVO;
-import com.chelvc.cloud.uc.api.dto.ScoreDTO;
-import com.chelvc.cloud.uc.api.param.ScorePagingParam;
-import com.chelvc.cloud.uc.api.service.ScoreService;
-import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.common.model.Pagination;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.util.CollectionUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 积分接口
- *
- * @author qizai
- * @date 2023/9/6
- */
-@Validated
-@RestController
-@ResponseWrapping
-public class ScoreController {
-    @DubboReference
-    private ScoreService scoreService;
-
-    /**
-     * 查询用户积分明细分页信息
-     *
-     * @param param 查询参数
-     * @return 积分明细分页信息
-     */
-    @GetMapping("/score/paging")
-    public Pagination<ScoreVO> getCustomerScorePaging(@Valid ScorePagingParam param) {
-        Pagination<ScoreDTO> pagination = this.scoreService.getScorePaging(param);
-        List<ScoreDTO> records = pagination.getRecords();
-        if (CollectionUtils.isEmpty(records)) {
-            return Pagination.empty();
-        }
-
-        // 构建积分明细信息
-        List<ScoreVO> scoreDetails = records.stream().map(o -> ScoreCopier.INSTANCE.copying(o))
-                .collect(Collectors.toList());
-        return pagination.convert(scoreDetails);
-    }
-}

src/main/java/com/chelvc/cloud/maintain/controller/SignController.java

@@ -1,30 +0,0 @@
-package com.chelvc.cloud.maintain.controller;
-
-import com.chelvc.cloud.uc.api.service.SignService;
-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.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 签到接口
- *
- * @author Woody
- * @date 2023/5/7
- */
-@Validated
-@RestController
-@ResponseWrapping
-public class SignController {
-    @DubboReference
-    private SignService signService;
-
-    /**
-     * 用户签到
-     */
-    @PostMapping("/sign")
-    public void sign() {
-        this.signService.sign();
-    }
-}

src/main/java/com/chelvc/cloud/maintain/controller/SmsController.java

@@ -1,40 +0,0 @@
-package com.chelvc.cloud.maintain.controller;
-
-import com.chelvc.cloud.uc.api.param.MobileParam;
-import com.chelvc.framework.base.annotation.ResponseWrapping;
-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.context.annotation.Lazy;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-
-/**
- * 短信接口
- *
- * @author Woody
- * @date 2023/3/28
- */
-@Validated
-@RestController
-@ResponseWrapping
-@RequiredArgsConstructor(onConstructor = @__({@Autowired, @Lazy}))
-public class SmsController {
-    private final CaptchaSmsHandler captchaSmsHandler;
-
-    /**
-     * 发送验证码短信
-     *
-     * @param param 手机号参数
-     * @return 短信会话信息
-     */
-    @PostMapping("/sms/captcha")
-    public SmsSession captcha(@RequestBody @Valid MobileParam param) {
-        return this.captchaSmsHandler.send(param.getMobile());
-    }
-}

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

@@ -3,18 +3,13 @@ package com.chelvc.cloud.maintain.controller;
 import javax.validation.Valid;
 
 import com.chelvc.cloud.maintain.copier.UserCopier;
-import com.chelvc.cloud.maintain.vo.UserVO;
-import com.chelvc.cloud.uc.api.dto.UserDTO;
-import com.chelvc.cloud.uc.api.param.UserModifyParam;
+import com.chelvc.cloud.maintain.vo.PersonalVO;
+import com.chelvc.cloud.uc.api.param.PersonalModifyParam;
 import com.chelvc.cloud.uc.api.service.UserService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
-import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.base.util.ResourceUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
-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;
@@ -33,32 +28,22 @@ public class UserController {
     private UserService userService;
 
     /**
-     * 注销当前用户
-     */
-    @DeleteMapping("/user/mine/unregister")
-    public void unregister() {
-        this.userService.unregister();
-    }
-
-    /**
-     * 获取用户信息
+     * 获取用户个人信息
      *
-     * @return 用户信息
+     * @return 用户个人信息
      */
-    @GetMapping("/user/info")
-    public UserVO getUserInfo() {
-        UserDTO user = this.userService.getUser(SessionContextHolder.getId());
-        ResourceUtils.required(user, "用户不存在");
-        return UserCopier.INSTANCE.copying(user);
+    @GetMapping("/user/mine")
+    public PersonalVO getPersonal() {
+        return UserCopier.INSTANCE.copying(this.userService.getPersonal());
     }
 
     /**
-     * 修改用户信息
+     * 修改用户个人信息
      *
      * @param param 修改参数
      */
-    @PostMapping("/user/updateUser")
-    public void updateUser(@RequestBody @Valid UserModifyParam param) {
-        this.userService.updateUser(param);
+    @PutMapping("/user/mine")
+    public void updatePersonal(@RequestBody @Valid PersonalModifyParam param) {
+        this.userService.updatePersonal(param);
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/UserCouponController.java

@@ -1,10 +1,14 @@
 package com.chelvc.cloud.maintain.controller;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+
 import com.chelvc.cloud.maintain.copier.UserCouponCopier;
-import com.chelvc.cloud.maintain.vo.CouponVO;
 import com.chelvc.cloud.maintain.vo.UserCouponVO;
 import com.chelvc.cloud.vehicle.api.dto.UserCouponDTO;
-import com.chelvc.cloud.vehicle.api.param.CouponPagingParam;
 import com.chelvc.cloud.vehicle.api.param.UserCouponPagingParam;
 import com.chelvc.cloud.vehicle.api.param.UserCouponQueryParam;
 import com.chelvc.cloud.vehicle.api.service.UserCouponService;
@@ -18,12 +22,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * 优惠券领取记录接口
  *
@@ -50,7 +48,6 @@ public class UserCouponController {
 
     /**
      * 自动领取优惠券
-     *
      */
     @PostMapping("/usercoupon/autoclaim")
     public void autoClaimCoupon() {
@@ -101,8 +98,7 @@ public class UserCouponController {
      */
     @GetMapping("/usercoupon/{id}")
     public UserCouponVO getUserCoupon(@PathVariable("id") @Min(value = 1, message = "优惠券领取记录主键不能小于1") Long id) {
-        UserCouponVO couponGain = this.convert(this.userCouponService.getUserCoupon(id));
-        return couponGain;
+        return UserCouponCopier.INSTANCE.copying(this.userCouponService.getUserCoupon(id));
     }
 
     /**
@@ -120,17 +116,6 @@ public class UserCouponController {
         }
 
         // 构建优惠券领取记录信息
-        List<UserCouponVO> couponGains = records.stream().map(this::convert).collect(Collectors.toList());
-        return pagination.convert(couponGains);
-    }
-
-    /**
-     * 转换优惠券领取记录
-     *
-     * @param userCoupon 优惠券领取记录DTO
-     * @return 优惠券领取记录VO
-     */
-    private UserCouponVO convert(UserCouponDTO userCoupon) {
-        return UserCouponCopier.INSTANCE.copying(userCoupon);
+        return pagination.convert(UserCouponCopier.INSTANCE::copying);
     }
 }

src/main/java/com/chelvc/cloud/maintain/copier/ScoreCopier.java

@@ -1,44 +0,0 @@
-package com.chelvc.cloud.maintain.copier;
-
-import com.chelvc.cloud.maintain.vo.ScoreVO;
-import com.chelvc.cloud.uc.api.dto.ScoreDTO;
-import org.mapstruct.Builder;
-import org.mapstruct.IterableMapping;
-import org.mapstruct.Mapper;
-import org.mapstruct.Named;
-import org.mapstruct.factory.Mappers;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 积分记录对象拷贝接口
- *
- * @author qizai
- * @Date 2023/9/6
- **/
-@Mapper(builder = @Builder(disableBuilder = true))
-public interface ScoreCopier {
-    /**
-     * 对象拷贝接口实例
-     */
-    ScoreCopier INSTANCE = Mappers.getMapper(ScoreCopier.class);
-
-    /**
-     * 积分记录拷贝
-     *
-     * @param score 积分记录
-     * @return 积分记录
-     */
-    @Named("dto2vo")
-    ScoreVO copying(ScoreDTO score);
-
-    /**
-     * 积分记录拷贝
-     *
-     * @param scores 积分记录集合
-     * @return 积分记录列表
-     */
-    @IterableMapping(qualifiedByName = "dto2vo")
-    List<ScoreVO> copying(Collection<ScoreDTO> scores);
-}

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

@@ -1,16 +1,18 @@
 package com.chelvc.cloud.maintain.copier;
 
+import java.util.Collection;
+import java.util.List;
+
+import com.chelvc.cloud.maintain.vo.PersonalVO;
 import com.chelvc.cloud.maintain.vo.UserVO;
 import com.chelvc.cloud.uc.api.dto.UserDTO;
+import com.chelvc.cloud.uc.api.dto.UserPersonalDTO;
 import org.mapstruct.Builder;
 import org.mapstruct.IterableMapping;
 import org.mapstruct.Mapper;
 import org.mapstruct.Named;
 import org.mapstruct.factory.Mappers;
 
-import java.util.Collection;
-import java.util.List;
-
 /**
  * 用户对象拷贝接口
  *
@@ -33,6 +35,14 @@ public interface UserCopier {
     @Named("dto2vo")
     UserVO copying(UserDTO user);
 
+    /**
+     * 用户个人信息拷贝
+     *
+     * @param personal 用户个人信息
+     * @return 用户个人信息
+     */
+    PersonalVO copying(UserPersonalDTO personal);
+
     /**
      * 用户信息拷贝
      *

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

@@ -0,0 +1,30 @@
+package com.chelvc.cloud.maintain.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/maintain/vo/CategoryVO.java

@@ -3,10 +3,7 @@ package com.chelvc.cloud.maintain.vo;
 import java.io.Serializable;
 import java.util.List;
 
-import com.chelvc.cloud.vehicle.api.constant.CategoryType;
 import com.chelvc.cloud.vehicle.api.dto.CategoryDTO;
-import com.chelvc.framework.base.jackson.EnumerationFormatSerializer;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -28,12 +25,6 @@ public class CategoryVO implements Serializable {
      */
     private Long id;
 
-    /**
-     * 分类类型
-     */
-    @JsonSerialize(using = EnumerationFormatSerializer.class)
-    private CategoryType type;
-
     /**
      * 分类图标
      */
@@ -47,4 +38,13 @@ public class CategoryVO implements Serializable {
      * 子集分类
      */
     private List<CategoryDTO> children;
+
+    /**
+     * 分类类型 分类类型 0-平台的分类 1-商家的分类
+     */
+    private String  type;
+    /**
+     * 商家ID
+     */
+    private Long merchantId;
 }

src/main/java/com/chelvc/cloud/maintain/vo/CouponVO.java

@@ -4,7 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.chelvc.cloud.vehicle.api.constant.CouponType;
-import com.chelvc.framework.base.jackson.EnumerationFormatSerializer;
+import com.chelvc.framework.common.serializer.JacksonEnumerateSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -35,7 +35,7 @@ public class CouponVO implements Serializable {
     /**
      * 优惠券类型
      */
-    @JsonSerialize(using = EnumerationFormatSerializer.class)
+    @JsonSerialize(using = JacksonEnumerateSerializer.class)
     private CouponType type;
 
     /**

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

@@ -0,0 +1,44 @@
+package com.chelvc.cloud.maintain.vo;
+
+import java.io.Serializable;
+
+import com.chelvc.cloud.uc.api.model.Gender;
+import com.chelvc.framework.common.serializer.JacksonEnumerateSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 用户个人信息
+ *
+ * @author Woody
+ * @date 2024/2/29
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PersonalVO implements Serializable {
+    /**
+     * 用户ID
+     */
+    private Long id;
+
+    /**
+     * 用户性别
+     */
+    @JsonSerialize(using = JacksonEnumerateSerializer.class)
+    private Gender gender;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+}

src/main/java/com/chelvc/cloud/maintain/vo/ReservationVO.java

@@ -30,6 +30,11 @@ public class ReservationVO implements Serializable {
      */
     private Long userId;
 
+    /**
+     * 用户名称
+     */
+    private String username;
+
     /**
      * 商家ID
      */

src/main/java/com/chelvc/cloud/maintain/vo/ScoreVO.java

@@ -1,51 +0,0 @@
-package com.chelvc.cloud.maintain.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 积分记录信息
- *
- * @Author qizai
- * @Date 2023/9/6
- */
-@Data
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ScoreVO implements Serializable {
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 用户ID
-     */
-    private Long userId;
-
-    /**
-     * 积分值
-     */
-    private Integer value;
-
-    /**
-     * 积分来源
-     */
-    private String origin;
-
-    /**
-     * 积分备注
-     */
-    private String remark;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-}

src/main/java/com/chelvc/cloud/maintain/vo/UserVO.java

@@ -1,8 +1,10 @@
 package com.chelvc.cloud.maintain.vo;
 
 import java.io.Serializable;
-import java.util.Date;
 
+import com.chelvc.cloud.uc.api.model.Gender;
+import com.chelvc.framework.common.serializer.JacksonEnumerateSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -25,9 +27,10 @@ public class UserVO implements Serializable {
     private Long id;
 
     /**
-     * 用户名
+     * 性别
      */
-    private String username;
+    @JsonSerialize(using = JacksonEnumerateSerializer.class)
+    private Gender gender;
 
     /**
      * 用户头像
@@ -38,24 +41,4 @@ public class UserVO implements Serializable {
      * 用户昵称
      */
     private String nickname;
-
-    /**
-     * 性别
-     */
-    private String gender;
-
-    /**
-     * 常用地
-     */
-    private String useCity;
-
-    /**
-     * 个人介绍
-     */
-    private String introduction;
-
-    /**
-     * 生日
-     */
-    private Date birthday;
 }

src/main/resources/application-dev.yml

@@ -17,13 +17,32 @@ nacos:
     server-addr: 47.108.128.78:6848
 
 oauth:
-  token:
-    secret: oauth.token.secret@chelvc!@#2023
-    recheck: true
+  secret: oauth.token.secret@chelvc!@#2023
+  clients:
+    - id: chelvc_client
+      secret: chelvc@secret#2023!
+      scopes: ADMIN,CUSTOMER,MERCHANT
+      grants: sms,wechat,password,refresh_token
+      access-token-timeout: 3600
+      refresh-token-timeout: 86400
+
 upload:
-  standard:
-    path: /home/chelvc/upload
-    domain: http://file.chelvc.com
+  clients:
+    - path: /home/chelvc/upload
+      domain: http://file.chelvc.com
+      channel: LOCAL
+
 location:
-  tencent:
-    key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+  caching:
+    enabled: true
+  clients:
+    - key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+      channel: TENCENT
+
+sms:
+  clients:
+    - id: LTAI5tAnS3tQqjpHdT1KqeUw
+      secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
+      template: SMS_274640619
+      signature: 车旅程
+      channel: ALIYUN

src/main/resources/application-pre.yml

@@ -17,13 +17,32 @@ nacos:
     server-addr: 127.0.0.1:6848
 
 oauth:
-  token:
-    secret: oauth.token.secret@chelvc!@#2023
-    recheck: true
+  secret: oauth.token.secret@chelvc!@#2023
+  clients:
+    - id: chelvc_client
+      secret: chelvc@secret#2023!
+      scopes: ADMIN,CUSTOMER,MERCHANT
+      grants: sms,wechat,password,refresh_token
+      access-token-timeout: 3600
+      refresh-token-timeout: 86400
+
 upload:
-  standard:
-    path: /home/chelvc/upload
-    domain: http://file.chelvc.com
+  clients:
+    - path: /home/chelvc/upload
+      domain: http://file.chelvc.com
+      channel: LOCAL
+
 location:
-  tencent:
-    key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+  caching:
+    enabled: true
+  clients:
+    - key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+      channel: TENCENT
+
+sms:
+  clients:
+    - id: LTAI5tAnS3tQqjpHdT1KqeUw
+      secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
+      template: SMS_274640619
+      signature: 车旅程
+      channel: ALIYUN

src/main/resources/application-prod.yml

@@ -17,13 +17,32 @@ nacos:
     server-addr: 127.0.0.1:6848
 
 oauth:
-  token:
-    secret: oauth.token.secret@chelvc!@#2023
-    recheck: true
+  secret: oauth.token.secret@chelvc!@#2023
+  clients:
+    - id: chelvc_client
+      secret: chelvc@secret#2023!
+      scopes: ADMIN,CUSTOMER,MERCHANT
+      grants: sms,wechat,password,refresh_token
+      access-token-timeout: 3600
+      refresh-token-timeout: 86400
+
 upload:
-  standard:
-    path: /home/chelvc/upload
-    domain: http://file.chelvc.com
+  clients:
+    - path: /home/chelvc/upload
+      domain: http://file.chelvc.com
+      channel: LOCAL
+
 location:
-  tencent:
-    key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+  caching:
+    enabled: true
+  clients:
+    - key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+      channel: TENCENT
+
+sms:
+  clients:
+    - id: LTAI5tAnS3tQqjpHdT1KqeUw
+      secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
+      template: SMS_274640619
+      signature: 车旅程
+      channel: ALIYUN

src/main/resources/application-test.yml

@@ -17,13 +17,32 @@ nacos:
     server-addr: 127.0.0.1:6848
 
 oauth:
-  token:
-    secret: oauth.token.secret@chelvc!@#2023
-    recheck: true
+  secret: oauth.token.secret@chelvc!@#2023
+  clients:
+    - id: chelvc_client
+      secret: chelvc@secret#2023!
+      scopes: ADMIN,CUSTOMER,MERCHANT
+      grants: sms,wechat,password,refresh_token
+      access-token-timeout: 3600
+      refresh-token-timeout: 86400
+
 upload:
-  standard:
-    path: /home/chelvc/upload
-    domain: http://file.chelvc.com
+  clients:
+    - path: /home/chelvc/upload
+      domain: http://file.chelvc.com
+      channel: LOCAL
+
 location:
-  tencent:
-    key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+  caching:
+    enabled: true
+  clients:
+    - key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+      channel: TENCENT
+
+sms:
+  clients:
+    - id: LTAI5tAnS3tQqjpHdT1KqeUw
+      secret: xs6OZj6pyJLTcNBDjp6ikftVyKRXsk
+      template: SMS_274640619
+      signature: 车旅程
+      channel: ALIYUN

src/main/resources/application.yml

@@ -12,6 +12,8 @@ spring:
     time-zone: GMT+8
     serialization:
       write-dates-as-timestamps: true
+  messages:
+    basename: i18n/messages
   cloud:
     nacos:
       discovery:
@@ -40,8 +42,4 @@ dubbo:
     group: ${spring.profiles.active}
     check: false
     timeout: 10000
-    retries: 0
-
-oauth:
-  resource:
-    permit: "/**/sms/**,/**/index,/**/configuration,/**/categories"
+    retries: 0

src/main/resources/i18n/messages.properties

@@ -0,0 +1,9 @@
+ADMIN=管理端
+CUSTOMER=顾客端
+MERCHANT=商家端
+Time.Deviated=请校准系统时间
+Token.Expired=当前会话已失效，请重新登陆
+Token.Changed=您的账号已在其他设备登陆
+Scope.Changed=您的应用已切换到【{0}】
+SMS.Count.Limit=短信发送次数已达上限
+SMS.Frequency.Limit=短信发送过于频繁，请稍后再试

src/main/resources/logback-spring.xml

@@ -4,8 +4,9 @@
 
 	<springProperty name="LOG_PATH" source="logging.path" defaultValue="./"/>
 
+	<turboFilter class="com.chelvc.framework.base.interceptor.DynamicLoggingInterceptor"/>
+
 	<appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
-		<filter class="com.chelvc.framework.base.interceptor.DynamicLoggingInterceptor"/>
 		<encoder>
 			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger: %msg%n</pattern>
 			<charset>UTF-8</charset>
@@ -14,7 +15,6 @@
 
 	<appender name="FILE_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${LOG_PATH}/maintain.log</file>
-		<filter class="com.chelvc.framework.base.interceptor.DynamicLoggingInterceptor"/>
 		<encoder>
 			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger: %msg%n</pattern>
 			<charset>UTF-8</charset>