Skip to content

Commit

Permalink
🔖 V1.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
oddfar committed Aug 18, 2023
1 parent 3acd906 commit ef26997
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 11 deletions.
2 changes: 1 addition & 1 deletion campus-admin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>campus</artifactId>
<groupId>com.oddfar.campus</groupId>
<version>1.0.6</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion campus-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>campus</artifactId>
<groupId>com.oddfar.campus</groupId>
<version>1.0.6</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion campus-framework/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>campus</artifactId>
<groupId>com.oddfar.campus</groupId>
<version>1.0.6</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
5 changes: 4 additions & 1 deletion campus-modular/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>campus</artifactId>
<groupId>com.oddfar.campus</groupId>
<version>1.0.6</version>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -49,8 +49,11 @@
<warName>${project.artifactId}</warName>
</configuration>
</plugin>

</plugins>

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

</build>

</project>
2 changes: 1 addition & 1 deletion campus-modular/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ campus:
# 名称
name: campus-imaotai
# 版本
version: 1.0.6
version: ${revision}

server:
port: 8160
Expand Down
44 changes: 39 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.oddfar.campus</groupId>
<artifactId>campus</artifactId>
<version>1.0.6</version>
<version>${revision}</version>
<packaging>pom</packaging>

<name>campus</name>
Expand All @@ -21,7 +21,7 @@
</modules>

<properties>
<campus.version>1.0.6</campus.version>
<revision>1.0.7</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<bitwalker.version>1.21</bitwalker.version>
Expand All @@ -36,6 +36,8 @@
<poi.version>4.1.2</poi.version>
<pagehelper.boot.version>1.4.3</pagehelper.boot.version>
<sunmail.version>1.6.2</sunmail.version>
<!-- 插件版本 -->
<flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
</properties>

<!-- 依赖声明 -->
Expand Down Expand Up @@ -149,19 +151,19 @@
<dependency>
<groupId>com.oddfar.campus</groupId>
<artifactId>campus-common</artifactId>
<version>${campus.version}</version>
<version>${revision}</version>
</dependency>
<!-- 系统模块-->
<dependency>
<groupId>com.oddfar.campus</groupId>
<artifactId>campus-framework</artifactId>
<version>${campus.version}</version>
<version>${revision}</version>
</dependency>
<!--后台管理-->
<dependency>
<groupId>com.oddfar.campus</groupId>
<artifactId>campus-admin</artifactId>
<version>${campus.version}</version>
<version>${revision}</version>
</dependency>
</dependencies>

Expand All @@ -179,7 +181,39 @@
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<!-- 统一版本号管理 -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${flatten-maven-plugin.version}</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>


Expand Down
2 changes: 1 addition & 1 deletion vue_campus_admin/src/views/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default {
data() {
return {
// 版本号
version: "1.0.6",
version: "1.0.7",
};
},
methods: {
Expand Down

0 comments on commit ef26997

Please sign in to comment.