代码修改

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/OnenetDevice.java

@@ -22,7 +22,7 @@ public class OnenetDevice extends UuidIdentityEntityWithCreateTime{
    private String imsi;//sim的imsi
    private String psk;//onenet DTLS加密所使用的PSK
    private String deviceId;//onenet平台设备id
    private String deviceType;//设备厂商类型1未来鹰2 海康
    private String deviceType;//设备厂商类型1未来鹰2 海康 3赛特
    private String categoryCode;//设备类型标识 14气感，15烟感
    @Column(name="name")

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/config/MultipartConfig.java

@@ -1,5 +1,6 @@
package com.yihu.jw.gateway.config;
import com.yihu.jw.gateway.filter.CORSFilter;
import com.yihu.jw.gateway.filter.CsrfFilter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -19,6 +20,8 @@ public class MultipartConfig {
    @Autowired
    CsrfFilter csrfFilter;
    @Autowired
    private CORSFilter corsFilter;
    @Value("${server.tomcat.basedir}")
    String tomcatLocation;
@@ -35,6 +38,16 @@ public class MultipartConfig {
        return factory.createMultipartConfig();
    }
    @Bean
    public FilterRegistrationBean testFilterRegistration3() {
        FilterRegistrationBean registration = new FilterRegistrationBean();
        registration.setFilter(corsFilter);
        registration.addUrlPatterns("/*");
        registration.setName("corsFilter");
        registration.setOrder(-1);
        return registration;
    }
    @Bean
    public FilterRegistrationBean testFilterRegistration4() {
        FilterRegistrationBean registration = new FilterRegistrationBean();

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/CORSFilter.java

@@ -1,9 +1,10 @@
package com.yihu.jw.gateway.filter;
import org.springframework.core.annotation.Order;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import javax.servlet.*;
import javax.servlet.annotation.WebFilter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -11,10 +12,13 @@ import java.io.IOException;
/**
 * Created by yeshijie on 2024/3/26.
 */
@Order(1)
@WebFilter(filterName = "corsFilter", urlPatterns = {"/*"})
//@Order(-1)
//@WebFilter(filterName = "corsFilter", urlPatterns = {"/*"}) 注解的jar启动不生效要tomcat
@Component
public class CORSFilter implements Filter {
    private Logger logger = LoggerFactory.getLogger(CORSFilter.class);
    @Override
    public void init(FilterConfig filterConfig) throws ServletException {
@@ -24,9 +28,10 @@ public class CORSFilter implements Filter {
    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
        HttpServletResponse response = (HttpServletResponse) servletResponse;
        HttpServletRequest request = (HttpServletRequest) servletRequest;
        System.out.println(">>>>>>>>>>>>>>>>>来了》》》》》》》》》》》》》》》》"+request.getHeader("Origin"));
        logger.info(">>>>>>>>>>>>>>>>>来了》》》》》》》》》》》》》》》》"+request.getHeader("Origin"));
        //https://yyfbxt.szhz.hangzhou.gov.cn:8068/web/mgop/gov-open/zj/2002347641/reserved/index.html
        response.setHeader("Access-Control-Allow-Origin", "https://yyfbxt.szhz.hangzhou.gov.cn:8068");
//        response.setHeader("Access-Control-Allow-Origin", "https://yyfbxt.szhz.hangzhou.gov.cn:8068");
//        response.setHeader("Access-Control-Allow-Origin", "*");
//        response.setHeader("Access-Control-Allow-Headers", "access-control-allow-origin, authority, content-type, version-info, X-Requested-With");
        response.setHeader("Access-Control-Allow-Headers", "*");
//        response.setHeader("Access-Control-Expose-Headers", "*");
@@ -35,7 +40,7 @@ public class CORSFilter implements Filter {
        //response.setHeader("Access-Control-Allow-Credentials", "true");
        if ("OPTIONS".equals(request.getMethod())) {
            response.setStatus(HttpServletResponse.SC_OK);
            System.out.println("OPTIONS=======================");
            logger.info("OPTIONS=======================");
            return;
        }
        filterChain.doFilter(request, response);