修改bug
This commit is contained in:
parent
b00b4b1673
commit
24dfaa7529
|
@ -93,7 +93,6 @@ public class JwtUtil {
|
||||||
public static String getUsername(String token) {
|
public static String getUsername(String token) {
|
||||||
try {
|
try {
|
||||||
DecodedJWT jwt = JWT.decode(token);
|
DecodedJWT jwt = JWT.decode(token);
|
||||||
System.out.println("jwt222-----------"+jwt.getClaim("username").asString());
|
|
||||||
return jwt.getClaim("username").asString();
|
return jwt.getClaim("username").asString();
|
||||||
} catch (JWTDecodeException e) {
|
} catch (JWTDecodeException e) {
|
||||||
System.out.println("getUsername-----------null");
|
System.out.println("getUsername-----------null");
|
||||||
|
|
|
@ -50,7 +50,7 @@ public class SyncEvaluationsSzkcStat extends BaseSync {
|
||||||
KcEvaluationsStat entity = entityList.get(0);
|
KcEvaluationsStat entity = entityList.get(0);
|
||||||
String col2745 = entity.getCol6176();
|
String col2745 = entity.getCol6176();
|
||||||
if(col2745.length()>0){
|
if(col2745.length()>0){
|
||||||
System.out.println("thpjb----"+entity.getCol00());
|
System.out.println("szkcpjb----"+entity.getCol00());
|
||||||
String arr[] = col2745.split("@");
|
String arr[] = col2745.split("@");
|
||||||
try {
|
try {
|
||||||
entity.setCol62(arr[1]);
|
entity.setCol62(arr[1]);
|
||||||
|
|
|
@ -739,7 +739,7 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
||||||
System.out.println("filPath:"+zyInfoStudent.getFilePath());
|
System.out.println("filPath:"+zyInfoStudent.getFilePath());
|
||||||
System.out.println("docPath:"+docPath);
|
System.out.println("docPath:"+docPath);
|
||||||
System.out.println("pdfPath:"+pdfPath);
|
System.out.println("pdfPath:"+pdfPath);
|
||||||
// PDFUtil.office2PDF(docPath,pdfPath);
|
PDFUtil.office2PDF(docPath,pdfPath);
|
||||||
zyInfoStudent.setPdfPath("contract/"+namePath);
|
zyInfoStudent.setPdfPath("contract/"+namePath);
|
||||||
}else{
|
}else{
|
||||||
ZykInfo zykInfo = new ZykInfo();
|
ZykInfo zykInfo = new ZykInfo();
|
||||||
|
|
|
@ -184,11 +184,8 @@ public class LoginController {
|
||||||
@GetMapping("/user/getUserInfo")
|
@GetMapping("/user/getUserInfo")
|
||||||
public Result<JSONObject> getUserInfo(HttpServletRequest request){
|
public Result<JSONObject> getUserInfo(HttpServletRequest request){
|
||||||
Result<JSONObject> result = new Result<JSONObject>();
|
Result<JSONObject> result = new Result<JSONObject>();
|
||||||
System.out.println("getUserInfo------------------"+request.getHeader("X-Access-Token"));
|
|
||||||
String username = JwtUtil.getUserNameByToken(request);
|
String username = JwtUtil.getUserNameByToken(request);
|
||||||
System.out.println("username------------------"+username);
|
|
||||||
if(oConvertUtils.isNotEmpty(username)) {
|
if(oConvertUtils.isNotEmpty(username)) {
|
||||||
System.out.println("isnotempty-----------------------"+username);
|
|
||||||
// 根据用户名查询用户信息
|
// 根据用户名查询用户信息
|
||||||
SysUser sysUser = sysUserService.getUserByName(username);
|
SysUser sysUser = sysUserService.getUserByName(username);
|
||||||
JSONObject obj=new JSONObject();
|
JSONObject obj=new JSONObject();
|
||||||
|
@ -207,7 +204,6 @@ public class LoginController {
|
||||||
//update-begin---author:liusq ---date:2022-06-29 for:接口返回值修改,同步修改这里的判断逻辑-----------
|
//update-begin---author:liusq ---date:2022-06-29 for:接口返回值修改,同步修改这里的判断逻辑-----------
|
||||||
//update-end---author:scott ---date::2022-06-20 for:vue3前端,支持自定义首页--------------
|
//update-end---author:scott ---date::2022-06-20 for:vue3前端,支持自定义首页--------------
|
||||||
|
|
||||||
System.out.println("111111111-----------------------");
|
|
||||||
obj.put("userInfo",sysUser);
|
obj.put("userInfo",sysUser);
|
||||||
obj.put("sysAllDictItems", sysDictService.queryAllDictItems());
|
obj.put("sysAllDictItems", sysDictService.queryAllDictItems());
|
||||||
|
|
||||||
|
@ -217,7 +213,6 @@ public class LoginController {
|
||||||
List<SysUserRole> sysUserRoleList = sysUserRoleService.list(sysUserRoleQw);
|
List<SysUserRole> sysUserRoleList = sysUserRoleService.list(sysUserRoleQw);
|
||||||
Set<String> roleIdSet = sysUserRoleList.stream().map(x -> x.getRoleId()).collect(Collectors.toSet());
|
Set<String> roleIdSet = sysUserRoleList.stream().map(x -> x.getRoleId()).collect(Collectors.toSet());
|
||||||
|
|
||||||
System.out.println("22222222222-----------------------");
|
|
||||||
if(roleIdSet != null && !roleIdSet.isEmpty()){
|
if(roleIdSet != null && !roleIdSet.isEmpty()){
|
||||||
QueryWrapper<SysRole> sysRoleQw = new QueryWrapper<>();
|
QueryWrapper<SysRole> sysRoleQw = new QueryWrapper<>();
|
||||||
sysRoleQw.in("id",roleIdSet);
|
sysRoleQw.in("id",roleIdSet);
|
||||||
|
@ -225,12 +220,9 @@ public class LoginController {
|
||||||
obj.put("roleList",sysRoleList);
|
obj.put("roleList",sysRoleList);
|
||||||
}
|
}
|
||||||
|
|
||||||
System.out.println("3333333333333-----------------------"+obj.toJSONString());
|
|
||||||
result.setResult(obj);
|
result.setResult(obj);
|
||||||
result.success("");
|
result.success("");
|
||||||
}
|
}
|
||||||
System.out.println("result1-----------------------"+result.getCode());
|
|
||||||
System.out.println("result2-----------------------"+result.getMessage());
|
|
||||||
return result;
|
return result;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue