diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjLoginController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjLoginController.java index aa96d8836..1693bf5a7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjLoginController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjLoginController.java @@ -1,7 +1,9 @@ package com.zhgd.xmgl.modules.basicdata.controller; +import cn.hutool.core.util.IdUtil; import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.redis.lock.RedisRepository; import com.zhgd.xmgl.entity.sj.JwtPayloadUserInfo; import com.zhgd.xmgl.entity.sj.TokenResponse; import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl; @@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -45,6 +48,9 @@ public class SjLoginController { private String sjUnifiedAuthenticationSuccessRedirect; @Value("${sj.unifiedAuthentication.success.redirect.app:}") private String sjUnifiedAuthenticationSuccessRedirectApp; + @Resource + RedisRepository redisRepository; + private static String SJ_TOKEN_ID = "SJ_TOKEN_ID:"; /** * 根据code获取token @@ -69,12 +75,17 @@ public class SjLoginController { , Long.parseLong(tokenByCode.getRe_expires_in()), TimeUnit.SECONDS); } } + String uid = IdUtil.simpleUUID(); + log.info("uid:{}", uid); + redisRepository.set(SJ_TOKEN_ID + uid, access_token, 600L); if (StringUtils.isBlank(platform)) { //重定向到应用页面(一般为首页)pc端 - response.sendRedirect(sjUnifiedAuthenticationSuccessRedirect + access_token); + log.info("重定向:{}", sjUnifiedAuthenticationSuccessRedirect + uid); + response.sendRedirect(sjUnifiedAuthenticationSuccessRedirect + uid); } else { //重定向到应用页面(一般为首页)app端 - response.sendRedirect(sjUnifiedAuthenticationSuccessRedirectApp + access_token); + log.info("重定向:{}", sjUnifiedAuthenticationSuccessRedirectApp + uid); + response.sendRedirect(sjUnifiedAuthenticationSuccessRedirectApp + uid); } } @@ -103,7 +114,9 @@ public class SjLoginController { @ResponseBody public Result getLoginInfoByToken(@RequestParam String uid) throws InvalidKeySpecException, IOException { log.info("uid>>>{}", uid); - JwtPayloadUserInfo jwtPayloadUserInfo = JwtRsaUtils.verifyWithUserInfo(uid); + String token = String.valueOf(redisRepository.get(SJ_TOKEN_ID + uid)); + log.info("token>>>{}", token); + JwtPayloadUserInfo jwtPayloadUserInfo = JwtRsaUtils.verifyWithUserInfo(token); if (jwtPayloadUserInfo != null) { Result result = systemUserService.sjLogin(jwtPayloadUserInfo); return result; diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java index d3b6cd438..b7670fc49 100644 --- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java @@ -110,6 +110,7 @@ public class TaskProgressServiceImpl extends ServiceImpl() .eq(TaskProgress::getId, taskProgress.getParentId())); diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index c187a4ae6..5e7dd34c2 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -88,6 +88,7 @@ public class ${entityName}Controller { @ApiOperation(value = "添加${tableVo.ftlDescription}信息", notes = "添加${tableVo.ftlDescription}信息" , httpMethod="POST") @PostMapping(value = "/add") public Result<${entityName}> add(@RequestBody ${entityName} ${entityName?uncap_first}) { + ${entityName?uncap_first}.setId(null); ${entityName?uncap_first}Service.save(${entityName?uncap_first}); return Result.ok(); }