szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,293 Commits 13 Branches 41 Tags 242 MiB
Commit Graph

886 Commits

Author SHA1 Message Date
YunaiV 071fafd687 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	README.md
#	pom.xml
#	yudao-dependencies/pom.xml
 2025-05-03 08:36:08 +08:00
YunaiV cd263022d4 fix：【全局】sqlserver 在分页的兼容性 2025-05-02 22:47:25 +08:00
YunaiV 00ed548ef5 【同步】jdk21 和 jdk8 的代码 2025-05-02 21:09:14 +08:00
YunaiV a557f0733f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApiImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImplTest.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/template/AppCouponTemplateRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
 2025-05-02 21:01:58 +08:00
YunaiV cce09044c1 reactor：【INFRA】文件上传 api，增加 directory 参数，去除 path 参数，并支持按照日期分目录、文件名不再使用 sha256 而是时间戳 2025-05-02 18:22:00 +08:00
YunaiV 74490ed03b reactor：使用 aj-captcha 官方 1.4.0 2025-04-30 15:09:06 +08:00
YunaiV e7ad73c278 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
 2025-04-30 15:02:49 +08:00
YunaiV d7656535a2 reactor：使用 aj-captcha 官方 1.4.0 2025-04-30 15:01:19 +08:00
YunaiV b047274306 【同步】jdk21 和 jdk8 的代码 2025-04-30 13:47:25 +08:00
YunaiV 622e71cd55 【同步】jdk21 和 jdk8 的代码 2025-04-30 13:47:00 +08:00
YunaiV 3c361527fc reactor：使用 justauth 官方 1.16.7（jdk8 特殊适配，等 1.4.1） 2025-04-30 09:42:33 +08:00
YunaiV 54941f1361 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareCreateReqVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareUpdateReqVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/record/IotOtaUpgradeRecordPageReqVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/task/IotOtaUpgradeTaskPageReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/AfterSaleServiceImpl.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientService.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java
 2025-04-30 00:11:24 +08:00
YunaiV 4cebe4af14 reactor：使用 justauth 官方 1.16.7 2025-04-30 00:05:54 +08:00
YunaiV abfbe1ea83 feat：【SYSTEM】通过系统配置管理来设置系统是否可注册用户 2025-04-26 17:22:42 +08:00
YunaiV 4a9e9961b0 fix：【SYSTEM】AdminUserServiceImplTest 的 testUpdateUserProfile_success 单测报错 2025-04-26 17:04:20 +08:00
YunaiV cca592a15b fix：【SYSTEM】修复创建租户管理员时，select/update 自动拼接user_id 问题 2025-04-26 16:51:41 +08:00
YunaiV 1b62f5a456 【功能优化】VBEN5.0 接入的 SQL 同步 2025-04-23 23:15:36 +08:00
YunaiV ab8cad2352 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialUserController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java
 2025-04-23 23:08:41 +08:00
YunaiV 11402e1412 【功能优化】SYSTEM：updateUserProfile 接口，增加 avatar 参数，逐步替代掉 updateUserAvatar 接口 2025-04-22 09:11:47 +08:00
YunaiV 1c854bb547 【代码评审】INFRA：代码生成在 vben5 的模版 2025-04-21 20:14:15 +08:00
YunaiV 436eb29d30 【功能新增】SYSTEM：返回人信息时，增加 username、email，用于 vben 界面的展示 2025-04-19 19:45:07 +08:00
YunaiV 4ed753d6b8 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
 2025-03-30 10:55:04 +08:00
YunaiV 9b11199665 【功能新增】system：增加租户的下拉选择，用于登录界面 2025-03-22 09:41:22 +08:00
YunaiV 77e64c217e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	pom.xml
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/http/HttpUtils.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceController.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/IotDeviceStatusUpdateReqVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductController.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/vo/IotThingModelSaveReqVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/IotThinkModelFunctionController.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/vo/IotThinkModelFunctionPageReqVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/emq/callback/EmqxCallback.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/emq/client/EmqxClient.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/emq/start/EmqxStart.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductService.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductServiceImpl.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionService.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionServiceImpl.java
#	yudao-server/src/main/resources/application-local.yaml
 2025-03-17 13:16:59 +08:00
