GTsoft/RuoYi-Vue-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,069 Commits 2 Branches 25 Tags 125 MiB
29cc9da934
Commit Graph

281 Commits

Author SHA1 Message Date
疯狂的狮子li
896939ce4e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
 2021-08-17 14:23:19 +08:00
RuoYi
5c155f5f11 支持自定义注解实现接口限流 2021-08-17 14:08:18 +08:00
疯狂的狮子li
52d0d62c35 update 同步 ruoyi 适配改动 2021-08-17 10:45:01 +08:00
疯狂的狮子li
d3abd6c96e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.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-ui/src/components/Breadcrumb/index.vue
 2021-08-17 10:38:07 +08:00
RuoYi
03cf98d3c9 优化异常信息 2021-08-16 16:25:25 +08:00
疯狂的狮子li
2915548bce remove 移除无用配置 2021-08-12 11:41:43 +08:00
疯狂的狮子li
8adbdee9d9 remove 移除无用配置 2021-08-12 11:37:12 +08:00
疯狂的狮子li
6a66aaff47 update 注入器 insert 增加 update 字段处理 2021-08-11 16:47:38 +08:00
疯狂的狮子li
9bfa420a76 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	README.md
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.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-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
	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/controller/BaseController.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
	ruoyi-ui/package.json
	ruoyi-ui/src/views/system/menu/index.vue
 2021-08-09 09:55:50 +08:00
RuoYi
7736097f6b 提取通用方法到基类控制器 2021-08-08 19:12:12 +08:00
疯狂的狮子li
c06a02fb97 add 增加 完整国际化解决方案 2021-08-06 18:59:08 +08:00
疯狂的狮子li
79bf332c53 remove 移除通用上传下载接口与配置 2021-08-04 19:11:39 +08:00
疯狂的狮子li
43901370e9 update 自动注入修改为强制注入 无用户信息返回 null 并日志报警 2021-08-04 18:13:11 +08:00
疯狂的狮子li
c813046594 update 日常校验 统一重构到 StringUtils 便于维护扩展 2021-08-02 19:28:41 +08:00
疯狂的狮子li
c958217d19 update 修改 自动注入器 用户未登录异常拦截抛出警告 返回Null 2021-08-02 13:08:19 +08:00
疯狂的狮子li
f8ab5663ef update 日常字符串校验 统一重构到 StringUtils 便于维护扩展 2021-08-02 12:15:14 +08:00
疯狂的狮子li
cfdeada3fd Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-admin/src/main/resources/i18n/messages.properties
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
	ruoyi-generator/src/main/resources/vm/java/service.java.vm
	ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/src/api/login.js
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/utils/zipdownload.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/system/user/index.vue
 2021-08-02 11:21:09 +08:00
疯狂的狮子li
210b5af1c7 update 优化自动注入器 异常检查更完善 2021-08-02 09:39:35 +08:00
疯狂的狮子li
946242e8f1 add 增加 重复提交 配置属性类 2021-08-01 11:04:37 +08:00
RuoYi
a1cc346aca 优化代码生成模板 2021-07-30 21:50:47 +08:00
RuoYi
5397e345ca 新增是否开启用户注册功能 2021-07-30 21:23:35 +08:00
疯狂的狮子li
c65acd6a28 update 重写 防重提交拦截器 支持全局与注解自定义 拦截时间配置配置 优化逻辑 2021-07-30 19:10:54 +08:00
RuoYi
f6bc28000e 防止错误token导致的解析异常 2021-07-29 17:32:55 +08:00
疯狂的狮子li
90d2a7af03 update 更新 BigNumberSerializer 书写错误 2021-07-29 15:09:23 +08:00
疯狂的狮子li
d29a7adc9a update 更新 BigNumberSerializer 注释 2021-07-29 14:28:08 +08:00
疯狂的狮子li
7e613f8da6 add 增加 jackson 超出 JS 最大数值自动转字符串(雪花id序列化)处理 2021-07-29 13:11:35 +08:00
RuoYi
6b5dd4d2be 优化XSS跨站脚本过滤 2021-07-28 16:04:59 +08:00
疯狂的狮子li
973471c63b 发布 v2.6.0 2021-07-28 10:45:01 +08:00
疯狂的狮子li
fbe9ad2392 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-ui/src/router/index.js
 2021-07-24 19:03:36 +08:00
