From c80c0184b6e560d41d5aa5691874e07b681fa18f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 一月 2025 18:41:24 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java |  341 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 257 insertions(+), 84 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
index 3a6752e..83f0fd9 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -16,12 +16,11 @@
 import com.ruoyi.account.util.carBrand.CarBrandUtil;
 import com.ruoyi.account.wx.model.WeixinProperties;
 import com.ruoyi.common.core.constant.Constants;
+import com.ruoyi.common.core.constant.MsgConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.dto.PointChangeDto;
 import com.ruoyi.common.core.enums.status.AppUserStatusEnum;
-import com.ruoyi.common.core.utils.JwtUtils;
-import com.ruoyi.common.core.utils.OrderCodeUtil;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.*;
 import com.ruoyi.common.core.utils.bean.BeanUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.domain.BasePojo;
@@ -30,6 +29,8 @@
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.log.enums.OperatorType;
 import com.ruoyi.common.redis.service.RedisService;
+import com.ruoyi.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.common.security.auth.AuthUtil;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.common.security.utils.SecurityUtils;
@@ -46,6 +47,7 @@
 import com.ruoyi.other.api.feignClient.IntegralRuleClient;
 import com.ruoyi.other.api.feignClient.OtherClient;
 import com.ruoyi.other.api.feignClient.VipClient;
+import com.ruoyi.system.api.model.LoginUser;
 import com.ruoyi.system.api.model.LoginUserApplet;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -164,7 +166,7 @@
     }
     
     
-    
+    @RequiresPermissions(value = {"/company"}, logical = Logical.OR)
     @ApiOperation(value = "单位管理列表", tags = {"用户管理-单位管理"})
     @PostMapping(value = "/unit/page")
     public R<Page<TCompany>> unitPage(@RequestBody UnitListQueryDto unitListQueryDto) {
@@ -177,8 +179,10 @@
         }
         return R.ok(data);
     }
-
-
+    
+    
+    
+    @RequiresPermissions(value = {"/appUser/list", "/appUser/add", "/appUser/update", "/appUser/updateCompany"}, logical = Logical.OR)
     @ApiOperation(value = "单位下拉框", tags = {"用户管理-单位管理"})
     @GetMapping(value = "/unit/select")
     public R<List<TCompany>> unitSelect() {
@@ -190,8 +194,10 @@
 
         return R.ok(pageR.getData().getRecords());
     }
-
-
+    
+    
+    
+    @RequiresPermissions(value = {"/company/add", "/company/update"}, logical = Logical.OR)
     @ApiOperation(value = "单位管理添加或编辑", tags = {"用户管理-单位管理"})
     @PostMapping(value = "/unit/addOrUpdate")
     @Log(title = "【单位管理】添加或编辑单位", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@@ -200,10 +206,10 @@
        otherClient.unitAddorUpadate(tCompany);
         return R.ok();
     }
-
-
-
-
+    
+    
+    
+    @RequiresPermissions(value = {"/company/del"}, logical = Logical.OR)
     @ApiOperation(value = "单位管理删除", tags = {"用户管理-单位管理"})
     @DeleteMapping(value = "/unit/delete")
     @Log(title = "【单位管理】删除单位", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@@ -219,8 +225,9 @@
         return R.ok();
 
     }
-
-
+    
+    
+    @RequiresPermissions(value = {"/appUser/list"}, logical = Logical.OR)
     @ApiOperation(value = "用户列表", tags = {"用户管理-用户列表"})
     @PostMapping(value = "/user/page")
     public R<Page<TAppUser>> userPage(@RequestBody UserListQueryDto userListQueryDto) {
@@ -284,7 +291,9 @@
         }
         return R.ok(page);
     }
-
+    
+    
+    @RequiresPermissions(value = {"/vipList"}, logical = Logical.OR)
     @ApiOperation(value = "会员列表", tags = {"用户管理-会员列表"})
     @PostMapping(value = "/user/vip/page")
     public R<Page<TAppUser>> vipPage(@RequestBody UserListQueryDto userListQueryDto) {
@@ -350,7 +359,9 @@
         }
         return R.ok(page);
     }
