ct 5 天之前
父节点
当前提交
2cca790825

+ 6 - 0
fs-common/src/main/java/com/fs/common/config/CorsSupport.java

@@ -23,6 +23,12 @@ public final class CorsSupport {
             "https://admin.jnmyunl.com",
             "https://company.jnmyunl.com",
             "https://doctor.jnmyunl.com",
+            "https://h5.jnmyunl.com",
+            "https://companyh5.jnmyunl.com",
+            "https://h5course.jnmyunl.com",
+            "https://h5download.jnmyunl.com",
+            "https://game.jnmyunl.com",
+            "https://userapp.jnmyunl.com",
             // 通用业务域
             "https://admin.cdwjyyh.com",
             "https://company.cdwjyyh.com",

+ 31 - 0
fs-common/src/main/java/com/fs/common/filter/PageHelperClearFilter.java

@@ -0,0 +1,31 @@
+package com.fs.common.filter;
+
+import com.github.pagehelper.PageHelper;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 请求结束后清理 PageHelper 线程变量,避免线程复用时把分页 LIMIT 拼到已有 limit 的 SQL 上。
+ */
+@Component
+@Order(Ordered.HIGHEST_PRECEDENCE + 20)
+public class PageHelperClearFilter extends OncePerRequestFilter {
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws ServletException, IOException {
+        try {
+            filterChain.doFilter(request, response);
+        } finally {
+            PageHelper.clearPage();
+        }
+    }
+}

+ 7 - 1
fs-service/src/main/java/com/fs/course/mapper/FsCourseLinkMapper.java

@@ -70,7 +70,13 @@ public interface FsCourseLinkMapper
      */
     public int deleteFsCourseLinkByLinkIds(Long[] linkIds);
 
-    @Select("select link, real_link, chat_id, update_time, company_user_id from fs_course_link where link = #{suffix} order by link_id desc limit 1")
+    /**
+     * 按短链查一条。内层 limit 1;外层包一层,避免 PageHelper 再追加 LIMIT 导致语法错误。
+     */
+    @Select("SELECT link, real_link, chat_id, update_time, company_user_id FROM (" +
+            "SELECT link, real_link, chat_id, update_time, company_user_id FROM fs_course_link " +
+            "WHERE link = #{suffix} ORDER BY link_id DESC LIMIT 1" +
+            ") AS course_link_one")
     FsCourseLink selectFsCourseLinkByLink(@Param("suffix") String suffix);
 
     void insertFsCourseLinkBatch(@Param("courseLinks")List<FsCourseLink> courseLinkToInsert);

+ 2 - 2
fs-user-app/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/fs-user-app/logs" />
+    <!-- 日志存放路径:启动时 -DLOG_PATH=/home/fs-user-app-1/logs 可分实例目录;未传则用默认 -->
+	<property name="log.path" value="${LOG_PATH:-/home/fs-user-app/logs}" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />