18339543638 пре 2 година
родитељ
комит
53daf62266

+ 2 - 2
nb-admin/src/main/resources/application.yml

@@ -39,13 +39,13 @@ sa-token:
   # token名称 (同时也是cookie名称)
   token-name: Authorization
   # token有效期,单位s 默认30天, -1代表永不过期
-  timeout: -1
+  timeout: 2592000
   # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒 一天
   activity-timeout: 86400
   # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
   is-concurrent: true
   # 在多人登录同一账号时,是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
-  is-share: false
+  is-share: true
   # token风格
   token-style: simple-uuid
   # 是否输出操作日志

+ 16 - 10
nb-service/web-service/src/main/java/com/nb/web/service/system/service/impl/SysRoleServiceImpl.java

@@ -175,16 +175,22 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
                     .filter(Objects::nonNull)
                     .forEach(sysUserRole -> {
                         Set<String> permissionsByUserId = sysMenuService.getPermissionsByUserId(sysUserRole.getUserId());
-                        List<String> tokens =stpLogic.getTokenValueListByLoginId(sysUserRole.getUserId());
-                        tokens.
-                                parallelStream().forEach(token->{
-                            SaSession tokenSessionByToken = stpLogic.getTokenSessionByToken(token);
-                            LoginUser user = (LoginUser) tokenSessionByToken.get(Constants.LOGIN_USER_KEY);
-                            if(user!=null){
-                                user.setPermissions(permissionsByUserId);
-                                tokenSessionByToken.set(Constants.LOGIN_USER_KEY,user);
-                            }
-                        });
+                        SaSession session = stpLogic.getSessionByLoginId(sysUserRole.getUserId());
+                        LoginUser user = (LoginUser) session.get(Constants.LOGIN_USER_KEY);
+                        if(user!=null){
+                            user.setPermissions(permissionsByUserId);
+                            session.set(Constants.LOGIN_USER_KEY,user);
+                        }
+//                        List<String> tokens =stpLogic.getTokenValueListByLoginId(sysUserRole.getUserId());
+//                        tokens.
+//                                parallelStream().forEach(token->{
+//                            SaSession tokenSessionByToken = stpLogic.getTokenSessionByToken(token);
+//                            LoginUser user = (LoginUser) tokenSessionByToken.get(Constants.LOGIN_USER_KEY);
+//                            if(user!=null){
+//                                user.setPermissions(permissionsByUserId);
+//                                tokenSessionByToken.set(Constants.LOGIN_USER_KEY,user);
+//                            }
+//                        });
                     });
         }
 

+ 1 - 1
nb-service/web-service/src/main/resources/mapper/bus/BusPatientMapper.xml

@@ -172,7 +172,7 @@
         p.alarm as patient_alarm,
         i.id as infusion_id,
         i.device_id as device_id,
-        i.clinic_id as clinic_id,
+        p.clinic_id as clinic_id,
         i.classification as classification,
         i.data_number as data_num,
         i.total_dose as total_dose,