721 Commits

Author SHA1 Message Date
疯狂的狮子li
c57ab693e4 update 更新 README.md 与 项目首页 关于接口文档介绍 2022-07-11 16:34:31 +08:00
疯狂的狮子li
af54608f62 update 优化 移除自带 swagger-ui 界面包 建议使用外置工具 2022-07-11 16:29:16 +08:00
疯狂的狮子li
a46a7458e1 Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
#	README.md
#	pom.xml
#	ruoyi-admin/pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
#	ruoyi-admin/src/main/resources/application.yml
#	ruoyi-common/pom.xml
#	ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
#	ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java
#	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
#	ruoyi-framework/pom.xml
#	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
#	ruoyi-generator/pom.xml
#	ruoyi-job/pom.xml
#	ruoyi-system/pom.xml
#	ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java
#	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
#	ruoyi-ui/src/views/monitor/cache/list.vue
#	ruoyi-ui/src/views/system/dict/data.vue
#	ruoyi-ui/vue.config.js
#	sql/ry_20220625.sql
2022-07-06 15:46:19 +08:00
疯狂的狮子li
c33aa5c969 add 同步ruoyi 新增缓存列表菜单功能 2022-07-06 15:42:45 +08:00
疯狂的狮子li
7545323eba 😘 发布 4.2.0 2022-06-28 09:39:34 +08:00
RuoYi
6f48fc3c58 若依 3.8.3 2022-06-27 08:23:47 +08:00
zbk
2ae41df23b
修复缓存列表页面变量名错误导致错误 2022-06-26 12:51:55 +00:00
RuoYi
8c956d681b 默认不启用压缩文件缓存防止node_modules过大 2022-06-26 08:53:56 +08:00
RuoYi
89eb44afbc 优化字典数据回显样式下拉框显示值 2022-06-26 08:53:15 +08:00
RuoYi
9d7e32fb07 新增缓存列表菜单功能 2022-06-25 09:39:39 +08:00
疯狂的狮子li
63eb145772 update 同步 ruoyi 2022-06-15 18:18:51 +08:00
RuoYi
e8fbf5fdbd reset babel 2022-06-14 21:26:14 +08:00
RuoYi
eab1b450d5 优化代码 2022-06-13 21:43:11 +08:00
疯狂的狮子li
426aeb0a7f 发布 4.2.0-beta1 公测版 2022-06-07 11:04:43 +08:00
疯狂的狮子Li
5ced7e05f5 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	README.md
	pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/views/index.vue
2022-05-28 22:30:06 +08:00
mingliangyang
52e1717014 增加对空字符串参数的过滤 2022-05-27 12:06:27 +08:00
RuoYi
8a2e3d13f2 表单构建按钮不显示正则校验 2022-05-27 09:18:26 +08:00
RuoYi
63d471ec94 修复字典导出序列化报错问题 2022-05-27 08:37:14 +08:00
RuoYi
77fffda10e 添加新群号:139821253 2022-05-23 09:38:52 +08:00
疯狂的狮子li
970561b956 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/src/assets/styles/element-variables.scss
	ruoyi-ui/src/views/monitor/server/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/user/index.vue
