admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2023-11-14 10:55:43 +08:00
parent a08501c5bd
commit ab1654f083
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SjLoginController.java
View File

@ -1,7 +1,9 @@
package com.zhgd.xmgl.modules.basicdata.controller; package com.zhgd.xmgl.modules.basicdata.controller;
import cn.hutool.core.util.IdUtil;
import com.gexin.fastjson.JSON; import com.gexin.fastjson.JSON;
import com.zhgd.jeecg.common.api.vo.Result; 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.JwtPayloadUserInfo;
import com.zhgd.xmgl.entity.sj.TokenResponse; import com.zhgd.xmgl.entity.sj.TokenResponse;
import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl; 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.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
@ -45,6 +48,9 @@ public class SjLoginController {
private String sjUnifiedAuthenticationSuccessRedirect; private String sjUnifiedAuthenticationSuccessRedirect;
@Value("${sj.unifiedAuthentication.success.redirect.app:}") @Value("${sj.unifiedAuthentication.success.redirect.app:}")
private String sjUnifiedAuthenticationSuccessRedirectApp; private String sjUnifiedAuthenticationSuccessRedirectApp;
@Resource
RedisRepository redisRepository;
private static String SJ_TOKEN_ID = "SJ_TOKEN_ID:";
/** /**
* 根据code获取token * 根据code获取token
@ -69,12 +75,17 @@ public class SjLoginController {
, Long.parseLong(tokenByCode.getRe_expires_in()), TimeUnit.SECONDS); , 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)) { if (StringUtils.isBlank(platform)) {
//重定向到应用页面（一般为首页）pc端 //重定向到应用页面（一般为首页）pc端
response.sendRedirect(sjUnifiedAuthenticationSuccessRedirect + access_token); log.info("重定向：{}", sjUnifiedAuthenticationSuccessRedirect + uid);
response.sendRedirect(sjUnifiedAuthenticationSuccessRedirect + uid);
} else { } else {
//重定向到应用页面（一般为首页）app端 //重定向到应用页面（一般为首页）app端
response.sendRedirect(sjUnifiedAuthenticationSuccessRedirectApp + access_token); log.info("重定向：{}", sjUnifiedAuthenticationSuccessRedirectApp + uid);
response.sendRedirect(sjUnifiedAuthenticationSuccessRedirectApp + uid);
} }
} }
@ -103,7 +114,9 @@ public class SjLoginController {
@ResponseBody @ResponseBody
public Result getLoginInfoByToken(@RequestParam String uid) throws InvalidKeySpecException, IOException { public Result getLoginInfoByToken(@RequestParam String uid) throws InvalidKeySpecException, IOException {
log.info("uid>>>{}", uid); 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) { if (jwtPayloadUserInfo != null) {
Result result = systemUserService.sjLogin(jwtPayloadUserInfo); Result result = systemUserService.sjLogin(jwtPayloadUserInfo);
return result; return result;

1
src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java
View File

@ -110,6 +110,7 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
@Override @Override
public void add(TaskProgress taskProgress) { public void add(TaskProgress taskProgress) {
taskProgress.setId(null);
if (!Objects.equals(taskProgress.getParentId(), 0L)) { if (!Objects.equals(taskProgress.getParentId(), 0L)) {
TaskProgress tp = taskProgressMapper.selectOne(new LambdaQueryWrapper<TaskProgress>() TaskProgress tp = taskProgressMapper.selectOne(new LambdaQueryWrapper<TaskProgress>()
.eq(TaskProgress::getId, taskProgress.getParentId())); .eq(TaskProgress::getId, taskProgress.getParentId()));

1
src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
View File

@ -88,6 +88,7 @@ public class ${entityName}Controller {
@ApiOperation(value = "添加${tableVo.ftlDescription}信息", notes = "添加${tableVo.ftlDescription}信息" , httpMethod="POST") @ApiOperation(value = "添加${tableVo.ftlDescription}信息", notes = "添加${tableVo.ftlDescription}信息" , httpMethod="POST")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<${entityName}> add(@RequestBody ${entityName} ${entityName?uncap_first}) { public Result<${entityName}> add(@RequestBody ${entityName} ${entityName?uncap_first}) {
${entityName?uncap_first}.setId(null);
${entityName?uncap_first}Service.save(${entityName?uncap_first}); ${entityName?uncap_first}Service.save(${entityName?uncap_first});
return Result.ok(); return Result.ok();
} }