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

jiaosong

2023-09-18 2a8241df4493a36b046855f2283b1c3da9e6bfbe

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

 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>

 server/company/src/main/resources/application.yml

@@ -5,7 +5,7 @@
  env: development
#  env: production
server:
  port: 10012
  port: 10022

spring:
#  application:

 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>

 server/pom.xml

@@ -234,6 +234,9 @@
      </plugin>
    </plugins>
  </build>



  <!--<build>

    <finalName>${project.artifactId}</finalName>

 server/service/pom.xml

@@ -17,4 +17,5 @@
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>


</project>