稚屿
c24fc4282c 修正方法名单词拼写错误 2021-07-20 00:54:50 +00:00
疯狂的狮子li
eea8f33cf9 发布 v2.5.2 bug修复版 
(cherry picked from commit b12bdd1f15)
 2021-07-19 19:44:18 +08:00
疯狂的狮子li
28fa991fc2 update 修复 thread-pool: enabled 配置不生效问题 2021-07-14 10:43:33 +08:00
疯狂的狮子li
55546dfc80 发布 v2.5.1 针对 v2.5.0 版本新特性bug修复 2021-07-13 13:49:47 +08:00
疯狂的狮子li
a412b6b03a update 验证码开关 转移到系统配置内 2021-07-13 13:38:53 +08:00
疯狂的狮子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
RuoYi
7b894da43c 参数管理支持配置验证码开关 2021-07-13 10:30:40 +08:00
疯狂的狮子li
e085ec9418 发布 v2.5.0 2021-07-12 09:53: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
c02dad2ca3 默认访问首页新增提示语 2021-07-11 15:28:11 +08:00
疯狂的狮子li
1c11d7ccc1 update 转移 springboot-admin 到扩展模块项目 2021-07-09 15:30:40 +08:00
疯狂的狮子li
2704e921c8 update 增加 feign 熔断 自定义结构体解析方法 与 demo 注释 2021-07-04 19:18:06 +08:00
疯狂的狮子li
c26073afeb update 优化缓存配置 增加spring-cache演示案例 2021-07-04 02:13:24 +08:00
疯狂的狮子li
2d8f380b71 update 优化 增加MP注入异常拦截 2021-07-02 09:39:07 +08:00
疯狂的狮子li
5647cf7a7e update 规范maven写法 2021-07-01 10:42:24 +08:00
sxq
645c926bbd 集成lock4j框架，删除redisson锁，使用lock4j的锁。 2021-06-22 16:06:02 +08:00
疯狂的狮子li
40bba563d6 update 优化多数据源aop顺序问题 2021-06-22 13:43:05 +08:00
疯狂的狮子li
c950daf301 update 优化 多数据源集成 相关pr 2021-06-22 11:31:27 +08:00
dingzhongyuan
cf16e31632 多数据源替换成dynamic-datasource 2021-06-22 11:31:04 +08:00
疯狂的狮子li
f585992c6f Merge remote-tracking branch 'origin/dev' into dev 2021-06-21 19:41:11 +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
d507111008 update 更新 jackson 时区配置 2021-06-19 00:34:57 +08:00
疯狂的狮子li
c98ab8fb51 add 增加 自定义 批量insert方法 2021-06-18 15:27:47 +08:00
疯狂的狮子li
0140965a30 update 优化 jdk11 相关 pr 2021-06-17 09:42:00 +08:00
CharlieJohn
8bda10c23c !54 fix 生成器生成的 service 和 serviceImpl 中 deleteWithValidByIds 参数字段类型错误 
* fix 生成器生成的 service 和 serviceImpl 中 deleteWithValidByIds 参数字段类型错误
 2021-06-17 09:30:52 +08:00
