tianzeOrg
/
fund_investment
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改实务认知得分和智能评分规则

Browse Source
master
xiaoCJ
parent 7b3b5f58d2
commit cb8c6f13ec
2 changed files with 17 additions and 21 deletions

32
src/main/java/com/sztzjy/fund_investment/config/security/TokenProvider.java
Unescape Escape View File

@ -47,12 +47,12 @@ public class TokenProvider {
.getBody();
JwtUser jwtUser = new JwtUser();
jwtUser.setName(claims.get("name")==null?"":claims.get("name").toString());
jwtUser.setUserId(claims.get("userId")==null?"":claims.get("userId").toString());
jwtUser.setRoleId(Integer.valueOf(claims.get("roleId")==null?"0":claims.get("roleId").toString()));
jwtUser.setClassId(Integer.valueOf(claims.get("classId")==null?"0":claims.get("classId").toString()));
jwtUser.setSchoolId(Integer.valueOf(claims.get("schoolId")==null?"0":claims.get("schoolId").toString()));
jwtUser.setUsername(claims.get("username")==null?"":claims.get("username").toString());
jwtUser.setName(claims.get("name") == null ? "" : claims.get("name").toString());
jwtUser.setUserId(claims.get("userId") == null ? "" : claims.get("userId").toString());
jwtUser.setRoleId(Integer.valueOf(claims.get("roleId") == null ? "0" : claims.get("roleId").toString()));
jwtUser.setClassId(Integer.valueOf(claims.get("classId") == null ? "0" : claims.get("classId").toString()));
jwtUser.setSchoolId(Integer.valueOf(claims.get("schoolId") == null ? "0" : claims.get("schoolId").toString()));
jwtUser.setUsername(claims.get("username") == null ? "" : claims.get("username").toString());
jwtUser.setAuthorityCodes((List<String>) claims.get("authorityCodes"));
return jwtUser;
} catch (ExpiredJwtException e1) {
@ -106,11 +106,7 @@ public class TokenProvider {
* 解析智云平台的token
*/
public static JwtUser getJWTUserByZhiYun(String token) {
// token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VybmFtZSI6InR6czAwMSIsInVzZXJJZCI6" +
// "NDg3LCJuYW1lIjoi5Zev5ZO8IiwicGFzc3dvcmQiOiIxMjNxd2UiLCJyb2xlSWQiOjQsInNjaG9" +
// "vbElkIjoxLCJzY2hvb2xOYW1lIjoi5aSp5oup5aSn5a2mIi" +
// "wiY2xhc3NJZCI6MjAsImNsYXNzTmFtZSI6IuWkqeaLqea8lOekujHnj60iLCJsZXZlbElkIjo1fQ" +
// ".5fVdEtC7eDC2HuUX8jnodomdTUw_nPOzkOJUXCw5Fqc";
// token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjb2xsZWdlIjoi5ryU56S65a2m6ZmiIiwiaWNpYnRTY2hvb2xJZCI6NCwibWQ1UHdkIjoiNDYtRjktNEMtOEQtRTEtNEYtQjMtNjYtODAtODUtMDctNjgtRkYtMUItN0YtMkEiLCJyb2xlaWQiOiI0Iiwic2V4Ijoi55S3IiwidXNlcklkIjoiNDkyIiwic3R1ZGVudElkIjoiNDA1MSIsInBhc3N3b3JkIjoiMTIzcXdlIiwiY2xhc3NJZCI6IjIxNiIsImljaWJ0Q2xhc3NJZCI6MjA5LCJtYWpvciI6IuS6p-WTgea8lOekuuS4k-S4miIsInNjaG9vbCI6IuWkqeaLqeWkp-WtpiIsInNjaG9vbElkIjoiMjMyIiwibmFtZSI6InR6czAwNiIsInN0dWRlbnRObyI6InR6czAwNiIsImFwcGxpY2F0aW9uSWQiOiIxMjIiLCJjbGFzcyI6IuWkqeaLqea8lOekujbnj60iLCJ1c2VybmFtZSI6InR6czAwNiJ9.P6EmI0cQoAZwuoPJrwRjtjZNSCANUtxcRebQTtm0HOI";
try {
Claims claims = Jwts.parser()
.setSigningKey(Keys.hmacShaKeyFor(SECRET_ZHIYUN.getBytes()))
@ -118,12 +114,15 @@ public class TokenProvider {
.getBody();
JwtUser jwtUser = new JwtUser();
jwtUser.setName(claims.get("name")==null?null:claims.get("name").toString());
jwtUser.setUserId(claims.get("userId")==null?null:claims.get("userId").toString());
jwtUser.setRoleId(Integer.valueOf(claims.get("roleid")==null?"0":claims.get("roleid").toString()));
jwtUser.setClassId(Integer.valueOf(claims.get("classId")==null?"0":claims.get("classId").toString()));
jwtUser.setSchoolId(Integer.valueOf(claims.get("schoolId")==null?"0":claims.get("schoolId").toString()));
jwtUser.setName(claims.get("name") == null ? null : claims.get("name").toString());
jwtUser.setUserId(claims.get("userId") == null ? null : claims.get("userId").toString());
jwtUser.setRoleId(Integer.valueOf(claims.get("roleid") == null ? "0" : claims.get("roleid").toString()));
jwtUser.setClassId(Integer.valueOf(claims.get("classId") == null ? "0" : claims.get("classId").toString()));
jwtUser.setSchoolId(Integer.valueOf(claims.get("schoolId") == null ? "0" : claims.get("schoolId").toString()));
jwtUser.setUsername(claims.get("username").toString());
jwtUser.setClassName(claims.get("class") == null ? null : claims.get("class").toString());
jwtUser.setSchoolName(claims.get("school") == null ? "0" : claims.get("school").toString());
jwtUser.setPassword(claims.get("password").toString());
return jwtUser;
} catch (Exception e) {
throw new UnAuthorizedException("token解析失败");
@ -133,6 +132,7 @@ public class TokenProvider {
//生成智云平台32字节密钥
public static void main(String[] args) {
getJWTUserByZhiYun("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjb2xsZWdlIjoi5ryU56S65a2m6ZmiIiwiaWNpYnRTY2hvb2xJZCI6NCwibWQ1UHdkIjoiNDYtRjktNEMtOEQtRTEtNEYtQjMtNjYtODAtODUtMDctNjgtRkYtMUItN0YtMkEiLCJyb2xlaWQiOiI0Iiwic2V4Ijoi55S3IiwidXNlcklkIjoiNDkyIiwic3R1ZGVudElkIjoiNDA1MSIsInBhc3N3b3JkIjoiMTIzcXdlIiwiY2xhc3NJZCI6IjIxNiIsImljaWJ0Q2xhc3NJZCI6MjA5LCJtYWpvciI6IuS6p-WTgea8lOekuuS4k-S4miIsInNjaG9vbCI6IuWkqeaLqeWkp-WtpiIsInNjaG9vbElkIjoiMjMyIiwibmFtZSI6InR6czAwNiIsInN0dWRlbnRObyI6InR6czAwNiIsImFwcGxpY2F0aW9uSWQiOiIxMjIiLCJjbGFzcyI6IuWkqeaLqea8lOekujbnj60iLCJ1c2VybmFtZSI6InR6czAwNiJ9.P6EmI0cQoAZwuoPJrwRjtjZNSCANUtxcRebQTtm0HOI");
// String prefix = "zy_wh_mnjy_";
// String generatedKey = generateKey(prefix);
// System.out.println("Generated Key: " + generatedKey);

6
src/main/java/com/sztzjy/fund_investment/controller/UserController.java
Unescape Escape View File

@ -206,14 +206,10 @@ public class UserController {
Map<String, Object> map = new HashMap<>();
map.put("token", token);
map.put("name", loginResult.getName());
User user = userService.findById(loginResult.getUserId());
map.put("username", loginResult.getUsername());
map.put("roleId", loginResult.getRoleId());
map.put("schoolId", loginResult.getSchoolId());
if (StringUtils.isNotBlank(loginResult.getUserId())) {
map.put("classId", loginResult.getClassId());
}
map.put("token", token);
map.put("classId", loginResult.getClassId());
map.put("userId", loginResult.getUserId());
return new ResultEntity(HttpStatus.OK, map);
}

Write Preview
Loading…
Cancel
Save