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

146 Commits

Author SHA1 Message Date
疯狂的狮子li 8ddd71a818 update 使用hutool重构 判断是否url 2021-07-12 14:29:49 +08:00
疯狂的狮子li cd34c87afa fix 修复升级合并错误 2021-07-12 11:00:12 +08:00
疯狂的狮子li e085ec9418 发布 v2.5.0 2021-07-12 09:53:46 +08:00
疯狂的狮子li 599016a63a update 同步ruoyi修正差异 2021-07-12 09:44:46 +08:00
疯狂的狮子li 8231953e29 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi-framework/pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-generator/pom.xml
	ruoyi-quartz/pom.xml
	ruoyi-system/pom.xml
	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/package.json
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/layout/components/AppMain.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/index.vue
 2021-07-12 09:37:23 +08:00
RuoYi 170cfb356c 若依 3.6.0 2021-07-12 08:42:11 +08:00
RuoYi 5879c2484a 菜单路由配置支持内链访问 2021-07-11 16:31:10 +08:00
RuoYi c02dad2ca3 默认访问首页新增提示语 2021-07-11 15:28:11 +08:00
疯狂的狮子li ea506de048 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/src/directive/index.js
	ruoyi-ui/src/directive/permission/hasPermi.js
	ruoyi-ui/src/directive/permission/hasRole.js
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/system/notice/index.vue
 2021-07-09 18:07:32 +08:00
疯狂的狮子li d6bb7ab832 update 更新 admin client 与 actuator 配置到 环境配置文件 2021-07-09 17:41:45 +08:00
疯狂的狮子li 43486f2f41 update 配置 monitor-admin docker编排 2021-07-09 17:15:09 +08:00
RuoYi da1095e298 授权用户添加访问权限 2021-07-09 17:08:30 +08:00
疯狂的狮子li 1c11d7ccc1 update 转移 springboot-admin 到扩展模块项目 2021-07-09 15:30:40 +08:00
疯狂的狮子li 6a8e281b66 update 更新docker脚本配置 2021-07-08 20:06:06 +08:00
疯狂的狮子li d0bbcc4e77 update 更新 docker ip配置 2021-07-06 15:30:25 +08:00
疯狂的狮子li 282f3b0632 add 增加 docker 配置 2021-07-06 14:06:25 +08:00
疯狂的狮子li 59114a14ff update 同步 ruoyi 对新业务进行修正 2021-07-06 13:05:47 +08:00
疯狂的狮子li aa14085746 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/api/system/role.js
	ruoyi-ui/src/api/system/user.js
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
 2021-07-06 12:01:05 +08:00
疯狂的狮子li 9ac87fd66f update 优化中英文语言配置 2021-07-06 11:39:14 +08:00
RuoYi 90c41d498c 角色管理新增分配用户功能 2021-07-05 14:54:09 +08:00
疯狂的狮子li de194880ae update 关闭默认二级缓存 推荐使用 spring-cache 注解手动缓存 2021-07-04 02:21:04 +08:00
疯狂的狮子li c26073afeb update 优化缓存配置 增加spring-cache演示案例 2021-07-04 02:13:24 +08:00
RuoYi 9c7901f526 用户管理新增分配角色功能 2021-07-01 18:01:36 +08:00
疯狂的狮子li 5647cf7a7e update 规范maven写法 2021-07-01 10:42:24 +08:00
疯狂的狮子li 10a6a9192d update 更新 MP 详细日志配置 2021-06-29 09:57:45 +08:00
疯狂的狮子li 99de90a015 update 更新配置注释(规范使用方法) 2021-06-28 19:23:02 +08:00
疯狂的狮子li 66f453452e fix 相对路径下载问题 2021-06-24 15:41:16 +08:00
疯狂的狮子li f098222a43 update 集成 Lock4j 分布式锁 2021-06-22 16:45:37 +08:00
sxq 56eba9cded Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts. 2021-06-22 15:35:52 +08:00
疯狂的狮子li 8338913ac5 update 更新动态数据源 默认数据源配置 与文档链接 2021-06-22 11:38:33 +08:00
dingzhongyuan cf16e31632 多数据源替换成dynamic-datasource 2021-06-22 11:31:04 +08:00
疯狂的狮子li dcd95d013f update springboot 2.3.11 => 2.4.7 
update springboot-admin 2.3.1 => 2.4.1
update feign 2.2.6 => 3.0.3
update hutool 5.7.1 => 5.7.2
 2021-06-21 12:43:23 +08:00
疯狂的狮子li a1717eac6d update 升级 hutool 5.7.1 适配工具类 2021-06-16 15:39:19 +08:00
疯狂的狮子li d98faaffee update 移除 fastjson 增加 jackson 工具类 重写相关业务 2021-06-13 15:39:35 +08:00
疯狂的狮子li 5311937b69 update 增加 jackson 配置 默认序列化时间格式 2021-06-12 23:41:56 +08:00
疯狂的狮子li b3541e9758 update 优化 使用 hutool 替换 ruoyi 自带工具类 解决部分方法过期与高版本JDK不兼容问题 2021-06-12 20:13:35 +08:00
疯狂的狮子li 35f607f9a5 remove 删除无用注释 2021-06-10 18:23:59 +08:00
疯狂的狮子li b561f7d906 remove 移除无用配置文件 2021-06-10 15:43:20 +08:00
RuoYi 2ace3257f9 升级swagger到最新版本v3.0.0 2021-06-09 20:07:36 +08:00
RuoYi c16ee7fc2c 升级swagger到最新版本v3.0.0 2021-06-08 16:34:36 +08:00
疯狂的狮子li dcf125a08a update 优化 redis锁pr 代码 2021-06-04 16:09:43 +08:00
sxq ad6386a618 redis分布式锁（基于注解形势）。 2021-06-04 15:00:56 +08:00
疯狂的狮子li d674d934e7 fix 修复上传路径 win 打包编译为 win 路径, linux 报错问题 2021-06-04 09:46:28 +08:00
疯狂的狮子li 2ee2e4505a fix 修复配置文件书写错误 2021-06-02 14:28:40 +08:00
RuoYi edd2981076 调整用户测试接口swagger注解 2021-06-02 11:45:30 +08:00
疯狂的狮子li 99c4692a0d update 升级 luttuce 为 redisson 性能更强 工具更全 2021-05-31 23:21:14 +08:00
疯狂的狮子li d0b2166525 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-ui/src/api/system/config.js
	ruoyi-ui/src/api/system/dict/type.js
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dict/index.vue
 2021-05-28 10:07:15 +08:00
RuoYi af9cfb40a4 优化参数&字典缓存操作 2021-05-27 17:38:44 +08:00
疯狂的狮子li 380b4e5f3a 配置文件错误 2021-05-25 14:28:38 +08:00
疯狂的狮子li 2885ced2c7 add 增加验证码开关 2021-05-25 14:02:50 +08:00