|
@@ -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);
|
|
|
}
|
|
|
}
|