guzijian / bsth-alcohol-sign · Commits

Commit 7c053e59eff2d5edb1e8fed00b24c058bddc2395

Authored by 2c
1 parent 556f52c4

统一登录代码优化， 

miniO更新key
Inline Side-by-side
Showing 2 changed files with 10 additions and 4 deletions
Bsth-admin/src/main/resources/application-druid-lingangPrd.yml
  View file @7c053e5
... ... @@ -220,10 +220,10 @@ netty:
220 220 speech: device/speech
221 221 port: 8989
222 222 minio:
223   - host: http://10.10.200.172:9009
  223 + host: http://10.10.200.172:9008
224 224 url: ${minio.host}/${minio.bucket}/
225   - access-key: alcohol_0D2GVpdJ3
226   - secret-key: ZF4M3dFk1SjmKDuCphTRfh2MZ5T84r25w6YVDSsA
  225 + access-key: J3L5Hkz9mJuqouk0STw5
  226 + secret-key: e9IuvN6Bh4KRI47OQObXEJjlBJFUtI3FU8mm7LEZ
227 227 bucket: alchohol
228 228 bsth:
229 229 face:
... ...
Bsth-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
  View file @7c053e5
... ... @@ -122,6 +122,10 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
122 122 String username = resDataJson.getString("userName");
123 123  
124 124 AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
  125 + // 05-开头的账号需要去掉05-
  126 + if(username.contains("05-")){
  127 + username = username.replace("05-", "");
  128 + }
125 129 SysUser sysUser = sysUserService.selectUserByUserName(username);
126 130  
127 131  
... ... @@ -153,7 +157,9 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
153 157 roleMapper.updateRole(sysRole);
154 158 }
155 159 }
156   - userRoleMapper.batchUserRole(sysUserRoleList);
  160 + if(sysUserRoleList.size() > 0){
  161 + userRoleMapper.batchUserRole(sysUserRoleList);
  162 + }
157 163 /**
158 164 * 角色列表更新 结束
159 165 */
... ...