修改系统

This commit is contained in:
huangdeliang
2020-11-25 21:36:44 +08:00
570 changed files with 47911 additions and 47241 deletions

95
pom.xml
View File

@ -3,16 +3,16 @@
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>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
<groupId>com.stdiet</groupId>
<artifactId>stdiet</artifactId>
<version>3.1.0</version>
<name>ruoyi</name>
<name>stdiet</name>
<!-- <url>http://www.ruoyi.vip</url> -->
<description>管理系统</description>
<properties>
<ruoyi.version>3.1.0</ruoyi.version>
<stdiet.version>3.1.0</stdiet.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
@ -148,50 +148,50 @@
<!-- 定时任务-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-quartz</artifactId>
<version>${ruoyi.version}</version>
<groupId>com.stdiet</groupId>
<artifactId>stdiet-quartz</artifactId>
<version>${stdiet.version}</version>
</dependency>
<!-- 代码生成-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-generator</artifactId>
<version>${ruoyi.version}</version>
<groupId>com.stdiet</groupId>
<artifactId>stdiet-generator</artifactId>
<version>${stdiet.version}</version>
</dependency>
<!-- 核心模块-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
<version>${ruoyi.version}</version>
<groupId>com.stdiet</groupId>
<artifactId>stdiet-framework</artifactId>
<version>${stdiet.version}</version>
</dependency>
<!-- 系统模块-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
<version>${ruoyi.version}</version>
<groupId>com.stdiet</groupId>
<artifactId>stdiet-system</artifactId>
<version>${stdiet.version}</version>
</dependency>
<!-- 通用工具-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
<version>${ruoyi.version}</version>
<groupId>com.stdiet</groupId>
<artifactId>stdiet-common</artifactId>
<version>${stdiet.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<modules>
<module>ruoyi-admin</module>
<module>ruoyi-framework</module>
<module>ruoyi-system</module>
<module>ruoyi-quartz</module>
<module>ruoyi-generator</module>
<module>ruoyi-common</module>
<module>ruoyi-custom</module>
<module>stdiet-admin</module>
<module>stdiet-framework</module>
<module>stdiet-system</module>
<module>stdiet-quartz</module>
<module>stdiet-generator</module>
<module>stdiet-common</module>
<module>stdiet-custom</module>
</modules>
<packaging>pom</packaging>
@ -207,7 +207,25 @@
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<!-- 资源文件处理插件,必须配置 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
</plugins>
<resources>
<!-- 所有公共资源文件 -->
<resource>
<directory>src/main/resources</directory>
</resource>
<!-- 不同环境的资源文件 -->
<resource>
<directory>src/main/filters/${profileActive}</directory>
</resource>
</resources>
</build>
<repositories>
@ -235,4 +253,29 @@
</pluginRepository>
</pluginRepositories>
<profiles>
<!-- dev开发环境配置,release为生产环境配置 -->
<profile>
<id>dev</id>
<properties>
<profileActive>dev</profileActive>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<id>local</id>
<properties>
<profileActive>local</profileActive>
</properties>
</profile>
<profile>
<id>prod</id>
<properties>
<profileActive>prod</profileActive>
</properties>
</profile>
</profiles>
</project>