diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesLocalTeacher.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesLocalTeacher.java index da951f75..630c93f0 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesLocalTeacher.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesLocalTeacher.java @@ -41,7 +41,7 @@ public class CeesLocalTeacher implements Serializable { /** * UnionID */ - private String unionID; + private String unionId; /**创建人*/ @ApiModelProperty(value = "创建人") private String createBy; diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesUser.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesUser.java index 7f57b425..4b0564b5 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesUser.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesUser.java @@ -42,7 +42,7 @@ public class CeesUser implements Serializable { /** * UnionID */ - private String unionID; + private String unionId; /**创建人*/ @ApiModelProperty(value = "创建人") diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesWaiTeacher.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesWaiTeacher.java index e7309693..96965a18 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesWaiTeacher.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesWaiTeacher.java @@ -41,7 +41,7 @@ public class CeesWaiTeacher implements Serializable { /** * UnionID */ - private String unionID; + private String unionId; /**创建人*/ @ApiModelProperty(value = "创建人") private String createBy; diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/Student.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/Student.java index 2f75e8f5..ee2f4075 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/Student.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/Student.java @@ -41,7 +41,7 @@ public class Student implements Serializable { /** * UnionID */ - private String unionID; + private String unionId; /**创建人*/ @ApiModelProperty(value = "创建人") private String createBy; diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesLocalTeacherServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesLocalTeacherServiceImpl.java index f03ea1e3..92be4610 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesLocalTeacherServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesLocalTeacherServiceImpl.java @@ -51,9 +51,14 @@ public class CeesLocalTeacherServiceImpl extends ServiceImpl impl student.setGroupId(user.getGroupId()); student.setMajorId(user.getMajorId()); student.setUserMajorId(user.getUserMajorId()); + student.setOpenId(student.getOpenId()); + student.setUnionId(student.getUnionId()); // 插入或更新数据 this.save(student); + user.setOpenId(student.getOpenId()); + user.setUnionId(student.getUnionId()); user.setUserName(student.getUserName()); ceesUserService.updateById(user); JSONObject jsonObject = new JSONObject(); diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/WeChantServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/WeChantServiceImpl.java index e1f8c1fc..8f77106e 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/WeChantServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/WeChantServiceImpl.java @@ -160,7 +160,7 @@ public class WeChantServiceImpl implements WeChantService { // 检查四个身份 switch (identity) { -// 管理员2 学生3,老师 6 ,外校老师9 +// 管理员1, 学生2,老师 3 ,外校老师4 case 1: LambdaQueryWrapper H5AdminInfoWreapper = new LambdaQueryWrapper<>(); H5AdminInfoWreapper.eq(CeesAdminInfo::getUserId, userId); diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application.yml index eb05807d..285e3932 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application.yml @@ -5,10 +5,17 @@ spring: active: '@profile.name@' wx: - # 来源于测试平台 + # 来源于正式 appid: wx2b5899dac09216d4 secret: 8bcf767da0755534f64dcf1aecfa44e2 apiUrl: https://api.weixin.qq.com/ openApiUrl: https://open.weixin.qq.com/ -# authRedirectUri: http://192.168.76.1:9999/home authRedirectUri: http://www.ceesh5.hrbnu.club/home + + +# 测试公众号 +# appid: wx604b36a6bc00d376 +# secret: f763076bef56be2c620f65a43827550e +# apiUrl: https://api.weixin.qq.com/ +# openApiUrl: https://open.weixin.qq.com/ +# authRedirectUri: https://6072-112-102-213-17.ngrok-free.app/home