Sfoglia il codice sorgente

feat: web鉴权接口图标拼接完整路径

weijianghai 2 anni fa
parent
commit
3211e9557b

+ 5 - 1
src/main/java/com/nokia/service/AclService.java

@@ -13,6 +13,7 @@ import com.nokia.pojo.Notice;
 import com.nokia.pojo.User;
 import com.nokia.pojo.UserRoleCity;
 import com.nokia.pojo.VerificationLog;
+import com.nokia.service.file.FileService;
 import com.nokia.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,11 +50,12 @@ public class AclService {
     private final VerificationLogDao verificationLogDao;
     private final UserRoleCityDao userRoleCityDao;
     private final NoticeDao noticeDao;
+    private final FileService fileService;
 
     @Autowired
     public AclService(UserDao userDao, TopService topService, DopService dopService, WoyunweiService woyunweiService,
                       RedisTemplate<String, Object> redisTemplate, VerificationLogDao verificationLogDao,
-                      UserRoleCityDao userRoleCityDao, NoticeDao noticeDao) {
+                      UserRoleCityDao userRoleCityDao, NoticeDao noticeDao, FileService fileService) {
         this.userDao = userDao;
         this.topService = topService;
         this.dopService = dopService;
@@ -62,6 +64,7 @@ public class AclService {
         this.verificationLogDao = verificationLogDao;
         this.userRoleCityDao = userRoleCityDao;
         this.noticeDao = noticeDao;
+        this.fileService = fileService;
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -222,6 +225,7 @@ public class AclService {
                         webFunctionSystem.setSystemName(tt.getSystemName());
                         tt.setUrl(tt.getUrl() + (tt.getUrl().contains("?") ? "&" : "?")
                                 + "fromSystem=" + tokenEntity.getFromSystem() + "&token=" + tokenEntity.getToken());
+                        tt.setWebIcon(fileService.getEndpointBucket() + tt.getWebIcon());
                         webFunctionVos.add(tt);
                     }
                 }

+ 5 - 0
src/main/java/com/nokia/service/file/FileService.java

@@ -69,4 +69,9 @@ public interface FileService {
     default Map<String, Object> putObject(String object, InputStream stream, long objectSize) {
         return putObject(object, stream, objectSize, null);
     }
+
+    /**
+     * 获取对象存储服务的地址
+     */
+    String getEndpointBucket();
 }

+ 8 - 0
src/main/java/com/nokia/service/file/MinioServiceImpl.java

@@ -99,4 +99,12 @@ public class MinioServiceImpl implements FileService {
             throw new MyRuntimeException(e);
         }
     }
+
+    /**
+     * 获取对象存储服务的地址
+     */
+    @Override
+    public String getEndpointBucket() {
+        return minioConfig.getEndpoint() + minioConfig.getBucket();
+    }
 }

+ 2 - 2
src/main/resources/application-test.properties

@@ -18,8 +18,8 @@ spring.redis.database=10
 spring.redis.password=Richr00t
 redis.timeoutSeconds=600
 # minio配置
-minio.endpoint=https://192.168.50.3:29000
-minio.bucket=acl-tousu-test
+minio.endpoint=https://192.168.50.3:12041/
+minio.bucket=oss-acl-tousu-test
 minio.accessKey=QBZSEFMteKaz69Sh
 minio.secretKey=6hNzjymqo3PCX7oQRQ8ESGePzK3b52Dc
 minio.expiry=15