wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
258 Commits 2 Branches 0 Tags 6 MiB
Commit Graph

162 Commits

Author SHA1 Message Date
RuoYi c1db17dd77 限制外链地址必须以http(s)://开头 2020-05-26 11:54:46 +08:00
疯狂的狮子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
 2020-05-20 09:15:19 +08:00
RuoYi 41799c10f0 修改数据源类型优先级，先根据方法，再根据类 2020-05-19 11:00:47 +08:00
RuoYi 25b114aae7 支持是否需要设置token属性，自定义返回码消息。 2020-05-18 14:27:15 +08:00
RuoYi 5434ceb1a3 swagger请求前缀加入配置。 2020-05-17 22:43:09 +08:00
RuoYi 9aeb0cc1f3 修复定时任务执行一次按钮后不提示消息问题 2020-05-17 15:47:29 +08:00
RuoYi 9f4918cc14 修改上级部门（选择项排除本身和下级） 2020-05-16 18:39:30 +08:00
RuoYi 8c7aca2527 缺少 @Override 2020-05-16 17:15:13 +08:00
疯狂的狮子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
 2020-05-14 16:25:43 +08:00
RuoYi 4f1f0bdbd3 通用http发送方法增加参数 contentType 编码类型 2020-05-14 14:27:47 +08:00
RuoYi f3d0bf6c26 更换IP地址查询接口 2020-05-13 21:11:14 +08:00
RuoYi ddcabaa6fb 淘宝IP接口不稳定，默认关闭。 2020-05-13 18:50:59 +08:00
疯狂的狮子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
 2020-05-07 17:44:08 +08:00
RuoYi 4b77378458 添加校验部门包含未停用的子部门 2020-05-07 12:00:09 +08:00
疯狂的狮子li b15be7078c 同步ruoyi-vue更新 2020-05-06 11:57:51 +08:00
RuoYi 066d3f3f9f 修改定时任务详情下次执行时间日期显示错误 2020-04-30 12:11:53 +08:00
RuoYi a3e97ed677 角色管理查询设置默认排序字段 2020-04-29 22:26:05 +08:00
RuoYi 2d93e7aeb3 swagger添加enable参数控制是否启用 2020-04-29 21:58:24 +08:00
RuoYi 1a079532e8 只对json类型请求构建可重复读取inputStream的request 2020-04-29 21:14:12 +08:00
RuoYi eec5c58b4a 修改代码生成字典字段int类型没有自动选中问题 2020-04-29 16:06:49 +08:00
疯狂的狮子li 42008124b6 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	ruoyi-ui/src/assets/styles/ruoyi.scss
#	ruoyi-ui/src/views/tool/gen/index.vue
 2020-04-29 09:17:17 +08:00
疯狂的狮子li 1dae7c9bc9 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
	ruoyi/src/main/resources/vm/java/domain.java.vm
	ruoyi/src/main/resources/vm/vue/index.vue.vm
 2020-04-29 09:16:29 +08:00
RuoYi aa23ef1e99 添加新群号：104180207 2020-04-28 12:05:52 +08:00
疯狂的狮子li 1062da678f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
	ruoyi/src/main/resources/vm/java/domain.java.vm
	ruoyi/src/main/resources/vm/vue/index.vue.vm
 2020-04-25 20:14:40 +08:00
RuoYi e7ac78535d 表格树模板去掉多余的) 2020-04-24 10:49:12 +08:00
RuoYi 526c3867b4 代码生成Date字段添加默认格式 2020-04-21 17:13:02 +08:00
RuoYi d452ddf5f0 用户管理角色选择权限控制 2020-04-21 16:00:06 +08:00
疯狂的狮子li 405ad4280c Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2020-04-21 09:09:43 +08:00
疯狂的狮子li 44e2618ee2 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/monitor/job/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/system/user/profile/userAvatar.vue
	ruoyi-ui/src/views/tool/gen/importTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/sql/ry_20200415.sql
	ruoyi/src/main/java/com/ruoyi/project/system/domain/SysMenu.java
	ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
	ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
	ruoyi/src/main/resources/vm/sql/sql.vm
	ruoyi/src/main/resources/vm/vue/index.vue.vm
 2020-04-21 09:08:48 +08:00
疯狂的狮子li 09918e338a 修复 undertow 未生效问题 2020-04-19 14:47:25 +08:00
RuoYi aae1825697 模板sql.vm添加菜单状态 2020-04-18 11:50:47 +08:00
RuoYi 14392d9764 dialog添加append-to-body属性，防止ie遮罩 2020-04-17 14:14:54 +08:00
RuoYi ec98648e4d 菜单区分状态和显示隐藏功能 2020-04-15 18:04:41 +08:00
疯狂的狮子li 1dac24c9f8 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi/pom.xml
 2020-04-13 12:51:20 +08:00