2022-05-16 09:38:03 +08:00
RuoYi
9c3b53b701 用户管理左侧树型组件增加选中高亮保持 2022-05-13 15:02:16 +08:00
疯狂的狮子li
6a69be88c5 update 调整 图片预览组件 去除无用根目录拼接 2022-05-13 09:41:54 +08:00
疯狂的狮子li
af6a08398e update 优化 文件与图片上传组件 使用id存储回显 2022-05-12 10:55:44 +08:00
RuoYi
5693bbe1f5 升级oshi到最新版本6.1.6 2022-05-11 09:58:25 +08:00
疯狂的狮子Li
e4267c5c56 update 优化 弹窗点击遮罩层 默认不关闭 可在 main.js 修改 2022-05-10 23:45:33 +08:00
疯狂的狮子Li
99dfd42372 update 优化 上传组件 部分用户存储url串 导致无法回显问题 2022-05-10 23:35:54 +08:00
疯狂的狮子Li
940b996e2d !175 [重大改动] 基于S3协议重新实现 OSS模块 支持自定义域名
* [重大改动] 基于S3协议重新实现 OSS模块 支持自定义域名
2022-05-10 01:40:40 +00:00
RuoYi
0055f479cb 修复字典数据显示不全问题(I55MR3) 2022-05-09 20:27:09 +08:00
疯狂的狮子li
71e392c1f9 add 增加 获取短信验证码接口 2022-05-06 18:08:16 +08:00
RuoYi
cbe405f6ea ui code format 2022-05-01 20:22:25 +08:00
疯狂的狮子li
aac6e0521a 发布 4.1.0 2022-04-24 13:28:52 +08:00
疯狂的狮子li
7e25a80c5b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
	ruoyi-ui/package.json
2022-04-24 11:46:25 +08:00
疯狂的狮子li
e6e2f48f7e update 更新 readme 技术栈介绍 2022-04-21 10:40:37 +08:00
疯狂的狮子li
e316f613d0 update 首页 更新日志 指向官网 2022-04-21 10:26:18 +08:00
疯狂的狮子Li
3dfb116fdd update 优化文件上传、图片上传组件 文件列表展示文件原名便于后续处理, 完善组件删除功能 2022-04-18 19:55:23 +08:00
RuoYi
68a616d7c7 升级element-ui到最新版本2.15.8 2022-04-15 09:32:21 +08:00
疯狂的狮子Li
7984fdfd20 update 演示树表 增加 展开/折叠 功能 2022-04-11 12:09:42 +08:00
疯狂的狮子Li
d637f03067 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	README.md
	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/core/controller/BaseController.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-framework/pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-generator/pom.xml
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-job/pom.xml
	ruoyi-system/pom.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/README.md
	ruoyi-ui/bin/package.bat
	ruoyi-ui/package.json
	ruoyi-ui/src/views/index.vue
2022-04-11 11:58:44 +08:00
RuoYi
de5ae4a05e 添加页签openPage支持传递参数 2022-04-08 15:42:10 +08:00
RuoYi
bac3b3a0dc 降级jsencrypt版本兼容IE浏览器 2022-04-02 10:15:25 +08:00
RuoYi
a854e0ca8e 若依 3.8.2 2022-04-01 08:30:48 +08:00
RuoYi
b2c3f45141 update registry source 2022-03-30 10:39:09 +08:00
RuoYi
d5f9b5b74a topNav自定义隐藏侧边栏路由 2022-03-30 10:38:51 +08:00
疯狂的狮子Li
a6f30412ad update 修改角色适配 采用 get set 转换数据类型 2022-03-25 15:22:01 +08:00
疯狂的狮子Li
b624648115 fix 修复增加应用路径路由不生效问题 2022-03-25 15:21:27 +08:00
疯狂的狮子Li
9d1d74c022 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	README.md
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-ui/src/layout/components/Sidebar/Item.vue
	ruoyi-ui/src/layout/index.vue
	ruoyi-ui/src/store/modules/app.js
	ruoyi-ui/src/store/modules/user.js
	ruoyi-ui/src/views/index.vue
2022-03-25 11:17:51 +08:00
疯狂的狮子li
1dbcd4ee6e update 代码生成 支持界面动态配置切换数据源(找不到默认查 primary 数据源) 2022-03-23 15:14:16 +08:00
RuoYi
eaa12de740 添加新群号:167385320 2022-03-22 16:47:56 +08:00
疯狂的狮子li
d31ed1f2e1 update 修正错误提交 2022-03-17 19:53:42 +08:00
疯狂的狮子li
cf67d606ae update 初步适配 postgres (代码生成两次导入有问题) 2022-03-17 19:52:40 +08:00