Merge remote-tracking branch 'origin/devlop' into devlop

4 years ago · b53667b991
2 changed files with 2 additions and 2 deletions
--- a/payment-base-app/pom.xml
+++ b/payment-base-app/pom.xml
@ -203,7 +203,7 @@
                <artifactId>maven-compiler-plugin</artifactId>
                <version>3.1</version>
            </plugin>
-            <plugin>
+            <plugin>              
                <artifactId>maven-assembly-plugin</artifactId>
                <configuration>
                    <archive>
--- a/payment-base-app/src/main/resources/application.yml
+++ b/payment-base-app/src/main/resources/application.yml
@ -1,7 +1,7 @@
 server:
  port: 5080 #服务端口
  servlet:
-    context-path: /rbs-pay
+    context-path: /
 #spring相关配置
 spring:
  application: