提交修改

This commit is contained in:
daihh
2023-02-09 14:47:34 +08:00
parent b92a6d879c
commit 3a60026381
4 changed files with 27 additions and 20 deletions

View File

@@ -34,6 +34,7 @@ public class BoeTokenImpl implements IAuthorizationToken{
Map<String,Object> payloadMap=new HashMap<String,Object>();
// payloadMap.put("iss", "http://u.boe.com");
payloadMap.put("iss","http://u.boe.com");
//long iat=System.currentTimeMillis()/1000;
long iat=System.currentTimeMillis()/1000;
payloadMap.put("iat", iat);
long exp=iat+(12*60*60);//过期时间,12个小时过期
@@ -97,30 +98,30 @@ public class BoeTokenImpl implements IAuthorizationToken{
// public static void main(String[] args) {
//
// Map<String,String> data=new HashMap<String,String>();
// data.put("userId","DFF192E1-FB7B-11EC-9DDF-005056BD9028");//原系统id
// data.put("name", "测试账号0001");
//
// try {
//
// BoeTokenImpl impl=new BoeTokenImpl();
// String token=impl.createToken(data);
// System.out.println(token);
// }catch(Exception e) {
// e.printStackTrace();
// }
//// Map<String,String> data=new HashMap<String,String>();
//// data.put("userId","DFF192E1-FB7B-11EC-9DDF-005056BD9028");//原系统id
//// data.put("name", "测试账号0001");
////
//// try {
////
//// BoeTokenImpl impl=new BoeTokenImpl();
//// String token=impl.createToken(data);
//// System.out.println(token);
//// }catch(Exception e) {
//// e.printStackTrace();
//// }
//
// try {
//
// BoeTokenImpl impl=new BoeTokenImpl();
// String token=impl.createToken(data);
// System.out.println(token);
//// String token=impl.createToken(data);
//// System.out.println(token);
////
//// Map<String,String> tokenData = impl.readToken(token);
//
//
// //String token="eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NDYyMDU0NjcsImV4cCI6MTY0NjIxMjY2NywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjAxNTU1M0RELTQ0NUUtNjlENC0zNTFGLUREOUExQTU2NDIwRSIsInBlcm1pc3Npb24iOiIifQ==.90e9509faf109b1c92e26f9475121d1bfd7c3e32b962d8ee1526849fee14501a";
// String token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NTAxOTY1NTksImV4cCI6MTY1MDIwMzc1OSwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInBlcm1pc3Npb24iOiIifQ==.6b6c5a073e4a62d81d91105fd65c1eb936dd597c30b2dd0d4924e6df885aaff2";
// String token="eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ1SWQiOiI5NTI5NDg2MjY0OTc3MjQ0MTEiLCJ1c2VyTm8iOiIxMjM0NTYwMSIsImlzcyI6Imh0dHA6Ly91LmJvZS5jb20iLCJuYW1lIjoi5Luj5rW35YW0IiwiR2l2ZW5OYW1lIjoiYm9ldSIsImRlcGFydElkIjoiOTg0MTQ3NTY2NTIxNjY3NTg0IiwicGVybWlzc2lvbiI6IiIsImV4cCI6MTY3NTc4MTQwMSwiaWF0IjoxNjc1NzM4MjAxLCJhaWQiOiI5NTI5NDg2MjY0OTc3MjQ0MTEiLCJ1c2VySWQiOiIwMTU1NTNERC00NDVFLTY5RDQtMzUxRi1ERDlBMUE1NjQyMEUifQ==.d1d8d3e53ece04a8a863d5f0a3c227cea559cc4cfcbc9010a1125f7a11d6e9a0";
// //String token = "eyJhbGciOiJIUzI1NiIsInR5cGUiOiJ0b2tlbiJ9.eyJpc3MiOiJodHRwOi8vdS5ib2UuY29tIiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVJZCI6OTY1MzQyMDI3NDk3NjA3MTY4LCJ1c2VySWQiOiI2QjA0OUZBRi1DMzE0LTdDQ0YtMEQyOC0wRDIzRjRDNDI1MzEiLCJleHAiOjE2NzU3NTU4ODYzMzV9.c65d86ccc5feb1c820490d94196f5509b6bb97dce748bc590160c6d8489bde6a";
// String[] tokens = token.split("\\.");
// System.out.println(tokens.length);
// String header = new String(Base64.decodeBase64(tokens[0]));
@@ -133,6 +134,7 @@ public class BoeTokenImpl implements IAuthorizationToken{
// //读取userId和exp过期时间
// ObjectMapper om=new ObjectMapper();
// JsonNode json = om.readTree(payload);
// System.out.println(json);
// String userId=json.get("userId").asText();
// long exp=json.get("exp").asLong();
// System.out.println("userId="+userId+",exp="+exp);

View File

@@ -31,4 +31,7 @@ public class CourseStudyItem {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime finishTime;
}

View File

@@ -704,7 +704,7 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
QueryBuilder query=QueryBuilder.from(StudyCourse.class.getSimpleName()+" sc,"+ Course.class.getSimpleName()+" c");
query.addFields("sc.id","sc.aid","sc.aname","sc.progress","sc.status","sc.addTime");
query.addFields("c.id","c.name","c.sysType1","c.sysType2","c.sysType3");
query.addFields("c.id","c.name","c.sysType1","c.sysType2","c.sysType3","sc.finishTime");
query.addFilter(FieldFilters.eqField("sc.courseId","c.id"));
query.addFilter(FieldFilters.eq("c.enabled",true));
query.addFilter(FieldFilters.eq("c.deleted",false));
@@ -719,12 +719,14 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
item.setStudentName((String)objs[2]);
item.setProgress((Float)objs[3]);
item.setStatus((Integer)objs[4]);
//item.setStartTime((LocalDateTime)objs[5]);
item.setStartTime((LocalDateTime)objs[5]);
item.setCourseId((String)objs[6]);
item.setCourseName((String)objs[7]);
item.setSysType1((String)objs[8]);
item.setSysType2((String)objs[9]);
item.setSysType3((String)objs[10]);
item.setFinishTime((LocalDateTime)objs[11]);
rslist.add(item);
}

View File

@@ -51,8 +51,8 @@ public class Message extends IdEntity {
private Integer pageType;
/**
*页面参数 默认是id
* */
* 页面参数 默认是id
**/
@Column(name = "page_params",length = 50)
private String pageParams;