Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-08-19 745ae03c3a79de89696cb938729c0d305025b48a

Merge remote-tracking branch 'origin/master'

 ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -93,16 +93,6 @@
        return R.ok();
    }

    @DeleteMapping("logoutApplet")
    public R<?> logoutApplet(HttpServletRequest request) {
        String token = SecurityUtils.getToken(request);
        if (StringUtils.isNotEmpty(token))
        {
            // 删除用户缓存记录
            AuthUtil.logoutByToken(token);
        }
        return R.ok();
    }

    @PostMapping("refresh")
    public R<?> refresh(HttpServletRequest request)

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/status/AppUserStatusEnum.java

New file
@@ -0,0 +1,46 @@
package com.ruoyi.common.core.enums.status;

import lombok.Getter;

/**
 * @Description
 * @Author xiaochen
 * @Date 2023/6/8 16:42
 */
public enum AppUserStatusEnum {


    NORMAL(1, "正常"),
    FREEZE(2, "冻结"),
    LOGOFF(3, "注销");

    @Getter
    private String desc;


    @Getter
    private int code;


    AppUserStatusEnum(int code, String desc) {
        this.code = code;
        this.desc = desc;
    }

    /**
     * 通过code获取枚举
     *
     * @param code
     * @return
     */
    public static AppUserStatusEnum fromCode(Integer code) {
        AppUserStatusEnum[] resultTypes = AppUserStatusEnum.values();
        for (AppUserStatusEnum resultType : resultTypes) {
            if (code.equals(resultType.getCode())) {
                return resultType;
            }
        }
        return null;
    }

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java

@@ -23,6 +23,8 @@
import com.ruoyi.account.util.GiveVipUtil;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.status.AppUserStatusEnum;
import com.ruoyi.common.core.utils.JwtUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -30,7 +32,9 @@
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.redis.service.RedisService;
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;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.feignClient.ExchangeOrderClient;
import com.ruoyi.order.api.model.TChargingOrder;
@@ -56,6 +60,7 @@
import org.springframework.web.client.RestTemplate;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -555,6 +560,21 @@
        return AjaxResult.success();
    }

    @ApiOperation(value = "注销接口", tags = {"小程序-用户管理-注销账号"})
    @DeleteMapping("/logoff")
    public AjaxResult<?> logoff(HttpServletRequest request) {
        String token = SecurityUtils.getToken(request);
        if (StringUtils.isNotEmpty(token))
        {
            String userId = JwtUtils.getUserId(token);
            // 账号注销
            appUserService.update(Wrappers.<TAppUser>lambdaUpdate().set(TAppUser::getStatus, AppUserStatusEnum.LOGOFF.getCode()).eq(TAppUser::getId, userId));
            // 删除用户缓存记录
            AuthUtil.logoutByToken(token);
        }
        return AjaxResult.success();
    }

    /**
     * 根据用户id查询用户信息
     * @param appUserIds 用户id