疯狂的狮子li
|
f093da99ec
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/resources/application-prod.yml
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/assets/styles/sidebar.scss
ruoyi-ui/src/layout/components/Navbar.vue
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/settings.js
ruoyi-ui/src/store/getters.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/store/modules/settings.js
ruoyi-ui/src/store/modules/tagsView.js
ruoyi-ui/src/views/monitor/druid/index.vue
|
5 years ago |
RuoYi
|
6810243ab7
|
修复树表数据显示不全&加载慢问题
|
5 years ago |
|
疯狂的狮子li
|
8b37eca241
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/utils/zipdownload.js
|
5 years ago |
|
RuoYi
|
8e1e4cd8fe
|
通用下载完成后删除节点
|
5 years ago |
|
疯狂的狮子li
|
c24b912b50
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/store/modules/permission.js
|
5 years ago |
|
RuoYi
|
a9c6ba12e6
|
代码生成日期控件区分范围
|
5 years ago |
|
疯狂的狮子li
|
476df3117b
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/utils/permission.js
ruoyi-ui/src/utils/request.js
|
5 years ago |
|
若依
|
1a87ee7c19
|
防止get请求参数值为false或0等特殊值会导致无法正确的传参
Merge pull request !146 from wugh/hotfix/gitee-issue_I2A5FU
|
5 years ago |
DokiYoloo
|
3c4b01ab83
|
权限工具类增加admin判断
|
5 years ago |
wugh
|
886ce995af
|
[bug修复] 解决get请求,如果参数值为false或0等特殊值会导致无法正确传参
|
5 years ago |
|
疯狂的狮子li
|
69f30760f8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
|
5 years ago |
|
RuoYi
|
563e11d9c1
|
get请求params添加null值判断
|
5 years ago |
|
疯狂的狮子li
|
e80349c343
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/utils/request.js
|
5 years ago |
|
RuoYi
|
ef92ad4d8c
|
支持get请求映射params参数
|
5 years ago |
|
疯狂的狮子li
|
5ebd0a971f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
5 years ago |
|
RuoYi
|
23868c4fad
|
防止安全扫描YUI出现的风险提示
|
5 years ago |
|
疯狂的狮子li
|
bd39b971cf
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-ui/package.json
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/views/monitor/job/index.vue
|
5 years ago |
|
若依
|
f67c97e095
|
!102 rouyi.js中添加日期范围方法dateRange获取bug修复
Merge pull request !102 from zora/master
|
5 years ago |
|
疯狂的狮子li
|
cddaf4b088
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
5 years ago |
|
RuoYi
|
669c42795a
|
表单构建布局型组件新增按钮
|
5 years ago |
shizhenwei
|
5b0525d05c
|
[修改]此工具类应使用参数dateRange而非bind在model上的dateRange
|
5 years ago |
|
疯狂的狮子li
|
5aeac1a8ae
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/package.json
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/utils/ruoyi.js
|
6 years ago |
|
RuoYi
|
5fcf342f5a
|
修改sass为node-sass，避免el-icon图标乱码
|
6 years ago |
|
若依
|
5c4f0c5503
|
!65 根节点为子部门时，树状结构显示问题
Merge pull request !65 from GSTong/master
|
6 years ago |
|
疯狂的狮子li
|
def4377226
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/utils/ruoyi.js
|
6 years ago |
|
RuoYi
|
d596d5bb8e
|
还原 addDateRange js 函数
|
6 years ago |
|
疯狂的狮子li
|
088bc98a43
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-ui/package.json
|
6 years ago |
|
RuoYi
|
1bad003fe3
|
修改公私钥
|
6 years ago |
gst
|
0070297fe1
|
根节点为子部门时，树状结构显示问题
|
6 years ago |
|
疯狂的狮子li
|
a9f4a4e111
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
.gitignore
ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/utils/ruoyi.js
|
6 years ago |
|
RuoYi
|
3b61ed56b0
|
添加获取当前的环境配置方法
|
6 years ago |
fungleo
|
d78f642201
|
Merge remote-tracking branch 'upstream/master'
|
6 years ago |
|
fungleo
|
26dfee2ce8
|
彻底重写回显数据字典方法
|
6 years ago |
|
RuoYi
|
b56898858d
|
超时登录后页面跳转到首页
|
6 years ago |
|
疯狂的狮子li
|
c7785d1dbc
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
README.md
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-ui/src/utils/request.js
|
6 years ago |
|
fungleo
|
503dd64e3f
|
优化 addDateRange js 函数
|
6 years ago |
|
fungleo
|
876ecf21c7
|
优化构建树形数据JS方法
|
6 years ago |
|
fungleo
|
107672419e
|
Merge remote-tracking branch 'upstream/master'
|
6 years ago |
|
fungleo
|
d8d636fdbd
|
优化 回显数据字典（字符串数组）JS 函数
|
6 years ago |
|
RuoYi
|
8b5d254242
|
全局异常状态汉化拦截处理
|
6 years ago |
|
疯狂的狮子li
|
c966d9bada
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-ui/babel.config.js
ruoyi-ui/package.json
ruoyi-ui/src/api/tool/gen.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/views/login.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/notice/index.vue
ruoyi-ui/src/views/system/post/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi-ui/vue.config.js
sql/ry_20200724.sql
|
6 years ago |
|
RuoYi
|
5c6adb25fc
|
代码生成支持复选框
|
6 years ago |
|
疯狂的狮子li
|
e19e2fd9cc
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/sql/sql.vm
ruoyi-ui/src/utils/index.js
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
ruoyi-ui/src/views/tool/gen/importTable.vue
|
6 years ago |
|
fungleo
|
a09a342f58
|
优化 uitls/ruoyi.js 中 selectDictLabel 方法，数组迭代器换为 some
提高性能
|
6 years ago |
|
fungleo
|
3e1bd8e3bc
|
修复 utils/index.js 中不包含 parseTime 函数的 bug
|
6 years ago |
|
疯狂的狮子li
|
1e79d6f56f
|
同步升级3.0
|
6 years ago |
|
RuoYi
|
d5cc95fefb
|
升级element-ui版本到2.13.2
|
6 years ago |
|
疯狂的狮子li
|
98941acd2a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/api/system/dept.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/dept/index.vue
ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java
ruoyi/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
ruoyi/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
ruoyi/src/main/resources/application.yml
|
6 years ago |
|
RuoYi
|
25b114aae7
|
支持是否需要设置token属性，自定义返回码消息。
|
6 years ago |
|
疯狂的狮子li
|
4bee0d652a
|
修复前端页面报错 找不到模块问题
|
6 years ago |
