Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
git test
RuoYi
Commits
7e259cd1
Commit
7e259cd1
authored
4 years ago
by
RuoYi
Browse files
Options
Download
Email Patches
Plain Diff
若依 4.3
parent
3846329c
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
pom.xml
+2
-2
pom.xml
ruoyi-admin/pom.xml
+1
-1
ruoyi-admin/pom.xml
ruoyi-admin/src/main/resources/application.yml
+1
-1
ruoyi-admin/src/main/resources/application.yml
ruoyi-admin/src/main/resources/templates/demo/form/summernote.html
+2
-2
...in/src/main/resources/templates/demo/form/summernote.html
ruoyi-admin/src/main/resources/templates/include.html
+2
-2
ruoyi-admin/src/main/resources/templates/include.html
ruoyi-admin/src/main/resources/templates/index.html
+3
-3
ruoyi-admin/src/main/resources/templates/index.html
ruoyi-admin/src/main/resources/templates/login.html
+2
-2
ruoyi-admin/src/main/resources/templates/login.html
ruoyi-admin/src/main/resources/templates/main.html
+67
-1
ruoyi-admin/src/main/resources/templates/main.html
ruoyi-admin/src/main/resources/templates/register.html
+2
-2
ruoyi-admin/src/main/resources/templates/register.html
ruoyi-admin/src/main/resources/templates/skin.html
+1
-1
ruoyi-admin/src/main/resources/templates/skin.html
ruoyi-common/pom.xml
+1
-1
ruoyi-common/pom.xml
ruoyi-framework/pom.xml
+1
-1
ruoyi-framework/pom.xml
ruoyi-generator/pom.xml
+1
-1
ruoyi-generator/pom.xml
ruoyi-quartz/pom.xml
+1
-1
ruoyi-quartz/pom.xml
ruoyi-system/pom.xml
+1
-1
ruoyi-system/pom.xml
with
88 additions
and
22 deletions
+88
-22
pom.xml
+
2
-
2
View file @
7e259cd1
...
...
@@ -6,14 +6,14 @@
<groupId>
com.ruoyi
</groupId>
<artifactId>
ruoyi
</artifactId>
<version>
4.
2
.0
</version>
<version>
4.
3
.0
</version>
<name>
ruoyi
</name>
<url>
http://www.ruoyi.vip
</url>
<description>
若依管理系统
</description>
<properties>
<ruoyi.version>
4.
2
.0
</ruoyi.version>
<ruoyi.version>
4.
3
.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>
...
...
This diff is collapsed.
Click to expand it.
ruoyi-admin/pom.xml
+
1
-
1
View file @
7e259cd1
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
ruoyi
</artifactId>
<groupId>
com.ruoyi
</groupId>
<version>
4.
2
.0
</version>
<version>
4.
3
.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<packaging>
jar
</packaging>
...
...
This diff is collapsed.
Click to expand it.
ruoyi-admin/src/main/resources/application.yml
+
1
-
1
View file @
7e259cd1
...
...
@@ -3,7 +3,7 @@ ruoyi:
# 名称
name
:
RuoYi
# 版本
version
:
4.
2
.0
version
:
4.
3
.0
# 版权年份
copyrightYear
:
2019
# 实例演示开关
...
...
This diff is collapsed.
Click to expand it.
ruoyi-admin/src/main/resources/templates/demo/form/summernote.html
+
2
-
2
View file @
7e259cd1
...
...
@@ -17,7 +17,7 @@
<h2>
若依后台管理系统
</h2>
<p>
ruoyi是一个完全响应式,基于Bootstrap3.3.6最新版本开发的扁平化主题,她采用了主流的左右两栏式布局,使用了Html5+CSS3等现代技术,她提供了诸多的强大的可以重新组合的UI组件,并集成了最新的jQuery版本(v2.1.1),当然,也集成了很多功能强大,用途广泛的就jQuery插件,她可以用于所有的Web应用程序,如
<b>
网站管理后台
</b>
,
<b>
网站会员中心
</b>
,
<b>
CMS
</b>
,
<b>
CRM
</b>
,
<b>
OA
</b>
等等,当然,您也可以对她进行深度定制,以做出更强系统。
</p>
<p>
<b>
当前版本:
</b>
v4.
2
.0
<b>
当前版本:
</b>
v4.
3
.0
</p>
<p>
<span
class=
"label label-warning"
>
免费开源
</span>
...
...
@@ -56,7 +56,7 @@
<h3>
你好,若依
</h3>
<p>
H+是一个完全响应式,基于Bootstrap3.3.6最新版本开发的扁平化主题,她采用了主流的左右两栏式布局,使用了Html5+CSS3等现代技术,她提供了诸多的强大的可以重新组合的UI组件,并集成了最新的jQuery版本(v2.1.1),当然,也集成了很多功能强大,用途广泛的就jQuery插件,她可以用于所有的Web应用程序,如
<b>
网站管理后台
</b>
,
<b>
网站会员中心
</b>
,
<b>
CMS
</b>
,
<b>
CRM
</b>
,
<b>
OA
</b>
等等,当然,您也可以对她进行深度定制,以做出更强系统。
</p>
<p>
<b>
当前版本:
</b>
v4.
2
.0
<b>
当前版本:
</b>
v4.
3
.0
</p>
<p>
<span
class=
"label label-warning"
>
开源免费
</span>
...
...
This diff is collapsed.
Click to expand it.
ruoyi-admin/src/main/resources/templates/include.html
+
2
-
2
View file @
7e259cd1
...
...
@@ -41,8 +41,8 @@
<script
th:src=
"@{/ajax/libs/iCheck/icheck.min.js}"
></script>
<script
th:src=
"@{/ajax/libs/layer/layer.min.js}"
></script>
<script
th:src=
"@{/ajax/libs/layui/layui.js}"
></script>
<script
th:src=
"@{/ruoyi/js/common.js?v=4.
2
.0}"
></script>
<script
th:src=
"@{/ruoyi/js/ry-ui.js?v=4.
2
.0}"
></script>
<script
th:src=
"@{/ruoyi/js/common.js?v=4.
3
.0}"
></script>
<script
th:src=
"@{/ruoyi/js/ry-ui.js?v=4.
3
.0}"
></script>
<script
th:inline=
"javascript"
>
var
ctx
=
[[@{
/
}]];
</script>
</div>
...
...
This diff is collapsed.
Click to expand it.
ruoyi-admin/src/main/resources/templates/index.html
+
3
-
3
View file @
7e259cd1
...
...
@@ -14,7 +14,7 @@
<link
th:href=
"@{/css/animate.css}"
rel=
"stylesheet"
/>
<link
th:href=
"@{/css/style.css}"
rel=
"stylesheet"
/>
<link
th:href=
"@{/css/skins.css}"
rel=
"stylesheet"
/>
<link
th:href=
"@{/ruoyi/css/ry-ui.css?v=4.
2
.0}"
rel=
"stylesheet"
/>
<link
th:href=
"@{/ruoyi/css/ry-ui.css?v=4.
3
.0}"
rel=
"stylesheet"
/>
</head>
<body
class=
"fixed-sidebar full-height-layout gray-bg"
style=
"overflow: hidden"
>
<div
id=
"wrapper"
>
...
...
@@ -246,8 +246,8 @@
<script
th:src=
"@{/js/jquery.contextMenu.min.js}"
></script>
<script
th:src=
"@{/ajax/libs/blockUI/jquery.blockUI.js}"
></script>
<script
th:src=
"@{/ajax/libs/layer/layer.min.js}"
></script>
<script
th:src=
"@{/ruoyi/js/ry-ui.js?v=4.
2
.0}"
></script>
<script
th:src=
"@{/ruoyi/js/common.js?v=4.
2
.0}"
></script>
<script
th:src=
"@{/ruoyi/js/ry-ui.js?v=4.
3
.0}"
></script>
<script
th:src=
"@{/ruoyi/js/common.js?v=4.
3
.0}"
></script>
<script
th:src=
"@{/ruoyi/index.js}"
></script>
<script
th:src=
"@{/ajax/libs/fullscreen/jquery.fullscreen.js}"
></script>
<script
th:inline=
"javascript"
>
...
...
This diff is collapsed.
Click to expand it.
ruoyi-admin/src/main/resources/templates/login.html
+
2
-
2
View file @
7e259cd1
...
...
@@ -9,7 +9,7 @@
<link
href=
"../static/css/font-awesome.min.css"
th:href=
"@{/css/font-awesome.min.css}"
rel=
"stylesheet"
/>
<link
href=
"../static/css/style.css"
th:href=
"@{/css/style.css}"
rel=
"stylesheet"
/>
<link
href=
"../static/css/login.min.css"
th:href=
"@{/css/login.min.css}"
rel=
"stylesheet"
/>
<link
href=
"../static/ruoyi/css/ry-ui.css"
th:href=
"@{/ruoyi/css/ry-ui.css?v=4.
2
.0}"
rel=
"stylesheet"
/>
<link
href=
"../static/ruoyi/css/ry-ui.css"
th:href=
"@{/ruoyi/css/ry-ui.css?v=4.
3
.0}"
rel=
"stylesheet"
/>
<!-- 360浏览器急速模式 -->
<meta
name=
"renderer"
content=
"webkit"
>
<!-- 避免IE使用兼容模式 -->
...
...
@@ -78,7 +78,7 @@
<script
src=
"../static/ajax/libs/validate/messages_zh.min.js"
th:src=
"@{/ajax/libs/validate/messages_zh.min.js}"
></script>
<script
src=
"../static/ajax/libs/layer/layer.min.js"
th:src=
"@{/ajax/libs/layer/layer.min.js}"
></script>
<script
src=
"../static/ajax/libs/blockUI/jquery.blockUI.js"
th:src=
"@{/ajax/libs/blockUI/jquery.blockUI.js}"
></script>
<script
src=
"../static/ruoyi/js/ry-ui.js"
th:src=
"@{/ruoyi/js/ry-ui.js?v=4.
2
.0}"
></script>
<script
src=
"../static/ruoyi/js/ry-ui.js"
th:src=
"@{/ruoyi/js/ry-ui.js?v=4.
3
.0}"
></script>
<script
src=
"../static/ruoyi/login.js"
th:src=
"@{/ruoyi/login.js}"
></script>
</body>
</html>
This diff is collapsed.
Click to expand it.
ruoyi-admin/src/main/resources/templates/main.html
+
67
-
1
View file @
7e259cd1
...
...
@@ -96,13 +96,79 @@
<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"
>
<h5
class=
"panel-title"
>
<a
data-toggle=
"collapse"
data-parent=
"#version"
href=
"#v43"
>
v4.3.0
</a><code
class=
"pull-right"
>
2020.06.22
</code>
</h5>
</div>
<div
id=
"v43"
class=
"panel-collapse collapse in"
>
<div
class=
"panel-body"
>
<ol>
<li>
代码生成模板支持主子表
</li>
<li>
代码生成显示类型支持复选框
</li>
<li>
前端表单样式修改成圆角
</li>
<li>
新增回显数据字典(字符串数组)
</li>
<li>
修复浏览器手动缩放比例后菜单无法自适应问题
</li>
<li>
限制用户不允许选择系统管理员角色
</li>
<li>
用户信息添加输入框组图标
&
鼠标按下显示密码
</li>
<li>
升级fastjson到最新版1.2.70 修复高危安全漏洞
</li>
<li>
升级Bootstrap版本到v3.3.7
</li>
<li>
修复selectColumns方法获取子对象数据无效问题
</li>
<li>
修改数据源类型优先级,先根据方法,再根据类
</li>
<li>
修改上级部门(选择项排除本身和下级)
</li>
<li>
首页菜单显示调整
</li>
<li>
添加是否开启swagger配置
</li>
<li>
新增示例(主子表提交)
</li>
<li>
新增示例(多级联动下拉示例)
</li>
<li>
新增示例(表格属性data数据加载)
</li>
<li>
新增表格列参数(是否列选项可见ignore)
</li>
<li>
新增表格参数(是否启用显示卡片视图cardView)
</li>
<li>
新增表格参数(是否显示全屏按钮showFullscreen)
</li>
<li>
新增表格参数(是否启用分页条无限循环的功能paginationLoop)
</li>
<li>
新增表格参数(是否显示表头showHeader)
</li>
<li>
表格添加显示/隐藏所有列方法 showAllColumns/hideAllColumns
</li>
<li>
修复部分情况节点不展开问题
</li>
<li>
修复关闭标签页后刷新还是上次地址问题
</li>
<li>
修复选择菜单后刷新页面,菜单箭头显示不对问题
</li>
<li>
修复jquery表单序列化时复选框未选中不会序列化到对象中问题
</li>
<li>
Excel支持readConverterExp读取字符串组内容
</li>
<li>
更换IP地址查询接口
</li>
<li>
默认关闭获取ip地址
</li>
<li>
操作处理ajaxSuccess判断修正
</li>
<li>
HttpUtils.sendPost()方法,参数无需拼接参数到url
</li>
<li>
通用http发送方法增加参数 contentType 编码类型
</li>
<li>
HTML过滤器不替换
&
实体
</li>
<li>
代码生成浮点型改用BigDecimal
</li>
<li>
修复表单构建单选和多选框渲染问题
</li>
<li>
代码生成模板调整,字段为String并且必填则加空串条件
</li>
<li>
字典数据查询列表根据dictSort升序排序
</li>
<li>
修复树表对imageView和tooltip方法无效问题
</li>
<li>
修复Long类型比较相等问题调整
</li>
<li>
示例demo页面清除html链接,防止点击后跳转出现404
</li>
<li>
在线用户强退方法合并
</li>
<li>
添加校验部门包含未停用的子部门
</li>
<li>
取消回车自动提交表单
</li>
<li>
'A','I','BUTTON' 标签忽略clickToSelect事件,防止点击操作按钮时选中
</li>
<li>
邮箱显示截取部分字符串,防止低分辨率错位
</li>
<li>
代码生成列属性根据sort排序
</li>
<li>
修复更多操作部分浏览器不兼容情况
</li>
<li>
图片预览事件属性修正
</li>
<li>
修复冻结列排序样式无效问题
</li>
<li>
修复context-path的情况下个人中心刷新导致样式问题
</li>
<li>
全屏editFull打开适配表树
</li>
<li>
其他细节优化
</li>
</ol>
</div>
</div>
</div>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
>
<h5
class=
"panel-title"
>
<a
data-toggle=
"collapse"
data-parent=
"#version"
href=
"#v42"
>
v4.2.0
</a><code
class=
"pull-right"
>
2020.03.23
</code>
</h5>
</div>
<div
id=
"v42"
class=
"panel-collapse collapse
in
"
>
<div
id=
"v42"
class=
"panel-collapse collapse"
>
<div
class=
"panel-body"
>
<ol>
<li>
用户管理添加分配角色页面
</li>
...
...
This diff is collapsed.
Click to expand it.
ruoyi-admin/src/main/resources/templates/register.html
+
2
-
2
View file @
7e259cd1
...
...
@@ -9,7 +9,7 @@
<link
href=
"../static/css/font-awesome.min.css"
th:href=
"@{/css/font-awesome.min.css}"
rel=
"stylesheet"
/>
<link
href=
"../static/css/style.css"
th:href=
"@{/css/style.css}"
rel=
"stylesheet"
/>
<link
href=
"../static/css/login.min.css"
th:href=
"@{/css/login.min.css}"
rel=
"stylesheet"
/>
<link
href=
"../static/ruoyi/css/ry-ui.css"
th:href=
"@{/ruoyi/css/ry-ui.css?v=4.
2
.0}"
rel=
"stylesheet"
/>
<link
href=
"../static/ruoyi/css/ry-ui.css"
th:href=
"@{/ruoyi/css/ry-ui.css?v=4.
3
.0}"
rel=
"stylesheet"
/>
<!-- 360浏览器急速模式 -->
<meta
name=
"renderer"
content=
"webkit"
>
<!-- 避免IE使用兼容模式 -->
...
...
@@ -77,7 +77,7 @@
<script
src=
"../static/ajax/libs/validate/messages_zh.min.js"
th:src=
"@{/ajax/libs/validate/messages_zh.min.js}"
></script>
<script
src=
"../static/ajax/libs/layer/layer.min.js"
th:src=
"@{/ajax/libs/layer/layer.min.js}"
></script>
<script
src=
"../static/ajax/libs/blockUI/jquery.blockUI.js"
th:src=
"@{/ajax/libs/blockUI/jquery.blockUI.js}"
></script>
<script
src=
"../static/ruoyi/js/ry-ui.js"
th:src=
"@{/ruoyi/js/ry-ui.js?v=4.
2
.0}"
></script>
<script
src=
"../static/ruoyi/js/ry-ui.js"
th:src=
"@{/ruoyi/js/ry-ui.js?v=4.
3
.0}"
></script>
<script
src=
"../static/ruoyi/register.js"
th:src=
"@{/ruoyi/register.js}"
></script>
</body>
</html>
This diff is collapsed.
Click to expand it.
ruoyi-admin/src/main/resources/templates/skin.html
+
1
-
1
View file @
7e259cd1
...
...
@@ -140,7 +140,7 @@
</ul>
</body>
<script
th:src=
"@{/js/jquery.min.js}"
></script>
<script
th:src=
"@{/ruoyi/js/common.js?v=4.
2
.0}"
></script>
<script
th:src=
"@{/ruoyi/js/common.js?v=4.
3
.0}"
></script>
<script
type=
"text/javascript"
>
//皮肤样式列表
var
skins
=
[
"
skin-blue
"
,
"
skin-green
"
,
"
skin-purple
"
,
"
skin-red
"
,
"
skin-yellow
"
];
...
...
This diff is collapsed.
Click to expand it.
ruoyi-common/pom.xml
+
1
-
1
View file @
7e259cd1
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
ruoyi
</artifactId>
<groupId>
com.ruoyi
</groupId>
<version>
4.
2
.0
</version>
<version>
4.
3
.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
This diff is collapsed.
Click to expand it.
ruoyi-framework/pom.xml
+
1
-
1
View file @
7e259cd1
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
ruoyi
</artifactId>
<groupId>
com.ruoyi
</groupId>
<version>
4.
2
.0
</version>
<version>
4.
3
.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
This diff is collapsed.
Click to expand it.
ruoyi-generator/pom.xml
+
1
-
1
View file @
7e259cd1
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
ruoyi
</artifactId>
<groupId>
com.ruoyi
</groupId>
<version>
4.
2
.0
</version>
<version>
4.
3
.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
This diff is collapsed.
Click to expand it.
ruoyi-quartz/pom.xml
+
1
-
1
View file @
7e259cd1
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
ruoyi
</artifactId>
<groupId>
com.ruoyi
</groupId>
<version>
4.
2
.0
</version>
<version>
4.
3
.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
This diff is collapsed.
Click to expand it.
ruoyi-system/pom.xml
+
1
-
1
View file @
7e259cd1
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
ruoyi
</artifactId>
<groupId>
com.ruoyi
</groupId>
<version>
4.
2
.0
</version>
<version>
4.
3
.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment