yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2024-10-24 19:06:28 +08:00
parent b00b4b1673
commit 24dfaa7529
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
View File

@ -93,7 +93,6 @@ public class JwtUtil {
public static String getUsername(String token) {
try {
DecodedJWT jwt = JWT.decode(token);
System.out.println("jwt222-----------"+jwt.getClaim("username").asString());
return jwt.getClaim("username").asString();
} catch (JWTDecodeException e) {
System.out.println("getUsername-----------null");

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncEvaluationsSzkcStat.java
View File

@ -50,7 +50,7 @@ public class SyncEvaluationsSzkcStat extends BaseSync {
KcEvaluationsStat entity = entityList.get(0);
String col2745 = entity.getCol6176();
if(col2745.length()>0){
System.out.println("thpjb----"+entity.getCol00());
System.out.println("szkcpjb----"+entity.getCol00());
String arr[] = col2745.split("@");
try {
entity.setCol62(arr[1]);

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java
View File

@ -739,7 +739,7 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
System.out.println("filPath:"+zyInfoStudent.getFilePath());
System.out.println("docPath:"+docPath);
System.out.println("pdfPath:"+pdfPath);
// PDFUtil.office2PDF(docPath,pdfPath);
PDFUtil.office2PDF(docPath,pdfPath);
zyInfoStudent.setPdfPath("contract/"+namePath);
}else{
ZykInfo zykInfo = new ZykInfo();

8
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
View File

@ -184,11 +184,8 @@ public class LoginController {
@GetMapping("/user/getUserInfo")
public Result<JSONObject> getUserInfo(HttpServletRequest request){
Result<JSONObject> result = new Result<JSONObject>();
System.out.println("getUserInfo------------------"+request.getHeader("X-Access-Token"));
String username = JwtUtil.getUserNameByToken(request);
System.out.println("username------------------"+username);
if(oConvertUtils.isNotEmpty(username)) {
System.out.println("isnotempty-----------------------"+username);
// 根据用户名查询用户信息
SysUser sysUser = sysUserService.getUserByName(username);
JSONObject obj=new JSONObject();
@ -207,7 +204,6 @@ public class LoginController {
//update-begin---author:liusq ---date:2022-06-29 for：接口返回值修改，同步修改这里的判断逻辑-----------
//update-end---author:scott ---date::2022-06-20 for：vue3前端，支持自定义首页--------------
System.out.println("111111111-----------------------");
obj.put("userInfo",sysUser);
obj.put("sysAllDictItems", sysDictService.queryAllDictItems());
@ -217,7 +213,6 @@ public class LoginController {
List<SysUserRole> sysUserRoleList = sysUserRoleService.list(sysUserRoleQw);
Set<String> roleIdSet = sysUserRoleList.stream().map(x -> x.getRoleId()).collect(Collectors.toSet());
System.out.println("22222222222-----------------------");
if(roleIdSet != null && !roleIdSet.isEmpty()){
QueryWrapper<SysRole> sysRoleQw = new QueryWrapper<>();
sysRoleQw.in("id",roleIdSet);
@ -225,12 +220,9 @@ public class LoginController {
obj.put("roleList",sysRoleList);
}
System.out.println("3333333333333-----------------------"+obj.toJSONString());
result.setResult(obj);
result.success("");
}
System.out.println("result1-----------------------"+result.getCode());
System.out.println("result2-----------------------"+result.getMessage());
return result;
}