疯狂的狮子li 76ea06748b 升级fastjson到最新版1.2.68 修复安全加固 2020-04-13 12:48:03 +08:00
RuoYi 5d20be2976 升级fastjson到最新版1.2.68 修复安全加固 2020-04-13 11:58:03 +08:00
疯狂的狮子li 29b131b107 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi/src/main/resources/vm/vue/index.vue.vm
 2020-04-10 13:43:18 +08:00
RuoYi 5ded2569d0 修复代码生成如果选择字典类型缺失逗号问题 2020-04-10 11:49:08 +08:00
疯狂的狮子li 31a2713012 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/api/login.js
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/tool/build/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
	ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
	ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
 2020-04-03 10:16:28 +08:00
RuoYi ec65b1f7ec 登录请求params更换为data，防止暴露url 2020-04-01 14:01:31 +08:00
RuoYi 8a394f0363 日志返回时间格式处理 2020-04-01 13:09:27 +08:00
RuoYi 8132ae0913 代码生成列属性排序查询 2020-04-01 10:15:29 +08:00
疯狂的狮子li 39d8723159 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
 2020-03-24 15:29:45 +08:00
RuoYi 9b0828be8e 角色禁用&菜单隐藏不查询权限 2020-03-22 16:41:30 +08:00
疯狂的狮子li 67657e9f02 升级 v2.2 2020-03-19 09:32:15 +08:00
疯狂的狮子li 2a922caf89 升级 v2.2 2020-03-19 09:22:46 +08:00
疯狂的狮子li bd7371fb8b 升级 v2.2 2020-03-19 09:21:17 +08:00
疯狂的狮子li 51ae2d1a87 升级 v2.2 2020-03-19 09:13:07 +08:00
疯狂的狮子li b1afb78ca2 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/components/SvgIcon/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/tagsView.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi/pom.xml
	ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
	ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi/src/main/java/com/ruoyi/framework/web/domain/Server.java
	ruoyi/src/main/java/com/ruoyi/project/common/CommonController.java
	ruoyi/src/main/resources/application.yml
 2020-03-19 09:10:03 +08:00
RuoYi 2cc14e5f56 若依 2.2 2020-03-18 09:43:17 +08:00
疯狂的狮子li 2e6bb454f4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/bin/package.bat
	ruoyi-ui/package.json
	ruoyi-ui/src/assets/styles/element-ui.scss
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/components/icons/element-icons.js
	ruoyi-ui/src/views/dashboard/mixins/resize.js
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi/src/main/java/com/ruoyi/common/filter/XssFilter.java
	ruoyi/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
	ruoyi/src/main/java/com/ruoyi/common/utils/text/CharsetKit.java
	ruoyi/src/main/java/com/ruoyi/common/utils/text/Convert.java
	ruoyi/src/main/java/com/ruoyi/common/utils/text/StrFormatter.java
	ruoyi/src/main/java/com/ruoyi/framework/config/FilterConfig.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
	ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysNoticeMapper.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/ISysNoticeService.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
 2020-03-16 09:58:40 +08:00
RuoYi 109c64e7c2 批量替换表前缀调整 2020-03-13 22:14:58 +08:00
RuoYi c0cd030d0f 批量替换表前缀修改 2020-03-13 21:41:57 +08:00
RuoYi 7604d59e49 修复通知公告批量删除异常问题 2020-03-13 21:24:26 +08:00
RuoYi 02062f31e9 通用http工具类 2020-03-13 21:18:41 +08:00
RuoYi ab992f4848 修复防重复提交注解无效问题 2020-03-13 21:15:50 +08:00
RuoYi baea48be68 调整包路径 2020-03-13 18:10:32 +08:00
RuoYi 1590e1068c 删除多余包 2020-03-13 18:07:02 +08:00
疯狂的狮子li 7507a3ed2a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/system/user/profile/index.vue
	ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
	ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
	ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
 2020-03-09 09:40:39 +08:00
RuoYi 166d5ec55f 修改个人信息，密码后redis中登录信息不会过期问题 2020-03-07 10:19:04 +08:00
RuoYi 09a3a971ff 操作日志排序调整 2020-03-07 10:11:22 +08:00
RuoYi bb1340ecc6 操作日志详细显示类型 2020-02-25 19:33:29 +08:00
疯狂的狮子li 87c0074fab Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
 2020-02-25 10:48:50 +08:00
