update

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/handler/BaseAuthenticationFailureEvenHandler.java

@@ -5,6 +5,7 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.keao.edu.common.entity.HttpResponseResult;
 import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +15,6 @@ import org.springframework.security.web.authentication.ExceptionMappingAuthentic
 import org.springframework.stereotype.Component;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.keao.edu.common.entity.HttpResponseResult;
 
 @Component
 public class BaseAuthenticationFailureEvenHandler extends ExceptionMappingAuthenticationFailureHandler {

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.keao.edu.common.entity.HttpResponseResult;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -38,7 +39,6 @@ import com.keao.edu.auth.api.entity.SysUserLoginLog;
 import com.keao.edu.auth.service.SysUserLoginLogService;
 import com.keao.edu.auth.service.SysUserLoginService;
 import com.keao.edu.auth.service.SysUserService;
-import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.security.SecurityConstants;
 import com.keao.edu.im.api.client.ImFeignService;
 import com.keao.edu.im.api.entity.ImResult;

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/provider/service/DefaultUserDetailsService.java

@@ -1,8 +1,10 @@
 package com.keao.edu.auth.core.provider.service;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import com.keao.edu.auth.api.dto.SysUserInfo;
+import com.keao.edu.auth.api.entity.SysUser;
+import com.keao.edu.auth.service.SysUserService;
+import com.keao.edu.common.security.AuthUser;
+import com.keao.edu.common.security.SecurityConstants;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.LockedException;
@@ -12,22 +14,15 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import com.keao.edu.auth.api.dto.SysUserInfo;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.auth.service.SysUserService;
-import com.keao.edu.common.security.AuthUser;
-import com.keao.edu.common.security.SecurityConstants;
+import java.util.ArrayList;
+import java.util.List;
 
 @Service
 public class DefaultUserDetailsService implements UserDetailsService {
 
 	@Autowired
-	private PasswordEncoder passwordEncoder;
-
-	@Autowired
 	private SysUserService sysUserService;
 
 	private final String BCRYPT = "{bcrypt}";

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/web/controller/TokenController.java

@@ -1,5 +1,6 @@
 package com.keao.edu.auth.web.controller;
 
+import com.keao.edu.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -31,7 +32,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.auth.service.SysUserService;
 import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.security.AuthUser;
 import com.keao.edu.common.security.SecurityUtils;
 import com.keao.edu.im.api.client.ImFeignService;

edu-common/src/main/java/com/keao/edu/common/controller/BaseController.java

@@ -2,7 +2,6 @@ package com.keao.edu.common.controller;
 
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.exception.BizException;
-
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

edu-common/src/main/java/com/keao/edu/common/entity/DatabaseSource.java

@@ -1,136 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(database_source):
- */
-public class DatabaseSource {
-
-	/**  */
-	private Integer id;
-	
-	/** 租户ID */
-	private String tenantId;
-	
-	/** 驱动 */
-	private String driver;
-	
-	/** 连接信息 */
-	private String url;
-	
-	/** 用户名 */
-	private String username;
-	
-	/** 密码 */
-	private String password;
-	
-	/** 数据库类型 */
-	private String type;
-	
-	/**  */
-	private String memo;
-	
-	/**  */
-	private boolean delFlag;
-	
-	/**  */
-	private java.util.Date createTime;
-	
-	/**  */
-	private java.util.Date updateTime;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setTenantId(String tenantId){
-		this.tenantId = tenantId;
-	}
-	
-	public String getTenantId(){
-		return this.tenantId;
-	}
-			
-	public void setDriver(String driver){
-		this.driver = driver;
-	}
-	
-	public String getDriver(){
-		return this.driver;
-	}
-			
-	public void setUrl(String url){
-		this.url = url;
-	}
-	
-	public String getUrl(){
-		return this.url;
-	}
-			
-	public void setUsername(String username){
-		this.username = username;
-	}
-	
-	public String getUsername(){
-		return this.username;
-	}
-			
-	public void setPassword(String password){
-		this.password = password;
-	}
-	
-	public String getPassword(){
-		return this.password;
-	}
-			
-	public void setType(String type){
-		this.type = type;
-	}
-	
-	public String getType(){
-		return this.type;
-	}
-			
-	public void setMemo(String memo){
-		this.memo = memo;
-	}
-	
-	public String getMemo(){
-		return this.memo;
-	}
-			
-	public void setDelFlag(boolean delFlag){
-		this.delFlag = delFlag;
-	}
-	
-	public boolean isDelFlag(){
-		return this.delFlag;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/HelpCenterCatalog.java

@@ -1,103 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(help_center_catalog):
- */
-public class HelpCenterCatalog {
-
-	/**  */
-	private Integer id;
-	
-	/** 父分类ID */
-	private Integer parentId;
-	
-	/** 分类名称 */
-	private String name;
-	
-	/** 描述 */
-	private String description;
-	
-	/** 创建时间 */
-	private java.util.Date createOn;
-	
-	/** 修改时间 */
-	private java.util.Date modifyOn;
-	
-	/** 排序 */
-	private Integer order;
-	
-	/** 状态 1 显示 0隐藏 */
-	private Integer status;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setParentId(Integer parentId){
-		this.parentId = parentId;
-	}
-	
-	public Integer getParentId(){
-		return this.parentId;
-	}
-			
-	public void setName(String name){
-		this.name = name;
-	}
-	
-	public String getName(){
-		return this.name;
-	}
-			
-	public void setDescription(String description){
-		this.description = description;
-	}
-	
-	public String getDescription(){
-		return this.description;
-	}
-			
-	public void setCreateOn(java.util.Date createOn){
-		this.createOn = createOn;
-	}
-	
-	public java.util.Date getCreateOn(){
-		return this.createOn;
-	}
-			
-	public void setModifyOn(java.util.Date modifyOn){
-		this.modifyOn = modifyOn;
-	}
-	
-	public java.util.Date getModifyOn(){
-		return this.modifyOn;
-	}
-			
-	public void setOrder(Integer order){
-		this.order = order;
-	}
-	
-	public Integer getOrder(){
-		return this.order;
-	}
-			
-	public void setStatus(Integer status){
-		this.status = status;
-	}
-	
-	public Integer getStatus(){
-		return this.status;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/HelpCenterContent.java

@@ -1,103 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(help_center_content):
- */
-public class HelpCenterContent {
-
-	/**  */
-	private Integer id;
-	
-	/** 标题 */
-	private String title;
-	
-	/** 内容 */
-	private String content;
-	
-	/** 分类ID */
-	private Integer catalogId;
-	
-	/** 创建时间 */
-	private java.util.Date createOn;
-	
-	/** 修改时间 */
-	private java.util.Date modifyOn;
-	
-	/** 状态 1显示 0隐藏 */
-	private Integer status;
-	
-	/** 排序 */
-	private Integer order;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setTitle(String title){
-		this.title = title;
-	}
-	
-	public String getTitle(){
-		return this.title;
-	}
-			
-	public void setContent(String content){
-		this.content = content;
-	}
-	
-	public String getContent(){
-		return this.content;
-	}
-			
-	public void setCatalogId(Integer catalogId){
-		this.catalogId = catalogId;
-	}
-	
-	public Integer getCatalogId(){
-		return this.catalogId;
-	}
-			
-	public void setCreateOn(java.util.Date createOn){
-		this.createOn = createOn;
-	}
-	
-	public java.util.Date getCreateOn(){
-		return this.createOn;
-	}
-			
-	public void setModifyOn(java.util.Date modifyOn){
-		this.modifyOn = modifyOn;
-	}
-	
-	public java.util.Date getModifyOn(){
-		return this.modifyOn;
-	}
-			
-	public void setStatus(Integer status){
-		this.status = status;
-	}
-	
-	public Integer getStatus(){
-		return this.status;
-	}
-			
-	public void setOrder(Integer order){
-		this.order = order;
-	}
-	
-	public Integer getOrder(){
-		return this.order;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/HttpResponseResult.java

@@ -1,72 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.springframework.http.HttpStatus;
-
-/**
- * HttpResponse 返回结果
- */
-public class HttpResponseResult<T> {
-
-	private boolean status = true;
-	private String msg;
-	private T data;
-	private int code;
-
-	public HttpResponseResult(boolean status, int code, T data, String message) {
-		this.status = status;
-		this.msg = message;
-		this.data = data;
-		this.code = code;
-	}
-
-	public HttpResponseResult(boolean status, HttpStatus resultCode, T data, String message) {
-		this.status = status;
-		this.msg = message;
-		this.data = data;
-		this.code = resultCode.value();
-	}
-
-	public HttpResponseResult() {
-	}
-
-	public int getCode() {
-		return code;
-	}
-
-	public void setCode(int code) {
-		this.code = code;
-	}
-
-	public boolean getStatus() {
-		return status;
-	}
-
-	public void setStatus(boolean status) {
-		this.status = status;
-	}
-
-	public String getMsg() {
-		return msg;
-	}
-
-	public void setMsg(String msg) {
-		this.msg = msg;
-	}
-
-	public T getData() {
-		return data;
-	}
-
-	public void setData(T data) {
-		this.data = data;
-	}
-
-	public void success() {
-		this.status = true;
-	}
-
-	public void fail() {
-		this.status = false;
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/LoginEntity.java

@@ -1,43 +0,0 @@
-package com.keao.edu.common.entity;
-
-public class LoginEntity {
-    private String smsCode;
-
-    private String clientId;
-
-    private String clientSecret;
-
-    private String phone;
-
-    public String getSmsCode() {
-        return smsCode;
-    }
-
-    public void setSmsCode(String smsCode) {
-        this.smsCode = smsCode;
-    }
-
-    public String getClientId() {
-        return clientId;
-    }
-
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
-    public String getClientSecret() {
-        return clientSecret;
-    }
-
-    public void setClientSecret(String clientSecret) {
-        this.clientSecret = clientSecret;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-}

edu-common/src/main/java/com/keao/edu/common/entity/Student.java

@@ -1,48 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(student):
- */
-public class Student {
-
-	/**  */
-	private Integer userId;
-	
-	/**  */
-	private java.util.Date createTime;
-	
-	/**  */
-	private java.util.Date updateTime;
-	
-	public void setUserId(Integer userId){
-		this.userId = userId;
-	}
-	
-	public Integer getUserId(){
-		return this.userId;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/SysConfig.java

@@ -1,92 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_config):
- */
-public class SysConfig {
-
-	/**  */
-	private Long id;
-	
-	/** 参数名称 */
-	private String paramName;
-	
-	/** 参数值 */
-	private String paranValue;
-	
-	/** 描述 */
-	private String description;
-	
-	/** 创建时间 */
-	private java.util.Date createOn;
-	
-	/** 修改时间 */
-	private java.util.Date modifyOn;
-	
-	/**  */
-	private String group;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setParamName(String paramName){
-		this.paramName = paramName;
-	}
-	
-	public String getParamName(){
-		return this.paramName;
-	}
-			
-	public void setParanValue(String paranValue){
-		this.paranValue = paranValue;
-	}
-	
-	public String getParanValue(){
-		return this.paranValue;
-	}
-			
-	public void setDescription(String description){
-		this.description = description;
-	}
-	
-	public String getDescription(){
-		return this.description;
-	}
-			
-	public void setCreateOn(java.util.Date createOn){
-		this.createOn = createOn;
-	}
-	
-	public java.util.Date getCreateOn(){
-		return this.createOn;
-	}
-			
-	public void setModifyOn(java.util.Date modifyOn){
-		this.modifyOn = modifyOn;
-	}
-	
-	public java.util.Date getModifyOn(){
-		return this.modifyOn;
-	}
-			
-	public void setGroup(String group){
-		this.group = group;
-	}
-	
-	public String getGroup(){
-		return this.group;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/SysMenu.java

@@ -1,191 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_menu):
- */
-public class SysMenu {
-
-	/** 菜单ID */
-	private Integer id;
-	
-	/** 菜单名称 */
-	private String name;
-	
-	/** 菜单权限标识 */
-	private String permission;
-	
-	/** 父级路由 */
-	private String parentPermission;
-	
-	/** 接口地址 */
-	private String path;
-	
-	/** 父菜单ID */
-	private Integer parentId;
-	
-	/** 图标 */
-	private String icon;
-	
-	/** 前端页面地址 */
-	private String component;
-	
-	/** 排序值 */
-	private Integer sort;
-	
-	/** 0-开启，1- 关闭 */
-	private boolean keepAlive;
-	
-	/** 菜单类型 （0菜单 1按钮） */
-	private String type;
-	
-	/** 创建时间 */
-	private java.util.Date createTime;
-	
-	/** 更新时间 */
-	private java.util.Date updateTime;
-	
-	/** 逻辑删除标记(0--正常 1--删除) */
-	private boolean delFlag;
-	
-	/** 0显示，1不显示 */
-	private Integer hidden;
-	
-	/**  */
-	private String memo;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setName(String name){
-		this.name = name;
-	}
-	
-	public String getName(){
-		return this.name;
-	}
-			
-	public void setPermission(String permission){
-		this.permission = permission;
-	}
-	
-	public String getPermission(){
-		return this.permission;
-	}
-			
-	public void setParentPermission(String parentPermission){
-		this.parentPermission = parentPermission;
-	}
-	
-	public String getParentPermission(){
-		return this.parentPermission;
-	}
-			
-	public void setPath(String path){
-		this.path = path;
-	}
-	
-	public String getPath(){
-		return this.path;
-	}
-			
-	public void setParentId(Integer parentId){
-		this.parentId = parentId;
-	}
-	
-	public Integer getParentId(){
-		return this.parentId;
-	}
-			
-	public void setIcon(String icon){
-		this.icon = icon;
-	}
-	
-	public String getIcon(){
-		return this.icon;
-	}
-			
-	public void setComponent(String component){
-		this.component = component;
-	}
-	
-	public String getComponent(){
-		return this.component;
-	}
-			
-	public void setSort(Integer sort){
-		this.sort = sort;
-	}
-	
-	public Integer getSort(){
-		return this.sort;
-	}
-			
-	public void setKeepAlive(boolean keepAlive){
-		this.keepAlive = keepAlive;
-	}
-	
-	public boolean isKeepAlive(){
-		return this.keepAlive;
-	}
-			
-	public void setType(String type){
-		this.type = type;
-	}
-	
-	public String getType(){
-		return this.type;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	public void setDelFlag(boolean delFlag){
-		this.delFlag = delFlag;
-	}
-	
-	public boolean isDelFlag(){
-		return this.delFlag;
-	}
-			
-	public void setHidden(Integer hidden){
-		this.hidden = hidden;
-	}
-	
-	public Integer getHidden(){
-		return this.hidden;
-	}
-			
-	public void setMemo(String memo){
-		this.memo = memo;
-	}
-	
-	public String getMemo(){
-		return this.memo;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/SysMessage.java

@@ -1,169 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_message):
- */
-public class SysMessage {
-
-	/** 主键 */
-	private Long id;
-	
-	/** 标题 */
-	private String title;
-	
-	/** 消息内容 */
-	private String content;
-	
-	/** 消息类型；1，表示短信；2，表示邮件; 3,app推送消息 */
-	private Integer type;
-	
-	/** 状态，1,发送失败;2,待发送;3,发送中;4,发送完成 */
-	private Integer status;
-	
-	/** 接收人(多个人用逗号分隔) */
-	private String receiver;
-	
-	/** 发送时间 */
-	private java.util.Date sendTime;
-	
-	/** 错误信息 */
-	private String errorMsg;
-	
-	/** 创建时间 */
-	private java.util.Date createOn;
-	
-	/** 修改时间 */
-	private java.util.Date modifyOn;
-	
-	/** 用户编号 */
-	private Integer userId;
-	
-	/** 备注 */
-	private String memo;
-	
-	/** 是否已读 */
-	private Integer readStatus;
-	
-	/** 消息组 */
-	private String group;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setTitle(String title){
-		this.title = title;
-	}
-	
-	public String getTitle(){
-		return this.title;
-	}
-			
-	public void setContent(String content){
-		this.content = content;
-	}
-	
-	public String getContent(){
-		return this.content;
-	}
-			
-	public void setType(Integer type){
-		this.type = type;
-	}
-	
-	public Integer getType(){
-		return this.type;
-	}
-			
-	public void setStatus(Integer status){
-		this.status = status;
-	}
-	
-	public Integer getStatus(){
-		return this.status;
-	}
-			
-	public void setReceiver(String receiver){
-		this.receiver = receiver;
-	}
-	
-	public String getReceiver(){
-		return this.receiver;
-	}
-			
-	public void setSendTime(java.util.Date sendTime){
-		this.sendTime = sendTime;
-	}
-	
-	public java.util.Date getSendTime(){
-		return this.sendTime;
-	}
-			
-	public void setErrorMsg(String errorMsg){
-		this.errorMsg = errorMsg;
-	}
-	
-	public String getErrorMsg(){
-		return this.errorMsg;
-	}
-			
-	public void setCreateOn(java.util.Date createOn){
-		this.createOn = createOn;
-	}
-	
-	public java.util.Date getCreateOn(){
-		return this.createOn;
-	}
-			
-	public void setModifyOn(java.util.Date modifyOn){
-		this.modifyOn = modifyOn;
-	}
-	
-	public java.util.Date getModifyOn(){
-		return this.modifyOn;
-	}
-			
-	public void setUserId(Integer userId){
-		this.userId = userId;
-	}
-	
-	public Integer getUserId(){
-		return this.userId;
-	}
-			
-	public void setMemo(String memo){
-		this.memo = memo;
-	}
-	
-	public String getMemo(){
-		return this.memo;
-	}
-			
-	public void setReadStatus(Integer readStatus){
-		this.readStatus = readStatus;
-	}
-	
-	public Integer getReadStatus(){
-		return this.readStatus;
-	}
-			
-	public void setGroup(String group){
-		this.group = group;
-	}
-	
-	public String getGroup(){
-		return this.group;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/SysMessageConfig.java

@@ -1,103 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_message_config):
- */
-public class SysMessageConfig {
-
-	/**  */
-	private Integer id;
-	
-	/** 消息类型 */
-	private String messageType;
-	
-	/** 消息内容 */
-	private String content;
-	
-	/** 描述 */
-	private String description;
-	
-	/** 最后修改时间 */
-	private java.util.Date modifyOn;
-	
-	/** 跳转url */
-	private String url;
-	
-	/** 消息组 */
-	private String group;
-	
-	/** 当前消息是否发送，0不发送，1发送 */
-	private Integer sendFlag;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setMessageType(String messageType){
-		this.messageType = messageType;
-	}
-	
-	public String getMessageType(){
-		return this.messageType;
-	}
-			
-	public void setContent(String content){
-		this.content = content;
-	}
-	
-	public String getContent(){
-		return this.content;
-	}
-			
-	public void setDescription(String description){
-		this.description = description;
-	}
-	
-	public String getDescription(){
-		return this.description;
-	}
-			
-	public void setModifyOn(java.util.Date modifyOn){
-		this.modifyOn = modifyOn;
-	}
-	
-	public java.util.Date getModifyOn(){
-		return this.modifyOn;
-	}
-			
-	public void setUrl(String url){
-		this.url = url;
-	}
-	
-	public String getUrl(){
-		return this.url;
-	}
-			
-	public void setGroup(String group){
-		this.group = group;
-	}
-	
-	public String getGroup(){
-		return this.group;
-	}
-			
-	public void setSendFlag(Integer sendFlag){
-		this.sendFlag = sendFlag;
-	}
-	
-	public Integer getSendFlag(){
-		return this.sendFlag;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/SysNewsInformation.java

@@ -1,169 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_news_information):
- */
-public class SysNewsInformation {
-
-	/**  */
-	private Long id;
-	
-	/** 标题 */
-	private String title;
-	
-	/** 内容 */
-	private String content;
-	
-	/** 封面图片 */
-	private String coverImage;
-	
-	/** 类型 */
-	private Integer type;
-	
-	/** 状态（1-可见 0-不可见） */
-	private String status;
-	
-	/** 备注 */
-	private String memo;
-	
-	/**  */
-	private java.util.Date createTime;
-	
-	/**  */
-	private java.util.Date updateTime;
-	
-	/** 链接地址 */
-	private String linkUrl;
-	
-	/** 跳转类型_bank,_slef */
-	private String hrefTarget;
-	
-	/** 顺序号 */
-	private Integer order;
-	
-	/**  */
-	private boolean delFlag;
-	
-	/** 1-对内;2-对外 */
-	private Integer tenantId;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setTitle(String title){
-		this.title = title;
-	}
-	
-	public String getTitle(){
-		return this.title;
-	}
-			
-	public void setContent(String content){
-		this.content = content;
-	}
-	
-	public String getContent(){
-		return this.content;
-	}
-			
-	public void setCoverImage(String coverImage){
-		this.coverImage = coverImage;
-	}
-	
-	public String getCoverImage(){
-		return this.coverImage;
-	}
-			
-	public void setType(Integer type){
-		this.type = type;
-	}
-	
-	public Integer getType(){
-		return this.type;
-	}
-			
-	public void setStatus(String status){
-		this.status = status;
-	}
-	
-	public String getStatus(){
-		return this.status;
-	}
-			
-	public void setMemo(String memo){
-		this.memo = memo;
-	}
-	
-	public String getMemo(){
-		return this.memo;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	public void setLinkUrl(String linkUrl){
-		this.linkUrl = linkUrl;
-	}
-	
-	public String getLinkUrl(){
-		return this.linkUrl;
-	}
-			
-	public void setHrefTarget(String hrefTarget){
-		this.hrefTarget = hrefTarget;
-	}
-	
-	public String getHrefTarget(){
-		return this.hrefTarget;
-	}
-			
-	public void setOrder(Integer order){
-		this.order = order;
-	}
-	
-	public Integer getOrder(){
-		return this.order;
-	}
-			
-	public void setDelFlag(boolean delFlag){
-		this.delFlag = delFlag;
-	}
-	
-	public boolean isDelFlag(){
-		return this.delFlag;
-	}
-			
-	public void setTenantId(Integer tenantId){
-		this.tenantId = tenantId;
-	}
-	
-	public Integer getTenantId(){
-		return this.tenantId;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/SysOauthClientDetails.java

@@ -1,136 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_oauth_client_details):
- */
-public class SysOauthClientDetails {
-
-	/** 客户端ID */
-	private String id;
-	
-	/** 资源ID */
-	private String resourceIds;
-	
-	/** 客户端密钥 */
-	private String clientSecret;
-	
-	/** 作用域 */
-	private String scope;
-	
-	/** 授权方式 */
-	private String authorizedGrantTypes;
-	
-	/**  */
-	private String webServerRedirectUri;
-	
-	/**  */
-	private String authorities;
-	
-	/** 请求令牌有效时间 */
-	private Integer accessTokenValidity;
-	
-	/** 刷新令牌有效时间 */
-	private Integer refreshTokenValidity;
-	
-	/** 扩展信息 */
-	private String additionalInformation;
-	
-	/** 是否自动放行 */
-	private String autoapprove;
-	
-	public void setId(String id){
-		this.id = id;
-	}
-	
-	public String getId(){
-		return this.id;
-	}
-			
-	public void setResourceIds(String resourceIds){
-		this.resourceIds = resourceIds;
-	}
-	
-	public String getResourceIds(){
-		return this.resourceIds;
-	}
-			
-	public void setClientSecret(String clientSecret){
-		this.clientSecret = clientSecret;
-	}
-	
-	public String getClientSecret(){
-		return this.clientSecret;
-	}
-			
-	public void setScope(String scope){
-		this.scope = scope;
-	}
-	
-	public String getScope(){
-		return this.scope;
-	}
-			
-	public void setAuthorizedGrantTypes(String authorizedGrantTypes){
-		this.authorizedGrantTypes = authorizedGrantTypes;
-	}
-	
-	public String getAuthorizedGrantTypes(){
-		return this.authorizedGrantTypes;
-	}
-			
-	public void setWebServerRedirectUri(String webServerRedirectUri){
-		this.webServerRedirectUri = webServerRedirectUri;
-	}
-	
-	public String getWebServerRedirectUri(){
-		return this.webServerRedirectUri;
-	}
-			
-	public void setAuthorities(String authorities){
-		this.authorities = authorities;
-	}
-	
-	public String getAuthorities(){
-		return this.authorities;
-	}
-			
-	public void setAccessTokenValidity(Integer accessTokenValidity){
-		this.accessTokenValidity = accessTokenValidity;
-	}
-	
-	public Integer getAccessTokenValidity(){
-		return this.accessTokenValidity;
-	}
-			
-	public void setRefreshTokenValidity(Integer refreshTokenValidity){
-		this.refreshTokenValidity = refreshTokenValidity;
-	}
-	
-	public Integer getRefreshTokenValidity(){
-		return this.refreshTokenValidity;
-	}
-			
-	public void setAdditionalInformation(String additionalInformation){
-		this.additionalInformation = additionalInformation;
-	}
-	
-	public String getAdditionalInformation(){
-		return this.additionalInformation;
-	}
-			
-	public void setAutoapprove(String autoapprove){
-		this.autoapprove = autoapprove;
-	}
-	
-	public String getAutoapprove(){
-		return this.autoapprove;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/SysRole.java

@@ -1,103 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_role):
- */
-public class SysRole {
-
-	/**  */
-	private Integer id;
-	
-	/**  */
-	private String roleName;
-	
-	/**  */
-	private String roleCode;
-	
-	/**  */
-	private String roleDesc;
-	
-	/**  */
-	private java.util.Date createTime;
-	
-	/**  */
-	private java.util.Date updateTime;
-	
-	/** 删除标识（0-正常,1-删除） */
-	private String delFlag;
-	
-	/** 分部编号 */
-	private Integer organId;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setRoleName(String roleName){
-		this.roleName = roleName;
-	}
-	
-	public String getRoleName(){
-		return this.roleName;
-	}
-			
-	public void setRoleCode(String roleCode){
-		this.roleCode = roleCode;
-	}
-	
-	public String getRoleCode(){
-		return this.roleCode;
-	}
-			
-	public void setRoleDesc(String roleDesc){
-		this.roleDesc = roleDesc;
-	}
-	
-	public String getRoleDesc(){
-		return this.roleDesc;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	public void setDelFlag(String delFlag){
-		this.delFlag = delFlag;
-	}
-	
-	public String getDelFlag(){
-		return this.delFlag;
-	}
-			
-	public void setOrganId(Integer organId){
-		this.organId = organId;
-	}
-	
-	public Integer getOrganId(){
-		return this.organId;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/SysRoleMenu.java

@@ -1,37 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_role_menu):
- */
-public class SysRoleMenu {
-
-	/** 角色ID */
-	private Integer roleId;
-	
-	/** 菜单ID */
-	private Integer menuId;
-	
-	public void setRoleId(Integer roleId){
-		this.roleId = roleId;
-	}
-	
-	public Integer getRoleId(){
-		return this.roleId;
-	}
-			
-	public void setMenuId(Integer menuId){
-		this.menuId = menuId;
-	}
-	
-	public Integer getMenuId(){
-		return this.menuId;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/SysSuggestion.java

@@ -1,92 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_suggestion):
- */
-public class SysSuggestion {
-
-	/** 编号 */
-	private Long id;
-	
-	/** 联系方式 */
-	private String mobileNo;
-	
-	/** 标题 */
-	private String title;
-	
-	/** 内容 */
-	private String content;
-	
-	/** 用户编号 */
-	private Long userId;
-	
-	/** 提交时间 */
-	private java.util.Date createTime;
-	
-	/**  */
-	private String clientType;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setMobileNo(String mobileNo){
-		this.mobileNo = mobileNo;
-	}
-	
-	public String getMobileNo(){
-		return this.mobileNo;
-	}
-			
-	public void setTitle(String title){
-		this.title = title;
-	}
-	
-	public String getTitle(){
-		return this.title;
-	}
-			
-	public void setContent(String content){
-		this.content = content;
-	}
-	
-	public String getContent(){
-		return this.content;
-	}
-			
-	public void setUserId(Long userId){
-		this.userId = userId;
-	}
-	
-	public Long getUserId(){
-		return this.userId;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setClientType(String clientType){
-		this.clientType = clientType;
-	}
-	
-	public String getClientType(){
-		return this.clientType;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/SysTask.java

@@ -1,114 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_task):
- */
-public class SysTask {
-
-	/** 任务id，主键 */
-	private Integer id;
-	
-	/** 任务名称 */
-	private String name;
-	
-	/** 任务所属分组 */
-	private String group;
-	
-	/** 具体任务接口 */
-	private String jobClass;
-	
-	/** 任务执行的时间表达式 */
-	private String timeExp;
-	
-	/** 状态（-1，执行失败；0，暂停；1，准备就绪；2，执行中；3，执行成功） */
-	private Integer status;
-	
-	/** 任务描述 */
-	private String description;
-	
-	/** 创建时间 */
-	private java.util.Date createOn;
-	
-	/** 修改时间 */
-	private java.util.Date modifyOn;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setName(String name){
-		this.name = name;
-	}
-	
-	public String getName(){
-		return this.name;
-	}
-			
-	public void setGroup(String group){
-		this.group = group;
-	}
-	
-	public String getGroup(){
-		return this.group;
-	}
-			
-	public void setJobClass(String jobClass){
-		this.jobClass = jobClass;
-	}
-	
-	public String getJobClass(){
-		return this.jobClass;
-	}
-			
-	public void setTimeExp(String timeExp){
-		this.timeExp = timeExp;
-	}
-	
-	public String getTimeExp(){
-		return this.timeExp;
-	}
-			
-	public void setStatus(Integer status){
-		this.status = status;
-	}
-	
-	public Integer getStatus(){
-		return this.status;
-	}
-			
-	public void setDescription(String description){
-		this.description = description;
-	}
-	
-	public String getDescription(){
-		return this.description;
-	}
-			
-	public void setCreateOn(java.util.Date createOn){
-		this.createOn = createOn;
-	}
-	
-	public java.util.Date getCreateOn(){
-		return this.createOn;
-	}
-			
-	public void setModifyOn(java.util.Date modifyOn){
-		this.modifyOn = modifyOn;
-	}
-	
-	public java.util.Date getModifyOn(){
-		return this.modifyOn;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/SysUser.java

@@ -1,268 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_user):
- */
-public class SysUser {
-
-	/** 主键ID */
-	private Integer id;
-	
-	/** 用户名 */
-	private String username;
-	
-	/**  */
-	private String password;
-	
-	/** 随机盐 */
-	private String salt;
-	
-	/** 简介 */
-	private String phone;
-	
-	/** 头像 */
-	private String avatar;
-	
-	/** 创建时间 */
-	private java.util.Date createTime;
-	
-	/** 修改时间 */
-	private java.util.Date updateTime;
-	
-	/** 0-正常，9-锁定 */
-	private String lockFlag;
-	
-	/** 0-正常，1-删除 */
-	private String delFlag;
-	
-	/** 微信openid */
-	private String wxOpenid;
-	
-	/** QQ openid */
-	private String qqOpenid;
-	
-	/** 用户类型（STUDENT/TEACHER/SYSTEM） */
-	private String userType;
-	
-	/** 性别（0，女  1，男） */
-	private String gender;
-	
-	/** 民族 */
-	private String nation;
-	
-	/** 出生日期 */
-	private java.util.Date birthdate;
-	
-	/** 邮箱 */
-	private String email;
-	
-	/**  */
-	private String organId;
-	
-	/** 融云token */
-	private String imToken;
-	
-	/** 真实姓名 */
-	private String realName;
-	
-	/** 身份证号码 */
-	private String idCardNo;
-	
-	/** 是否是超管 */
-	private boolean isSuperAdmin;
-	
-	/** 微信号 */
-	private String wechatId;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setUsername(String username){
-		this.username = username;
-	}
-	
-	public String getUsername(){
-		return this.username;
-	}
-			
-	public void setPassword(String password){
-		this.password = password;
-	}
-	
-	public String getPassword(){
-		return this.password;
-	}
-			
-	public void setSalt(String salt){
-		this.salt = salt;
-	}
-	
-	public String getSalt(){
-		return this.salt;
-	}
-			
-	public void setPhone(String phone){
-		this.phone = phone;
-	}
-	
-	public String getPhone(){
-		return this.phone;
-	}
-			
-	public void setAvatar(String avatar){
-		this.avatar = avatar;
-	}
-	
-	public String getAvatar(){
-		return this.avatar;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	public void setLockFlag(String lockFlag){
-		this.lockFlag = lockFlag;
-	}
-	
-	public String getLockFlag(){
-		return this.lockFlag;
-	}
-			
-	public void setDelFlag(String delFlag){
-		this.delFlag = delFlag;
-	}
-	
-	public String getDelFlag(){
-		return this.delFlag;
-	}
-			
-	public void setWxOpenid(String wxOpenid){
-		this.wxOpenid = wxOpenid;
-	}
-	
-	public String getWxOpenid(){
-		return this.wxOpenid;
-	}
-			
-	public void setQqOpenid(String qqOpenid){
-		this.qqOpenid = qqOpenid;
-	}
-	
-	public String getQqOpenid(){
-		return this.qqOpenid;
-	}
-			
-	public void setUserType(String userType){
-		this.userType = userType;
-	}
-	
-	public String getUserType(){
-		return this.userType;
-	}
-			
-	public void setGender(String gender){
-		this.gender = gender;
-	}
-	
-	public String getGender(){
-		return this.gender;
-	}
-			
-	public void setNation(String nation){
-		this.nation = nation;
-	}
-	
-	public String getNation(){
-		return this.nation;
-	}
-			
-	public void setBirthdate(java.util.Date birthdate){
-		this.birthdate = birthdate;
-	}
-	
-	public java.util.Date getBirthdate(){
-		return this.birthdate;
-	}
-			
-	public void setEmail(String email){
-		this.email = email;
-	}
-	
-	public String getEmail(){
-		return this.email;
-	}
-			
-	public void setOrganId(String organId){
-		this.organId = organId;
-	}
-	
-	public String getOrganId(){
-		return this.organId;
-	}
-			
-	public void setImToken(String imToken){
-		this.imToken = imToken;
-	}
-	
-	public String getImToken(){
-		return this.imToken;
-	}
-			
-	public void setRealName(String realName){
-		this.realName = realName;
-	}
-	
-	public String getRealName(){
-		return this.realName;
-	}
-			
-	public void setIdCardNo(String idCardNo){
-		this.idCardNo = idCardNo;
-	}
-	
-	public String getIdCardNo(){
-		return this.idCardNo;
-	}
-			
-	public void setIsSuperAdmin(boolean isSuperAdmin){
-		this.isSuperAdmin = isSuperAdmin;
-	}
-	
-	public boolean isIsSuperAdmin(){
-		return this.isSuperAdmin;
-	}
-			
-	public void setWechatId(String wechatId){
-		this.wechatId = wechatId;
-	}
-	
-	public String getWechatId(){
-		return this.wechatId;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/SysUserContracts.java

@@ -1,92 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_user_contracts):
- */
-public class SysUserContracts {
-
-	/**  */
-	private Long id;
-	
-	/**  */
-	private Integer userId;
-	
-	/** 合同号 */
-	private String contractNo;
-	
-	/** 协议类型 */
-	private String type;
-	
-	/** 协议地址 */
-	private String url;
-	
-	/** 备注 */
-	private String memo;
-	
-	/** 创建时间 */
-	private java.util.Date createTime;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setUserId(Integer userId){
-		this.userId = userId;
-	}
-	
-	public Integer getUserId(){
-		return this.userId;
-	}
-			
-	public void setContractNo(String contractNo){
-		this.contractNo = contractNo;
-	}
-	
-	public String getContractNo(){
-		return this.contractNo;
-	}
-			
-	public void setType(String type){
-		this.type = type;
-	}
-	
-	public String getType(){
-		return this.type;
-	}
-			
-	public void setUrl(String url){
-		this.url = url;
-	}
-	
-	public String getUrl(){
-		return this.url;
-	}
-			
-	public void setMemo(String memo){
-		this.memo = memo;
-	}
-	
-	public String getMemo(){
-		return this.memo;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/SysUserLogin.java

@@ -1,92 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_user_login):
- */
-public class SysUserLogin {
-
-	/**  */
-	private Integer userId;
-	
-	/** 用户登录总次数 */
-	private Integer loginCount;
-	
-	/** 最后登录时间 */
-	private java.util.Date lastLoginTime;
-	
-	/** 最后登录IP */
-	private String lastLoginIp;
-	
-	/** 连续登陆失败的次数 */
-	private Integer failCount;
-	
-	/** 锁定时间 单位：分钟(超过锁定时间自动解锁) */
-	private Integer lockTime;
-	
-	/** 锁定日期 */
-	private java.util.Date lockDate;
-	
-	public void setUserId(Integer userId){
-		this.userId = userId;
-	}
-	
-	public Integer getUserId(){
-		return this.userId;
-	}
-			
-	public void setLoginCount(Integer loginCount){
-		this.loginCount = loginCount;
-	}
-	
-	public Integer getLoginCount(){
-		return this.loginCount;
-	}
-			
-	public void setLastLoginTime(java.util.Date lastLoginTime){
-		this.lastLoginTime = lastLoginTime;
-	}
-	
-	public java.util.Date getLastLoginTime(){
-		return this.lastLoginTime;
-	}
-			
-	public void setLastLoginIp(String lastLoginIp){
-		this.lastLoginIp = lastLoginIp;
-	}
-	
-	public String getLastLoginIp(){
-		return this.lastLoginIp;
-	}
-			
-	public void setFailCount(Integer failCount){
-		this.failCount = failCount;
-	}
-	
-	public Integer getFailCount(){
-		return this.failCount;
-	}
-			
-	public void setLockTime(Integer lockTime){
-		this.lockTime = lockTime;
-	}
-	
-	public Integer getLockTime(){
-		return this.lockTime;
-	}
-			
-	public void setLockDate(java.util.Date lockDate){
-		this.lockDate = lockDate;
-	}
-	
-	public java.util.Date getLockDate(){
-		return this.lockDate;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/SysUserLoginLog.java

@@ -1,70 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_user_login_log):
- */
-public class SysUserLoginLog {
-
-	/** 会员ID */
-	private Integer userId;
-	
-	/** 登录IP */
-	private String loginIp;
-	
-	/** 登录时间 */
-	private java.util.Date loginTime;
-	
-	/** 终端类型(0,pc端;1,人工;2,移动端;3,自动) */
-	private Integer source;
-	
-	/**  */
-	private Long id;
-	
-	public void setUserId(Integer userId){
-		this.userId = userId;
-	}
-	
-	public Integer getUserId(){
-		return this.userId;
-	}
-			
-	public void setLoginIp(String loginIp){
-		this.loginIp = loginIp;
-	}
-	
-	public String getLoginIp(){
-		return this.loginIp;
-	}
-			
-	public void setLoginTime(java.util.Date loginTime){
-		this.loginTime = loginTime;
-	}
-	
-	public java.util.Date getLoginTime(){
-		return this.loginTime;
-	}
-			
-	public void setSource(Integer source){
-		this.source = source;
-	}
-	
-	public Integer getSource(){
-		return this.source;
-	}
-			
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/SysUserRole.java

@@ -1,37 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(sys_user_role):
- */
-public class SysUserRole {
-
-	/** 用户ID */
-	private Integer userId;
-	
-	/** 角色ID */
-	private Integer roleId;
-	
-	public void setUserId(Integer userId){
-		this.userId = userId;
-	}
-	
-	public Integer getUserId(){
-		return this.userId;
-	}
-			
-	public void setRoleId(Integer roleId){
-		this.roleId = roleId;
-	}
-	
-	public Integer getRoleId(){
-		return this.roleId;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/TenantInfo.java

@@ -1,114 +0,0 @@
-package com.keao.edu.common.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(tenant_info):
- */
-public class TenantInfo {
-
-	/**  */
-	private Integer id;
-	
-	/**  */
-	private String name;
-	
-	/**  */
-	private String address;
-	
-	/**  */
-	private String domainName;
-	
-	/**  */
-	private String logoUrl;
-	
-	/**  */
-	private String contactName;
-	
-	/**  */
-	private String contactPhone;
-	
-	/**  */
-	private java.util.Date createTime;
-	
-	/**  */
-	private java.util.Date updateTime;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setName(String name){
-		this.name = name;
-	}
-	
-	public String getName(){
-		return this.name;
-	}
-			
-	public void setAddress(String address){
-		this.address = address;
-	}
-	
-	public String getAddress(){
-		return this.address;
-	}
-			
-	public void setDomainName(String domainName){
-		this.domainName = domainName;
-	}
-	
-	public String getDomainName(){
-		return this.domainName;
-	}
-			
-	public void setLogoUrl(String logoUrl){
-		this.logoUrl = logoUrl;
-	}
-	
-	public String getLogoUrl(){
-		return this.logoUrl;
-	}
-			
-	public void setContactName(String contactName){
-		this.contactName = contactName;
-	}
-	
-	public String getContactName(){
-		return this.contactName;
-	}
-			
-	public void setContactPhone(String contactPhone){
-		this.contactPhone = contactPhone;
-	}
-	
-	public String getContactPhone(){
-		return this.contactPhone;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

edu-common/src/main/java/com/keao/edu/common/entity/UploadReturnBean.java

@@ -1,46 +0,0 @@
-package com.keao.edu.common.entity;
-
-/** 
- * @author sunzl 
- * 2015年8月26日 下午4:42:03 
- * 上传返回对象
- */
-public class UploadReturnBean {
-
-	public UploadReturnBean(String url, boolean status, String message) {
-		super();
-		this.url = url;
-		this.status = status;
-		this.message = message;
-	}
-
-	private String url;
-
-	private boolean status;// 上传状态
-
-	private String message;// 上传失败 返回原因
-
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public boolean isStatus() {
-		return status;
-	}
-
-	public void setStatus(boolean status) {
-		this.status = status;
-	}
-
-	public String getMessage() {
-		return message;
-	}
-
-	public void setMessage(String message) {
-		this.message = message;
-	}
-}

edu-common/src/main/java/com/keao/edu/common/security/BaseAccessDeniedHandler.java

@@ -1,11 +1,7 @@
 package com.keao.edu.common.security;
 
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.keao.edu.common.constant.CommonConstants;
+import com.keao.edu.common.entity.HttpResponseResult;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.slf4j.Logger;
@@ -15,8 +11,10 @@ import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.oauth2.provider.error.OAuth2AccessDeniedHandler;
 import org.springframework.stereotype.Component;
 
-import com.keao.edu.common.constant.CommonConstants;
-import com.keao.edu.common.entity.HttpResponseResult;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
 
 @Component
 public class BaseAccessDeniedHandler extends OAuth2AccessDeniedHandler {

edu-task/src/main/java/com/keao/edu/task/controller/TaskController.java

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.task.dal.model.Task;
 import com.keao.edu.task.queryinfo.TaskQueryInfo;

edu-user/edu-user-server/pom.xml

@@ -50,11 +50,5 @@
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>com.keao.edu</groupId>
-            <artifactId>edu-cms</artifactId>
-            <version>1.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>

edu-user/edu-user-server/src/main/java/com/keao/edu/user/UserServerApplication.java

@@ -10,15 +10,17 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.web.client.RestTemplate;
 
 @SpringBootApplication
 @EnableDiscoveryClient
-@EnableFeignClients("com.keao.edu")
-@MapperScan("com.keao.edu.common.dal.dao")
-@ComponentScan(basePackages = "com.keao.edu")
+@EnableFeignClients({"com.keao.edu"})
+@MapperScan("com.keao.edu.user.dao")
+@ComponentScan(basePackages="com.keao.edu")
 @Configuration
 @EnableSwagger2Doc
+@EnableAsync
 public class UserServerApplication {
 
 	public static void main(String[] args) {

edu-user/edu-user-server/src/main/java/com/keao/edu/user/config/ResourceServerConfig.java

@@ -25,7 +25,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 	@Override
 	public void configure(HttpSecurity http) throws Exception {
 		http.authorizeRequests()
-				.antMatchers("/v2/api-docs", "/news/list", "/news/query", "/news/homeList")
+				.antMatchers("/v2/api-docs")
 				.permitAll()
 				// 任何人不登录都可以获取的资源
 				// .antMatchers("/ipController/**").hasIpAddress("127.0.0.1") //特定ip可以不登录获取资源

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/EmployeeController.java

@@ -1,10 +1,11 @@
 package com.keao.edu.user.controller;
 
+
 import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.Employee;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.QueryInfo;
-import com.keao.edu.common.service.EmployeeService;
+import com.keao.edu.user.entity.Employee;
+import com.keao.edu.user.service.EmployeeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/queryinfo/NewsInformationQueryInfo.java

@@ -1,76 +0,0 @@
-package com.keao.edu.user.controller.queryinfo;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-import com.keao.edu.cms.dal.entity.NewsStatusEnum;
-import com.keao.edu.common.page.QueryInfo;
-
-public class NewsInformationQueryInfo extends QueryInfo {
-
-	@ApiModelProperty(value = "类型,1精彩活动，2热门资讯,3banner类型", required = false)
-	private Integer type;
-
-	@ApiModelProperty(value = "资讯状态", required = false)
-	private NewsStatusEnum status;
-
-	@ApiModelProperty(value = "标题", required = false)
-	private String title;
-
-	@ApiModelProperty(value = "备注", required = false)
-	private String memo;
-	
-	@ApiModelProperty(value = "租客编号", required = false)
-	private Integer tenantId;
-	
-	private Date date;
-
-	public Integer getType() {
-		return type;
-	}
-
-	public void setType(Integer type) {
-		this.type = type;
-	}
-
-	public NewsStatusEnum getStatus() {
-		return status;
-	}
-
-	public void setStatus(NewsStatusEnum status) {
-		this.status = status;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public String getMemo() {
-		return memo;
-	}
-
-	public void setMemo(String memo) {
-		this.memo = memo;
-	}
-
-	public Integer getTenantId() {
-		return tenantId;
-	}
-
-	public void setTenantId(Integer tenantId) {
-		this.tenantId = tenantId;
-	}
-}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/EmployeeDao.java

@@ -0,0 +1,9 @@
+package com.keao.edu.user.dao;
+
+import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.user.entity.Employee;
+
+public interface EmployeeDao extends BaseDAO<Integer, Employee> {
+
+	
+}

edu-common/src/main/java/com/keao/edu/common/entity/Employee.java → edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/Employee.java

@@ -1,6 +1,5 @@
-package com.keao.edu.common.entity;
+package com.keao.edu.user.entity;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -12,50 +11,42 @@ public class Employee {
 	private Integer userId;
 	
 	/** 工作性质（兼职、全职、临时） */
-	@ApiModelProperty(value = "工作性质（兼职、全职、临时）", required = true)
 	private String jobNature;
-
-	@ApiModelProperty(value = "学历", required = true)
+	
+	/** 学历 */
 	private String educationBackground;
 	
 	/** 毕业学校 */
-	@ApiModelProperty(value = "毕业学校", required = true)
 	private String graduateSchool;
 	
 	/** 技术职称 */
-	@ApiModelProperty(value = "技术职称", required = true)
 	private String technicalTitles;
 	
 	/** 入职时间 */
-	@ApiModelProperty(value = "入职时间", required = true)
 	private java.util.Date entryDate;
 	
 	/** 证件类型 */
-	@ApiModelProperty(value = "证件类型", required = true)
 	private String certificateType;
 	
 	/** 证件号码 */
-	@ApiModelProperty(value = "证件号码", required = true)
 	private String certificateNum;
 	
+	/**  */
 	private java.util.Date updateTime;
 	
+	/**  */
 	private java.util.Date createTime;
 	
 	/** 介绍 */
-	@ApiModelProperty(value = "介绍", required = true)
 	private String introduction;
 	
 	/** 离职日期 */
-	@ApiModelProperty(value = "离职日期", required = true)
 	private java.util.Date demissionDate;
 	
 	/** 联系地址 */
-	@ApiModelProperty(value = "联系地址", required = true)
 	private String contactAddress;
 	
 	/** 邮政编码 */
-	@ApiModelProperty(value = "邮政编码", required = true)
 	private String postalCode;
 	
 	public void setUserId(Integer userId){

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

@@ -0,0 +1,8 @@
+package com.keao.edu.user.service;
+
+import com.keao.edu.common.service.BaseService;
+import com.keao.edu.user.entity.Employee;
+
+public interface EmployeeService extends BaseService<Integer, Employee> {
+
+}

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

@@ -0,0 +1,23 @@
+package com.keao.edu.user.service.impl;
+
+
+import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.common.service.impl.BaseServiceImpl;
+import com.keao.edu.user.dao.EmployeeDao;
+import com.keao.edu.user.entity.Employee;
+import com.keao.edu.user.service.EmployeeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> implements EmployeeService {
+	
+	@Autowired
+	private EmployeeDao employeeDao;
+
+	@Override
+	public BaseDAO<Integer, Employee> getDAO() {
+		return employeeDao;
+	}
+	
+}

edu-user/edu-user-server/src/main/resources/bootstrap-dev.properties

@@ -1,16 +0,0 @@
-#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
-#spring.profiles.active=dev
-#\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.99.212.176:8848
-#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=e246d169-227d-4012-8c34-e90e057d95d2
-#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
-spring.cloud.nacos.config.group=DEFAULT_GROUP
-#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=cms
-#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
-spring.cloud.nacos.config.file-extension=yaml
-#\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
-#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
-spring.cloud.nacos.config.enabled=true

edu-user/edu-user-server/src/main/resources/bootstrap-prod.properties

@@ -1,16 +0,0 @@
-#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
-#spring.profiles.active=dev
-#\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.96.80.97:8848
-#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
-#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
-spring.cloud.nacos.config.group=DEFAULT_GROUP
-#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=cms
-#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
-spring.cloud.nacos.config.file-extension=yaml
-#\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
-#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
-spring.cloud.nacos.config.enabled=true

edu-user/edu-user-server/src/main/resources/bootstrap-test.properties

@@ -1,16 +0,0 @@
-#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
-#spring.profiles.active=dev
-#\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.96.85.100:8848
-#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=02105743-16b8-46ab-87df-2aca0f3dbca3
-#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
-spring.cloud.nacos.config.group=DEFAULT_GROUP
-#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=cms
-#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
-spring.cloud.nacos.config.file-extension=yaml
-#\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
-#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
-spring.cloud.nacos.config.enabled=true

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

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.keao.edu.user.dao.EmployeeDao">
+	
+	<resultMap type="com.keao.edu.user.entity.Employee" id="Employee">
+		<result column="user_id_" property="userId" />
+		<result column="job_nature_" property="jobNature" />
+		<result column="education_background_" property="educationBackground" />
+		<result column="graduate_school_" property="graduateSchool" />
+		<result column="technical_titles_" property="technicalTitles" />
+		<result column="entry_date_" property="entryDate" />
+		<result column="certificate_type_" property="certificateType" />
+		<result column="certificate_num_" property="certificateNum" />
+		<result column="update_time_" property="updateTime" />
+		<result column="create_time_" property="createTime" />
+		<result column="introduction_" property="introduction" />
+		<result column="demission_date_" property="demissionDate" />
+		<result column="contact_address_" property="contactAddress" />
+		<result column="postal_code_" property="postalCode" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="Employee" >
+		SELECT * FROM employee WHERE user_id_ = #{userId} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="Employee">
+		SELECT * FROM employee ORDER BY user_id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.keao.edu.user.entity.Employee" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO employee (user_id_,job_nature_,education_background_,graduate_school_,technical_titles_,entry_date_,
+		certificate_type_,certificate_num_,update_time_,create_time_,introduction_,demission_date_,contact_address_,postal_code_)
+		VALUES(#{userId},#{jobNature},#{educationBackground},#{graduateSchool},#{technicalTitles},#{entryDate},#{certificateType},
+		#{certificateNum},#{updateTime},#{createTime},#{introduction},#{demissionDate},#{contactAddress},#{postalCode})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.keao.edu.user.entity.Employee">
+		UPDATE employee <set>
+		<if test="graduateSchool != null">
+		graduate_school_ = #{graduateSchool},
+		</if>
+		<if test="introduction != null">
+		introduction_ = #{introduction},
+		</if>
+		<if test="postalCode != null">
+		postal_code_ = #{postalCode},
+		</if>
+		<if test="technicalTitles != null">
+		technical_titles_ = #{technicalTitles},
+		</if>
+		<if test="entryDate != null">
+		entry_date_ = #{entryDate},
+		</if>
+		<if test="contactAddress != null">
+		contact_address_ = #{contactAddress},
+		</if>
+		<if test="jobNature != null">
+		job_nature_ = #{jobNature},
+		</if>
+		<if test="createTime != null">
+		create_time_ = #{createTime},
+		</if>
+		<if test="userId != null">
+		user_id_ = #{userId},
+		</if>
+		<if test="certificateType != null">
+		certificate_type_ = #{certificateType},
+		</if>
+		<if test="updateTime != null">
+		update_time_ = #{updateTime},
+		</if>
+		<if test="educationBackground != null">
+		education_background_ = #{educationBackground},
+		</if>
+		<if test="certificateNum != null">
+		certificate_num_ = #{certificateNum},
+		</if>
+		<if test="demissionDate != null">
+		demission_date_ = #{demissionDate},
+		</if>
+		</set> WHERE user_id_ = #{userId}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM employee WHERE user_id_ = #{userId} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="Employee" parameterType="map">
+		SELECT * FROM employee ORDER BY user_id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM employee
+	</select>
+</mapper>