update

edu-auth/edu-auth-server/pom.xml

@@ -86,5 +86,9 @@
 			<groupId>com.keao.edu</groupId>
 			<artifactId>edu-datasource</artifactId>
 		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+    </dependencies>
 </project>

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/AuthServerApplication.java

@@ -17,7 +17,7 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients({"com.keao.edu"})
-@MapperScan("com.keao.edu.*.dal.dao")
+@MapperScan("com.keao.edu.auth.dal.dao")
 @ComponentScan(basePackages="com.keao.edu")
 @Configuration
 @EnableSwagger2Doc

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

@@ -1,13 +1,5 @@
 package com.keao.edu.auth.service.impl;
 
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.keao.edu.auth.api.dto.SysUserInfo;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.auth.dal.dao.SysUserDao;
@@ -16,29 +8,29 @@ import com.keao.edu.auth.service.SysUserRoleService;
 import com.keao.edu.auth.service.SysUserService;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.exception.BizException;
-import com.keao.edu.common.service.IdGeneratorService;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.im.api.client.ImFeignService;
 import com.keao.edu.im.api.entity.ImResult;
 import com.keao.edu.im.api.entity.ImUserModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implements SysUserService {
 
 	@Autowired
 	private SysUserDao sysUserDao;
-
 	@Autowired
 	private SysUserRoleService sysUserRoleService;
-
 	@Autowired
 	private SysRoleMenuService sysRoleMenuService;
 	@Autowired
 	private ImFeignService imFeignService;
-	@Autowired
-	private SysUserService sysUserService;
-	@Autowired
-	private IdGeneratorService smsCodeService;
 
 	@Value("${message.autoRegister}")
 	private boolean autoRegister;

edu-auth/edu-auth-server/src/main/resources/application.yml

@@ -83,4 +83,12 @@ management:
 
 ribbon:
   ReadTimeout: 60000
-  ConnectTimeout: 60000
+  ConnectTimeout: 60000
+
+message:
+  autoRegister: true
+  debugMode: true
+
+auth:
+  sysconfig:
+    tenantId: 1

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

@@ -179,10 +179,13 @@
     <select id="queryByStatus" resultMap="SysUser">
         select * from sys_user where lock_flag_ = #{status}
     </select>
+
     <select id="findUserBySalt" resultMap="SysUser">
         SELECT * FROM sys_user WHERE salt_ IS NOT NULL AND salt_ = 'replace' AND user_type_ LIKE CONCAT('%',#{userType},'%') LIMIT 1
     </select>
+
     <select id="queryByPhoneAndClient" resultMap="SysUser">
         select * from sys_user where (phone_ = #{phone} OR username_ = #{phone}) AND user_type_ LIKE CONCAT('%',#{client},'%') LIMIT 1 FOR UPDATE
     </select>
+
 </mapper>

edu-common/src/main/resources/config/mybatis/SysRoleDeptMapper.xml

@@ -1,63 +0,0 @@
-<?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.auth.dal.dao.SysRoleDeptDao">
-	
-	<resultMap type="com.keao.edu.auth.api.entity.SysRoleDept" id="SysRoleDept">
-		<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>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="SysRoleDept">
-		SELECT * FROM sys_role_dept ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.keao.edu.auth.api.entity.SysRoleDept" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		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>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.keao.edu.auth.api.entity.SysRoleDept">
-		UPDATE sys_role_dept
-		 <set>
-			 <if test="roleId != null">
-				 role_id_ = #{roleId},
-			 </if>
-			 <if test="deptId != null">
-				 dept_id_ = #{deptId},
-			 </if>
-		 </set>
-		 WHERE id_ = #{id}
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		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>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_role_dept
-	</select>
-</mapper>