Merge branch 'mp-server-test' into 'master'

Mp server test

See merge request quanshu/mp-server!3

mp-admin/src/main/resources/application-test.yml

@@ -10,7 +10,7 @@ pay:
 
 # 日志配置
 logging:
-  config: classpath:logback-8090.xml
+  config: classpath:logback-8091.xml
   level:
     com.qs.mp: debug
     org.springframework: warn
@@ -92,7 +92,7 @@ spring:
 # 环境配置
 server:
   # 服务端口
-  port: 8090
+  port: 8091
   servlet:
     # 项目contextPath
     context-path: /

mp-framework/src/main/java/com/qs/mp/framework/config/ResourcesConfig.java

@@ -1,5 +1,8 @@
 package com.qs.mp.framework.config;
 
+import com.qs.mp.common.config.MpConfig;
+import com.qs.mp.common.constant.Constants;
+import com.qs.mp.framework.interceptor.RepeatSubmitInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -9,9 +12,6 @@ import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import com.qs.mp.common.config.MpConfig;
-import com.qs.mp.common.constant.Constants;
-import com.qs.mp.framework.interceptor.RepeatSubmitInterceptor;
 
 /**
  * 通用配置
@@ -53,7 +53,8 @@ public class ResourcesConfig implements WebMvcConfigurer
         CorsConfiguration config = new CorsConfiguration();
         config.setAllowCredentials(true);
         // 设置访问源地址
-        config.addAllowedOrigin("*");
+        // config.addAllowedOrigin("*");
+        config.addAllowedOriginPattern("*");
         // 设置访问源请求头
         config.addAllowedHeader("*");
         // 设置访问源请求方法