-
+    
+    
+    @RequiresPermissions(value = {"/coupon/send"}, logical = Logical.OR)
     @ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券发放-选择人员")
     @PostMapping("/choiceUser")
     public R<Page<TAppUser>> choiceUser(@RequestBody ChoiceUserListQueryDto userListQueryDto) {
@@ -406,8 +417,9 @@
         }
         return R.ok(page);
     }
-
-
+    
+    
+    @RequiresPermissions(value = {"/appUser/add", "/appUser/update"}, logical = Logical.OR)
     @ApiOperation(value = "用户添加编辑", tags = {"用户管理-用户列表"})
     @PostMapping(value = "/user/addOrUpdate")
     @Log(title = "【用户列表】添加编辑用户", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@@ -454,7 +466,9 @@
         appUserService.saveOrUpdate(tAppUser);
         return R.ok();
     }
-
+    
+    
+    @RequiresPermissions(value = {"/appUser/select", "/vipList/select"}, logical = Logical.OR)
     @ApiOperation(value = "用户详情", tags = {"用户管理-用户列表"})
     @GetMapping(value = "/user/detail/{id}")
     public R<UserDetailDto> userDetail(@PathVariable Long id) {
@@ -489,8 +503,9 @@
 
         return R.ok(userDetailDto);
     }
-
-    @ApiOperation(value = "用户详情积分明细", tags = {"后台-用户管理-用户列表","小程序-个人中心"})
+    
+    @RequiresPermissions(value = {"/appUser/select", "/vipList/select"}, logical = Logical.OR)
+    @ApiOperation(value = "用户详情积分明细", tags = {"后台-用户管理-用户列表"})
     @PostMapping(value = "/user/points/page")
     public R<Page<TAppUserIntegralChange>> pointsDetail(@RequestBody PointsQueryDto pointsQueryDto) {
         if (pointsQueryDto.getUserId()==null){
@@ -539,20 +554,81 @@
         return R.ok(page);
 
     }
+    
+    
+    
+    @ApiOperation(value = "用户详情积分明细", tags = {"小程序-个人中心"})
+    @PostMapping(value = "/user/points/page1")
+    public R<Page<TAppUserIntegralChange>> pointsDetail1(@RequestBody PointsQueryDto pointsQueryDto) {
+        if (pointsQueryDto.getUserId()==null){
+            pointsQueryDto.setUserId(tokenService.getLoginUserApplet().getUserId());
+        }
+        List<Integer> types = new ArrayList<>();
+        if (pointsQueryDto.getType()==null){
+            types.add(1);
+            types.add(2);
+            types.add(3);
+            types.add(4);
+            types.add(5);
+            types.add(6);
+        }else if (pointsQueryDto.getType()==1){
+            types.add(1);
+            types.add(2);
+            types.add(3);
+            types.add(4);
+            types.add(5);
+        }else if (pointsQueryDto.getType()==2){
+            types.add(6);
+        }
+        Page<TAppUserIntegralChange> page = integralChangeService.lambdaQuery()
+                .eq(TAppUserIntegralChange::getAppUserId, pointsQueryDto.getUserId())
+                .orderByDesc(TAppUserIntegralChange::getCreateTime)
+                .eq(pointsQueryDto.getChangeType() != null, TAppUserIntegralChange::getChangeType, pointsQueryDto.getChangeType())
+                .in(!types.isEmpty(), TAppUserIntegralChange::getChangeType, types).page(Page.of(pointsQueryDto.getPageCurr(), pointsQueryDto.getPageSize()));
+        
+        for (TAppUserIntegralChange record : page.getRecords()) {
+            record.setDateTime(record.getCreateTime());
+            record.setUid(record.getId().toString());
+            if (record.getChangeType()==2||record.getChangeType()==3){
+                R<TChargingOrder> tChargingOrderR = chargingOrderClient.orderDetail(Long.valueOf(record.getExtension()));
+                if (tChargingOrderR.getData()!=null) {
+                    record.setOrderNum(tChargingOrderR.getData().getCode());
+                }
+            }
+            if (record.getChangeType()==6){
+                R<TExchangeOrder> tExchangeOrderR = exchangeOrderClient.orderDetail(Long.valueOf(record.getExtension()));
+                if (tExchangeOrderR.getData()!=null){
+                    record.setOrderNum(tExchangeOrderR.getData().getCode());
+                }
+            }
+        }
+        
+        return R.ok(page);
+        
+    }
+    
 
     @ApiOperation(value = "积分详情", tags = {"小程序-个人中心"})
     @GetMapping(value = "/user/points/detail")
     public R<TAppUserIntegralChange> pointsDetail(String id) {
         TAppUserIntegralChange byId = integralChangeService.getById(id);
+        Long userId = tokenService.getLoginUserApplet().getUserId();
+        if(!byId.getAppUserId().equals(userId)){
+            return R.fail("权限不足");
+        }
         if (byId.getChangeType()==6) {
             TExchangeOrder data = exchangeOrderClient.orderDetail(Long.valueOf(byId.getExtension())).getData();
             if (data != null) {
                 byId.setGoodType(data.getOrderType());
             }
+        }else if (byId.getChangeType()==4){
+            TAppUser byId1 = appUserService.getById(byId.getExtension());
+            byId.setExtension(byId1.getPhone());
         }
         return R.ok(byId);
     }
-
+    
+    @RequiresPermissions(value = {"/appUser/freeze"}, logical = Logical.OR)
     @ApiOperation(value = "冻结解冻用户", tags = {"后台-用户管理-用户列表"})
     @PostMapping(value = "/user/status/change")
     @Log(title = "【用户列表】冻结解冻用户", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@@ -563,7 +639,9 @@
         appUserService.updateById(appUser);
         return R.ok();
     }
-
+    
+    
+    @RequiresPermissions(value = {"/appUser/updateCompany"}, logical = Logical.OR)
     @ApiOperation(value = "修改单位", tags = {"后台-用户管理-用户列表"})
     @PostMapping(value = "/user/unit/change")
     @Log(title = "【用户列表】修改用户单位", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@@ -575,7 +653,9 @@
         }
     return R.ok();
     }