疯狂的狮子li
f9967cca4c fix 移除 Long 序列化为 String 配置 改为由用户自行添加注解 2021-06-16 17:41:48 +08:00
疯狂的狮子li
bb2ade75a8 update 升级 hutool 5.7.1 适配工具类 2021-06-16 15:38:44 +08:00
疯狂的狮子li
639816369a remove 移除无用swagger配置 2021-06-16 12:58:10 +08:00
疯狂的狮子li
d98faaffee update 移除 fastjson 增加 jackson 工具类 重写相关业务 2021-06-13 15:39:35 +08:00
疯狂的狮子li
c2cf7ba16a update 优化 jackson 序列化配置 2021-06-13 15:38:40 +08:00
疯狂的狮子li
8349e631d2 update 优化 异步工厂重写 使用 spring 异步处理 2021-06-12 20:14:50 +08:00
疯狂的狮子li
b3541e9758 update 优化 使用 hutool 替换 ruoyi 自带工具类 解决部分方法过期与高版本JDK不兼容问题 2021-06-12 20:13:35 +08:00
mingli
97a0c890bf update 增加MP自定义id 序列化兼容 2021-06-11 17:42:33 +08:00
疯狂的狮子li
57df2690da update spring-cache 整合 redisson 2021-06-10 20:23:15 +08:00
疯狂的狮子li
427430fc48 update 补全注释 更新文档 2021-06-10 17:11:44 +08:00
疯狂的狮子li
1bf9dd1217 update 优化redis锁工具代码结构 2021-06-10 13:32:50 +08:00
疯狂的狮子li
524683eabd update swagger 升级为 3.0.0 使用 OAS_30 协议 2021-06-10 09:57:34 +08:00
疯狂的狮子li
2103731f10 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/core/config/SwaggerConfig.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/online/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/tool/gen/index.vue
	ruoyi-ui/src/views/tool/swagger/index.vue
 2021-06-10 09:44:56 +08:00
疯狂的狮子li
a6ba7d9093 update 优化pr redis工具代码 2021-06-09 23:31:47 +08:00
RuoYi
2ace3257f9 升级swagger到最新版本v3.0.0 2021-06-09 20:07:36 +08:00
疯狂的狮子li
f087b37cb3 update 优化 锁切面代码 key到常量类 2021-06-04 16:46:28 +08:00
疯狂的狮子li
dcf125a08a update 优化 redis锁pr 代码 2021-06-04 16:09:43 +08:00
疯狂的狮子li
7c20d6e28c update 优化代码书写格式 使用工具类 2021-06-02 12:47:54 +08:00
疯狂的狮子li
a4edce5a93 Merge remote-tracking branch 'origin/dev' into dev 2021-06-02 09:41:19 +08:00
疯狂的狮子li
83ba79dca2 update 增加redis空密码兼容性 2021-06-02 09:41:12 +08:00
疯狂的狮子li
d1351503a8 update 优化代码书写格式 去除警告 2021-06-01 23:14:42 +08:00
疯狂的狮子li
99c4692a0d update 升级 luttuce 为 redisson 性能更强 工具更全 2021-05-31 23:21:14 +08:00
疯狂的狮子li
6d5a0d8a7e update 完美修复 数据权限功能(支持单表多表过滤) 2021-05-30 02:20:21 +08:00
疯狂的狮子li
8cc2aee13e fix 修复单表数据权限问题 2021-05-29 21:54:20 +08:00
疯狂的狮子Li
d2b077af35 fix 修复数据权限编写错误 2021-05-29 21:48:56 +08:00
疯狂的狮子li
06513446a0 update 还原数据权限修改 2021-05-29 19:44:33 +08:00
疯狂的狮子li
b7bd67b4cb update 优化数据权限sql 解决MP apply注入附带 AND 语法问题 2021-05-29 18:41:32 +08:00
疯狂的狮子li
ead1136e31 add 增加 security 权限框架 @Async 异步注解配置 2021-05-28 14:24:45 +08:00
疯狂的狮子li
b4f9d3a8f2 update 优化dataScope参数防止注入 2021-05-27 22:06:36 +08:00
RuoYi
6fa3bfe051 修复两处存在SQL注入漏洞问题 2021-05-27 17:38:27 +08:00
疯狂的狮子li
2885ced2c7 add 增加验证码开关 2021-05-25 14:02:50 +08:00
朱杰
5dc873209e add 增加验证码开关 2021-05-25 14:02:34 +08:00
疯狂的狮子li
3131b7ea9d fix redis反序列化异常问题 2021-05-25 13:40:18 +08:00
疯狂的狮子li
5795958a18 update 同步升级 ruoyi-vue 3.5.0 2021-05-25 10:14:18 +08:00
疯狂的狮子li
6c195af2a3 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
	ruoyi-framework/pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-generator/pom.xml
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-quartz/pom.xml
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
	ruoyi-system/pom.xml
	ruoyi-ui/package.json
	ruoyi-ui/public/index.html
	ruoyi-ui/src/views/index.vue
	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/config/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/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
 2021-05-25 10:00:36 +08:00
