Commit Graph

390 Commits (1e22d7ce7040aab296f765de8f0b8805e229154d)

Author SHA1 Message Date
yueye 1e22d7ce70 update 修改 代码生成 适配所有新功能
疯狂的狮子li 4827f9217b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java
	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
	ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/router/index.js
RuoYi 0e13296752 代码生成同步保留必填/类型选项
RuoYi dbca691746 优化代码
若依 e66f65b257
Result type not match for select id="selectMenuListByRoleId"
Merge pull request  from runphp/N/A
若依 5f60a37d8a
Condition 'DEFAULT_MAX_SIZE != -1' is always 'true'
Merge pull request  from runphp/N/A
若依 d30e136c1d
变量filename赋值后未使用
Merge pull request  from runphp/N/A
runphp 4191f5ca5c
Result type not match for select id="selectMenuListByRoleId"
疯狂的狮子li 1b7cde73f3 update 返回体 统一
runphp a00482d5d7
Condition 'DEFAULT_MAX_SIZE != -1' is always 'true'
runphp 2610869e9c
变量filename赋值后未使用
疯狂的狮子li bf019b405e add 增加 数据脱敏 功能
疯狂的狮子li b12b98ab1c update 使用 satoken 自带的 BCrypt 工具 替换 Security 加密工具 减少依赖
caohong 9cb15ec2ae 方法结果没有返回值时,去掉方法注释 @Return
疯狂的狮子li ef3b77f8a8 update sa-token 1.28.0 => 1.29.0 解决dubbo启动报错问题
疯狂的狮子li d6a93184c4 发布 0.6.0 完成 分布式存储 支持 Minio、七牛、阿里、腾讯
疯狂的狮子li 16b1f02705 fix 修复 接口文档 上传文件问题
疯狂的狮子li 69e699946f add 增加ruoyi-resource资源模块 移除ruoyi-file模块 调整项目结构
疯狂的狮子li 5870045c35 fix 修复xml参数未对应问题
疯狂的狮子li e35767b9cf fix 修复xml参数未对应问题
疯狂的狮子li bf151c5db2 update 补全 接口文档注解 调整返回类型为 R
疯狂的狮子li 5fb7886928 Merge remote-tracking branch 'ruoyi-cloud/master'
# Conflicts:
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
疯狂的狮子li af983c4f2f 发布 0.5.0 完成 satoken 与 mybatis-plus 整合
疯狂的狮子Li db70abf9f0 合并 新功能/satoken 分支
疯狂的狮子li 268e141d5e update 修改用户注册报未登录警告
RuoYi 1a1d6562d2 用户访问控制时校验数据权限,防止越权
疯狂的狮子li 0e9ec77392 add 整合 mybatis-plus 重写所有业务
疯狂的狮子li d3788a4d51 update 删除无用依赖
疯狂的狮子li 4a47063b57 update 删除无用测试配置
疯狂的狮子li 65fd3dcef6 update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题
RuoYi bd30f3d53a 若依 3.4.0
疯狂的狮子li 726116e8f6 fix vue3下点击编辑,取消修改报错问题
疯狂的狮子li b43a720a6d 发布 0.4.0 升级
疯狂的狮子li 075bfb040d Merge remote-tracking branch 'ruoyi-cloud/master'
# Conflicts:
#	pom.xml
#	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java
疯狂的狮子li 07ba70ec8c add 集成 EasyExcel 框架 完成业务功能切换
update 优化 Validation 校验框架功能
update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换
疯狂的狮子li 4bc137d113 fix 修复 升级带来的兼容性问题
RuoYi 79b1717f9a vue3下点击编辑,取消修改报错问题
疯狂的狮子li 0c2efd36cf add 整合 seata 1.4.2 对接 nacos 注册中心 配置中心
疯狂的狮子li 4b5d0fac02 fix 修复 dubbo 传输文件问题 临时更改 后续对接oss
疯狂的狮子li c28d9c208e Merge remote-tracking branch 'ruoyi-cloud/master'
# Conflicts:
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
#	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
#	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
#	sql/ry_config_20220114.sql
疯狂的狮子li 384a52e3e9 fix 修复 dubbo 自动配置优先级高于 nacos 导致配置不生效 循环依赖报错
RuoYi d0a19e5b6f 定时任务屏蔽违规的字符
若依 14db619b20
优化加载字典缓存数据
Merge pull request  from runphp/N/A
疯狂的狮子li 1de6f31b52 update 适配升级 springcloud 2021 springboot2.6
yueye ac4005c9dd add 新增 ruoyi-doc 模块 集成 Knife4j
疯狂的狮子li 94c732c439 add 自定义负载均衡模块 用于多团队开发
runphp 4a60f91994
优化加载字典缓存数据
runphp d601b5781e
字段更新未同步
RuoYi 8223a5dcc4 Vue3前端代码生成模板同步到最新
疯狂的狮子li bccfe2c0b2 update 抽取公共模块 ruoyi-common-dict 实现字典多服务调用