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

838 Commits

Author SHA1 Message Date
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 103583a847 个人信息创建时间获取属性值 2020-03-08 21:16:16 +08:00
RuoYi 166d5ec55f 修改个人信息，密码后redis中登录信息不会过期问题 2020-03-07 10:19:04 +08:00
RuoYi 09a3a971ff 操作日志排序调整 2020-03-07 10:11:22 +08:00
疯狂的狮子li bed1fd98ff Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/login/auth-redirect.vue
	ruoyi-ui/src/views/login/components/SocialSignin.vue
	ruoyi-ui/src/views/system/dept/index.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
 2020-03-02 16:15:24 +08:00
RuoYi f18b3bc6be 代码生成字段描述可编辑 2020-02-28 20:29:19 +08:00
RuoYi 0c1a27769a 删除无用页面 2020-02-28 19:56:19 +08:00
疯狂的狮子li f9b9156c8a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/tool/gen/importTable.vue
	ruoyi/src/main/resources/vm/java/mapper.java.vm
	ruoyi/src/main/resources/vm/java/service.java.vm
 2020-02-28 17:34:44 +08:00
RuoYi bb1340ecc6 操作日志详细显示类型 2020-02-25 19:33:29 +08:00
RuoYi 759a0fcb32 导入表单击行数据时选中对应的复选框 2020-02-25 13:49:48 +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
疯狂的狮子li abdb1048ed 删除文件 ruoyi-ui 2020-02-13 10:47:14 +08:00
疯狂的狮子li a7fa51303b 删除文件 LICENSE 2020-02-13 10:47:08 +08:00
疯狂的狮子li 3dd52a3f7d 删除文件 README.md 2020-02-13 10:47:02 +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 a5c170fa2a 修改同一页面el-upload和Editor时不显示问题。 2020-02-08 17:05:46 +08:00
RuoYi 5cdb4ecba5 修改用户个人资料同步缓存信息 2020-02-08 16:39:13 +08:00
RuoYi d49ac2e0f8 成功登陆不恢复按钮，防止多次点击 2020-02-08 15:31:29 +08:00
RuoYi c23c8ae248 README 2020-02-08 14:54:17 +08:00
RuoYi 140be61003 根据用户权限加载菜单数据树形结构 2020-02-08 14:49:46 +08:00
RuoYi a5dce6cccc 防止db字段名为一个字母导致出现生成异常 2020-02-02 15:43:43 +08:00
RuoYi f754a18676 添加新群号 2020-01-11 10:39:49 +08:00
RuoYi 0348349a86 Jackson日期反序列化时区问题 2020-01-03 16:57:35 +08:00
RuoYi 436f8eb737 部门顶级节点逻辑优化 2019-12-31 18:45:15 +08:00
RuoYi d677cd11d1 修改部门树默认值为[] 2019-12-31 18:03:01 +08:00
RuoYi 9067369ce0 防止时间为空出现的异常 2019-12-31 17:24:34 +08:00
RuoYi 3436f77c4a request.js缺少Message引用 2019-12-31 17:18:56 +08:00
RuoYi b9a97ef4aa 修改验证码记录提示错误 2019-12-31 17:04:19 +08:00