24282 2 سال پیش
والد
کامیت
66ead55789

+ 38 - 3
admin/pom.xml

@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.example</groupId>
-        <artifactId>test</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <groupId>com.fjhx</groupId>
+        <artifactId>new-winfaster</artifactId>
+        <version>1.0</version>
     </parent>
 
     <artifactId>admin</artifactId>
@@ -17,4 +17,39 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <dependencies>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-base</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <warName>${project.artifactId}</warName>
+                </configuration>
+            </plugin>
+        </plugins>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
 </project>

+ 1 - 1
admin/src/main/resources/application-dev.yml

@@ -36,4 +36,4 @@ spring:
                 # 连接池的最大数据库连接数
                 max-active: 8
                 # #连接池最大阻塞等待时间(使用负值表示没有限制)
-                max-wait: -1ms
+                max-wait: -1ms

+ 5 - 1
admin/src/main/resources/application-prod.yml

@@ -36,4 +36,8 @@ spring:
                 # 连接池的最大数据库连接数
                 max-active: 8
                 # #连接池最大阻塞等待时间(使用负值表示没有限制)
-                max-wait: -1ms
+                max-wait: -1ms
+
+server:
+    servlet:
+        context-path: /prod-api

+ 5 - 1
admin/src/main/resources/application-test.yml

@@ -36,4 +36,8 @@ spring:
                 # 连接池的最大数据库连接数
                 max-active: 8
                 # #连接池最大阻塞等待时间(使用负值表示没有限制)
-                max-wait: -1ms
+                max-wait: -1ms
+
+server:
+    servlet:
+        context-path: /test-api

+ 14 - 38
pom.xml

@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.example</groupId>
-    <artifactId>test</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <groupId>com.fjhx</groupId>
+    <artifactId>new-winfaster</artifactId>
+    <version>1.0</version>
     <packaging>pom</packaging>
     <modules>
         <module>admin</module>
@@ -24,47 +24,23 @@
         <version>2.7.6</version>
     </parent>
 
-    <dependencies>
 
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-base</artifactId>
-            <version>1.0.0</version>
-        </dependency>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.fjhx</groupId>
+                <artifactId>hx-base</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
-<!--        <dependency>-->
-<!--            <groupId>com.fly</groupId>-->
+    <!--        <dependency>-->
+    <!--            <groupId>com.fly</groupId>-->
 <!--            <artifactId>fly-generator</artifactId>-->
 <!--            <version>1.0.hx</version>-->
 <!--            <scope>test</scope>-->
 <!--        </dependency>-->
 
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
-        </plugins>
-        <finalName>${project.artifactId}</finalName>
-    </build>
 
 </project>