From 2a8241df4493a36b046855f2283b1c3da9e6bfbe Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 18 九月 2023 18:37:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/company/pom.xml | 34 +++++++++++++++++
server/service/pom.xml | 1
server/platform/pom.xml | 34 +++++++++++++++++
server/pom.xml | 3 +
server/company/src/main/resources/application.yml | 2
5 files changed, 73 insertions(+), 1 deletions(-)
diff --git a/server/company/pom.xml b/server/company/pom.xml
index d9e5f21..46badc0 100644
--- a/server/company/pom.xml
+++ b/server/company/pom.xml
@@ -24,4 +24,38 @@
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
+
+ <build>
+ <finalName>company</finalName>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <configuration>
+ <fork>true</fork>
+ <mainClass>com.doumee.CompanyApplication</mainClass>
+ <layout>ZIP</layout>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!--<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>-->
+
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/server/company/src/main/resources/application.yml b/server/company/src/main/resources/application.yml
index fc2ec48..6787c56 100644
--- a/server/company/src/main/resources/application.yml
+++ b/server/company/src/main/resources/application.yml
@@ -5,7 +5,7 @@
env: development
# env: production
server:
- port: 10012
+ port: 10022
spring:
# application:
diff --git a/server/platform/pom.xml b/server/platform/pom.xml
index 43c532f..95cc8db 100644
--- a/server/platform/pom.xml
+++ b/server/platform/pom.xml
@@ -21,4 +21,38 @@
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
+
+ <build>
+ <finalName>platform</finalName>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <configuration>
+ <fork>true</fork>
+ <mainClass>com.doumee.PlatformApplication</mainClass>
+ <layout>ZIP</layout>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!--<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>-->
+
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/server/pom.xml b/server/pom.xml
index 012fa87..57b0d85 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -234,6 +234,9 @@
</plugin>
</plugins>
</build>
+
+
+
<!--<build>
<finalName>${project.artifactId}</finalName>
diff --git a/server/service/pom.xml b/server/service/pom.xml
index 5ff9058..00f58b5 100644
--- a/server/service/pom.xml
+++ b/server/service/pom.xml
@@ -17,4 +17,5 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+
</project>
\ No newline at end of file
--
Gitblit v1.9.3