-
+    
+    
+    @RequiresPermissions(value = {"/appUser/del"}, logical = Logical.OR)
     @ApiOperation(value = "删除用户", tags = {"后台-用户管理-用户列表"})
     @DeleteMapping(value = "/user/delete")
     @Log(title = "【用户列表】删除用户", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@@ -613,10 +693,6 @@
             appUserInfoDto.setVipCouponNum(count);
             appUserInfoDto.setIsVip(1);
             appUserInfoDto.setVipExpireTime(byId.getVipEndTime());
-
-
-
-
         }
         //判断当天是否签到
         Long count = signService.lambdaQuery().eq(TAppUserSign::getAppUserId,userId).eq(TAppUserSign::getSignDay, LocalDate.now()).count();
@@ -632,14 +708,7 @@
         appUserInfoDto.setUserCars(list);
         appUserInfoDto.setFirstAdd(byId.getFirstAdd()!=null?byId.getFirstAdd():0);
         appUserInfoDto.setPoints(byId.getPoints()==null?0:byId.getPoints());
-
-
-
-
-
         return R.ok(appUserInfoDto);
-
-
     }
 
 
@@ -650,9 +719,7 @@
         TAppUser byId = appUserService.getById(userId);
         byId.setAvatar(url);
         appUserService.updateById(byId);
-
         return R.ok();
-
     }
 
     @ApiOperation(value = "优惠卷列表不分页(1可使用2不可用)", tags = {"小程序-个人中心"})
@@ -714,47 +781,49 @@
     @PostMapping(value = "/user/coupon/getById")
     public R<TAppCoupon> couponGetById(@RequestParam("id")Long id) {
         TAppCoupon appCoupon = appCouponService.getById(id);
+        Long userId = tokenService.getLoginUserApplet().getUserId();
+        if(!appCoupon.getAppUserId().equals(userId)){
+            return R.fail("权限不足");
+        }
         appCoupon.setUid(id.toString());
         return R.ok(appCoupon);
     }
-
-
-
+    
+    
+    
+    @RequiresPermissions(value = {"/appUser/giftVip", "/appUser/gift_vip"}, logical = Logical.OR)
     @ApiOperation(value = "赠送会员", tags = {"用户管理-用户列表"})
     @PostMapping(value = "/user/give/vip")
     @Log(title = "【用户列表】赠送会员", businessType = BusinessType.OTHER,operatorType = OperatorType.MANAGE)
     public R giveVip(@RequestBody GiveVipDto  giveVipDto) {
         String[] split = giveVipDto.getUserIds().split(",");
         for (String s : split) {
-
-
-        TAppUser nowUser = appUserService.getById(s);
-
-        int plusDay = 0;
-        if (giveVipDto.getType() == 1) {
-            plusDay = 1;
-        } else if (giveVipDto.getType() == 2) {
-            plusDay = 3;
-        } else if (giveVipDto.getType() == 3) {
-            plusDay = 12;
-        }
+            TAppUser nowUser = appUserService.getById(s);
+            int plusDay = 0;
+            if (giveVipDto.getType() == 1) {
+                plusDay = 1;
+            } else if (giveVipDto.getType() == 2) {
+                plusDay = 3;
+            } else if (giveVipDto.getType() == 3) {
+                plusDay = 12;
+            }
             BigDecimal bigDecimal = new BigDecimal("0");
             TVip info = vipClient.getInfo1(giveVipDto.getVipId()).getData();
-        switch (giveVipDto.getType()){
-            case 1:
-                bigDecimal = bigDecimal.add(info.getMonthlyCard()==null?new BigDecimal(0):info.getMonthlyCard());
-                break;
-            case 2:
-                bigDecimal = bigDecimal.add(info.getSeasonCard()==null?new BigDecimal(0):info.getSeasonCard());
-                break;
-            case 3:
-                bigDecimal = bigDecimal.add(info.getAnnualCard()==null?new BigDecimal(0):info.getAnnualCard());
-                break;
-        }
+            switch (giveVipDto.getType()){
+                case 1:
+                    bigDecimal = bigDecimal.add(info.getMonthlyCard()==null?new BigDecimal(0):info.getMonthlyCard());
+                    break;
+                case 2:
+                    bigDecimal = bigDecimal.add(info.getSeasonCard()==null?new BigDecimal(0):info.getSeasonCard());
+                    break;
+                case 3:
+                    bigDecimal = bigDecimal.add(info.getAnnualCard()==null?new BigDecimal(0):info.getAnnualCard());
+                    break;
+            }
             //增加vipDetail
-        giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay,giveVipDto.getType());
-        appUserService.updateById(nowUser);
-        // 新增后台赠送记录
+            giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay,giveVipDto.getType());
+            appUserService.updateById(nowUser);
+            // 新增后台赠送记录
             TGrantVip tGrantVip = new TGrantVip();
             tGrantVip.setCode(OrderCodeUtil.getOrderCode("ZS"));
             tGrantVip.setAppUserId(nowUser.getId());
@@ -766,6 +835,51 @@
         }
         return R.ok();
     }
