|
@@ -1,14 +1,26 @@
|
|
|
package com.ruoyi.api.controller.user;
|
|
package com.ruoyi.api.controller.user;
|
|
|
|
|
|
|
|
-import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
|
|
|
|
|
-import cn.hutool.core.date.DateUtil;
|
|
|
|
|
|
|
+import java.util.Date;
|
|
|
|
|
+import java.util.HashMap;
|
|
|
|
|
+import java.util.Map;
|
|
|
|
|
+
|
|
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
+
|
|
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
+import org.springframework.data.redis.core.StringRedisTemplate;
|
|
|
|
|
+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.RequestMapping;
|
|
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
+
|
|
|
import com.ruoyi.api.controller.common.AbstractApiController;
|
|
import com.ruoyi.api.controller.common.AbstractApiController;
|
|
|
import com.ruoyi.common.constant.Constants;
|
|
import com.ruoyi.common.constant.Constants;
|
|
|
import com.ruoyi.common.core.domain.R;
|
|
import com.ruoyi.common.core.domain.R;
|
|
|
import com.ruoyi.common.core.validate.RegGroup;
|
|
import com.ruoyi.common.core.validate.RegGroup;
|
|
|
import com.ruoyi.common.enums.FilePathSplicingType;
|
|
import com.ruoyi.common.enums.FilePathSplicingType;
|
|
|
import com.ruoyi.common.filepathsplicing.FilePathSplicing;
|
|
import com.ruoyi.common.filepathsplicing.FilePathSplicing;
|
|
|
-import com.ruoyi.common.utils.ServletUtils;
|
|
|
|
|
import com.ruoyi.framework.web.service.ApiTokenService;
|
|
import com.ruoyi.framework.web.service.ApiTokenService;
|
|
|
import com.ruoyi.system.enums.SequencePrefixEnum;
|
|
import com.ruoyi.system.enums.SequencePrefixEnum;
|
|
|
import com.ruoyi.system.service.ISysSequenceService;
|
|
import com.ruoyi.system.service.ISysSequenceService;
|
|
@@ -17,22 +29,12 @@ import com.ruoyi.user.enums.UserThirdType;
|
|
|
import com.ruoyi.user.service.IUserService;
|
|
import com.ruoyi.user.service.IUserService;
|
|
|
import com.ruoyi.weixin.domain.WxUserDto;
|
|
import com.ruoyi.weixin.domain.WxUserDto;
|
|
|
import com.ruoyi.weixin.service.WxUserService;
|
|
import com.ruoyi.weixin.service.WxUserService;
|
|
|
|
|
+
|
|
|
|
|
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
|
|
|
|
|
+import cn.hutool.core.date.DateUtil;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
-import org.springframework.data.redis.core.StringRedisTemplate;
|
|
|
|
|
-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.RequestMapping;
|
|
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
-
|
|
|
|
|
-import java.util.Date;
|
|
|
|
|
-import java.util.HashMap;
|
|
|
|
|
-import java.util.Map;
|
|
|
|
|
-
|
|
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 小程序用户管理Controller
|
|
* 小程序用户管理Controller
|
|
@@ -56,6 +58,9 @@ public class ApiUserLoginController extends AbstractApiController {
|
|
|
|
|
|
|
|
private final ISysSequenceService sysSequenceService;
|
|
private final ISysSequenceService sysSequenceService;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private StringRedisTemplate stringRedisTemplate;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 获取小程序openId
|
|
* 获取小程序openId
|
|
|
*/
|
|
*/
|
|
@@ -117,4 +122,5 @@ public class ApiUserLoginController extends AbstractApiController {
|
|
|
apiTokenService.removeToken(token);
|
|
apiTokenService.removeToken(token);
|
|
|
return R.ok("退出成功");
|
|
return R.ok("退出成功");
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
}
|
|
}
|