Skip to content

Commit

Permalink
release: 3.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@lerry903
lerry903 committed Jun 7, 2019
1 parent ac5f846 commit 3c8d269
Show file tree
Hide file tree
Showing 13 changed files with 53 additions and 25 deletions.
Binary file modified img/index.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>

<name>ruoyi</name>
<url>https://github.com/lerry903/RuoYi</url>
<description>若依管理系统</description>

<properties>
<ruoyi.version>3.3.1</ruoyi.version>
<ruoyi.version>3.4.0</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
Expand Down
26 changes: 13 additions & 13 deletions ruoyi-admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.3.1</version>
<version>3.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Expand Down Expand Up @@ -66,15 +66,15 @@
<warName>${artifactId}</warName>
</configuration>
</plugin>
<plugin>
<!--<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.0.0</version>
<!--将插件绑定在某个phase执行-->
&lt;!&ndash;将插件绑定在某个phase执行&ndash;&gt;
<executions>
<execution>
<id>build-image</id>
<!--将插件绑定在package这个phase上。也就是说，用户只需执行mvn package ，就会自动执行mvn docker:build-->
&lt;!&ndash;将插件绑定在package这个phase上。也就是说，用户只需执行mvn package ，就会自动执行mvn docker:build&ndash;&gt;
<phase>package</phase>
<goals>
<goal>build</goal>
Expand All @@ -83,35 +83,35 @@
</executions>
<configuration>
<!--指定生成的镜像名-->
&lt;!&ndash;指定生成的镜像名&ndash;&gt;
<imageName>lerry/${project.artifactId}</imageName>
<!--指定标签-->
&lt;!&ndash;指定标签&ndash;&gt;
<imageTags>
<imageTag>latest</imageTag>
</imageTags>
<!-- 指定 Dockerfile 路径 ${project.basedir}：项目根路径下-->
&lt;!&ndash; 指定 Dockerfile 路径 ${project.basedir}：项目根路径下&ndash;&gt;
<dockerDirectory>${project.basedir}</dockerDirectory>
<!--指定远程 docker api地址-->
&lt;!&ndash;指定远程 docker api地址&ndash;&gt;
<dockerHost>http://123.207.20.136:2375</dockerHost>
<!-- 这里是复制 jar 包到 docker 容器指定目录配置 -->
&lt;!&ndash; 这里是复制 jar 包到 docker 容器指定目录配置 &ndash;&gt;
<resources>
<resource>
<targetPath>/</targetPath>
<!--jar 包所在的路径 此处配置的 即对应 target 目录-->
&lt;!&ndash;jar 包所在的路径 此处配置的 即对应 target 目录&ndash;&gt;
<directory>${project.build.directory}</directory>
<!-- 需要包含的 jar包 ，这里对应的是 Dockerfile中添加的文件名　-->
&lt;!&ndash; 需要包含的 jar包 ，这里对应的是 Dockerfile中添加的文件名　&ndash;&gt;
<include>${project.build.finalName}.jar</include>
</resource>
</resources>
<!-- 以下两行是为了docker push到DockerHub使用的。 -->
&lt;!&ndash; 以下两行是为了docker push到DockerHub使用的。 &ndash;&gt;
<serverId>docker-hub</serverId>
<registryUrl>https://index.docker.io/v1</registryUrl>
</configuration>
</plugin>
</plugin>-->
</plugins>
<finalName>${project.artifactId}-${project.version}-${env}</finalName>
<filters>
Expand Down
2 changes: 1 addition & 1 deletion ruoyi-admin/src/main/resources/dev/application.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ruoyi:
# 描述
description: 若依管理系统
# 版本
version: 3.3.1
version: 3.4.0
# 获取ip地址开关
addressEnabled: true
#演示模式
Expand Down
2 changes: 1 addition & 1 deletion ruoyi-admin/src/main/resources/run/application.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ruoyi:
# 描述
description: 若依管理系统
# 版本
version: 3.3.1
version: 3.4.0
# 获取ip地址开关
addressEnabled: true
#演示模式
Expand Down
30 changes: 29 additions & 1 deletion ruoyi-admin/src/main/resources/templates/main.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,34 @@ <h5>更新日志</h5>
<div class="ibox-content no-padding">
<div class="panel-body">
<div class="panel-group" id="version">
<div class="panel panel-default">
<div class="panel-heading">
<a data-toggle="collapse" data-parent="#version" href="#v340">
<h5 class="panel-title">
v3.4.0<code class="pull-right">2019.06.07</code>
</h5>
</a>
</div>
<div id="v340" class="panel-collapse collapse in">
<div class="panel-body">
<ol>
<li>新增实例演示菜单及demo</li>
<li>新增支持docker部署</li>
<li>新增点击行触发事件</li>
<li>新增页签右键操作</li>
<li>去除druid监控页面底部广告</li>
<li>剔除页签操作功能</li>
<li>工具类调整</li>
<li>新增select2-bootstrap美化下拉框</li>
<li>修复部门四级修改祖级无效问题</li>
<li>修复角色权限注解失效问题</li>
<li>其他代码细节优化</li>
<li>优化调整其他样式</li>
<li>修复一些已知bug</li>
</ol>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<a data-toggle="collapse" data-parent="#version" href="#v331">
Expand All @@ -92,7 +120,7 @@ <h5 class="panel-title">
</h5>
</a>
</div>
<div id="v331" class="panel-collapse collapse in">
<div id="v331" class="panel-collapse collapse">
<div class="panel-body">
<ol>
<li>修复一些已知bug</li>
Expand Down
2 changes: 1 addition & 1 deletion ruoyi-admin/src/main/resources/uat/application.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ruoyi:
# 描述
description: 若依管理系统
# 版本
version: 3.3.1
version: 3.4.0
# 获取ip地址开关
addressEnabled: true
#演示模式
Expand Down
2 changes: 1 addition & 1 deletion ruoyi-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.3.1</version>
<version>3.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion ruoyi-common/src/main/java/com/ruoyi/common/config/Global.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public static String getName() {
* 获取项目版本
*/
public static String getVersion() {
return Convert.toStr(getConfig("ruoyi.version"), "3.3.1");
return Convert.toStr(getConfig("ruoyi.version"), "3.4.0");
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ruoyi-framework/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.3.1</version>
<version>3.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion ruoyi-generator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.3.1</version>
<version>3.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion ruoyi-quartz/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.3.1</version>
<version>3.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion ruoyi-system/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.3.1</version>
<version>3.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down

0 comments on commit 3c8d269

Please sign in to comment.