!7 update

Merge pull request !7 from 邹旋/zouxuan

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysDept.java

@@ -8,7 +8,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class SysDept {
 
 	/**  */
-	private Integer deptId;
+	private Integer id;
 	
 	/** 部门名称 */
 	private String name;
@@ -27,15 +27,15 @@ public class SysDept {
 	
 	/**  */
 	private Integer parentId;
-	
-	public void setDeptId(Integer deptId){
-		this.deptId = deptId;
+
+	public Integer getId() {
+		return id;
 	}
-	
-	public Integer getDeptId(){
-		return this.deptId;
+
+	public void setId(Integer id) {
+		this.id = id;
 	}
-			
+
 	public void setName(String name){
 		this.name = name;
 	}

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysMenu.java

@@ -8,7 +8,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class SysMenu {
 
 	/** 菜单ID */
-	private Integer menuId;
+	private Integer id;
 
 	/** 菜单名称 */
 	private String name;
@@ -46,12 +46,12 @@ public class SysMenu {
 	/** 逻辑删除标记(0--正常 1--删除) */
 	private String delFlag;
 
-	public void setMenuId(Integer menuId) {
-		this.menuId = menuId;
+	public Integer getId() {
+		return id;
 	}
 
-	public Integer getMenuId() {
-		return this.menuId;
+	public void setId(Integer id) {
+		this.id = id;
 	}
 
 	public void setName(String name) {

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysOauthClientDetails.java

@@ -8,7 +8,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class SysOauthClientDetails {
 
 	/** 客户端ID */
-	private String clientId;
+	private String id;
 	
 	/** 资源ID */
 	private String resourceIds;
@@ -39,15 +39,15 @@ public class SysOauthClientDetails {
 	
 	/** 是否自动放行 */
 	private String autoapprove;
-	
-	public void setClientId(String clientId){
-		this.clientId = clientId;
+
+	public String getId() {
+		return id;
 	}
-	
-	public String getClientId(){
-		return this.clientId;
+
+	public void setId(String id) {
+		this.id = id;
 	}
-			
+
 	public void setResourceIds(String resourceIds){
 		this.resourceIds = resourceIds;
 	}

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysRole.java

@@ -8,7 +8,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class SysRole {
 
 	/**  */
-	private Integer roleId;
+	private Integer id;
 	
 	/**  */
 	private String roleName;
@@ -27,15 +27,15 @@ public class SysRole {
 	
 	/** 删除标识（0-正常,1-删除） */
 	private String delFlag;
-	
-	public void setRoleId(Integer roleId){
-		this.roleId = roleId;
+
+	public Integer getId() {
+		return id;
 	}
-	
-	public Integer getRoleId(){
-		return this.roleId;
+
+	public void setId(Integer id) {
+		this.id = id;
 	}
-			
+
 	public void setRoleName(String roleName){
 		this.roleName = roleName;
 	}

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -8,7 +8,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class SysUser {
 
 	/** 主键ID */
-	private Integer userId;
+	private Integer id;
 
 	/** 用户名 */
 	private String username;
@@ -49,12 +49,12 @@ public class SysUser {
 	/** 用户类型 */
 	private String userType;
 
-	public void setUserId(Integer userId) {
-		this.userId = userId;
+	public Integer getId() {
+		return id;
 	}
 
-	public Integer getUserId() {
-		return this.userId;
+	public void setId(Integer id) {
+		this.id = id;
 	}
 
 	public void setUsername(String username) {

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/ImageVerifyCodeConfig.java

@@ -0,0 +1,28 @@
+package com.ym.mec.auth.config;
+
+import com.google.code.kaptcha.impl.DefaultKaptcha;
+import com.google.code.kaptcha.util.Config;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Properties;
+
+@Configuration
+public class ImageVerifyCodeConfig {
+    @Bean(name="captchaProducer")
+    public DefaultKaptcha getKaptchaBean(){
+        DefaultKaptcha defaultKaptcha=new DefaultKaptcha();
+        Properties properties=new Properties();
+        properties.setProperty("kaptcha.border", "yes");
+        properties.setProperty("kaptcha.border.color", "105,179,90");
+        properties.setProperty("kaptcha.textproducer.font.color", "blue");
+        properties.setProperty("kaptcha.image.width", "125");
+        properties.setProperty("kaptcha.image.height", "45");
+        properties.setProperty("kaptcha.session.key", "code");
+        properties.setProperty("kaptcha.textproducer.char.length", "4");
+        properties.setProperty("kaptcha.textproducer.font.names", "宋体,楷体,微软雅黑");
+        Config config=new Config(properties);
+        defaultKaptcha.setConfig(config);
+        return defaultKaptcha;
+    }
+}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/AuthenticationFailureListener.java

@@ -43,10 +43,10 @@ public class AuthenticationFailureListener implements ApplicationListener<Authen
             }
         }
         if(sysUser != null){
-            SysUserLogin userLogin = sysUserLoginService.findLoginByUserId(sysUser.getUserId());
+            SysUserLogin userLogin = sysUserLoginService.findLoginByUserId(sysUser.getId());
             if(userLogin == null){
                 userLogin = new SysUserLogin();
-                userLogin.setUserId(sysUser.getUserId());
+                userLogin.setUserId(sysUser.getId());
                 userLogin.setFailCount(1);
                 userLogin.setLastLoginTime(date);
                 userLogin.setLastLoginIp(hashMap.get("remoteAddress"));

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

@@ -71,11 +71,11 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 		}
 		Date date = new Date();
 		//修改添加登录信息
-		SysUserLogin userLogin = sysUserLoginService.findLoginByUserId(sysUser.getUserId());
+		SysUserLogin userLogin = sysUserLoginService.findLoginByUserId(sysUser.getId());
 		if(userLogin == null){
 			userLogin = new SysUserLogin();
 			userLogin.setLastLoginIp(request.getRemoteAddr());
-			userLogin.setUserId(sysUser.getUserId());
+			userLogin.setUserId(sysUser.getId());
 			userLogin.setLoginCount(1);
 			sysUserLoginService.insert(setUserLogin(userLogin,date));
 		}else {
@@ -87,7 +87,7 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 		SysUserLoginLog sysUserLoginLog = new SysUserLoginLog();
 		sysUserLoginLog.setLoginTime(date);
 		sysUserLoginLog.setLoginIp(request.getRemoteAddr());
-		sysUserLoginLog.setUserId(sysUser.getUserId());
+		sysUserLoginLog.setUserId(sysUser.getId());
 		sysUserLoginLogService.insert(sysUserLoginLog);
 		
 		try {

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -62,10 +62,10 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 		SysUserInfo userInfo = new SysUserInfo();
 		userInfo.setSysUser(sysUser);
 
-		List<String> roleCodeList = sysUserRoleService.queryRoleCodeListByUserId(sysUser.getUserId());
+		List<String> roleCodeList = sysUserRoleService.queryRoleCodeListByUserId(sysUser.getId());
 		userInfo.setRoles(roleCodeList.toArray(new String[roleCodeList.size()]));
 
-		List<Integer> roleIdList = sysUserRoleService.queryRoleIdListByUserId(sysUser.getUserId());
+		List<Integer> roleIdList = sysUserRoleService.queryRoleIdListByUserId(sysUser.getId());
 		List<String> permissionList = sysRoleMenuService.queryPermissionsByRoleIdList(roleIdList);
 
 		userInfo.setPermissions(permissionList.toArray(new String[permissionList.size()]));

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/SmsCodeController.java

@@ -47,6 +47,20 @@ public class SmsCodeController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation("校验短信验证码")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "phone", value = "手机号", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "code", value = "短信验证码", required = true, dataType = "String") })
+    @PostMapping("/verifySmsCode")
+    public Object verifySmsCode(String phone,String code) {
+        if(StringUtils.isEmpty(phone) || StringUtils.isEmpty(code)){
+            return failed(SecurityConstants.PARAM_VERIFY_EXCEPTION);
+        }
+        if(smsCodeService.verifyValidCode(phone,code)){
+            return succeed();
+        }
+        return failed();
+    }
+
     @PostMapping("/verifyLoginImage")
     @ApiOperation("校验登录图形验证码")
     @ApiImplicitParams({ @ApiImplicitParam(name = "phone", value = "手机号", required = true, dataType = "String"),

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/TokenController.java

@@ -1,19 +1,12 @@
 package com.ym.mec.auth.web.controller;
 
-import java.io.IOException;
-import java.util.Base64;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ym.mec.auth.core.service.AccessTokenService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.provider.token.DefaultTokenServices;
@@ -24,10 +17,11 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ym.mec.auth.core.service.AccessTokenService;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.entity.HttpResponseResult;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Base64;
+import java.util.Map;
 
 @RestController
 public class TokenController extends BaseController {

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysDeptMapper.xml

@@ -7,23 +7,23 @@
 <mapper namespace="com.ym.mec.auth.dal.dao.SysDeptDao">
 	
 	<resultMap type="com.ym.mec.auth.api.entity.SysDept" id="SysDept">
-		<result column="dept_id" property="deptId" />
-		<result column="name" property="name" />
-		<result column="sort" property="sort" />
-		<result column="create_time" property="createTime" />
-		<result column="update_time" property="updateTime" />
-		<result column="del_flag" property="delFlag" />
-		<result column="parent_id" property="parentId" />
+		<result column="id_" property="id" />
+		<result column="name_" property="name" />
+		<result column="sort_" property="sort" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="del_flag_" property="delFlag" />
+		<result column="parent_id_" property="parentId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysDept" >
-		SELECT * FROM sys_dept WHERE dept_id = #{deptId} 
+		SELECT * FROM sys_dept WHERE id_ = #{id}
 	</select>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysDept">
-		SELECT * FROM sys_dept ORDER BY dept_id
+		SELECT * FROM sys_dept ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -33,22 +33,22 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO sys_dept (dept_id,name,sort,create_time,update_time,del_flag,parent_id) VALUES(#{deptId},#{name},#{sort},#{createTime},#{updateTime},#{delFlag},#{parentId})
+		INSERT INTO sys_dept (id_,name_,sort,create_time_,update_time_,del_flag_,parent_id_) VALUES(#{id},#{name},#{sort},#{createTime},#{updateTime},#{delFlag},#{parentId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysDept">
-		UPDATE sys_dept SET del_flag = #{delFlag},update_time = #{updateTime},create_time = #{createTime},parent_id = #{parentId},name = #{name},sort = #{sort},dept_id = #{deptId} WHERE dept_id = #{deptId} 
+		UPDATE sys_dept SET del_flag_ = #{delFlag},update_time_ = #{updateTime},create_time_ = #{createTime},parent_id_ = #{parentId},name_ = #{name},sort_ = #{sort} WHERE id_ = #{id}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
-		DELETE FROM sys_dept WHERE dept_id = #{deptId} 
+		DELETE FROM sys_dept WHERE id_ = #{id}
 	</delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysDept" parameterType="map">
-		SELECT * FROM sys_dept ORDER BY dept_id <include refid="global.limit"/>
+		SELECT * FROM sys_dept ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysDeptRelationMapper.xml

@@ -7,18 +7,18 @@
 <mapper namespace="com.ym.mec.auth.dal.dao.SysDeptRelationDao">
 	
 	<resultMap type="com.ym.mec.auth.api.entity.SysDeptRelation" id="SysDeptRelation">
-		<result column="ancestor" property="ancestor" />
-		<result column="descendant" property="descendant" />
+		<result column="ancestor_" property="ancestor" />
+		<result column="descendant_" property="descendant" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysDeptRelation" parameterType="java.util.Map">
-		SELECT * FROM sys_dept_relation WHERE ancestor = #{ancestor} AND descendant = #{descendant} 
+		SELECT * FROM sys_dept_relation WHERE ancestor_ = #{ancestor} AND descendant_ = #{descendant}
 	</select>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysDeptRelation">
-		SELECT * FROM sys_dept_relation ORDER BY ancestor,descendant
+		SELECT * FROM sys_dept_relation ORDER BY ancestor_,descendant_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -28,22 +28,22 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO sys_dept_relation (ancestor,descendant) VALUES(#{ancestor},#{descendant})
+		INSERT INTO sys_dept_relation (ancestor_,descendant_) VALUES(#{ancestor},#{descendant})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysDeptRelation">
-		UPDATE sys_dept_relation SET ancestor = #{ancestor},descendant = #{descendant} WHERE ancestor = #{ancestor} AND descendant = #{descendant} 
+		UPDATE sys_dept_relation SET ancestor_ = #{ancestor},descendant_ = #{descendant} WHERE ancestor_ = #{ancestor} AND descendant_ = #{descendant}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" parameterType="java.util.Map">
-		DELETE FROM sys_dept_relation WHERE ancestor = #{ancestor} AND descendant = #{descendant} 
+		DELETE FROM sys_dept_relation WHERE ancestor_ = #{ancestor} AND descendant_ = #{descendant}
 	</delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysDeptRelation" parameterType="map">
-		SELECT * FROM sys_dept_relation ORDER BY ancestor,descendant <include refid="global.limit"/>
+		SELECT * FROM sys_dept_relation ORDER BY ancestor_,descendant_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -7,29 +7,29 @@
 <mapper namespace="com.ym.mec.auth.dal.dao.SysMenuDao">
 	
 	<resultMap type="com.ym.mec.auth.api.entity.SysMenu" id="SysMenu">
-		<result column="menu_id" property="menuId" />
-		<result column="name" property="name" />
-		<result column="permission" property="permission" />
-		<result column="path" property="path" />
-		<result column="parent_id" property="parentId" />
-		<result column="icon" property="icon" />
-		<result column="component" property="component" />
-		<result column="sort" property="sort" />
-		<result column="keep_alive" property="keepAlive" />
-		<result column="type" property="type" />
-		<result column="create_time" property="createTime" />
-		<result column="update_time" property="updateTime" />
-		<result column="del_flag" property="delFlag" />
+		<result column="id_" property="id" />
+		<result column="name_" property="name" />
+		<result column="permission_" property="permission" />
+		<result column="path_" property="path" />
+		<result column="parent_id_" property="parentId" />
+		<result column="icon_" property="icon" />
+		<result column="component_" property="component" />
+		<result column="sort_" property="sort" />
+		<result column="keep_alive_" property="keepAlive" />
+		<result column="type_" property="type" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="del_flag_" property="delFlag" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysMenu" >
-		SELECT * FROM sys_menu WHERE menu_id = #{menuId} 
+		SELECT * FROM sys_menu WHERE id_ = #{id}
 	</select>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysMenu">
-		SELECT * FROM sys_menu ORDER BY menu_id
+		SELECT * FROM sys_menu ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -39,22 +39,22 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO sys_menu (menu_id,name,permission,path,parent_id,icon,component,sort,keep_alive,type,create_time,update_time,del_flag) VALUES(#{menuId},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{keepAlive},#{type},#{createTime},#{updateTime},#{delFlag})
+		INSERT INTO sys_menu (id_,name_,permission_,path,parent_id_,icon_,component_,sort,keep_alive_,type_,create_time_,update_time_,del_flag_) VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{keepAlive},#{type},#{createTime},#{updateTime},#{delFlag})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysMenu">
-		UPDATE sys_menu SET path = #{path},del_flag = #{delFlag},update_time = #{updateTime},create_time = #{createTime},parent_id = #{parentId},name = #{name},icon = #{icon},component = #{component},permission = #{permission},sort = #{sort},keep_alive = #{keepAlive},type = #{type},menu_id = #{menuId} WHERE menu_id = #{menuId} 
+		UPDATE sys_menu SET path_ = #{path},del_flag_ = #{delFlag},update_time_ = #{updateTime},create_time_ = #{createTime},parent_id_ = #{parentId},name_ = #{name},icon_ = #{icon},component_ = #{component},permission_ = #{permission},sort_ = #{sort},keep_alive_ = #{keepAlive},type_ = #{type} WHERE id_ = #{id}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
-		DELETE FROM sys_menu WHERE menu_id = #{menuId} 
+		DELETE FROM sys_menu WHERE id_ = #{id}
 	</delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMenu" parameterType="map">
-		SELECT * FROM sys_menu ORDER BY menu_id <include refid="global.limit"/>
+		SELECT * FROM sys_menu ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
@@ -63,14 +63,14 @@
 	</select>
 
     <select id="getMenusByRoleId" resultType="com.ym.mec.auth.api.entity.SysMenu">
-		SELECT sm.* FROM sys_role_menu srm LEFT JOIN sys_menu sm ON srm.menu_id = sm.menu_id WHERE srm.role_id = 1 AND sm.del_flag = 0
+		SELECT sm.* FROM sys_role_menu srm LEFT JOIN sys_menu sm ON srm.menu_id_ = sm.id_ WHERE srm.role_id_ = 1 AND sm.del_flag_ = 0
 	</select>
 
 	<select id="findByUser" resultType="com.ym.mec.auth.api.entity.SysMenu">
 		SELECT sm.* FROM sys_user_role sur
-		LEFT JOIN sys_role sr ON sur.role_id = sr.role_id
-		LEFT JOIN sys_role_menu srm ON sr.role_id = srm.role_id
-		LEFT JOIN sys_menu sm ON srm.menu_id = sm.menu_id
-		WHERE sur.user_id = #{userId} AND sr.del_flag = 0 AND sm.del_flag = 0
+		LEFT JOIN sys_role sr ON sur.role_id_ = sr.id_
+		LEFT JOIN sys_role_menu srm ON sr.id_ = srm.role_id_
+		LEFT JOIN sys_menu sm ON srm.menu_id_ = sm.id_
+		WHERE sur.user_id_ = #{userId} AND sr.del_flag_ = 0 AND sm.del_flag_ = 0
 	</select>
 </mapper>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysOauthClientDetailsMapper.xml

@@ -7,27 +7,27 @@
 <mapper namespace="com.ym.mec.auth.dal.dao.SysOauthClientDetailsDao">
 	
 	<resultMap type="com.ym.mec.auth.api.entity.SysOauthClientDetails" id="SysOauthClientDetails">
-		<result column="client_id" property="clientId" />
-		<result column="resource_ids" property="resourceIds" />
-		<result column="client_secret" property="clientSecret" />
-		<result column="scope" property="scope" />
-		<result column="authorized_grant_types" property="authorizedGrantTypes" />
-		<result column="web_server_redirect_uri" property="webServerRedirectUri" />
-		<result column="authorities" property="authorities" />
-		<result column="access_token_validity" property="accessTokenValidity" />
-		<result column="refresh_token_validity" property="refreshTokenValidity" />
-		<result column="additional_information" property="additionalInformation" />
-		<result column="autoapprove" property="autoapprove" />
+		<result column="id_" property="id" />
+		<result column="resource_ids_" property="resourceIds" />
+		<result column="client_secret_" property="clientSecret" />
+		<result column="scope_" property="scope" />
+		<result column="authorized_grant_types_" property="authorizedGrantTypes" />
+		<result column="web_server_redirect_uri_" property="webServerRedirectUri" />
+		<result column="authorities_" property="authorities" />
+		<result column="access_token_validity_" property="accessTokenValidity" />
+		<result column="refresh_token_validity_" property="refreshTokenValidity" />
+		<result column="additional_information_" property="additionalInformation" />
+		<result column="autoapprove_" property="autoapprove" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysOauthClientDetails" >
-		SELECT * FROM sys_oauth_client_details WHERE client_id = #{clientId} 
+		SELECT * FROM sys_oauth_client_details WHERE id_ = #{id}
 	</select>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysOauthClientDetails">
-		SELECT * FROM sys_oauth_client_details ORDER BY client_id
+		SELECT * FROM sys_oauth_client_details ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -37,22 +37,22 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO sys_oauth_client_details (client_id,resource_ids,client_secret,scope,authorized_grant_types,web_server_redirect_uri,authorities,access_token_validity,refresh_token_validity,additional_information,autoapprove) VALUES(#{clientId},#{resourceIds},#{clientSecret},#{scope},#{authorizedGrantTypes},#{webServerRedirectUri},#{authorities},#{accessTokenValidity},#{refreshTokenValidity},#{additionalInformation},#{autoapprove})
+		INSERT INTO sys_oauth_client_details (id_,resource_ids_,client_secret_,scope_,authorized_grant_types_,web_server_redirect_uri_,authorities_,access_token_validity_,refresh_token_validity_,additional_information_,autoapprove_) VALUES(#{id},#{resourceIds},#{clientSecret},#{scope},#{authorizedGrantTypes},#{webServerRedirectUri},#{authorities},#{accessTokenValidity},#{refreshTokenValidity},#{additionalInformation},#{autoapprove})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysOauthClientDetails">
-		UPDATE sys_oauth_client_details SET additional_information = #{additionalInformation},access_token_validity = #{accessTokenValidity},autoapprove = #{autoapprove},scope = #{scope},web_server_redirect_uri = #{webServerRedirectUri},authorized_grant_types = #{authorizedGrantTypes},client_secret = #{clientSecret},resource_ids = #{resourceIds},client_id = #{clientId},authorities = #{authorities},refresh_token_validity = #{refreshTokenValidity} WHERE client_id = #{clientId} 
+		UPDATE sys_oauth_client_details SET additional_information_ = #{additionalInformation},access_token_validity_ = #{accessTokenValidity},autoapprove_ = #{autoapprove},scope_ = #{scope},web_server_redirect_uri_ = #{webServerRedirectUri},authorized_grant_types_ = #{authorizedGrantTypes},client_secret_ = #{clientSecret},resource_ids_ = #{resourceIds},authorities_ = #{authorities},refresh_token_validity_ = #{refreshTokenValidity} WHERE id_ = #{id}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
-		DELETE FROM sys_oauth_client_details WHERE client_id = #{clientId} 
+		DELETE FROM sys_oauth_client_details WHERE id_ = #{id}
 	</delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysOauthClientDetails" parameterType="map">
-		SELECT * FROM sys_oauth_client_details ORDER BY client_id <include refid="global.limit"/>
+		SELECT * FROM sys_oauth_client_details ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysRoleDeptMapper.xml

@@ -7,19 +7,19 @@
 <mapper namespace="com.ym.mec.auth.dal.dao.SysRoleDeptDao">
 	
 	<resultMap type="com.ym.mec.auth.api.entity.SysRoleDept" id="SysRoleDept">
-		<result column="id" property="id" />
-		<result column="role_id" property="roleId" />
-		<result column="dept_id" property="deptId" />
+		<result column="id_" property="id" />
+		<result column="role_id_" property="roleId" />
+		<result column="dept_id_" property="deptId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysRoleDept" >
-		SELECT * FROM sys_role_dept WHERE id = #{id} 
+		SELECT * FROM sys_role_dept WHERE id_ = #{id}
 	</select>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysRoleDept">
-		SELECT * FROM sys_role_dept ORDER BY id
+		SELECT * FROM sys_role_dept ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -29,22 +29,22 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO sys_role_dept (id,role_id,dept_id) VALUES(#{id},#{roleId},#{deptId})
+		INSERT INTO sys_role_dept (id_,role_id_,dept_id_) VALUES(#{id},#{roleId},#{deptId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysRoleDept">
-		UPDATE sys_role_dept SET role_id = #{roleId},id = #{id},dept_id = #{deptId} WHERE id = #{id} 
+		UPDATE sys_role_dept SET role_id_ = #{roleId},dept_id_ = #{deptId} WHERE id_ = #{id}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
-		DELETE FROM sys_role_dept WHERE id = #{id} 
+		DELETE FROM sys_role_dept WHERE id_ = #{id}
 	</delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysRoleDept" parameterType="map">
-		SELECT * FROM sys_role_dept ORDER BY id <include refid="global.limit"/>
+		SELECT * FROM sys_role_dept ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysRoleMapper.xml

@@ -7,23 +7,23 @@
 <mapper namespace="com.ym.mec.auth.dal.dao.SysRoleDao">
 	
 	<resultMap type="com.ym.mec.auth.api.entity.SysRole" id="SysRole">
-		<result column="role_id" property="roleId" />
-		<result column="role_name" property="roleName" />
-		<result column="role_code" property="roleCode" />
-		<result column="role_desc" property="roleDesc" />
-		<result column="create_time" property="createTime" />
-		<result column="update_time" property="updateTime" />
-		<result column="del_flag" property="delFlag" />
+		<result column="id_" property="id" />
+		<result column="role_name_" property="roleName" />
+		<result column="role_code_" property="roleCode" />
+		<result column="role_desc_" property="roleDesc" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="del_flag_" property="delFlag" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysRole" >
-		SELECT * FROM sys_role WHERE role_id = #{roleId} 
+		SELECT * FROM sys_role WHERE id_ = #{id}
 	</select>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysRole">
-		SELECT * FROM sys_role ORDER BY role_id
+		SELECT * FROM sys_role ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -33,22 +33,22 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO sys_role (role_id,role_name,role_code,role_desc,create_time,update_time,del_flag) VALUES(#{roleId},#{roleName},#{roleCode},#{roleDesc},#{createTime},#{updateTime},#{delFlag})
+		INSERT INTO sys_role (id_,role_name_,role_code_,role_desc_,create_time_,update_time_,del_flag_) VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},#{createTime},#{updateTime},#{delFlag})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysRole">
-		UPDATE sys_role SET role_name = #{roleName},del_flag = #{delFlag},update_time = #{updateTime},create_time = #{createTime},role_id = #{roleId},role_code = #{roleCode},role_desc = #{roleDesc} WHERE role_id = #{roleId} 
+		UPDATE sys_role SET role_name_ = #{roleName},del_flag_ = #{delFlag},update_time_ = #{updateTime},create_time_ = #{createTime},role_code_ = #{roleCode},role_desc_ = #{roleDesc} WHERE id_ = #{id}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
-		DELETE FROM sys_role WHERE role_id = #{roleId} 
+		DELETE FROM sys_role WHERE id_ = #{id}
 	</delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysRole" parameterType="map">
-		SELECT * FROM sys_role ORDER BY role_id <include refid="global.limit"/>
+		SELECT * FROM sys_role ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
@@ -56,7 +56,7 @@
 		SELECT COUNT(*) FROM sys_role
 	</select>
 
-    <select id="findRoleByUserId" resultType="com.ym.mec.auth.api.entity.SysRole">
-		SELECT sr.* FROM sys_user_role sur LEFT JOIN sys_role sr ON sur.role_id = sr.role_id WHERE sur.user_id = #{userId} AND sr.del_flag = 0
+    <select id="findRoleByUserId" resultMap="SysRole">
+		SELECT sr.* FROM sys_user_role sur LEFT JOIN sys_role sr ON sur.role_id_ = sr.id_ WHERE sur.user_id_ = #{userId} AND sr.del_flag_ = 0
 	</select>
 </mapper>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysRoleMenuMapper.xml

@@ -7,18 +7,18 @@
 <mapper namespace="com.ym.mec.auth.dal.dao.SysRoleMenuDao">
 	
 	<resultMap type="com.ym.mec.auth.api.entity.SysRoleMenu" id="SysRoleMenu">
-		<result column="role_id" property="roleId" />
-		<result column="menu_id" property="menuId" />
+		<result column="role_id_" property="roleId" />
+		<result column="menu_id_" property="menuId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysRoleMenu" parameterType="java.util.Map">
-		SELECT * FROM sys_role_menu WHERE role_id = #{roleId} AND menu_id = #{menuId} 
+		SELECT * FROM sys_role_menu WHERE role_id_ = #{roleId} AND menu_id_ = #{menuId}
 	</select>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysRoleMenu">
-		SELECT * FROM sys_role_menu ORDER BY role_id,menu_id
+		SELECT * FROM sys_role_menu ORDER BY role_id_,menu_id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -28,22 +28,22 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO sys_role_menu (role_id,menu_id) VALUES(#{roleId},#{menuId})
+		INSERT INTO sys_role_menu (role_id_,menu_id_) VALUES(#{roleId},#{menuId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysRoleMenu">
-		UPDATE sys_role_menu SET role_id = #{roleId},menu_id = #{menuId} WHERE role_id = #{roleId} AND menu_id = #{menuId} 
+		UPDATE sys_role_menu SET role_id_ = #{roleId},menu_id_ = #{menuId} WHERE role_id_ = #{roleId} AND menu_id_ = #{menuId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" parameterType="java.util.Map">
-		DELETE FROM sys_role_menu WHERE role_id = #{roleId} AND menu_id = #{menuId} 
+		DELETE FROM sys_role_menu WHERE role_id_ = #{roleId} AND menu_id_ = #{menuId}
 	</delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysRoleMenu" parameterType="map">
-		SELECT * FROM sys_role_menu ORDER BY role_id,menu_id <include refid="global.limit"/>
+		SELECT * FROM sys_role_menu ORDER BY role_id_,menu_id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
@@ -52,6 +52,6 @@
 	</select>
 	
 	<select id="queryPermissionsByRoleId" resultType="string" parameterType="int">
-		SELECT m.permission FROM sys_role_menu rm left join sys_menu m on rm.menu_id = m.menu_id where rm.role_id = #{roleId} and m.del_flag = 0
+		SELECT m.permission_ FROM sys_role_menu rm left join sys_menu m on rm.menu_id_ = m.id_ where rm.role_id_ = #{roleId} and m.del_flag_ = 0
 	</select>
 </mapper>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserLoginLogMapper.xml

@@ -7,10 +7,10 @@
 <mapper namespace="com.ym.mec.auth.dal.dao.SysUserLoginLogDao">
 	
 	<resultMap type="com.ym.mec.auth.api.entity.SysUserLoginLog" id="SysUserLoginLog">
-		<result column="user_id" property="userId" />
-		<result column="login_ip" property="loginIp" />
-		<result column="login_time" property="loginTime" />
-		<result column="source" property="source" />
+		<result column="user_id_" property="userId" />
+		<result column="login_ip_" property="loginIp" />
+		<result column="login_time_" property="loginTime" />
+		<result column="source_" property="source" />
 	</resultMap>
 	
 	
@@ -26,7 +26,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO sys_user_login_log (user_id,login_ip,login_time,source) VALUES(#{userId},#{loginIp},#{loginTime},#{source})
+		INSERT INTO sys_user_login_log (user_id_,login_ip_,login_time_,source_) VALUES(#{userId},#{loginIp},#{loginTime},#{source})
 	</insert>
 	
 	

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserLoginMapper.xml

@@ -7,23 +7,23 @@
 <mapper namespace="com.ym.mec.auth.dal.dao.SysUserLoginDao">
 	
 	<resultMap type="com.ym.mec.auth.api.entity.SysUserLogin" id="SysUserLogin">
-		<result column="user_id" property="userId" />
-		<result column="login_count" property="loginCount" />
-		<result column="last_login_time" property="lastLoginTime" />
-		<result column="last_login_ip" property="lastLoginIp" />
-		<result column="fail_count" property="failCount" />
-		<result column="lock_time" property="lockTime" />
-		<result column="lock_date" property="lockDate" />
+		<result column="user_id_" property="userId" />
+		<result column="login_count_" property="loginCount" />
+		<result column="last_login_time_" property="lastLoginTime" />
+		<result column="last_login_ip_" property="lastLoginIp" />
+		<result column="fail_count_" property="failCount" />
+		<result column="lock_time_" property="lockTime" />
+		<result column="lock_date_" property="lockDate" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysUserLogin" >
-		SELECT * FROM sys_user_login WHERE user_id = #{userId}
+		SELECT * FROM sys_user_login WHERE user_id_ = #{userId}
 	</select>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysUserLogin">
-		SELECT * FROM sys_user_login ORDER BY user_id
+		SELECT * FROM sys_user_login ORDER BY user_id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -33,22 +33,22 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
 		</selectKey>
 		-->
-		INSERT INTO sys_user_login (user_id,login_count,last_login_time,last_login_ip,fail_count,lock_time,lock_date) VALUES(#{userId},#{loginCount},#{lastLoginTime},#{lastLoginIp},#{failCount},#{lockTime},#{lockDate})
+		INSERT INTO sys_user_login (user_id_,login_count_,last_login_time_,last_login_ip_,fail_count_,lock_time_,lock_date_) VALUES(#{userId},#{loginCount},#{lastLoginTime},#{lastLoginIp},#{failCount},#{lockTime},#{lockDate})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysUserLogin">
-		UPDATE sys_user_login SET user_id = #{userId},last_login_time = #{lastLoginTime},last_login_ip = #{lastLoginIp},fail_count = #{failCount},lock_time = #{lockTime},login_count = #{loginCount},lock_date = #{lockDate} WHERE user_id = #{userId}
+		UPDATE sys_user_login SET user_id_ = #{userId},last_login_time_ = #{lastLoginTime},last_login_ip_ = #{lastLoginIp},fail_count_ = #{failCount},lock_time_ = #{lockTime},login_count_ = #{loginCount},lock_date_ = #{lockDate} WHERE user_id_ = #{userId}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
-		DELETE FROM sys_user_login WHERE user_id = #{userId}
+		DELETE FROM sys_user_login WHERE user_id_ = #{userId}
 	</delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysUserLogin" parameterType="map">
-		SELECT * FROM sys_user_login ORDER BY user_id <include refid="global.limit"/>
+		SELECT * FROM sys_user_login ORDER BY user_id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
@@ -57,6 +57,6 @@
 	</select>
 
 	<select id="findLoginByUserId" resultMap="SysUserLogin">
-		SELECT * FROM sys_user_login WHERE user_id = #{userId}
+		SELECT * FROM sys_user_login WHERE user_id_ = #{userId}
 	</select>
 </mapper>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -7,43 +7,43 @@
 <mapper namespace="com.ym.mec.auth.dal.dao.SysUserDao">
 	
 	<resultMap type="com.ym.mec.auth.api.entity.SysUser" id="SysUser">
-		<result column="user_id" property="userId" />
-		<result column="username" property="username" />
-		<result column="password" property="password" />
-		<result column="salt" property="salt" />
-		<result column="phone" property="phone" />
-		<result column="avatar" property="avatar" />
-		<result column="dept_id" property="deptId" />
-		<result column="create_time" property="createTime" />
-		<result column="update_time" property="updateTime" />
-		<result column="lock_flag" property="lockFlag" />
-		<result column="del_flag" property="delFlag" />
-		<result column="wx_openid" property="wxOpenid" />
-		<result column="qq_openid" property="qqOpenid" />
-		<result column="user_type" property="userType" />
+		<result column="id_" property="id" />
+		<result column="username_" property="username" />
+		<result column="password_" property="password" />
+		<result column="salt_" property="salt" />
+		<result column="phone_" property="phone" />
+		<result column="avatar_" property="avatar" />
+		<result column="dept_id_" property="deptId" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="lock_flag_" property="lockFlag" />
+		<result column="del_flag_" property="delFlag" />
+		<result column="wx_openid_" property="wxOpenid" />
+		<result column="qq_openid_" property="qqOpenid" />
+		<result column="user_type_" property="userType" />
 	</resultMap>
 	
 	<!-- 查询条件 -->
 	<sql id="queryCondition">
 			<if test="userStartDate != null">
-				and create_time &gt;= #{createStartDate}
+				and create_time_ &gt;= #{createStartDate}
 			</if>
 			<if test="userEndDate != null">
-				and create_time &lt;= #{createEndDate}
+				and create_time_ &lt;= #{createEndDate}
 			</if>
 			<if test="userType != null">
-				and user_type = #{userType}
+				and user_type_ = #{userType}
 			</if>
 	</sql>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysUser" >
-		SELECT * FROM sys_user WHERE user_id = #{userId} 
+		SELECT * FROM sys_user WHERE id_ = #{id}
 	</select>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysUser">
-		SELECT * FROM sys_user ORDER BY user_id
+		SELECT * FROM sys_user ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -53,22 +53,22 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO sys_user (user_id,username,password,salt,phone,avatar,dept_id,create_time,update_time,lock_flag,del_flag,wx_openid,qq_openid,user_type) VALUES(#{userId},#{username},#{password},#{salt},#{phone},#{avatar},#{deptId},#{createTime},#{updateTime},#{lockFlag},#{delFlag},#{wxOpenid},#{qqOpenid},#{userType})
+		INSERT INTO sys_user (id_,username_,password_,salt_,phone_,avatar_,dept_id_,create_time_,update_time_,lock_flag_,del_flag_,wx_openid_,qq_openid_,user_type_) VALUES(#{id},#{username},#{password},#{salt},#{phone},#{avatar},#{deptId},#{createTime},#{updateTime},#{lockFlag},#{delFlag},#{wxOpenid},#{qqOpenid},#{userType})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysUser">
-		UPDATE sys_user SET del_flag = #{delFlag},salt = #{salt},create_time = #{createTime},qq_openid = #{qqOpenid},avatar = #{avatar},lock_flag = #{lockFlag},password = #{password},update_time = #{updateTime},wx_openid = #{wxOpenid},user_id = #{userId},phone = #{phone},dept_id = #{deptId},username = #{username},user_type = #{userType} WHERE user_id = #{userId} 
+		UPDATE sys_user SET del_flag_ = #{delFlag},salt_ = #{salt},create_time_ = #{createTime},qq_openid_ = #{qqOpenid},avatar_ = #{avatar},lock_flag_ = #{lockFlag},password_ = #{password},update_time_ = #{updateTime},wx_openid_ = #{wxOpenid},phone_ = #{phone},dept_id_ = #{deptId},username_ = #{username},user_type_ = #{userType} WHERE id_ = #{id}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
-		DELETE FROM sys_user WHERE user_id = #{userId} 
+		DELETE FROM sys_user WHERE id_ = #{id}
 	</delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysUser" parameterType="map">
-		SELECT * FROM sys_user ORDER BY user_id
+		SELECT * FROM sys_user ORDER BY id_
 		<include refid="queryCondition" />
 		<include refid="global.orderby" />
 		<include refid="global.limit" />
@@ -81,10 +81,10 @@
 	</select>
 	
 	<select id="queryByUsername" resultMap="SysUser">
-		select * from sys_user where username = #{username}
+		select * from sys_user where username_ = #{username}
 	</select>
 	
 	<select id="queryByPhone" resultMap="SysUser">
-		select * from sys_user where phone = #{phone}
+		select * from sys_user where phone_ = #{phone}
 	</select>
 </mapper>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserRoleMapper.xml

@@ -7,18 +7,18 @@
 <mapper namespace="com.ym.mec.auth.dal.dao.SysUserRoleDao">
 	
 	<resultMap type="com.ym.mec.auth.api.entity.SysUserRole" id="SysUserRole">
-		<result column="user_id" property="userId" />
-		<result column="role_id" property="roleId" />
+		<result column="user_id_" property="userId" />
+		<result column="role_id_" property="roleId" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysUserRole" parameterType="java.util.Map">
-		SELECT * FROM sys_user_role WHERE user_id = #{userId} AND role_id = #{roleId} 
+		SELECT * FROM sys_user_role WHERE user_id_ = #{userId} AND role_id_ = #{roleId}
 	</select>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysUserRole">
-		SELECT * FROM sys_user_role ORDER BY user_id,role_id
+		SELECT * FROM sys_user_role ORDER BY user_id_,role_id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -28,12 +28,12 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO sys_user_role (user_id,role_id) VALUES(#{userId},#{roleId})
+		INSERT INTO sys_user_role (user_id_,role_id_) VALUES(#{userId},#{roleId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.auth.api.entity.SysUserRole">
-		UPDATE sys_user_role SET user_id = #{userId},role_id = #{roleId} WHERE user_id = #{userId} AND role_id = #{roleId} 
+		UPDATE sys_user_role SET user_id_ = #{userId},role_id_ = #{roleId} WHERE user_id_ = #{userId} AND role_id_ = #{roleId}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
@@ -43,7 +43,7 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysUserRole" parameterType="map">
-		SELECT * FROM sys_user_role ORDER BY user_id,role_id <include refid="global.limit"/>
+		SELECT * FROM sys_user_role ORDER BY user_id_,role_id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
@@ -52,10 +52,10 @@
 	</select>
 	
 	<select id="queryRoleIdListByUserId" resultType="int" parameterType="int">
-		SELECT ur.role_id FROM sys_user_role ur left join sys_role r on ur.role_id = r.role_id where ur.user_id = #{userId} and r.del_flag = 0
+		SELECT ur.role_id_ FROM sys_user_role ur left join sys_role r on ur.role_id_ = r.id_ where ur.user_id_ = #{userId} and r.del_flag_ = 0
 	</select>
 	
 	<select id="queryRoleCodeListByUserId" resultType="string" parameterType="int">
-		SELECT r.role_code FROM sys_user_role ur left join sys_role r on ur.role_id = r.role_id where ur.user_id = #{userId} and r.del_flag = 0
+		SELECT r.role_code_ FROM sys_user_role ur left join sys_role r on ur.role_id_ = r.id_ where ur.user_id_ = #{userId} and r.del_flag_ = 0
 	</select>
 </mapper>