图片上传

src/main/java/com/caimei365/manager/config/CorsConfig.java

@@ -1,24 +1,43 @@
 package com.caimei365.manager.config;
 
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
-@Configuration
-public class CorsConfig {
-    @Bean
-    public WebMvcConfigurer corsConfigurer() {
-        return new WebMvcConfigurer() {
-            @Override
-            public void addCorsMappings(CorsRegistry registry) {
-                registry.addMapping("/**")
-                        .allowedOrigins("*")
-                        .allowedMethods("GET", "POST", "PUT", "DELETE")
-                        .allowedHeaders("*")
-                        .allowedOriginPatterns("*")
-                        .maxAge(3600);
-            }
-        };
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2023/9/21
+ */
+@Component
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class CorsConfig implements Filter {
+
+
+    @Override
+    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
+        HttpServletResponse response = (HttpServletResponse) res;
+        HttpServletRequest request = (HttpServletRequest) req;
+        response.setHeader("Access-Control-Allow-Origin", "*"); // 允许的前端地址
+        response.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS"); // 允许的 HTTP 方法
+        response.setHeader("Access-Control-Allow-Headers", "*");  // 允许的请求头
+        response.setHeader("Access-Control-Max-Age", "3600");
+        if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
+            response.setStatus(HttpServletResponse.SC_OK);
+        } else {
+            chain.doFilter(req, res);
+        }
     }
 }

src/main/java/com/caimei365/manager/config/security/SecurityConfig.java

@@ -44,7 +44,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
     @Override
     public void configure(WebSecurity web) {
         // 需要放行的URL
-        web.ignoring().antMatchers("/register", "/hello");
+        web.ignoring().antMatchers("/register", "/hello","/formData/MultiPictareaddData");
     }
 
     /**

src/main/java/com/caimei365/manager/service/caimei/user/CustomerService.java

@@ -102,7 +102,7 @@ public interface CustomerService {
     ResponseJson delShopInfo(Integer id);
 
     /**
-     * 相关文章列表
+     * 相关搜索词列表
      * @param cmShopKeyword
      * @param pageNum
      * @param pageSize
@@ -111,7 +111,7 @@ public interface CustomerService {
     ResponseJson<PaginationVo<CmShopKeyword>> getShopKeywordList(CmShopKeyword cmShopKeyword, Integer pageNum, Integer pageSize);
 
     /**
-     * 选择文章
+     * 选择关键词
      * @param keyword
      * @param pageNum
      * @param pageSize
@@ -120,7 +120,7 @@ public interface CustomerService {
     ResponseJson<PaginationVo<CmUserSearchFrequency>> getSearchFrequencyList(String keyword, Integer pageNum, Integer pageSize);
 
     /**
-     * 添加文章统计
+     * 添加搜索词统计
      * @param shopId
      * @param keyWordIds
      * @return
@@ -136,7 +136,7 @@ public interface CustomerService {
     ResponseJson renewShopKeyword(Integer id, Integer status);
 
     /**
-     * 删除统计文章
+     * 删除统计搜索词
      * @param id
      * @return
      */

src/main/java/com/caimei365/manager/utils/formDataUtils.java

@@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j;
 import com.caimei365.manager.FastDFS.FastDFSClient;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;

src/main/resources/mapper/user/CustomerServiceDao.xml

@@ -162,7 +162,7 @@
                 and cusf.keyword like concat('%',#{keyword},'%')
             </if>
             <if test="status != null">
-                csk.status = #{status}
+                and csk.status = #{status}
             </if>
         </where>
         order by csk.addTime desc, (SELECT COUNT(recordID) FROM cm_behavior_record WHERE pageType = 8 AND pageLabel = cusf.keyword) desc
@@ -174,7 +174,7 @@
 
     <select id="getSearchFrequencyList" resultType="com.caimei365.manager.entity.caimei.cmUser.CmUserSearchFrequency">
         select * from cm_user_search_frequency
-        where delStatus = 0 and trueStatus = 1
+        where delStatus = 1 and trueStatus = 1
         <if test="keyword != null and keyword != ''">
             and keyword like concat('%',#{keyword},'%')
         </if>