update

edu-auth/edu-auth-api/src/main/java/com/keao/edu/auth/api/client/SysUserFeignService.java

@@ -2,6 +2,7 @@ package com.keao.edu.auth.api.client;
 
 import java.util.List;
 
+import com.keao.edu.auth.api.client.fallback.SysUserFeignServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -9,7 +10,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.keao.edu.auth.api.client.fallback.SysUserFeignServiceFallback;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.config.FeignConfiguration;
 

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/service/impl/SysUserServiceImpl.java

@@ -13,7 +13,6 @@ import com.keao.edu.im.api.client.ImFeignService;
 import com.keao.edu.im.api.entity.ImResult;
 import com.keao.edu.im.api.entity.ImUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -1,8 +1,8 @@
 package com.keao.edu.im.service.Impl;
 
-import com.keao.edu.auth.api.client.EduUserFeignService;
+import com.keao.edu.user.api.client.EduUserFeignService;
 import com.keao.edu.auth.api.client.SysUserFeignService;
-import com.keao.edu.auth.api.entity.ExamRoom;
+import com.keao.edu.user.api.entity.ExamRoom;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.exception.BizException;
 import com.keao.edu.im.common.ApiException;

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/client/EduUserFeignService.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/client/EduUserFeignService.java

@@ -1,8 +1,8 @@
-package com.keao.edu.auth.api.client;
+package com.keao.edu.user.api.client;
 
 
-import com.keao.edu.auth.api.client.fallback.EduUserFeignServiceFallback;
-import com.keao.edu.auth.api.entity.ExamRoom;
+import com.keao.edu.user.api.client.fallback.EduUserFeignServiceFallback;
+import com.keao.edu.user.api.entity.ExamRoom;
 import com.keao.edu.common.config.FeignConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/client/fallback/EduUserFeignServiceFallback.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/client/fallback/EduUserFeignServiceFallback.java

@@ -1,7 +1,7 @@
-package com.keao.edu.auth.api.client.fallback;
+package com.keao.edu.user.api.client.fallback;
 
-import com.keao.edu.auth.api.client.EduUserFeignService;
-import com.keao.edu.auth.api.entity.ExamRoom;
+import com.keao.edu.user.api.client.EduUserFeignService;
+import com.keao.edu.user.api.entity.ExamRoom;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestParam;
 

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/entity/ExamRoom.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/ExamRoom.java

@@ -1,4 +1,4 @@
-package com.keao.edu.auth.api.entity;
+package com.keao.edu.user.api.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/entity/LoginEntity.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/LoginEntity.java

@@ -1,4 +1,4 @@
-package com.keao.edu.auth.api.entity;
+package com.keao.edu.user.api.entity;
 
 public class LoginEntity {
     private String smsCode;

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/entity/SysMenu.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysMenu.java

@@ -1,4 +1,4 @@
-package com.keao.edu.auth.api.entity;
+package com.keao.edu.user.api.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -67,7 +67,7 @@ public class SysMenu {
 	private Integer hid;
 
 	@ApiModelProperty(value = "子节点列表",required = false)
-	private List<SysMenu> sysMenus;
+	private List<com.keao.edu.auth.api.entity.SysMenu> sysMenus;
 
 	public String getParentPermission() {
 		return parentPermission;
@@ -85,11 +85,11 @@ public class SysMenu {
 		this.hid = hid;
 	}
 
-	public List<SysMenu> getSysMenus() {
+	public List<com.keao.edu.auth.api.entity.SysMenu> getSysMenus() {
 		return sysMenus;
 	}
 
-	public void setSysMenus(List<SysMenu> sysMenus) {
+	public void setSysMenus(List<com.keao.edu.auth.api.entity.SysMenu> sysMenus) {
 		this.sysMenus = sysMenus;
 	}
 

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/entity/SysOauthClientDetails.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysOauthClientDetails.java

@@ -1,4 +1,4 @@
-package com.keao.edu.auth.api.entity;
+package com.keao.edu.user.api.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/entity/SysRole.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysRole.java

@@ -1,4 +1,4 @@
-package com.keao.edu.auth.api.entity;
+package com.keao.edu.user.api.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/entity/SysRoleDept.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysRoleDept.java

@@ -1,4 +1,4 @@
-package com.keao.edu.auth.api.entity;
+package com.keao.edu.user.api.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/entity/SysRoleMenu.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysRoleMenu.java

@@ -1,4 +1,4 @@
-package com.keao.edu.auth.api.entity;
+package com.keao.edu.user.api.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/entity/SysUser.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysUser.java

@@ -1,4 +1,4 @@
-package com.keao.edu.auth.api.entity;
+package com.keao.edu.user.api.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/entity/SysUserLogin.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysUserLogin.java

@@ -1,4 +1,4 @@
-package com.keao.edu.auth.api.entity;
+package com.keao.edu.user.api.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/entity/SysUserLoginLog.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysUserLoginLog.java

@@ -1,4 +1,4 @@
-package com.keao.edu.auth.api.entity;
+package com.keao.edu.user.api.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/entity/SysUserRole.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/SysUserRole.java

@@ -1,4 +1,4 @@
-package com.keao.edu.auth.api.entity;
+package com.keao.edu.user.api.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/enums/SysUserType.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/enums/SysUserType.java

@@ -1,10 +1,10 @@
-package com.keao.edu.auth.api.enums;
+package com.keao.edu.user.api.enums;
 
 import org.apache.commons.lang3.StringUtils;
 
 import com.keao.edu.common.enums.BaseEnum;
 
-public enum SysUserType implements BaseEnum<String, SysUserType> {
+public enum SysUserType implements BaseEnum<String, com.keao.edu.auth.api.enums.SysUserType> {
 
 	STUDENT("学生"), EDUCATION("教务老师"), TEACHER("指导老师"), SYSTEM("系统內置"), ADMIN("管理员");
 
@@ -22,11 +22,11 @@ public enum SysUserType implements BaseEnum<String, SysUserType> {
 		return desc;
 	}
 
-	public static SysUserType queryByName(String name) {
+	public static com.keao.edu.auth.api.enums.SysUserType queryByName(String name) {
 		if (StringUtils.isBlank(name)) {
 			return null;
 		}
-		for (SysUserType sysUserType : SysUserType.values()) {
+		for (com.keao.edu.auth.api.enums.SysUserType sysUserType : com.keao.edu.auth.api.enums.SysUserType.values()) {
 			if (name.equals(sysUserType.getCode())) {
 				return sysUserType;
 			}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/enums/UserLockFlag.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/enums/UserLockFlag.java

@@ -1,8 +1,8 @@
-package com.keao.edu.auth.api.enums;
+package com.keao.edu.user.api.enums;
 
 import com.keao.edu.common.enums.BaseEnum;
 
-public enum UserLockFlag implements BaseEnum<Integer, UserLockFlag> {
+public enum UserLockFlag implements BaseEnum<Integer, com.keao.edu.auth.api.enums.UserLockFlag> {
 
 	NORMAL(0, "正常"), LOCKED(9, "锁定"), CANCELLED(1, "冻结");
 
@@ -31,8 +31,8 @@ public enum UserLockFlag implements BaseEnum<Integer, UserLockFlag> {
 		this.remark = remark;
 	}
 
-	public static UserLockFlag codeOf(int code) {
-		for (UserLockFlag userStatus : UserLockFlag.values()) {
+	public static com.keao.edu.auth.api.enums.UserLockFlag codeOf(int code) {
+		for (com.keao.edu.auth.api.enums.UserLockFlag userStatus : com.keao.edu.auth.api.enums.UserLockFlag.values()) {
 			if (code == userStatus.getCode()) {
 				return userStatus;
 			}

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/util/SecurityConstants.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/util/SecurityConstants.java

@@ -1,4 +1,4 @@
-package com.keao.edu.auth.api.util;
+package com.keao.edu.user.api.util;
 
 public interface SecurityConstants {
 

edu-user/edu-user-client-api/src/main/java/com/keao/edu/auth/api/util/SecurityUtils.java → edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/util/SecurityUtils.java

@@ -1,4 +1,4 @@
-package com.keao.edu.auth.api.util;
+package com.keao.edu.user.api.util;
 
 import com.alibaba.fastjson.JSON;
 import com.keao.edu.auth.api.dto.AuthUser;

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/AgencyServiceImpl.java

@@ -11,7 +11,6 @@ import com.keao.edu.im.api.entity.ImUserModel;
 import com.keao.edu.user.dao.AgencyDao;
 import com.keao.edu.user.dao.SysUserDao;
 import com.keao.edu.user.entity.Agency;
-import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.service.AgencyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/StudentServiceImpl.java

@@ -4,20 +4,14 @@ import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.exception.BizException;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
-import com.keao.edu.im.api.entity.ImResult;
-import com.keao.edu.im.api.entity.ImUserModel;
-import com.keao.edu.user.dao.ExamSongDao;
 import com.keao.edu.user.dao.StudentDao;
 import com.keao.edu.user.dao.SysUserDao;
-import com.keao.edu.user.entity.ExamSong;
 import com.keao.edu.user.entity.Student;
 import com.keao.edu.user.service.StudentService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Objects;
-
 /**
  * @Author Joburgess
  * @Date 2020.06.18

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/TeacherServiceImpl.java

@@ -1,7 +1,6 @@
 package com.keao.edu.user.service.impl;
 
 
-import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.exception.BizException;

edu-user/edu-user-server/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -24,7 +24,7 @@
 		<result column="role_name_" property="roleName" />
 		<result column="del_flag_" property="delFlag" />
 		<result column="tenant_id_" property="tenantId" />
-		<association property="sysUser" javaType="com.keao.edu.auth.api.entity.SysUser">
+		<association property="sysUser" javaType="SysUser">
 			<result column="id_" property="id"/>
 			<result column="username_" property="username"/>
 			<result column="real_name_" property="realName"/>

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRoomMapper.xml

@@ -6,7 +6,7 @@
 -->
 <mapper namespace="com.keao.edu.user.dao.ExamRoomDao">
 	
-	<resultMap type="com.keao.edu.auth.api.entity.ExamRoom" id="ExamRoom">
+	<resultMap type="ExamRoom" id="ExamRoom">
 		<result column="id_" property="id" />
 		<result column="exam_mode_" property="examMode" />
 		<result column="exam_location_id_" property="examLocationId" />
@@ -31,7 +31,7 @@
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.keao.edu.auth.api.entity.ExamRoom" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+	<insert id="insert" parameterType="ExamRoom" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO exam_room (id_,exam_mode_,exam_location_id_,subject_id_list_,main_teacher_user_id_,
 		assistant_teacher_user_id_list_,exam_time_json_,del_flag_,create_time_,update_time_,tenant_id_)
 		VALUES(#{id},#{examMode},#{examLocationId},#{subjectIdList},#{mainTeacherUserId},#{assistantTeacherUserIdList},
@@ -39,7 +39,7 @@
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.keao.edu.auth.api.entity.ExamRoom">
+	<update id="update" parameterType="ExamRoom">
 		UPDATE exam_room <set>
 		<if test="delFlag != null">
 		del_flag_ = #{delFlag},

edu-user/edu-user-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -6,7 +6,7 @@
 -->
 <mapper namespace="com.keao.edu.user.dao.SysUserDao">
 
-    <resultMap type="com.keao.edu.auth.api.entity.SysUser" id="SysUser">
+    <resultMap type="SysUser" id="SysUser">
         <result column="id_" property="id"/>
         <result column="username_" property="username"/>
         <result column="real_name_" property="realName"/>
@@ -57,7 +57,7 @@
 	</select>
 
     <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.keao.edu.auth.api.entity.SysUser" useGeneratedKeys="true" keyColumn="id"
+    <insert id="insert" parameterType="SysUser" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO sys_user
         (is_super_admin_,im_token_,id_,username_,salt_,phone_,avatar_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,
@@ -67,7 +67,7 @@
     </insert>
 
     <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.keao.edu.auth.api.entity.SysUser">
+    <update id="update" parameterType="SysUser">
         UPDATE sys_user
         <set>
             <if test="delFlag != null">

edu-user/edu-user-server/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -16,7 +16,7 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
-		<association property="sysUser" javaType="com.keao.edu.auth.api.entity.SysUser">
+		<association property="sysUser" javaType="SysUser">
 			<result column="id_" property="id"/>
 			<result column="username_" property="username"/>
 			<result column="real_name_" property="realName"/>