Commit Graph

1816 Commits

Author SHA1 Message Date
e309502115 抽数服务 2024-07-08 23:41:23 +08:00
root
b7a85ad872 Merge pull request '抽数模块和xxl-job整合' (#2) from xinwei into master
Reviewed-on: http://120.46.37.243:3000/lundu/ludu-cloud/pulls/2
2024-07-08 15:37:33 +00:00
d0c46176de 抽数模块和整合xxl-job 2024-07-08 20:11:39 +08:00
783bd5c892 xxl-job integration 2024-07-08 09:21:56 +08:00
3f4c483cd8 xxl-job integration 2024-07-05 17:11:08 +08:00
cd834112e2 ticket finish and sampling init 2024-07-04 11:50:11 +08:00
Hokin
7ffd9a461f init lundu bigdata 2024-06-26 11:58:17 +08:00
YunaiV
0ba330f3fe Merge branch 'master' of https://github.com/YunaiV/yudao-cloud 2024-06-04 21:44:23 +08:00
YunaiV
bad90e3471 Merge remote-tracking branch 'origin/master' 2024-06-04 21:44:02 +08:00
YunaiV
5c610b2df5 同步 HTTP 请求签名 2024-06-04 21:43:56 +08:00
YunaiV
0ee01346d0 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-security/pom.xml
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java
2024-06-04 21:34:48 +08:00
YunaiV
d1e13f4b82 【修复】docker build yudao-module-pay-biz image fail 2024-06-04 21:12:40 +08:00
芋道源码
bbf7231bf6
Merge pull request #157 from testwill/Dockerfile
fix: docker build yudao-module-pay-biz image fail
2024-06-04 21:10:54 +08:00
芋道源码
61f82468c4
Merge pull request #159 from dengyumin/patch-2
fix: Remove duplicate dependencies in pom.xml
2024-06-04 21:10:18 +08:00
YunaiV
873fbf596c 【修复】CRM:CrmBusinessStatusDO 缺少 BaseDO 2024-06-04 19:38:53 +08:00
YunaiV
025857c9f2 【同步】对齐 boot 和 cloud 的逻辑 2024-06-04 19:23:20 +08:00
小民同学
ab642c615e
fix: Remove duplicate dependencies in pom.xml 2024-05-31 16:46:59 +08:00
guoguangwu
f9be4f7448 fix: docker build yudao-module-pay-biz image fail
Signed-off-by: guoguangwu <guoguangwug@gmail.com>
2024-05-30 16:27:45 +08:00
芋道源码
1889822deb
!114 更新角色时,记录修改内容
Merge pull request !114 from syubun/master
2024-05-11 15:53:22 +00:00
芋道源码
cab5ce9856
!113 修正ERP业务类型枚举中的销售出库
Merge pull request !113 from 咖啡不苦/fixbug
2024-05-11 15:52:35 +00:00
芋道源码
972e795d6b
!116 【System模块】短信验证码前置补零对其endCode长度
Merge pull request !116 from aqiangaqiang/master
2024-05-11 15:46:44 +00:00
aqiangaqiang
b4151b62eb
【System模块】短信验证码前置补零对其endCode长度
Signed-off-by: aqiangaqiang <11317238+aqiangaqiang@user.noreply.gitee.com>
2024-05-10 00:59:31 +00:00
syubun
fbc6ae07e4 更新角色时,记录修改内容 2024-05-07 11:09:56 +08:00
刘华
06d322f9f7 修正ERP业务类型枚举-销售出库 2024-05-05 12:06:56 +08:00
YunaiV
4ca583cbe8 【发版】全局:2.1.0 发版 2024-05-04 09:52:40 +08:00
YunaiV
2bd9fd97bb Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
2024-05-04 09:48:50 +08:00
YunaiV
328445f7c0 【发版】全局:2.1.0 发版 2024-05-04 09:47:03 +08:00
YunaiV
1e106844e8 【同步】boot 和 cloud 版本 2024-05-04 09:45:51 +08:00
YunaiV
6fc6fb1bc8 【优化】GlobalExceptionHandler 新增 IGNORE_ERROR_MESSAGES,用于忽略“无效的刷新令牌”等非关键提示 2024-05-03 09:53:00 +08:00
YunaiV
1e23316fb1 【修复】MySQL jdbc 连接 5.7 示例不正确 2024-05-03 09:11:22 +08:00
YunaiV
d1ed445298 【优化】将 jdk17 的 List.of 替换成 ListUtil.of,提供更好的 jdk8 兼容性 2024-05-01 12:45:45 +08:00
YunaiV
86e5149ac6 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPortraitServiceImpl.java
2024-05-01 12:45:15 +08:00
YunaiV
61d8836c2d 【优化】将 jdk17 的 List.of 替换成 ListUtil.of,提供更好的 jdk8 兼容性 2024-05-01 12:44:48 +08:00
YunaiV
d10e5fc63f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-05-01 12:14:42 +08:00
YunaiV
bed86d84d4 【优化】README,将版本说明提前 2024-05-01 12:14:13 +08:00
YunaiV
74bc3b3fd2 【同步】对齐 boot 和 cloud 的逻辑 2024-05-01 09:36:34 +08:00
YunaiV
9d8f924fec Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/portrait/CrmStatisticsPortraitReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuRespVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuSaveVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
2024-05-01 09:32:36 +08:00
YunaiV
6d40550bbf 【同步】对齐 boot 和 cloud 的逻辑 2024-05-01 09:30:22 +08:00
YunaiV
78e151d4ee 【优化】降低 JDK 21 最低到 17 版本 2024-05-01 01:44:07 +08:00
YunaiV
ef63cb37b7 【优化】README,将版本说明提前 2024-05-01 01:37:25 +08:00
YunaiV
a015b1e539 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud 2024-05-01 00:38:22 +08:00
YunaiV
f7b0618216 【修复】短信模板中关于 type 字段的描述 2024-04-29 20:51:46 +08:00
YunaiV
fe11de8e3c 【增强】一键改包:支持 site、org 等包 2024-04-29 12:51:23 +08:00
YunaiV
b1c11f8dd8 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
2024-04-29 12:50:00 +08:00
YunaiV
b500bb7da1 【增强】一键改包:支持 site、org 等包 2024-04-29 12:48:46 +08:00
YunaiV
ed04f0ce5a 【修复】RPC 调用时,不再进行 tenant-id 校验,内部使用,无需校验 2024-04-29 09:46:30 +08:00
YunaiV
0f802a6b52 【修复】部分菜单,确实 menu.sql 配置的权限标识 2024-04-24 20:59:27 +08:00
YunaiV
59dd0a3f5c Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/CrmFollowUpRecordController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillConfigController.java
2024-04-24 20:55:04 +08:00
YunaiV
e618f833fd 【修复】部分菜单,确实 menu.sql 配置的权限标识 2024-04-24 20:11:19 +08:00
YunaiV
59178eca49 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java
2024-04-24 09:45:10 +08:00