101 Commits (45fe77ce4af66d9d9b2198d851bc2ee28043bdf7)

Author SHA1 Message Date
疯狂的狮子li 99c4692a0d update 升级 luttuce 为 redisson 性能更强 工具更全 4 years ago
疯狂的狮子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
4 years ago
RuoYi af9cfb40a4 优化参数&字典缓存操作 4 years ago
疯狂的狮子li 380b4e5f3a 配置文件错误 4 years ago
疯狂的狮子li 2885ced2c7 add 增加验证码开关 4 years ago
朱杰 5dc873209e add 增加验证码开关 4 years ago
疯狂的狮子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
4 years ago
RuoYi 5e64a93d11 若依 3.5.0 4 years ago
疯狂的狮子li 3d25dfbebe update 增加请求前缀 4 years ago
疯狂的狮子li 7076deb2b6 update 请求响应对象 与 分页对象 结构修改 适配接口文档配置 4 years ago
疯狂的狮子li db18050b86 update 验证码生成更新为无符号整数计算 4 years ago
疯狂的狮子li c4eb641d9c fix 修复swagger开关无法控制关闭问题 4 years ago
疯狂的狮子li 2ebcffb22e update 配置统一提取为 properties 配置类 4 years ago
疯狂的狮子li 89fa1dff09 update admin 实时监控日志 改为保留一天 4 years ago
疯狂的狮子li ee064fa84c update swagger升级3.0.2 4 years ago
疯狂的狮子li b5064021e6 remove 移除ruoyi自带服务监控(Admin已全部包含) 4 years ago
疯狂的狮子li 488cce767f update 打包插件更新 2.3.10 4 years ago
疯狂的狮子li d459bb61dc update 打包插件更新 2.3.10 4 years ago
疯狂的狮子li e071b4315a 正式发布 v2.0.0 4 years ago
疯狂的狮子li 869e975ed1 update springboot 升级 2.3.10 依赖全面升级适配 4 years ago
疯狂的狮子li dab99405c5 update springboot 升级 2.3.10 依赖全面升级适配 4 years ago
疯狂的狮子li f01bb5966a update 使用 MP 分页工具 重构业务 4 years ago
疯狂的狮子li 9159e2ed22 fix vue与boot整合打包与admin页面路由冲突 4 years ago
疯狂的狮子li c33c3de43a 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/monitor/SysOperlogController.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-ui/src/assets/styles/element-ui.scss
	ruoyi-ui/src/views/index.vue
4 years ago
RuoYi 32f333a00e 删除操作日志记录日志 4 years ago
疯狂的狮子li dafdb43c84 update 配置转移到 yml 文件 统一管理 4 years ago
疯狂的狮子li 961c60dd1a update 更新banner 4 years ago
疯狂的狮子li 98624e66e5 正式发布 1.0.0 4 years ago
疯狂的狮子li e3ea16d020 update 修改MP验证策略 NOT_NULL -> NOT_EMPTY 4 years ago
疯狂的狮子li 5fcef39a2e add 集成 spring-boot-admin 全方位监控 4 years ago
疯狂的狮子li f8633f8c4e fix Feign 熔断不生效 bug 4 years ago
疯狂的狮子li f093da99ec Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-admin/src/main/resources/application-prod.yml
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/getters.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/store/modules/tagsView.js
	ruoyi-ui/src/views/monitor/druid/index.vue
4 years ago
RuoYi c8df1f5e1f 布局设置支持保存&重置配置 4 years ago
疯狂的狮子li 5d1e977442 个人信息添加手机&邮箱重复验证 4 years ago
疯狂的狮子li 8434511e39 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
4 years ago
RuoYi 67371a9028 个人信息添加手机&邮箱重复验证 4 years ago
wugh 1270b056d5 [bug修复] 解决调整验证码干扰的类型无效,只用circle的bug
[优化] 调整使用那种验证码的逻辑判断,使用switch优化,并减少重复代码
4 years ago
疯狂的狮子li 31ddb2aee3 update swagger 升级为 knife4j 4 years ago
疯狂的狮子li 63a582404b update swagger 模板修改为 swagger-bootstrap-ui 4 years ago
疯狂的狮子li 9b4b9e0c74 update 删除通用工具 改为使用hutool 4 years ago
疯狂的狮子li 46aa17db9c Merge remote-tracking branch 'origin/master' 4 years ago
疯狂的狮子li 71325b540a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-admin/src/main/resources/application-prod.yml
	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
4 years ago
RuoYi c2e9200626 数据监控默认账户密码防止越权访问 4 years ago
疯狂的狮子li 2509815a4f fix 验证码点击不刷新 bug 4 years ago
疯狂的狮子li 57cfad671f update 使用hutool重写验证码生成 4 years ago
hechieh 51d942f14c update ruoyi-admin/src/main/resources/application.yml. 4 years ago
疯狂的狮子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
4 years ago
RuoYi 0b5c7f4c96 若依 3.4.0 4 years ago
疯狂的狮子li 118c02144f 集成 Feign 接口化管理 Http请求(如短信,支付,推送等) 4 years ago
疯狂的狮子li 3362ce5f33 升级 MybatisPlus 3.4.2 4 years ago