+    
+    
+    
+    @PostMapping(value = "/user/give/vip1")
+    public R giveVip1(@RequestBody GiveVipDto  giveVipDto) {
+        String[] split = giveVipDto.getUserIds().split(",");
+        for (String s : split) {
+            TAppUser nowUser = appUserService.getById(s);
+            int plusDay = 0;
+            if (giveVipDto.getType() == 1) {
+                plusDay = 1;
+            } else if (giveVipDto.getType() == 2) {
+                plusDay = 3;
+            } else if (giveVipDto.getType() == 3) {
+                plusDay = 12;
+            }
+            BigDecimal bigDecimal = new BigDecimal("0");
+            TVip info = vipClient.getInfo1(giveVipDto.getVipId()).getData();
+            switch (giveVipDto.getType()){
+                case 1:
+                    bigDecimal = bigDecimal.add(info.getMonthlyCard()==null?new BigDecimal(0):info.getMonthlyCard());
+                    break;
+                case 2:
+                    bigDecimal = bigDecimal.add(info.getSeasonCard()==null?new BigDecimal(0):info.getSeasonCard());
+                    break;
+                case 3:
+                    bigDecimal = bigDecimal.add(info.getAnnualCard()==null?new BigDecimal(0):info.getAnnualCard());
+                    break;
+            }
+            //增加vipDetail
+            giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay,giveVipDto.getType());
+            appUserService.updateById(nowUser);
+            // 新增后台赠送记录
+            TGrantVip tGrantVip = new TGrantVip();
+            tGrantVip.setCode(OrderCodeUtil.getOrderCode("ZS"));
+            tGrantVip.setAppUserId(nowUser.getId());
+            tGrantVip.setVipId(giveVipDto.getVipId());
+            tGrantVip.setOrderAmount(bigDecimal);
+            tGrantVip.setCreateTime(LocalDateTime.now());
+            tGrantVip.setAppUserId(nowUser.getId());
+            orderClient.managementGiveVip(tGrantVip);
+        }
+        return R.ok();
+    }
+    
 
     @ApiOperation(value = "已赠送列表", tags = {"小程序-个人中心-邀请好友"})
     @PostMapping(value = "/user/invite/page")
@@ -811,9 +925,13 @@
         }
         // 获取当前用户信息
         Long userId = tokenService.getLoginUserApplet().getUserId();
-        TAppUser appUser = appUserService.getById(userId);
-        appUser.setPhone(dto.getPhone());
-        appUserService.updateById(appUser);
+        TAppUser appUser = appUserService.getOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, dto.getPhone()).eq(TAppUser::getDelFlag, 0).eq(TAppUser::getStatus, 3));
+        if (Objects.nonNull(appUser)){
+            return AjaxResult.error("手机号已使用,请更换其他手机号");
+        }
+        TAppUser appUser1 = appUserService.getById(userId);
+        appUser1.setPhone(dto.getPhone());
+        appUserService.updateById(appUser1);
         return AjaxResult.success();
     }
 
@@ -1015,7 +1133,13 @@
     @ApiOperation(value = "添加编辑车辆", tags = {"小程序-个人中心-车辆"})
     @PostMapping(value = "/user/car/addOrUpdate")
     public R carAdd(@RequestBody TAppUserCar appUserCar) {
-
+        if(null != appUserCar.getId()){
+            TAppUserCar userCar = appUserCarService.getById(appUserCar.getId());
+            Long userId = tokenService.getLoginUserApplet().getUserId();
+            if(!userCar.getAppUserId().equals(userId)){
+                return R.fail("权限不足");
+            }
+        }
         LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet();
         Long userId = loginUserApplet.getUserId();
         TAppUser byId = appUserService.getById(userId);
@@ -1038,43 +1162,41 @@
         if (count==0){
             R<TIntegralRule> set = integralRuleClient.getSet();
             TIntegralRule data = set.getData();
-            JSONObject jsonObject = JSON.parseObject(data.getAddVehiclesEarnsPoints());
-
-
-            Integer point = 0;
-            //增加车牌50分,必填
+            if(null != data){
+                JSONObject jsonObject = JSON.parseObject(data.getAddVehiclesEarnsPoints());
+                Integer point = 0;
+                //增加车牌50分,必填
                 point = point+jsonObject.getInteger("num1");
                 if (doubleVip){
                     point = point+jsonObject.getInteger("num1");
                 }
-            //增加车型分
+                //增加车型分
                 if (StringUtils.isNotEmpty(appUserCar.getVehicleModel())){
                     point = point+jsonObject.getInteger("num2");
                     if (doubleVip){
                         point = point+jsonObject.getInteger("num2");
                     }
                 }
-            //增加车辆用途分
+                //增加车辆用途分
                 if (StringUtils.isNotEmpty(appUserCar.getVehicleUse())){
                     point = point+jsonObject.getInteger("num3");
                     if (doubleVip){
                         point = point+jsonObject.getInteger("num3");
                     }
                 }
-            //增加续航分
+                //增加续航分
                 if (StringUtils.isNotEmpty(appUserCar.getEndurance())){
                     point = point+jsonObject.getInteger("num4");
                     if (doubleVip){
                         point = point+jsonObject.getInteger("num4");
                     }
                 }
-
-            //增加积分记录
-            pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+point,5,userId,appUserCar.getLicensePlate(),"","");
-            byId.setPoints(byId.getPoints()+point);
+    
+                //增加积分记录
+                pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+point,5,userId,appUserCar.getLicensePlate(),"","");
+                byId.setPoints(byId.getPoints()+point);
+            }
             byId.setFirstAdd(1);
