zyp

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

@@ -64,7 +64,9 @@ import static com.fs.course.utils.LinkUtil.generateRandomStringWithLock;
 public class SopLogsTaskServiceImpl implements SopLogsTaskService {
 
 
-    private static final String REAL_LINK_PREFIX = "https://h5.cdwjyyh.com/courseh5/pages/course/learning?course=";
+    private static final String REAL_LINK_PREFIX = "/courseH5/pages/course/learning?course=";
+    private static final String SHORT_LINK_PREFIX = "/courseH5/pages/course/learning?s=";
+
     private static final String QWSOP_KEY_PREFIX = "qwsop:";
     private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
     private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -152,7 +154,6 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
     @PostConstruct
     public void init() {
         loadCourseConfig();
-        loadDomainNames();
         startConsumers();
     }
 
@@ -171,14 +172,6 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
         }
     }
 
-    private void loadDomainNames() {
-        try {
-            cachedDomainNames = fsCourseDomainNameMapper.selectAllDomainNames();
-            log.info("Loaded {} domain names for short links.", cachedDomainNames.size());
-        } catch (Exception e) {
-            log.error("Failed to load domain names: {}", e.getMessage(), e);
-        }
-    }
 
 
     private void startConsumers() {
@@ -230,17 +223,6 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
         }
     }
 
-    @Scheduled(fixedDelay = 60000) // 每60秒刷新一次
-    public void refreshDomainNames() {
-        synchronized(domainLock) {
-            try {
-                cachedDomainNames = fsCourseDomainNameMapper.selectAllDomainNames();
-                log.info("Refreshed {} domain names for short links.", cachedDomainNames.size());
-            } catch (Exception e) {
-                log.error("Failed to refresh domain names: {}", e.getMessage(), e);
-            }
-        }
-    }
 
 
     @PreDestroy
@@ -1124,7 +1106,8 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
         Date updateTime = Date.from(expireDateTime.atZone(ZoneId.systemDefault()).toInstant());
         link.setUpdateTime(updateTime);
 
-        String sortLink = "https://" + logVo.getDomain() + "/s/" + link.getLink();
+        //取销售绑定的二级域名
+        String sortLink = logVo.getDomain() + SHORT_LINK_PREFIX + link.getLink();
         enqueueCourseLink(link);
         return sortLink;
     }

fs-service-system/src/main/java/com/fs/course/service/impl/FsCourseLinkServiceImpl.java

@@ -138,7 +138,8 @@ public class FsCourseLinkServiceImpl implements IFsCourseLinkService
         return fsCourseLinkMapper.deleteFsCourseLinkByLinkId(linkId);
     }
 
-    private static final String realLink = "/courseh5/pages/course/learning?course=";
+    private static final String realLink = "/courseH5/pages/course/learning?course=";
+    private static final String shortLink = "/courseH5/pages/course/learning?s=";
     private static final String miniappRealLink = "/pages_course/video?course=";
 
 
@@ -188,7 +189,7 @@ public class FsCourseLinkServiceImpl implements IFsCourseLinkService
             link.setRealLink(realLink+course);
             if (fsCourseLinkMapper.updateFsCourseLink(link)>0){
                 String domainName = getDomainName(param.getCompanyUserId(), config);
-                String sortLink = domainName + "/s/" + link.getLink();
+                String sortLink = domainName + shortLink + link.getLink();
                 return R.ok("短链生成").put("url",sortLink);
             }
         }
@@ -224,7 +225,7 @@ public class FsCourseLinkServiceImpl implements IFsCourseLinkService
         link.setUpdateTime(calendar.getTime());
         if (fsCourseLinkMapper.insertFsCourseLink(link)>0){
             String domainName = getDomainName(param.getCompanyUserId(), config);
-            String sortLink = domainName + "/s/" + link.getLink();
+            String sortLink = domainName + shortLink + link.getLink();
             return R.ok("短链生成").put("url",sortLink);
         }
         return R.error("短链生成失败！");
@@ -266,7 +267,7 @@ public class FsCourseLinkServiceImpl implements IFsCourseLinkService
         link.setUpdateTime(calendar.getTime());
         if (fsCourseLinkMapper.insertFsCourseLink(link)>0){
             String domainName = getDomainName(param.getCompanyUserId(), config);
-            String sortLink = domainName + "/s/" + link.getLink();
+            String sortLink = domainName + shortLink + link.getLink();
             return R.ok("短链生成").put("url",sortLink);
         }
         return R.error("短链生成失败！");

fs-service-system/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -62,7 +62,9 @@ import static com.fs.course.utils.LinkUtil.generateRandomStringWithLock;
 @Service
 public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
 
-    private static final String REAL_LINK_PREFIX = "/courseh5/pages/course/learning?course=";
+    private static final String REAL_LINK_PREFIX = "/courseH5/pages/course/learning?course=";
+    private static final String SHORT_LINK_PREFIX = "/courseH5/pages/course/learning?s=";
+
     private static final String miniappRealLink = "/pages_course/video.html?course=";
     private static final String appRealLink = "/pages/courseAnswer/index?link=";
     private static final String appLink = "https://jump.ylrztop.com/jumpapp/pages/index/index?link=";
@@ -721,19 +723,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
 
 
     private String createLink(FsCourseLink link,String domain){
-
-//        List<FsCourseDomainName> cachedDomainNames = fsCourseDomainNameMapper.selectAllDomainNames();
-//        if (cachedDomainNames == null || cachedDomainNames.isEmpty()) {
-//            log.error("一键生成短链-域名出错-No domain names available for short link generation.");
-//            return "";
-//        }
-//
-//        int randomIndex = ThreadLocalRandom.current().nextInt(cachedDomainNames.size());
-//
-//        // 从缓存中随机选择一个域名
-//        FsCourseDomainName fsCourseDomainName = cachedDomainNames.get(randomIndex);
-        String sortLink = domain + "/s/" + link.getLink();
-
+        String sortLink = domain + SHORT_LINK_PREFIX + link.getLink();
         return sortLink;
     }