From e1199724d209c29a7b640bc96d2ffa32acf381dc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 20 八月 2024 09:10:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 48 ------------------------------------------------
1 files changed, 0 insertions(+), 48 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index 7f333d2..91f7ab4 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -3,23 +3,11 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.account.api.feignClient.AppUserClient;
-import com.ruoyi.account.api.model.TAppUser;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.MsgConstants;
-import com.ruoyi.common.core.utils.HttpUtils;
-import com.ruoyi.common.core.utils.MsgUtil;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
-import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.auth.form.LoginBody;
import com.ruoyi.auth.form.RegisterBody;
@@ -33,7 +21,6 @@
import com.ruoyi.system.api.model.LoginUser;
import java.util.*;
-import java.util.concurrent.TimeUnit;
/**
* token 控制
@@ -51,10 +38,6 @@
private SysLoginService sysLoginService;
@Resource
private SysUserClient userClient;
- @Autowired
- private RedisService redisService;
- @Autowired
- private AppUserClient appUserClient;
@@ -97,16 +80,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)
@@ -127,27 +100,6 @@
// 用户注册
sysLoginService.register(registerBody.getUsername(), registerBody.getPassword(), request);
return R.ok();
- }
-
- /**
- * 获取验证码
- *
- * @param phone 手机号
- * @return 结果
- */
- @ApiOperation(value = "获取验证码",notes = "获取验证码",tags = {"更换手机号获取验证码"})
- @GetMapping("getCode")
- public AjaxResult getCode(@RequestParam("phone") String phone)
- {
- TAppUser appUser = appUserClient.selectByPhone(phone).getData();
- if (Objects.nonNull(appUser)){
- return AjaxResult.error("该手机号已绑定账号");
- }
- String code = MsgUtil.createCode();
- redisService.setCacheObject(phone+Constants.APPLET,code,5L, TimeUnit.MINUTES);
- String reqStr = MsgUtil.codeMsg(phone, code);
- String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
- return AjaxResult.success(result);
}
}
--
Gitblit v1.7.1