RuoYi
5e64a93d11 若依 3.5.0 2021-05-25 09:37:55 +08:00
疯狂的狮子li
5f584e683a update redis序列化修改为使用jackson 2021-05-24 16:12:40 +08:00
RuoYi
4aabf5d8be Redis设置HashKey序列化 2021-05-24 15:10:55 +08:00
RuoYi
cf6254a8d5 用户登录后记录最后登录IP&时间 2021-05-24 14:21:29 +08:00
RuoYi
77ebca264a 修复请求形参未传值记录日志异常问题 2021-05-23 19:22:30 +08:00
疯狂的狮子li
3d25dfbebe update 增加请求前缀 2021-05-20 17:00:18 +08:00
疯狂的狮子li
db18050b86 update 验证码生成更新为无符号整数计算 2021-05-19 22:57:34 +08:00
疯狂的狮子li
c4eb641d9c fix 修复swagger开关无法控制关闭问题 2021-05-17 16:36:07 +08:00
疯狂的狮子li
2ebcffb22e update 配置统一提取为 properties 配置类 2021-05-17 13:39:59 +08:00
疯狂的狮子li
9d94d0fce9 remove 移除ruoyi自带服务监控(Admin已全部包含) 2021-05-15 14:25:07 +08:00
疯狂的狮子li
b5064021e6 remove 移除ruoyi自带服务监控(Admin已全部包含) 2021-05-15 14:23:43 +08:00
疯狂的狮子li
dab99405c5 update springboot 升级 2.3.10 依赖全面升级适配 2021-05-14 16:58:09 +08:00
疯狂的狮子li
9159e2ed22 fix vue与boot整合打包与admin页面路由冲突 2021-05-13 09:16:28 +08:00
疯狂的狮子li
dafdb43c84 update 配置转移到 yml 文件 统一管理 2021-05-11 10:02:32 +08:00
疯狂的狮子li
98624e66e5 正式发布 1.0.0 2021-05-10 15:34:17 +08:00
疯狂的狮子li
a181c09786 fix 修复数据权限问题 2021-05-08 23:35:39 +08:00
疯狂的狮子li
251547e79e update 重写MP注入器 2021-04-25 09:19:38 +08:00
疯狂的狮子li
1bef814c51 update 补全实体类 注入注解 2021-04-22 21:07:18 +08:00
疯狂的狮子li
5fcef39a2e add 集成 spring-boot-admin 全方位监控 2021-04-22 15:04:35 +08:00
疯狂的狮子li
9173f9c9cb fix feign熔断问题 2021-04-22 09:32:28 +08:00
疯狂的狮子li
046b0bc98a 同步 ruoyi 2021-04-19 17:44:22 +08:00
疯狂的狮子li
97873a7b2b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/components/ThemePicker/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/store/modules/settings.js
 2021-04-19 17:43:32 +08:00
疯狂的狮子li
f8633f8c4e fix Feign 熔断不生效 bug 2021-04-19 17:38:47 +08:00
RuoYi
b6f13c546b 过滤BindingResult对象，防止异常 2021-04-18 21:54:53 +08:00
疯狂的狮子li
876a06a9cd update mp化 2021-04-13 17:14:50 +08:00
疯狂的狮子li
8b37eca241 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/utils/zipdownload.js
 2021-04-08 17:12:13 +08:00
疯狂的狮子li
1d3a361a66 fix 字节转换 bug 2021-04-08 16:40:10 +08:00
wangze
17407d0127 调整cache_repeat_key为驼峰格式 2021-04-02 22:40:15 +08:00
wugh
3d6fbb93f5 !11 [功能] 拆分出Vo,QueryBo,AddBo,EditBo等领域对象 
* [修改] 错误引入的无用导包删除
* [新增] 增加Vo,QueryBo,AddBo,EditBo等视图,并调整controller,service的调用代码
* [新增] 增加CreateAndUpdateMetaObjectHandler,配合fill注解,实现创建和修改人的自动设置,减少重复代码
 2021-03-22 09:32:49 +08:00
