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

1425 Commits

Author SHA1 Message Date
疯狂的狮子li 6f47310c24 同步升级3.0 端口提交错误 改回8080 2020-07-20 10:47:00 +08:00
疯狂的狮子li 1e79d6f56f 同步升级3.0 2020-07-20 10:41:32 +08:00
RuoYi cee572f237 若依 3.0 2020-07-19 10:25:40 +08:00
RuoYi 0d341f1aaa 代码生成查询条件修正 2020-07-18 16:24:04 +08:00
RuoYi 11ab4b4832 缺少JsonIgnore包路径。 2020-07-18 12:32:22 +08:00
若依 3afa664173 !42 处理代码生成页面中的查询条件“创建时间”未生效的问题 
Merge pull request !42 from 平凡/hmxmylove-master-patch-60881
 2020-07-18 12:23:28 +08:00
若依 1624debefe !41 禁止加密密文返回前端 
Merge pull request !41 from 平凡/hmxmylove-master-patch-79033
 2020-07-18 12:23:20 +08:00
平凡 0238c4ad92 处理代码生成页面中的查询条件“创建时间”未生效的问题 2020-07-18 00:07:17 +08:00
平凡 0d52e11e3d 禁止加密密文返回前端 2020-07-18 00:03:27 +08:00
RuoYi d5cc95fefb 升级element-ui版本到2.13.2 2020-07-17 16:56:03 +08:00
疯狂的狮子li a53a3b3119 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
	ruoyi/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
	ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
	ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
 2020-07-17 16:43:47 +08:00
RuoYi d29fe10b93 删除babel，提高编译速度。 2020-07-17 16:20:31 +08:00
RuoYi 086b9cdc23 新增菜单默认主类目 2020-07-17 15:19:06 +08:00
疯狂的狮子li 22f3e2ad23 Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2020-07-17 11:41:29 +08:00
疯狂的狮子li 4555050301 删除 mybatis相关配置 2020-07-17 11:41:09 +08:00
Sxile 22b09535af 修复param参数名称 2020-07-17 11:11:03 +08:00
Sxile aad58640dc 翻转""为equals调用方，防止空指针异常 2020-07-17 11:10:14 +08:00
RuoYi 2211a75704 编码文件名修改为uuid方式 2020-07-17 09:24:04 +08:00
疯狂的狮子li e6dc647287 修复数据库decimal类型无improt问题 2020-07-16 20:09:35 +08:00
RuoYi 4088463adf 定时任务cron表达式验证 2020-07-16 16:54:14 +08:00
疯狂的狮子li e85334bacd 修复 生成器业务名 只会截取表下划线的最后一个 导致很多controller 会重名 问题 2020-07-16 13:14:01 +08:00
疯狂的狮子li a3a3d62034 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/views/system/role/index.vue
 2020-07-13 09:27:49 +08:00
若依 dd7a9850e3 !39 角色权限修改时已有权限未自动勾选异常修复 
Merge pull request !39 from 严俊东/N/A
 2020-07-10 18:28:20 +08:00
RuoYi a691da0c97 防止切换权限用户后登录出现404 2020-07-10 16:36:25 +08:00
RuoYi ec09696512 Excel支持sort导出排序 2020-07-10 14:47:58 +08:00
严俊东 d04ec69df4 角色权限修改时已有权限未自动勾选异常修复 2020-07-10 12:52:45 +08:00
疯狂的狮子li 59b42fddea Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi/src/main/java/com/ruoyi/framework/redis/RedisCache.java
 2020-07-10 11:40:38 +08:00
若依 bc56aae219 !33 RedisCache中所有方法参数添加final，并优化list和set存取效率，添加其它常用redis方法 
RedisCache中所有方法参数添加final，并优化list和set存取效率，添加其它常用redis方法
 2020-07-10 10:28:57 +08:00
疯狂的狮子li eef65b449d Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/README.md
	ruoyi/src/main/resources/application.yml
 2020-07-06 09:16:44 +08:00
RuoYi 31765f6392 Merge branch 'master' of https://github.com/yangzongzhuan/RuoYi-Vue 2020-07-04 16:07:51 +08:00
RuoYi 1e2a2026c6 修改文件编码格式 2020-07-04 16:04:30 +08:00
RuoYi e56efebce5 调整文件编码 2020-07-04 15:56:56 +08:00
若依 fb53780d8a !32 令牌秘钥的“秘”写错了，看到顺手就提交了哈 
Merge pull request !32 from jack/N/A
 2020-07-02 21:01:23 +08:00
liguonan 3a69a31d07 RedisCache中所有方法参数添加final，并优化list取出效率，添加其它常用redis方法 2020-07-02 19:35:37 +08:00
jack d9367425fa 令牌秘钥的“秘”写错了，看到顺手就提交了哈 2020-07-02 18:03:18 +08:00
疯狂的狮子li 942629722d 删除 测试数据 2020-07-02 10:58:13 +08:00
疯狂的狮子li f652a035b7 增加 数据库超时重连配置 2020-07-01 09:16:47 +08:00
疯狂的狮子li c70ec63952 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi/sql/ry_20200629.sql
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
 2020-07-01 09:16:25 +08:00
RuoYi 338f661d41 创建用户不允许选择系统管理员角色 2020-06-29 11:44:46 +08:00
疯狂的狮子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
 2020-06-29 09:08:18 +08:00
疯狂的狮子li 2e95557840 删除测试代码 2020-06-29 09:07:17 +08:00
RuoYi 794d6f17db 修复代码生成导入表结构出现异常页面不提醒问题 2020-06-24 17:55:36 +08:00
RuoYi 7a9564ced5 修复代码生成点击多次表修改数据不变化的问题 2020-06-24 17:17:22 +08:00
RuoYi 5d5f955a34 修复头像上传成功二次打开无法改变裁剪框大小和位置问题 2020-06-24 15:59:18 +08:00
RuoYi eac9403ea4 修复布局为small者mini用户表单显示错位问题 2020-06-24 15:21:39 +08:00
RuoYi f7f02e3a3f 修复热部署导致的强换异常问题 2020-06-24 14:26:21 +08:00
疯狂的狮子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
 2020-06-21 10:06:26 +08:00
若依 0dff669374 !28 update ruoyi-ui/src/views/monitor/job/log.vue. 
Merge pull request !28 from abbfun/N/A
 2020-06-19 22:17:49 +08:00
Sxile 5bd2838b2b 修复注释与参数名称不对应 2020-06-19 18:22:47 +08:00
Sxile f39be3ab9b 添加缺少的@ Override 2020-06-19 18:17:57 +08:00