YunaiV 7c84ab9919 【代码评审】IoT：整体实现 2025-03-17 13:14:54 +08:00
YunaiV eb7269083a Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-03-17 08:54:10 +08:00
YunaiV ba1e4f36b6 【同步】jdk21 和 jdk8 的代码 2025-03-16 17:27:05 +08:00
YunaiV 7609c74c8b Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmHttpRequestUtils.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
 2025-03-16 17:22:39 +08:00
YunaiV 2dc8071faa 【功能优化】全局：增加 selectFirstOne 方法，解决容易出现并发场景下的查询 2025-03-16 16:31:36 +08:00
YunaiV 36165e72fc Merge branch 'feature/bpm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-03-16 16:19:10 +08:00
YunaiV 2ddf9d05e6 【缺陷修复】BPM：使用 DataPermissionUtils 替代 DataPermission，避免 this 调用无法生效的问题 2025-03-16 15:24:56 +08:00
YunaiV 803da9ed9e 【功能优化】System：componentName 重复校验，避免 vue3 router 初始化有问题 2025-03-15 21:37:18 +08:00
YunaiV a44a45a2cb Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/trigger/BpmHttpRequestTrigger.java
 2025-02-09 11:36:21 +08:00
YunaiV bb11fdd3fa Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot 
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/IotThinkModelFunctionController.http
 2025-02-09 07:23:17 +08:00
mcwindy 4e43958fe3 fix typo: adminTenentId -> adminTenantId, appTenentId -> appTenantId 2025-02-05 11:42:59 +08:00
YunaiV 7168e60fdd 【功能新增】IoT：实现 IotRuleSceneDataBridgeAction 的 http 部分的逻辑 2025-02-03 18:33:43 +08:00
YunaiV 38c24bddb6 【同步】jdk21 和 jdk8 的代码 2025-01-25 10:13:41 +08:00
YunaiV 3682bcda3e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
 2025-01-25 10:10:19 +08:00
YunaiV 06634a4265 【单测修复】system：AdminAuthServiceImplTest 2025-01-25 10:09:39 +08:00
YunaiV aab61f7963 【代码评审】Bpm：更多设置-摘要设置 2025-01-24 21:03:55 +08:00
YunaiV 0911d42e49 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnum.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumCollectionValidator.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumValidator.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageUserController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
 2025-01-24 20:56:26 +08:00
YunaiV 295fad7d97 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-01-24 20:17:17 +08:00
puhui999 d83b7cd5b9 【代码优化】InEnum 不必须指定 int 类型，通过泛型指定 2025-01-24 17:31:41 +08:00
Dincat dcf55c3533 !1196 修复角色更新时，记录的操作日志将更新前的数据记录为空的问题 
* 修复角色更新时，记录的操作日志将更新前的数据记录为空的问题
 2025-01-23 12:05:09 +00:00
壁虎 92a4831644 正则表达式补上次数规则 2025-01-05 18:30:44 +08:00
YunaiV f8fc3101c6 【代码优化】支持通过短信重置后台密码 2025-01-04 11:41:31 +08:00
杨宇庆 8d22ed8bea !1156 feat: 支持短信重置后台密码 
* feat: 支持短信重置后台密码
* 重构管理后台验证码的验证流程
 2025-01-04 03:39:33 +00:00
YunaiV 182511b65b !162 移除用户账号正则检验中长度限制 2025-01-04 08:39:39 +08:00
YunaiV 50536f1af0 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
 2024-12-19 21:27:52 +08:00
xiaoxin 4afdb76ac1 imp: 租户套餐重名校验 
(cherry picked from commit fe404ec233)
 2024-12-11 09:18:29 +08:00