diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/ThirdLoginController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/ThirdLoginController.java index 2feed7d9..ab5fc623 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/ThirdLoginController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/ThirdLoginController.java @@ -1,9 +1,20 @@ package com.jero.modules.system.controller; -import cn.hutool.crypto.SecureUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.api.vo.Result; +import com.jero.common.constant.CommonConstant; +import com.jero.common.system.util.JwtUtil; +import com.jero.common.util.PasswordUtil; +import com.jero.common.util.RedisUtil; +import com.jero.common.util.oConvertUtils; +import com.jero.modules.base.service.BaseCommonService; +import com.jero.modules.system.entity.SysThirdAccount; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.model.ThirdLoginModel; +import com.jero.modules.system.service.ISysThirdAccountService; +import com.jero.modules.system.service.ISysUserService; import com.xkcoding.justauth.AuthRequestFactory; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -11,19 +22,6 @@ import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.request.AuthRequest; import me.zhyd.oauth.utils.AuthStateUtils; -import com.jero.common.api.vo.Result; -import com.jero.common.constant.CacheConstant; -import com.jero.common.constant.CommonConstant; -import com.jero.common.util.*; -import com.jero.modules.base.service.BaseCommonService; -import com.jero.common.system.util.JwtUtil; -import com.jero.common.system.vo.LoginUser; -import com.jero.modules.system.entity.SysThirdAccount; -import com.jero.modules.system.entity.SysUser; -import com.jero.modules.system.model.ThirdLoginModel; -import com.jero.modules.system.service.ISysThirdAccountService; -import com.jero.modules.system.service.ISysUserService; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -31,7 +29,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.Date; import java.util.List; /** @@ -54,7 +51,7 @@ public class ThirdLoginController { @Autowired private AuthRequestFactory factory; - private String TOKEN = "token"; + private static final String TOKEN = "token"; @RequestMapping("/render/{source}") public void render(@PathVariable("source") String source, HttpServletResponse response) throws IOException {