Browse Source

fix(登录及权限模块): 权限接入模块联调修复

gjs 3 years ago
parent
commit
3aa6c01a0c

+ 2 - 3
src/main/java/com/macro/mall/tiny/modules/business/service/impl/FileServiceImpl.java

@@ -1,7 +1,7 @@
 package com.macro.mall.tiny.modules.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.keystar.eprdms.core.utils.UserContextHolder;
+import com.keystar.eprdms.core.utils.ShiroContextHolder;
 import com.macro.mall.tiny.common.exception.Asserts;
 import com.macro.mall.tiny.common.util.MyFileUtils;
 import com.macro.mall.tiny.config.UploadConfig;
@@ -13,7 +13,6 @@ import com.macro.mall.tiny.modules.business.service.BDirectoryCacheService;
 import com.macro.mall.tiny.modules.business.service.FileService;
 import com.macro.mall.tiny.modules.business.service.KrBLineCacheService;
 import com.macro.mall.tiny.modules.business.service.KrBTowerService;
-import com.macro.mall.tiny.security.util.ShiroAuthUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
@@ -95,7 +94,7 @@ public class FileServiceImpl implements FileService {
         addChunk(name, chunk);
         if (isUploaded(name)) {
             removeKey(name);
-            String username = UserContextHolder.getInstance().getUsername();
+            String username = ShiroContextHolder.getInstance().getUsername();
             Subject subject = SecurityUtils.getSubject();
             asyncHandler.handleDocument(provinceId, cityId, target, lineName, voltage, lineStatus, serviceBegintimeTs, beginTower, endTower, username, subject, charset);
         }

+ 3 - 0
src/main/resources/config/bootstrap.yml

@@ -21,6 +21,9 @@ keystar:
 com:
   keystar:
     shiro:
+      jwt-encrypt: U0JBUElOENhspJrzkyNjQ1NA
+      shiro-security-cache-info: 47.107.126.107:16733
+      application-key: 398688e7-2ce0-4165-bb18-856bff2ca4b4
       anon-urls:
         - /swagger-ui.html
         - /swagger-resources/**