-
-
         }
         CarNumDto carNumDto = CarUtil.carNum(appUserCar.getLicensePlate());
         if (carNumDto==null){
@@ -1093,6 +1215,11 @@
     @ApiOperation(value = "添加编辑车辆", tags = {"小程序-个人中心-车辆"})
     @GetMapping(value = "/user/car/delete")
     public R carDelete(String id) {
+        TAppUserCar appUserCar = appUserCarService.getById(id);
+        Long userId = tokenService.getLoginUserApplet().getUserId();
+        if(!appUserCar.getAppUserId().equals(userId)){
+            return R.fail("权限不足");
+        }
         boolean b = appUserCarService.removeById(id);
         return R.ok();
     }
@@ -1100,6 +1227,10 @@
     @GetMapping(value = "/user/car/detail")
     public R<TAppUserCar> carDetail(String id) {
         TAppUserCar byId = appUserCarService.getById(id);
+        Long userId = tokenService.getLoginUserApplet().getUserId();
+        if(!byId.getAppUserId().equals(userId)){
+            return R.fail("权限不足");
+        }
         return R.ok(byId);
     }
 
@@ -1180,5 +1311,47 @@
         appUserService.updateById(appUser);
         return AjaxResult.success();
     }
+
+    @PostMapping("/sendMessage")
+    public R<String> sendMessage(@RequestBody SendMessageDTO sendMessageDTO){
+        switch (sendMessageDTO.getType()){
+            case 1:
+                String reqStr1 = MsgUtil.codeMsg(sendMessageDTO.getPhone(), sendMessageDTO.getCode());
+                String result1 = HttpUtils.post(MsgConstants.SEND_URL, reqStr1);
+                return R.ok(result1);
+            case 2:
+                String reqStr2 = MsgUtil.applyCodeMsg(sendMessageDTO.getPhone(), sendMessageDTO.getCode());
+                String result2 = HttpUtils.post(MsgConstants.SEND_URL, reqStr2);
+                return R.ok(result2);
+            default:
+                String reqStr3 = MsgUtil.faultMsg(sendMessageDTO.getPhone(), sendMessageDTO.getSite(), sendMessageDTO.getChargeGun());
+                String result3 = HttpUtils.post(MsgConstants.SEND_URL, reqStr3);
+                return R.ok(result3);
+        }
+    }
+    
+    
+    @PostMapping(value = "/user/logOut")
+    @ApiOperation(value = "退出登录", tags = {"小程序-个人中心"})
+    public AjaxResult logOut(){
+        String token = tokenService.getLoginUserApplet().getToken();
+        redisService.deleteObject("login_tokens:" + token);
+        return AjaxResult.success();
+    }
+    
+    
+    
+    @PostMapping("/refresh")
+    @ApiOperation(value = "刷新token过期时间", tags = {"小程序-个人中心"})
+    public R<?> refresh(HttpServletRequest request) {
+        LoginUserApplet loginUser = tokenService.getLoginUserAppletToken(request);
+        if (StringUtils.isNotNull(loginUser)) {
+            // 刷新令牌有效期
+            tokenService.refreshToken1(loginUser);
+            return R.ok();
+        }
+        return R.ok();
+    }
+    
 }
 

--
Gitblit v1.7.1