419 Commits

Author SHA1 Message Date
疯狂的狮子li
7545323eba 😘 发布 4.2.0 2022-06-28 09:39:34 +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
RuoYi
8a2e3d13f2 表单构建按钮不显示正则校验 2022-05-27 09:18:26 +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
RuoYi
5693bbe1f5 升级oshi到最新版本6.1.6 2022-05-11 09:58:25 +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
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
e6e2f48f7e update 更新 readme 技术栈介绍 2022-04-21 10:40:37 +08:00
疯狂的狮子li
e316f613d0 update 首页 更新日志 指向官网 2022-04-21 10:26:18 +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
a854e0ca8e 若依 3.8.2 2022-04-01 08:30:48 +08:00
疯狂的狮子Li
a6f30412ad update 修改角色适配 采用 get set 转换数据类型 2022-03-25 15:22:01 +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
疯狂的狮子li
49ac180329 update 优化 SysRole 部分字段类型 防止数据库类型映射异常 2022-03-16 12:59:04 +08:00
疯狂的狮子li
cd312f1348 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/index.vue
	ruoyi-ui/src/store/modules/app.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/job/log.vue
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/online/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/importTable.vue
2022-03-15 10:20:53 +08:00
疯狂的狮子li
2285a94958 update 更新首页关于 权限认证框架 框架说明 改为 Sa-Token 2022-03-14 14:06:43 +08:00
疯狂的狮子li
333a38978e update 重命名 菜单字段 query -> query_param 解决系统关键字问题 2022-03-11 13:29:04 +08:00
疯狂的狮子Li
604c671d41 update 临时处理 关于数据源的切换(后续在页面做个输入框 有兴趣的可以pr) 2022-03-06 11:22:27 +08:00
RuoYi
6130bebbb3 开启TopNav没有子菜单情况隐藏侧边栏 2022-03-06 09:03:44 +08:00
SG
07dfef48be
修改提示 2022-03-05 12:28:44 +00:00
RuoYi
cb8f5de5af 修复表单清除元素位置未垂直居中问题(I4V27B) 2022-03-04 19:24:28 +08:00
疯狂的狮子li
42df37bb21 发布 4.0.1 大升级 4.X 之后第一个修复版本 2022-03-01 10:08:09 +08:00
疯狂的狮子li
b9afd55856 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.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/src/components/FileUpload/index.vue
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/views/monitor/server/index.vue
	ruoyi-ui/src/views/system/user/index.vue
2022-02-28 12:16:18 +08:00
fuzui
96edba7eec fix: 服务监控中运行参数显示条件错误 2022-02-26 03:20:50 +08:00
疯狂的狮子li
6751b97db9 fix 修复一些小问题 2022-02-25 18:34:37 +08:00
RuoYi
927b05713a 组件fileUpload支持多文件同时选择上传 2022-02-25 11:51:29 +08:00
疯狂的狮子li
568e2a9337 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/src/components/Pagination/index.vue
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/utils/request.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/server/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
2022-02-24 15:30:20 +08:00
RuoYi
bb65cd1976 代码生成子表支持日期/字典配置 2022-02-24 09:28:51 +08:00
“lumingsyc”
9aaa9ce8aa 优化部门管理页面email字段的表单验证多余的单引号 2022-02-23 20:00:47 +08:00
RuoYi
4d8bd8805b 优化个人中心页面email字段的表单验证多余的单引号 2022-02-23 16:54:59 +08:00
疯狂的狮子li
075f7fc19e update 增加 用户注册 用户类型默认值 2022-02-21 10:53:59 +08:00
RuoYi
54c6c4e547 服务监控新增运行参数信息显示 2022-02-20 16:06:33 +08:00
疯狂的狮子li
587fb27484 add 增加页面更新说明 2022-02-18 10:38:03 +08:00
疯狂的狮子li
7f305962f2 发布 4.0.0 2022-02-18 10:31:13 +08:00
疯狂的狮子li
ee2f74dc5e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	.gitignore
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.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-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.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/ISysLogininforService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.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/SysDictDataServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.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/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/views/tool/build/index.vue
2022-02-14 14:27:13 +08:00
RuoYi
b7b4364db2 代码生成编辑修改打开新页签 2022-02-12 13:14:09 +08:00
疯狂的狮子li
d99dd4b875 update 调整oss预览开关 使用前端直接调用更改配置参数 2022-02-09 14:52:33 +08:00
稚屿
a29201a248 修正单词拼写错误 2022-02-09 08:46:54 +08:00
疯狂的狮子li
911867d5a5 update 数据库更改 对接多用户体系 2022-01-17 17:09:27 +08:00
疯狂的狮子li
8052d75957 Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
#	ruoyi-admin/src/main/resources/application.yml
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
#	ruoyi-ui/src/views/login.vue
#	ruoyi-ui/src/views/register.vue
2022-01-17 15:48:09 +08:00