修改Bug

fengjin

2023-09-19 abc906e6387bed2c189b706f18d7749ef53bb9bc

修改Bug

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/Constant.java

@@ -73,4 +73,10 @@
     */
    public static final String HCAUTHORIZATION = "HCAuthorization";


    /**
     * 小程序  花城e+token
     */
    public static final String UNION_AUTHORIZATION = "Union_Authorization";

}

 springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/config/ResourcesConfig.java

@@ -1,64 +1,64 @@
package com.chuangongzhijia.huacheng_union_applets.config;

import com.panzhihua.common.constants.Constants;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
import org.springframework.web.filter.OncePerRequestFilter;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;

/**
 * 通用配置
 * 
 * @author huanghongfa
 */
@Configuration
public class ResourcesConfig implements WebMvcConfigurer {


    @Override
    public void addCorsMappings(CorsRegistry registry) {
        //设置允许跨域的路径
        registry.addMapping ("/**")
                //设置允许跨域请求的域名
                .allowedOrigins("*")
                //是否允许证书
                .allowCredentials (true)
                //设置允许的方法
                .allowedMethods ("GET","POST","DELETE")
                //设置允许的header属性
                .allowedHeaders ("*")
                //允许跨域时间
                .maxAge (3600);
    }

    /**
     * 跨域配置
     */
    @Bean
    public CorsFilter corsFilter() {
        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
        CorsConfiguration config = new CorsConfiguration();
        config.setAllowCredentials(true);
        // 设置访问源地址
        config.addAllowedOrigin("*");
        // 设置访问源请求头
        config.addAllowedHeader("*");
        // 设置访问源请求方法
        config.addAllowedMethod("*");
        // 对接口配置跨域设置
        source.registerCorsConfiguration("/**", config);
        return new CorsFilter(source);
    }
}
//package com.chuangongzhijia.huacheng_union_applets.config;
//
//import com.panzhihua.common.constants.Constants;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//import org.springframework.stereotype.Component;
//import org.springframework.web.cors.CorsConfiguration;
//import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
//import org.springframework.web.filter.CorsFilter;
//import org.springframework.web.filter.OncePerRequestFilter;
//import org.springframework.web.servlet.config.annotation.CorsRegistry;
//import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
//
//import javax.servlet.FilterChain;
//import javax.servlet.ServletException;
//import javax.servlet.http.HttpServletRequest;
//import javax.servlet.http.HttpServletResponse;
//import java.io.IOException;
//
///**
// * 通用配置
// *
// * @author huanghongfa
// */
//@Configuration
//public class ResourcesConfig implements WebMvcConfigurer {
//
//
//    @Override
//    public void addCorsMappings(CorsRegistry registry) {
//        //设置允许跨域的路径
//        registry.addMapping ("/**")
//                //设置允许跨域请求的域名
//                .allowedOrigins("*")
//                //是否允许证书
//                .allowCredentials (true)
//                //设置允许的方法
//                .allowedMethods ("GET","POST","DELETE")
//                //设置允许的header属性
//                .allowedHeaders ("*")
//                //允许跨域时间
//                .maxAge (3600);
//    }
//
//    /**
//     * 跨域配置
//     */
//    @Bean
//    public CorsFilter corsFilter() {
//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
//        CorsConfiguration config = new CorsConfiguration();
//        config.setAllowCredentials(true);
//        // 设置访问源地址
//        config.addAllowedOrigin("*");
//        // 设置访问源请求头
//        config.addAllowedHeader("*");
//        // 设置访问源请求方法
//        config.addAllowedMethod("*");
//        // 对接口配置跨域设置
//        source.registerCorsConfiguration("/**", config);
//        return new CorsFilter(source);
//    }
//}

 springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/resolvers/AuthorizationInterceptor.java

@@ -45,16 +45,17 @@
        Object bean = handlerMethod.getBean();
        String token;
        //从header中得到token
        String header = request.getHeader(Constant.AUTHORIZATION);
        String header = request.getHeader(Constant.UNION_AUTHORIZATION);
        request.getHeader(Constant.AUTHORIZATION);
        if (header != null) {
            String[] tokens = request.getHeader(Constant.AUTHORIZATION).split(" ");
            String[] tokens = request.getHeader(Constant.UNION_AUTHORIZATION).split(" ");
            if (tokens.length >= 2) {
                token = request.getHeader(Constant.AUTHORIZATION).split(" ")[1];
                token = request.getHeader(Constant.UNION_AUTHORIZATION).split(" ")[1];
            } else {
                token = request.getHeader(Constant.AUTHORIZATION);
                token = request.getHeader(Constant.UNION_AUTHORIZATION);
            }
        } else {
            token = request.getHeader(Constant.AUTHORIZATION);
            token = request.getHeader(Constant.UNION_AUTHORIZATION);
        }
        if (manager.checkToken(token)) {
            //如果token验证成功，权限检查通过，将token对应的用户id存在request中，便于之后注入