Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

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-dto/src/main/java/com/usoftchina/smartschool/account/dto/AccountDTO.java

@@ -15,6 +15,7 @@ public class AccountDTO implements Serializable {
     private String user_code;
     private String salt;
     private List<RoleDTO> roleMaps;
+    private Long school_id;
 
     public Long getId() {
         return id;
@@ -55,4 +56,12 @@ public class AccountDTO implements Serializable {
     public void setRoleMaps(List<RoleDTO> roleMaps) {
         this.roleMaps = roleMaps;
     }
+
+    public Long getSchool_id() {
+        return school_id;
+    }
+
+    public void setSchool_id(Long school_id) {
+        this.school_id = school_id;
+    }
 }

base-servers/account/account-server/src/main/java/com/usoftchina/smartschool/account/controller/AccountController.java

@@ -36,7 +36,7 @@ public class AccountController {
             return Result.error(ExceptionCode.USER_NAME_EXIST);
         }
         Account account = BeanMapper.map(accountRegDTO, Account.class);
-        account.setSalt(accountDTO.getUser_phone());
+        account.setSalt(accountRegDTO.getUser_phone());
         account.setUser_pass(accountService.getEncryptedPassword(accountRegDTO.getUser_pass(), account.getSalt()));
         //保存账户
         accountService.save(account);

base-servers/account/account-server/src/main/java/com/usoftchina/smartschool/account/service/AccountService.java

@@ -9,7 +9,7 @@ public interface AccountService {
      * 注册
      * @return
      */
-    AccountDTO save(Account account);
+    boolean save(Account account);
 
     /**
      * 通过手机号查找用户

base-servers/account/account-server/src/main/java/com/usoftchina/smartschool/account/service/impl/AccountServiceImpl.java

@@ -26,13 +26,16 @@ public class AccountServiceImpl implements AccountService {
     private AccountRoleMapper accountRoleMapper;
 
     @Override
-    public AccountDTO save(Account account) {
-        return null;
+    public boolean save(Account account) {
+        return accountMapper.insertSelective(account) > 0;
     }
 
     @Override
     public AccountDTO findByMobile(String mobile) {
         Account account = accountMapper.selectByMobile(mobile);
+        if (account == null){
+            return null;
+        }
         AccountDTO accountDTO = BeanMapper.map(account, AccountDTO.class);
         List<RoleDTO> roleDTOList = accountRoleMapper.selectByAccountId(account.getId());
         accountDTO.setRoleMaps(roleDTOList);

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

@@ -7,7 +7,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://10.10.100.166:3306/school?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.10.100.166:3306/smart_campus?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

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/auth/auth-server/src/main/java/com/usoftchina/smartschool/auth/controller/AuthController.java

@@ -48,6 +48,7 @@ public class AuthController {
         if (result.isSuccess()){
             AccountDTO accountDTO = result.getData();
             Long school_id = accountDTO.getRoleMaps().stream().filter(roleDTO -> "教师".equals(roleDTO.getRole_name())).findFirst().get().getSchool_id();
+            accountDTO.setSchool_id(school_id);
             JwtInfo jwtInfo = new JwtInfo("school", school_id, accountDTO.getId(), accountDTO.getUser_phone());
             JwtToken jwtToken = JwtHelper.generateToken(jwtInfo, privateKeyPath, expire);
             TokenDTO tokenDTO = BeanMapper.map(jwtToken, TokenDTO.class);

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

@@ -7,6 +7,7 @@ import com.usoftchina.smartschool.auth.jwt.JwtInfo;
 import com.usoftchina.smartschool.context.BaseContextHolder;
 import com.usoftchina.smartschool.exception.BizException;
 import com.usoftchina.smartschool.exception.ExceptionCode;
+import com.usoftchina.smartschool.utils.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,9 +39,10 @@ public class AuthFilter implements GlobalFilter, Ordered {
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         try {
-                // 鉴别身份信息
-             /*   String token = getAuthToken(exchange.getRequest());
-                JwtInfo jwt = null;
+            // 鉴别身份信息
+            String token = getAuthToken(exchange.getRequest());
+            JwtInfo jwt = null;
+            if (token != null) {
                 try {
                     jwt = JwtHelper.getInfoFromToken(token, authConfig.getPublicKey());
                 } catch (BizException e) {
@@ -49,11 +51,13 @@ 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) {
                     throw new BizException(ExceptionCode.USER_NOT_EXIST);
-                }*/
+                }
+            }
             return chain.filter(exchange);
         } finally {
             BaseContextHolder.remove();
@@ -62,10 +66,10 @@ public class AuthFilter implements GlobalFilter, Ordered {
 
     private String getAuthToken(ServerHttpRequest request) {
         List<String> headers = request.getHeaders().get(authConfig.getAuthHeader());
-        if (headers.isEmpty()) {
-            throw new BizException(ExceptionCode.JWT_ILLEGAL_ARGUMENT);
+        if (!CollectionUtils.isEmpty(headers)) {
+            return headers.get(0).trim();
         }
-        return headers.get(0).trim();
+        return null;
     }
 
     @Override

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
@@ -140,3 +146,4 @@ auth:
   expire: 18000
   ignores:
     - /api/auth/authorize
+    - /api/account/account/register

frontend/pc-web/packages/font-school/sass/etc/icons.scss

@@ -1,10 +1,28 @@
+.font-school {
+  font-family: "font-school" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.ss-nav-interaction:before {
+  content: "\e905";
+}
+
+.ss-nav-setting:before {
+  content: "\e904";
+}
+
+.ss-nav-info:before {
+  content: "\e903";
+}
+
+.ss-delete:before {
+  content: "\e902";
+}
+
+.ss-add:before {
+  content: "\e901";
+}
 
-.ss-deleta:before {
-    content: "\e902";
-  }
-  
-  .ss-add:before {
-    content: "\e901";
-  }
-  
-  

frontend/pc-web/resources/json/navigation.json

@@ -1,6 +1,6 @@
 [{
     "text": "基础资料",
-    "iconCls": "x-sa sa-accountCenter",
+    "iconCls": "x-ss ss-nav-info",
     "items": [{
         "id": "basic-school-schoolinfo",
         "text": "学校信息",
@@ -20,7 +20,7 @@
     }]
 }, {
     "text": "系统设置",
-    "iconCls": "x-sa sa-setting",
+    "iconCls": "x-ss ss-nav-setting",
     "items": [{
         "id": "setting-access-roleaccess",
         "text": "角色授权",
@@ -36,7 +36,7 @@
     }]
 }, {
     "text": "家校互动",
-    "iconCls": "x-sa sa-setting",
+    "iconCls": "x-ss ss-nav-interaction",
     "items": [{
         "id": "interaction-notice-schoolnotice", 
         "text": "学校通知",