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

1356 Commits

Author SHA1 Message Date
疯狂的狮子li fd5414f82e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/views/login.vue
	sql/ry_20210713.sql
 2021-07-13 13:34:10 +08:00
疯狂的狮子li 79965e30af fix 合并 pr !68 业务集群部署与文件上传的问题 2021-07-13 13:20:08 +08:00
疯狂的狮子li 5c8de41b32 fix 修复 docker业务集群部署与文件上传的问题 2021-07-13 13:12:32 +08:00
疯狂的狮子li 6bf38a806c fix 修复 docker业务集群部署与文件上传的问题 2021-07-13 13:11:37 +08:00
疯狂的狮子li 15c45eae11 fix 修复代码生成同步表结构id冲突问题 2021-07-13 13:08:47 +08:00
疯狂的狮子li 45b9acd57b fix 修复代码生成选择字典 无法取消问题 2021-07-13 11:32:02 +08:00
疯狂的狮子li 3b765f3ac9 fix 修复代码生成字典为null问题 2021-07-13 11:24:12 +08:00
RuoYi 7b894da43c 参数管理支持配置验证码开关 2021-07-13 10:30:40 +08:00
RuoYi c8b66f9b04 删除富文本video事件 2021-07-13 10:28:55 +08:00
若依 25d9edd5c9 !259 图片上传 - 多图时无法删除相应图片修复 
Merge pull request !259 from 严俊东/N/A
 2021-07-13 02:26:10 +00:00
疯狂的狮子li fdad98b321 Merge remote-tracking branch 'origin/dev' into dev 2021-07-12 14:30:05 +08:00
疯狂的狮子li 8ddd71a818 update 使用hutool重构 判断是否url 2021-07-12 14:29:49 +08:00
疯狂的狮子Li 1cbe4c0d88 Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev 2021-07-12 03:39:26 +00:00
严俊东 77a21d098f 图片上传 - 多图时无法删除相应图片修复 2021-07-12 03:01:50 +00:00
疯狂的狮子li cd34c87afa fix 修复升级合并错误 2021-07-12 11:00:12 +08:00
疯狂的狮子li d30ba9d52e 发布 v2.5.0 2021-07-12 09:58:32 +08:00
疯狂的狮子li e085ec9418 发布 v2.5.0 2021-07-12 09:53:46 +08:00
疯狂的狮子li aac20ca789 update hutool 5.7.4 2021-07-12 09:46:05 +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
RuoYi 1bfa14e3c6 富文本默认上传返回url类型 2021-07-10 12:17:32 +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 5dec58e7f5 自定义弹窗拖拽指令 2021-07-09 17:12:29 +08:00
RuoYi 8321f92d2c 全局注册通用组件 2021-07-09 17:09:57 +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 33ae270b0d update 更新 nginx https 配置 2021-07-09 14:14:16 +08:00
疯狂的狮子li 4c500eb50c update 更新 部署文档 2021-07-08 21:01:57 +08:00
疯狂的狮子li dcad0cdf92 update 更新 业务模块 集群配置 2021-07-08 20:34:24 +08:00
疯狂的狮子li bc5898b8cd update 更新 nginx 配置文件 2021-07-08 20:34:12 +08:00
疯狂的狮子li 18705b4f26 update 更新文档 Docker 文档说明 2021-07-08 20:33:49 +08:00
疯狂的狮子li e169366638 update 更新文档 PR 说明 2021-07-08 20:18:27 +08:00
疯狂的狮子li ae8c0b6c43 update 更新sql文件项目官网 2021-07-08 20:06:19 +08:00
疯狂的狮子li 6a8e281b66 update 更新docker脚本配置 2021-07-08 20:06:06 +08:00
疯狂的狮子li 821f54f1ab update 富文本接口返回值修正 2021-07-08 20:05:37 +08:00
疯狂的狮子li e30079d656 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/components/ImageUpload/index.vue
 2021-07-08 19:58:28 +08:00
RuoYi f56da498ab ImageUpload组件支持多图片上传 2021-07-08 19:17:09 +08:00
疯狂的狮子li 6905522b91 update 优化 docker 配置 2021-07-08 16:47:34 +08:00
RuoYi e259093e01 文件上传组件添加数量限制属性 2021-07-08 15:49:04 +08:00
RuoYi e963a86b15 富文本编辑组件添加类型属性 2021-07-08 15:48:11 +08:00
RuoYi e447fb806b FileUpload组件支持多文件上传 2021-07-08 12:36:02 +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 80e74eb91c add 增加 docker 编排 与 shell 脚本 2021-07-06 13:48:06 +08:00
疯狂的狮子li 61e2a60438 update 同步 ruoyi 对新业务进行修正 2021-07-06 13:19:53 +08:00