疯狂的狮子li
|
f0bee6af63
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
|
6 years ago |
|
疯狂的狮子li
|
2e95557840
|
删除测试代码
|
6 years ago |
RuoYi
|
794d6f17db
|
修复代码生成导入表结构出现异常页面不提醒问题
|
6 years ago |
|
RuoYi
|
f7f02e3a3f
|
修复热部署导致的强换异常问题
|
6 years ago |
|
疯狂的狮子li
|
827bbc2b17
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java
ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java
ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java
ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java
|
6 years ago |
Sxile
|
5bd2838b2b
|
修复注释与参数名称不对应
|
6 years ago |
|
Sxile
|
f39be3ab9b
|
添加缺少的@ Override
|
6 years ago |
|
Sxile
|
f5badba2bb
|
添加{}使代码更容易理解
|
6 years ago |
|
Sxile
|
9ea0041fab
|
常量接口修改为常量类
|
6 years ago |
|
疯狂的狮子li
|
eb7c29c647
|
解决文件上传bug,因undertow与tomcat对文件写入的底层实现不同,无需创建新文件
|
6 years ago |
|
疯狂的狮子li
|
8d318c222e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
|
6 years ago |
|
RuoYi
|
a195df175f
|
修正定时任务日志权限字符
|
6 years ago |
|
疯狂的狮子li
|
db380f9af1
|
还原
|
6 years ago |
|
疯狂的狮子li
|
694fb19628
|
修复 上传文件重名问题
|
6 years ago |
|
疯狂的狮子li
|
c53d5fd1f6
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/vue.config.js
ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
|
6 years ago |
|
RuoYi
|
03aef64693
|
缺少EscapeUtil包路径。
|
6 years ago |
Live
|
2daf89e0c6
|
HttpUtils.sendPost()方法，参数无需拼接参数到url,否则会出现双份参数
请求url或form参数 会出现双份参数,并无法获取
{"token":["xxxxxxx","xxxxxxx"],"payType":["weixin","weixin"],"amount":["100","100"],"orderId":["123","123"]}
|
6 years ago |
|
Live
|
19b8688759
|
IpUtils工具，清除Xss特殊字符，防止Xff注入攻击
|
6 years ago |
|
Live
|
33f09d7747
|
生成domain 如果是浮点型 统一用BigDecimal
|
6 years ago |
|
疯狂的狮子li
|
6bb7db31aa
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/components/IconSelect/index.vue
ruoyi-ui/src/permission.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml
ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml
ruoyi/src/main/resources/vm/vue/index.vue.vm
ruoyi/src/main/resources/vm/xml/mapper.xml.vm
|
6 years ago |
|
RuoYi
|
945fb282dd
|
代码生成模板调整，字段为String并且必填则加空串条件
|
6 years ago |
|
RuoYi
|
5680d91a87
|
代码生成字典Integer/Long使用parseInt
|
6 years ago |
|
RuoYi
|
ff695831dc
|
修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
|
6 years ago |
|
RuoYi
|
ea9effaf32
|
修正岗位导出权限注解
|
6 years ago |
|
RuoYi
|
ec407bbe25
|
数据范围过滤属性调整
|
6 years ago |
|
疯狂的狮子li
|
8a62368141
|
同步若依2.3版本
|
6 years ago |
|
疯狂的狮子li
|
5f866906d1
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/package.json
ruoyi-ui/src/api/system/config.js
ruoyi-ui/src/api/system/dict/data.js
ruoyi-ui/src/api/system/dict/type.js
ruoyi-ui/src/assets/styles/element-variables.scss
ruoyi-ui/src/components/SvgIcon/index.vue
ruoyi-ui/src/layout/components/Sidebar/Link.vue
ruoyi-ui/src/layout/components/Sidebar/index.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/views/monitor/job/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/system/user/profile/resetPwd.vue
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
ruoyi-ui/vue.config.js
ruoyi/pom.xml
ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi/src/main/java/com/ruoyi/common/utils/StringUtils.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
ruoyi/src/main/resources/application.yml
ruoyi/src/main/resources/vm/sql/sql.vm
ruoyi/src/main/resources/vm/vue/index.vue.vm
|
6 years ago |
|
RuoYi
|
b4b3ff8813
|
若依 2.3
|
6 years ago |
|
RuoYi
|
1e2058bdfb
|
字典管理添加缓存读取
|
6 years ago |
|
RuoYi
|
0d546e4ba4
|
参数管理支持缓存操作
|
6 years ago |
|
RuoYi
|
b16b860b63
|
侧边栏key调整
|
6 years ago |
|
疯狂的狮子li
|
35e940f0b5
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/layout/components/Sidebar/index.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
|
6 years ago |
|
RuoYi
|
b5c789a267
|
防止空路由出现的警告，设置默认path=/
|
6 years ago |
|
RuoYi
|
bb1324a70a
|
支持一级菜单（和主页同级）在main区域显示
|
6 years ago |
|
RuoYi
|
c1db17dd77
|
限制外链地址必须以http(s)://开头
|
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
|
41799c10f0
|
修改数据源类型优先级，先根据方法，再根据类
|
6 years ago |
|
RuoYi
|
25b114aae7
|
支持是否需要设置token属性，自定义返回码消息。
|
6 years ago |
|
RuoYi
|
5434ceb1a3
|
swagger请求前缀加入配置。
|
6 years ago |
|
RuoYi
|
9aeb0cc1f3
|
修复定时任务执行一次按钮后不提示消息问题
|
6 years ago |
|
RuoYi
|
9f4918cc14
|
修改上级部门（选择项排除本身和下级）
|
6 years ago |
|
RuoYi
|
8c7aca2527
|
缺少 @Override
|
6 years ago |
|
疯狂的狮子li
|
661cc0afdb
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
ruoyi/src/main/resources/application.yml
ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
|
6 years ago |
|
RuoYi
|
4f1f0bdbd3
|
通用http发送方法增加参数 contentType 编码类型
|
6 years ago |
|
RuoYi
|
f3d0bf6c26
|
更换IP地址查询接口
|
6 years ago |
|
RuoYi
|
ddcabaa6fb
|
淘宝IP接口不稳定，默认关闭。
|
6 years ago |
|
疯狂的狮子li
|
d350c048b8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/store/modules/tagsView.js
ruoyi/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
|
6 years ago |
|
RuoYi
|
4b77378458
|
添加校验部门包含未停用的子部门
|
6 years ago |
|
疯狂的狮子li
|
b15be7078c
|
同步ruoyi-vue更新
|
6 years ago |
|
RuoYi
|
066d3f3f9f
|
修改定时任务详情下次执行时间日期显示错误
|
6 years ago |