疯狂的狮子li
7ae2df1390 update 使用hutool 重写 UserAgent 2021-03-15 17:49:30 +08:00
疯狂的狮子li
9b4b9e0c74 update 删除通用工具 改为使用hutool 2021-03-15 16:38:43 +08:00
疯狂的狮子li
2b8ab9cc4d update 使用hutool重写系统监控 2021-03-12 18:02:23 +08:00
疯狂的狮子li
57cfad671f update 使用hutool重写验证码生成 2021-03-12 16:52:55 +08:00
疯狂的狮子li
ac99fddfe6 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/package.json
	ruoyi-ui/src/views/index.vue
 2021-02-22 10:04:43 +08:00
RuoYi
0b5c7f4c96 若依 3.4.0 2021-02-22 09:40:28 +08:00
疯狂的狮子li
118c02144f 集成 Feign 接口化管理 Http请求(如短信,支付,推送等) 2021-01-27 15:15:03 +08:00
疯狂的狮子li
a4756004f8 删除过时配置 2021-01-27 13:10:05 +08:00
疯狂的狮子li
b5e8fa2b98 统一校验配置类名称 2021-01-21 09:31:37 +08:00
疯狂的狮子li
3362ce5f33 升级 MybatisPlus 3.4.2 2021-01-15 15:55:24 +08:00
疯狂的狮子li
f44ff8477f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	README.md
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
 2020-12-16 12:44:21 +08:00
RuoYi
6cf2a8edeb 升级SpringBoot到最新版本2.2.12 提升启动速度 2020-12-16 10:05:53 +08:00
疯狂的狮子li
7e476b941e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
	ruoyi-ui/package.json
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2020-12-14 09:27:27 +08:00
RuoYi
8988d0b4ab 若依 3.3.0 2020-12-14 09:02:10 +08:00
疯狂的狮子li
8d4f3561d5 修复mybatis-plus插件不生效bug 2020-12-11 18:45:57 +08:00
疯狂的狮子li
f56f57a236 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.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/SysRoleMenuMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/assets/styles/variables.scss
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/components/Screenfull/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
	ruoyi-ui/src/layout/index.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/store/modules/user.js
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi-ui/vue.config.js
 2020-12-11 14:27:54 +08:00
RuoYi
9e387dc447 去除用户手机邮箱部门必填验证 2020-12-11 13:26:14 +08:00
葛瑞士
cf7f51a633 解决多文件上传Log报错 2020-12-09 16:05:09 +08:00
疯狂的狮子li
5a62019cdd 更新 如何修改为Tomcat相关注释配置与说明 2020-12-08 16:21:30 +08:00
疯狂的狮子li
ff563c44e2 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/package.json
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
 2020-11-18 10:41:13 +08:00
RuoYi
8f145bba3a 若依 v3.2.1 2020-11-18 09:32:15 +08:00
疯狂的狮子li
03f0e3a137 为所有MP插件和配置增加官方链接 2020-11-16 14:12:14 +08:00
疯狂的狮子li
148d0361e0 增加字段填充配置 2020-11-16 14:03:55 +08:00
疯狂的狮子li
d626dd9e90 更新分页插件配置 增加主键插件配置 2020-11-16 13:57:26 +08:00
疯狂的狮子li
550f781d6f 重磅升级 Mybatis-Plus 插件 全部升级为最新插件 2020-11-13 11:17:33 +08:00
疯狂的狮子li
5d748a50ff 删除 MyBatisConfig.java 配置文件 2020-11-03 09:58:01 +08:00
RuoYi
082b19e33a mapperLocations配置支持分隔符 2020-11-02 17:34:52 +08:00
疯狂的狮子li
616fbc45ae 增加 校验框架配置与全局异常处理 2020-10-28 16:01:26 +08:00
疯狂的狮子li
cf44d1f213 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
	ruoyi-ui/src/views/system/dept/index.vue
 2020-10-28 11:54:52 +08:00
tucke
093ba5b389 误修改，回退 2020-10-26 09:53:58 +08:00
疯狂的狮子li
30d15afd33 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
	ruoyi-generator/src/main/resources/vm/sql/sql.vm
	ruoyi-ui/src/views/login.vue
	sql/ry_20201021.sql
 2020-10-23 17:41:02 +08:00