Prechádzať zdrojové kódy

zyp --每人二级域名

zyp 2 týždňov pred
rodič
commit
2b106d8715

+ 11 - 1
fs-qw-task/src/main/java/com/fs/app/taskService/impl/SopLogsTaskServiceImpl.java

@@ -271,6 +271,10 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
         long startTimeMillis = System.currentTimeMillis();
         log.info("====== 开始选择和处理 SOP 用户日志 ======");
 
+        CourseConfig config;
+        synchronized(configLock) {
+            config = cachedCourseConfig;
+        }
         List<SopUserLogsVo> sopUserLogsVos = sopUserLogsMapper.selectSopUserLogsListByTime();
         if (sopUserLogsVos.isEmpty()) {
             log.info("没有需要处理的 SOP 用户日志。");
@@ -303,7 +307,13 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
                     Long companyUserId = Long.parseLong(userKey[1]);
                     CompanyUser companyUser = companyUserList.stream().filter(cu -> Objects.equals(cu.getUserId(), companyUserId)).findFirst().orElse(null);
                     if (Objects.nonNull(companyUser)) {
-                        s.setDomain(companyUser.getDomain());
+                        if (StringUtils.isNotBlank(companyUser.getDomain())) {
+                            s.setDomain(companyUser.getDomain());
+                        } else {
+                            s.setDomain(config.getRealLinkDomainName());
+                        }
+                    } else {
+                        s.setDomain(config.getRealLinkDomainName());
                     }
                 })
                 .collect(Collectors.groupingBy(SopUserLogsVo::getSopId));