登录功能调整

base-servers/account/account-api/src/main/java/com/usoftchina/smartschool/account/api/AccountApi.java

@@ -16,6 +16,6 @@ public interface AccountApi {
     @GetMapping(value = "/account/read", params = "mobile")
     Result<AccountDTO> findByMobile(@RequestParam("mobile") String mobile);
 
-    @GetMapping(value = "/pwd/check")
+    @GetMapping(value = "/account/pwd/check")
     Result<AccountDTO> checkPwd(@RequestParam(value = "username") String username, @RequestParam(value = "password") String password);
 }

base-servers/account/account-server/src/main/resources/mapper/AccountMapper.xml

@@ -4,8 +4,8 @@
   <select id="selectByPrimaryKey" resultType="com.usoftchina.smartschool.account.po.Account">
     SELECT * FROM SYS_USER WHERE USER_ID = #{id}
   </select>
-  <select id="selectByMobile" resultType="com.usoftchina.smartschool.account.dto.AccountDTO">
-    select users.user_id id, users.user_phone, users.user_code
+  <select id="selectByMobile" resultType="com.usoftchina.smartschool.account.po.Account">
+    select users.user_id id, users.user_pass, users.user_phone, users.user_code, salt
     from sys_user users
     where user_phone = #{mobile};
   </select>

base-servers/account/account-server/src/main/resources/mapper/AccountRoleMapper.xml

@@ -1,7 +1,7 @@
 <?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.usoftchina.smartschool.account.mapper.AccountRoleMapper">
-  <select id="selectByAccountId" parameterType="int" resultType="com.usoftchina.smartschool.account.dto.RoleDTO">
+  <select id="selectByAccountId" parameterType="java.lang.Long" resultType="com.usoftchina.smartschool.account.dto.RoleDTO">
     select sys_role.role_id,sys_role.role_name,sys_role.role_sign,sys_role.create_date,sys_role.role_remarks,sys_teacher.school_id
     from sys_user_role
     left join sys_teacher on sys_teacher.user_id = sys_user_role.user_id

base-servers/gateway-server/src/main/java/com/usoftchina/smartschool/gateway/config/AuthFilter.java

@@ -51,6 +51,7 @@ public class AuthFilter implements GlobalFilter, Ordered {
                 BaseContextHolder.setAppId(jwt.getAppId());
                 BaseContextHolder.setUserId(jwt.getUserId());
                 BaseContextHolder.setUserName(jwt.getUserName());
+                BaseContextHolder.setSchoolId(jwt.getSchool_id());
                 BaseContextHolder.setToken(token);
                 AccountDTO accountDTO = accountApi.findByMobile(jwt.getUserName()).getData();
                 if (null == accountDTO) {

base-servers/gateway-server/src/main/resources/application.yml

@@ -68,6 +68,12 @@ spring:
         - Path=/api/file/**
         filters:
         - RewritePath=/api/file/(?<segment>.*), /$\{segment}
+      - id: AUTH-SERVER
+        uri: lb://AUTH-SERVER
+        predicates:
+        - Path=/api/auth/**
+        filters:
+        - RewritePath=/api/auth/(?<segment>.*), /$\{segment}
   redis:
     host: 10.10.100.166
     port: 6379