fungleo
|
d78f642201
|
Merge remote-tracking branch 'upstream/master'
|
5 years ago |
|
fungleo
|
26dfee2ce8
|
彻底重写回显数据字典方法
|
5 years ago |
RuoYi
|
b56898858d
|
超时登录后页面跳转到首页
|
5 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
|
5 years ago |
|
疯狂的狮子li
|
5b1ed429ae
|
文件路径,使用jvm系统变量,兼容windows和linux;
|
5 years ago |
|
疯狂的狮子li
|
c8613ac9a7
|
错误修正
|
5 years ago |
|
fungleo
|
503dd64e3f
|
优化 addDateRange js 函数
|
5 years ago |
|
疯狂的狮子li
|
d9aa681a0d
|
错误修正
|
5 years ago |
|
fungleo
|
876ecf21c7
|
优化构建树形数据JS方法
|
5 years ago |
|
fungleo
|
107672419e
|
Merge remote-tracking branch 'upstream/master'
|
5 years ago |
|
RuoYi
|
21d07c1d71
|
修复角色的权限分配后，未实时生效问题
|
5 years ago |
|
fungleo
|
d8d636fdbd
|
优化 回显数据字典（字符串数组）JS 函数
|
5 years ago |
|
RuoYi
|
743fce7829
|
优化防重提交唯一标识
|
5 years ago |
liguonan
|
de2ac66f0b
|
修复在线用户判断逻辑
|
5 years ago |
|
RuoYi
|
8b5d254242
|
全局异常状态汉化拦截处理
|
5 years ago |
|
RuoYi
|
a7eb0f98ac
|
README
|
5 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
|
5 years ago |
|
疯狂的狮子li
|
a95abff0d3
|
删除文件 ruoyi-common/src/main/resources
|
5 years ago |
|
RuoYi
|
4dcf737db0
|
表格工具栏右侧添加刷新&显隐查询栏
|
5 years ago |
|
RuoYi
|
b32d0724b7
|
升级vue-cli版本到4.4.4
|
5 years ago |
|
若依
|
8deacb702e
|
!54 update ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml.
Merge pull request !54 from yongdaidai/N/A
|
5 years ago |
|
若依
|
5be8d46d05
|
!51 优化生成vue文件的vm模板文件
Merge pull request !51 from FungLeo/master
|
5 years ago |
yongdaidai
|
fb19dd3e4e
|
update ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml.
解决如果导入多个同名部门dept_name,parent_id相同,但是删除状态(del_flag)不同,导致查询结果为多条,mybatis不能映射为一条数据的问题.
|
5 years ago |
|
RuoYi
|
cbf4795fd5
|
表单类型为Integer/Long设置整形默认值
|
5 years ago |
|
RuoYi
|
5d74ed32bd
|
表单类型为Integer/Long设置整形默认值
|
5 years ago |
|
若依
|
6afaced3cf
|
!53 update ruoyi-ui/src/views/system/role/index.vue.
Merge pull request !53 from abbfun/N/A
|
5 years ago |
abbfun
|
f3976c0792
|
update ruoyi-ui/src/views/system/role/index.vue.
权限修正（角色导出权限）
|
5 years ago |
|
RuoYi
|
22225a5119
|
HTML过滤器改为将html转义
|
5 years ago |
|
RuoYi
|
fe030cc022
|
修改 node-sass 为 dart-sass
|
5 years ago |
|
fungleo
|
ca657b0482
|
优化 index-tree.vue.vm 文件，undefined 修改为 null
|
5 years ago |
|
fungleo
|
c1d1ace36d
|
优化index.vue.vm模板，!=1修改为严格不等；undefined修改为null
|
5 years ago |
|
RuoYi
|
6e7d7aba93
|
代码生成支持自定义路径
|
5 years ago |
|
RuoYi
|
388e36ed4d
|
优化参数
|
5 years ago |
|
若依
|
5d89d0b36a
|
!49 代码生成器默认mapper路径与默认mapperScan路径不一致
Merge pull request !49 from HaoRan/master
|
5 years ago |
|
若依
|
55095a50b5
|
!48 ExcelUtil 功能优化
Merge pull request !48 from soulCoke/master
|
5 years ago |
HR.Hu
|
ee4b4de7b1
|
修复 代码生成器默认mapper路径与默认mapperScan路径不一致的bug
|
5 years ago |
|
RuoYi
|
92c6301285
|
Excel支持分割字符串组内容
|
5 years ago |
|
RuoYi
|
5c6adb25fc
|
代码生成支持复选框
|
5 years ago |
soulCoke
|
8dd3ca5bb6
|
excel 导入数字不需要格式化 ，导入允许列和属性个数不一致。
|
5 years ago |
Sxile
|
be778ba370
|
修复参数注释
|
5 years ago |
|
RuoYi
|
52d48fa63e
|
检查字符支持小数点&降级改成异常提醒
|
6 years ago |
|
RuoYi
|
df3ef54b41
|
验证码类型支持（数组计算、字符验证）
|
6 years ago |
|
疯狂的狮子li
|
8a9a53225a
|
Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
|
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 |
|
疯狂的狮子li
|
8e1b8a3a3f
|
全注入 可能会出现小白乱用的情况 改成@Autowired构造注入
|
6 years ago |
|
RuoYi
|
1e40e60dbf
|
支持CORS跨域请求
|
6 years ago |
|
若依
|
133a10ecf2
|
!47 修复和优化前端 utils 工具函数
Merge pull request !47 from FungLeo/master
|
6 years ago |
|
RuoYi
|
6a84ae42a5
|
代码生成支持选择上级菜单
|
6 years ago |
|
RuoYi
|
b2d79b62d1
|
代码生成支持选择上级菜单
|
6 years ago |
|
fungleo
|
a09a342f58
|
优化 uitls/ruoyi.js 中 selectDictLabel 方法，数组迭代器换为 some
提高性能
|
6 years ago |
