Pre Merge pull request !114 from 道高玄四达/hxy/feat

pull/114/MERGE
道高玄四达 4 years ago committed by Gitee
commit 26faf467b3

2
.gitignore vendored

@ -41,3 +41,5 @@ nbdist/
!*/build/*.java !*/build/*.java
!*/build/*.html !*/build/*.html
!*/build/*.xml !*/build/*.xml
docker/**/jar/*.jar

@ -40,6 +40,10 @@
<common-pool.version>2.10.0</common-pool.version> <common-pool.version>2.10.0</common-pool.version>
<commons-collections.version>3.2.2</commons-collections.version> <commons-collections.version>3.2.2</commons-collections.version>
<transmittable-thread-local.version>2.12.2</transmittable-thread-local.version> <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
<publish.root>${rootlocation}/docker/ruoyi</publish.root>
<!-- 将配置文件打包到指定目录 -->
<publish.dir>${publish.root}</publish.dir>
<jardir>${project.artifactId}</jardir>
</properties> </properties>
<!-- 依赖声明 --> <!-- 依赖声明 -->
@ -273,6 +277,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -284,6 +289,75 @@
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.2.0</version>
<executions>
<!-- mvn install 时根目录 rootlocation变量注入-->
<execution>
<id>register-root-location-var</id>
<phase>validate</phase>
<goals>
<goal>rootlocation</goal>
</goals>
</execution>
<!-- mvn clean 时根目录 rootlocation变量注入-->
<execution>
<id>register-root-location-var-clean</id>
<phase>pre-clean</phase>
<goals>
<goal>rootlocation</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<!--拷贝jar到docker目录下-->
<execution>
<id>copy-jar</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<encoding>UTF-8</encoding>
<outputDirectory>${publish.dir}/jar</outputDirectory>
<resources>
<resource>
<directory>${project.build.directory}</directory>
<includes>
<include>*.jar</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<!-- 清除生成到docker/ruoyi下的jar包-->
<filesets>
<fileset>
<directory>${publish.dir}/jar</directory>
<includes>
<include>*.jar</include>
</includes>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

@ -19,4 +19,17 @@
ruoyi-api系统接口 ruoyi-api系统接口
</description> </description>
<properties>
<publish.dir>${publish.root}/api</publish.dir>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<inherited>false</inherited>
</plugin>
</plugins>
</build>
</project> </project>

@ -15,6 +15,10 @@
ruoyi-api-system系统接口模块 ruoyi-api-system系统接口模块
</description> </description>
<properties>
<publish.dir>${publish.root}/api/system</publish.dir>
</properties>
<dependencies> <dependencies>
<!-- RuoYi Common Core--> <!-- RuoYi Common Core-->

@ -14,6 +14,10 @@
ruoyi-auth认证授权中心 ruoyi-auth认证授权中心
</description> </description>
<properties>
<publish.dir>${publish.root}/auth</publish.dir>
</properties>
<dependencies> <dependencies>
<!-- SpringCloud Alibaba Nacos --> <!-- SpringCloud Alibaba Nacos -->

@ -25,4 +25,14 @@
ruoyi-common通用模块 ruoyi-common通用模块
</description> </description>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<inherited>false</inherited>
</plugin>
</plugins>
</build>
</project> </project>

@ -14,6 +14,10 @@
ruoyi-gateway网关模块 ruoyi-gateway网关模块
</description> </description>
<properties>
<publish.dir>${publish.root}/gateway</publish.dir>
</properties>
<dependencies> <dependencies>
<!-- SpringCloud Gateway --> <!-- SpringCloud Gateway -->

@ -22,4 +22,7 @@
ruoyi-modules业务模块 ruoyi-modules业务模块
</description> </description>
<properties>
<publish.dir>${publish.root}/modules</publish.dir>
</properties>
</project> </project>

@ -15,6 +15,10 @@
ruoyi-modules-file文件服务 ruoyi-modules-file文件服务
</description> </description>
<properties>
<publish.dir>${publish.root}/modules/file</publish.dir>
</properties>
<dependencies> <dependencies>
<!-- SpringCloud Alibaba Nacos --> <!-- SpringCloud Alibaba Nacos -->

@ -15,6 +15,10 @@
ruoyi-modules-gen代码生成 ruoyi-modules-gen代码生成
</description> </description>
<properties>
<publish.dir>${publish.root}/modules/gen</publish.dir>
</properties>
<dependencies> <dependencies>
<!-- SpringCloud Alibaba Nacos --> <!-- SpringCloud Alibaba Nacos -->

@ -15,6 +15,10 @@
ruoyi-modules-job定时任务 ruoyi-modules-job定时任务
</description> </description>
<properties>
<publish.dir>${publish.root}/modules/job</publish.dir>
</properties>
<dependencies> <dependencies>
<!-- SpringCloud Alibaba Nacos --> <!-- SpringCloud Alibaba Nacos -->

@ -15,6 +15,10 @@
ruoyi-modules-system系统模块 ruoyi-modules-system系统模块
</description> </description>
<properties>
<publish.dir>${publish.root}/modules/system</publish.dir>
</properties>
<dependencies> <dependencies>
<!-- SpringCloud Alibaba Nacos --> <!-- SpringCloud Alibaba Nacos -->

@ -12,6 +12,11 @@
<module>ruoyi-monitor</module> <module>ruoyi-monitor</module>
</modules> </modules>
<properties>
<publish.dir>${publish.root}/visual</publish.dir>
</properties>
<artifactId>ruoyi-visual</artifactId> <artifactId>ruoyi-visual</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>

@ -14,6 +14,10 @@
ruoyi-visual-monitor监控中心 ruoyi-visual-monitor监控中心
</description> </description>
<properties>
<publish.dir>${publish.root}/visual/monitor</publish.dir>
</properties>
<dependencies> <dependencies>
<!-- SpringBoot Admin --> <!-- SpringBoot Admin -->

Loading…
Cancel
Save