RuoYi 9d45070429 设置mybatis全局的配置文件 2020-02-24 14:32:21 +08:00
疯狂的狮子li 0ba48df61e 升级 v2.1 2020-02-24 10:19:17 +08:00
疯狂的狮子li db20b4a3d3 升级 v2.1 2020-02-24 10:02:53 +08:00
疯狂的狮子li 6687efd887 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/components/RuoYi/Git/index.vue
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/utils/index.js
	ruoyi-ui/src/utils/permission.js
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/system/dept/index.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/tool/build/index.vue
	ruoyi-ui/src/views/tool/gen/genInfoForm.vue
	ruoyi/pom.xml
	ruoyi/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
	ruoyi/src/main/resources/application.yml
	ruoyi/src/main/resources/mybatis/monitor/SysLogininforMapper.xml
	ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
	ruoyi/src/main/resources/vm/java/controller.java.vm
	ruoyi/src/main/resources/vm/java/domain.java.vm
	ruoyi/src/main/resources/vm/vue/index.vue.vm
 2020-02-24 09:56:22 +08:00
RuoYi cb0a4b78ee 若依 2.1 2020-02-24 09:28:16 +08:00
疯狂的狮子li c9527fcf42 修复地址开关无效问题 2020-02-24 09:23:37 +08:00
RuoYi 46a1695292 修复地址开关无效问题 2020-02-23 15:43:50 +08:00
疯狂的狮子li a1cf719d26 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
 2020-02-18 14:47:23 +08:00
RuoYi b7107a4dba 用户手机邮箱必填&密码参数修改 2020-02-18 11:15:08 +08:00
RuoYi c0cd2f61da 返回参数忽略密码字段 2020-02-17 15:07:27 +08:00
疯狂的狮子li 7cd5c26337 修复sql报错 2020-02-16 16:30:10 +08:00
疯狂的狮子li fbba782f5c 增加彩色日志输出 调整优化日志格式 2020-02-14 13:58:35 +08:00
疯狂的狮子li a108574387 增加彩色日志输出 调整优化日志格式 2020-02-14 13:40:39 +08:00
疯狂的狮子li de74b802d4 web 容器使用 undertow 性能更强 2020-02-14 13:37:19 +08:00
疯狂的狮子li 83c427c1bb 增加 代码生成与MybatisPlus测试案例 cstest 2020-02-14 13:36:52 +08:00
疯狂的狮子li 7c8d062d58 修改 代码生成器 适配 MybatisPlus 2020-02-14 13:27:55 +08:00
疯狂的狮子li c7bc8e415f 集成 Lombok + MybatisPlus 3.3.0 2020-02-14 13:27:09 +08:00
疯狂的狮子li 2841620be6 初始化项目 2020-02-13 10:48:51 +08:00
疯狂的狮子li b279aa391c 删除文件 ruoyi 2020-02-13 10:47:22 +08:00
RuoYi c0ca2f837c 修改密码更新缓存信息 2020-02-10 13:28:50 +08:00
RuoYi 891062a7de 配置文件增加redis属性password 2020-02-08 19:25:57 +08:00
RuoYi 554beaf6e7 修改在角色管理页修改菜单权限偶尔未选中问题 2020-02-08 18:30:09 +08:00
RuoYi 5cdb4ecba5 修改用户个人资料同步缓存信息 2020-02-08 16:39:13 +08:00
RuoYi 140be61003 根据用户权限加载菜单数据树形结构 2020-02-08 14:49:46 +08:00
RuoYi a5dce6cccc 防止db字段名为一个字母导致出现生成异常 2020-02-02 15:43:43 +08:00
RuoYi 0348349a86 Jackson日期反序列化时区问题 2020-01-03 16:57:35 +08:00
RuoYi 436f8eb737 部门顶级节点逻辑优化 2019-12-31 18:45:15 +08:00
RuoYi b9a97ef4aa 修改验证码记录提示错误 2019-12-31 17:04:19 +08:00
RuoYi de870bd2fe 修改用户管理分页不正确的问题 2019-12-26 17:32:10 +08:00
RuoYi 3755597c76 添加一个默认空属性，用来判断节点显示 2019-12-26 15:59:03 +08:00
RuoYi 71c31dfd66 HTML过滤器不替换双引号为"，防止json格式无效 2019-12-20 17:09:33 +08:00
RuoYi 8bc7296fb4 添加HTML过滤器，用于去除XSS漏洞隐患 2019-12-20 11:34:45 +08:00
RuoYi 2d992db62a 修复多数据源下enabled=false导致读取不到bean导致异常问题 2019-12-19 16:21:49 +08:00
RuoYi b508e6f202 新增用户导入 2019-12-11 18:12:00 +08:00
RuoYi d2854c73f0 代码生成vue文件修正 2019-12-04 10:23:48 +08:00
RuoYi 04289c6021 代码生成sql权限修正 2019-12-04 10:17:06 +08:00
RuoYi 80242d712b 代码生成vue文件修正 2019-12-04 10:08:42 +08:00