Merge branch 'master' into registry-nacos

sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/configuration/BaseServiceConfiguration.java

@@ -17,6 +17,7 @@ import org.springframework.core.env.Environment;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
@@ -40,6 +41,15 @@ public class BaseServiceConfiguration extends WebMvcConfigurationSupport
 
     private ApiMappingHandlerMapping apiMappingHandlerMapping = new ApiMappingHandlerMapping();
 
+    @Override
+    protected void addResourceHandlers(ResourceHandlerRegistry registry) {
+        super.addResourceHandlers(registry);
+        // 支持swagger-bootstrap-ui首页
+        registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
+        // 支持默认swagger
+        registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
 
     @Override
     protected void addInterceptors(InterceptorRegistry registry) {

sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/config/OpenServiceConfig.java

@@ -4,7 +4,6 @@ import com.gitee.sop.servercommon.bean.ServiceConfig;
 import com.gitee.sop.servercommon.configuration.AlipayServiceConfiguration;
 import com.gitee.sop.servercommon.swagger.SwaggerSupport;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
@@ -14,21 +13,10 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @Configuration
 public class OpenServiceConfig extends AlipayServiceConfiguration {
 
-
     static {
         ServiceConfig.getInstance().getI18nModules().add("i18n/isp/goods_error");
     }
 
-    @Override
-    protected void addResourceHandlers(ResourceHandlerRegistry registry) {
-        super.addResourceHandlers(registry);
-        // 支持swagger-bootstrap-ui首页
-        registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
-        // 支持默认swagger
-        registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
-        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
-    }
-
 
     /**
      * 开启文档，本地微服务文档地址：http://localhost:2222/doc.html

sop-gateway/src/main/java/com/gitee/sop/gateway/controller/ErrorLogController.java

@@ -62,7 +62,10 @@ public class ErrorLogController {
     private void check(HttpServletRequest request) {
         Map<String, String> params = RequestUtil.convertRequestParamsToMap(request);
         ApiParam apiParam = ApiParam.build(params);
-        signer.checkSign(apiParam, secret);
+        boolean right = signer.checkSign(apiParam, secret);
+        if (!right) {
+            throw new RuntimeException("签名校验失败");
+        }
     }
 
 }

sop-test/pom.xml

@@ -15,8 +15,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
+        <java.version>1.8</java.version>
-        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -58,48 +57,39 @@
     </dependencies>
 
     <build>
-        <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
         <plugins>
-                <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
+            <!-- 打包时跳过测试 -->
-                <plugin>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.1.0</version>
-                </plugin>
-                <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
-                <plugin>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.0.2</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.0</version>
-                </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.1</version>
+                <version>2.12.4</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
             </plugin>
             <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
-                    <version>3.0.2</version>
+                <artifactId>maven-compiler-plugin</artifactId>
-                </plugin>
+                <version>3.1</version>
-                <plugin>
+                <configuration>
-                    <artifactId>maven-install-plugin</artifactId>
+                    <source>${java.version}</source>
-                    <version>2.5.2</version>
+                    <target>${java.version}</target>
-                </plugin>
+                    <encoding>UTF-8</encoding>
-                <plugin>
+                </configuration>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.2</version>
-                </plugin>
-                <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
-                <plugin>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>3.7.1</version>
             </plugin>
             <plugin>
-                    <artifactId>maven-project-info-reports-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
-                    <version>3.0.0</version>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
-        </pluginManagement>
     </build>
 </project>