566 Commits (fcef0f7f504829f3ff4463735f21111329379085)

Author SHA1 Message Date
YunaiV b77b6322e1 🔧 简化 mail 模块的 VO 2 years ago
YunaiV 4225db217d 🔧 简化 loginLog 和 operateLog 模块的 VO 2 years ago
YunaiV 8eb04d6805 🔧 简化 errorCode 模块的 VO 2 years ago
YunaiV c493397653 🔧 简化 dictType 和 dictData 模块的 VO 2 years ago
YunaiV a9c8f6c8e9 🔧 简化 post 和 dept 模块的 VO 2 years ago
YunaiV 455f8e49fb crm:code review 联系人 2 years ago
zyna 3f3899f5d3 crm联系人review修改,新增地区字段 2 years ago
YunaiV a1e6348a37 移除 weixin starter 组件,直接改成 wxjava starter 2 years ago
芋道源码 ee25b8aedb
!752 使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖,减少 starter
Merge pull request !752 from 芋道源码/feature/justauth-op
2 years ago
YunaiV 0bf24c6d16 使用 spring-boot-starter-justauth 替代原本 social starter 2 years ago
YunaiV 6b3a54c8df !69fix(system): 修复更新账号时岗位为空时发生的空指针异常 2 years ago
YunaiV 0233b092b8 websocket:重新封装 websocket 组件,支持 sender 广播 2 years ago
YunaiV 6a61db8508 security: query string 支持传递 token 参数,解决 ws token 认证 2 years ago
YunaiV 7506a1b012 sms:移除 sendCode、sendMsg 字段 2 years ago
YunaiV 6f135303d8 sms:移除 SmsCodeMapping + SmsCommonResult,简化短信的封装 2 years ago
YunaiV 822e441765 使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖,减少 starter 2 years ago
YunaiV 716b081464 crm:合并最新的数据权限 2 years ago
YunaiV 8c9873c425 Merge branch 'feature/crm' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/crm
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contact/ContactConvert.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/ContactServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dept/PostConvert.java
2 years ago
YunaiV 8c9c91f0ca crm:code review 配置管理 2 years ago
YunaiV 90f135ad95 Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm
# Conflicts:
#	sql/mysql/crm.sql
2 years ago
zhijiantianya@gmail.com 067d53ac48 代码生成器:增加单元测试,🛫 2 years ago
YunaiV 01a55b93c2 代码生成:增加更全的 tree 场景下的新增/修改校验 2 years ago
YunaiV f5ea270be3 部门:优化父部门的校验逻辑,为代码生成做个铺垫?! 2 years ago
YunaiV 5e6e02e4f4 vo 简化:使用 BeanUtils 替代 mapstruct 转换 2 years ago
YunaiV ddb5bce0a2 vo 简化:post 重构 2 years ago
Wanwan 5b295d56b6 feat: CRM 客户限制 2 years ago
puhui999 668fae9398 CRM-数据权限:完善 code review 提到的问题 2 years ago
YunaiV e8bc284dd0 优化:默认只引入 mysql driver,减少打包大小 2 years ago
YunaiV feba904fd8 多租户:登录界面,根据 host 域名获取对应的租户编号 2 years ago
YunaiV c162b39e1e 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2 years ago
YunaiV 1eff9822ce 同步最新 master 代码 2 years ago
YunaiV 787de1be94 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	sql/mysql/mall.sql
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java
2 years ago
YunaiV 87bc3f510c 优化:社交登录、用户的管理 2 years ago
YunaiV e9317bf293 Merge branch 'feature/mall_product_tmp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.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/SocialUserServiceImplTest.java
2 years ago
YunaiV d048daf7d6 mq 重构:默认的 mq 实现,采用 event,减少对 redis、rocketmq 等消息队列的依赖 2 years ago
puhui999 8552e86d8a 完善三方登录 2 years ago
puhui999 12ae5bf128 新增社交用户 RUD 2 years ago
puhui999 738fcef453 新增社交客户端 CRUD 2 years ago
puhui999 eb4b719b4b 添加社交客户端测试 sql 2 years ago
YunaiV 52e735f360 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java
2 years ago
YunaiV dd2f5ba2c3 统一 boot 和 cloud 代码 2 years ago
puhui999 6723cae781 营销活动:完善 review 提到的问题 2 years ago
YunaiV 728308cbc0 member:优化部分变量的命名 2 years ago
YunaiV 94c2ad5d1d 修复报错的单元测试 2 years ago
YunaiV d0caa77f80 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV ec27a1bae5 修复报错的单元测试 2 years ago
YunaiV 52ebcaaad7 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/59/ 2 years ago
YunaiV 14f006088a code review:敏感词 2 years ago
芋道源码 630890d0ac
!665 修复敏感词单字符检验失败问题
Merge pull request !665 from 摸鱼散人/master
2 years ago
YunaiV 979b484d7f saas:支持社交应用的多租户配置(wx 小程序) 2 years ago
YunaiV 6f757e5297 saas:支持社交应用的多租户配置(mp) 2 years ago
YunaiV d256275099 saas:支持社交应用的多租户配置 2 years ago
zhijiantianya@gmail.com 0af205ede1 Merge remote-tracking branch 'origin/master' 2 years ago
zhijiantianya@gmail.com c629fd2208 code review:工作流逻辑 2 years ago
daiwencheng 944e3862a5 修复敏感词检验问题
1.修复排序,优先使用较短的前缀失效问题
2.修复敏感词为单个字符校验失败问题
2 years ago
芋道源码 8fd814e0c1
!636 测试站内信接口增加Member 用户类型的支持。
Merge pull request !636 from 风狗/feature/mall_product
2 years ago
YunaiV 3110e427fb 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files 2 years ago
puhui999 c71bdd158a 拼团活动:完善 review 提到的问题 2 years ago
YunaiV fdb10aeced trade:优化运费模版的实现 3 years ago
YunaiV 5913ee0706 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
#	yudao-server/src/main/resources/application-local.yaml
3 years ago
绮梦 5a5f92d2e9 feat: 测试站内信接口增加Member 用户类型的支持。 3 years ago
YunaiV e384b810bf code review:分销逻辑 3 years ago
YunaiV 9b7c757942 1.8.2 版本发布 3 years ago
owen e9fd377772 分销:Review代码修改 3 years ago
YunaiV 421bb7d154 code review:分销逻辑 3 years ago
owen bf0e7d2c77 System:字典数据列表过滤已关闭的数据 3 years ago
owen 637ae8ce1d 分佣: 提现记录 3 years ago
owen 594e4d5fee system: uniapp增加字典数据查询接口 3 years ago
YunaiV 9630f236f8 Merge branch 'feature/auth' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
 Conflicts:
	README.md
3 years ago
YunaiV b81ebe6f19 修复 common 下的 test 引入不正确的问题,减少包依赖大小 3 years ago
YunaiV 222daa5366 pay 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效 3 years ago
YunaiV a51579a77d fileConfig 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效 3 years ago
YunaiV 48fd4972da sms 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效 3 years ago
YunaiV ebb3a04251 优化多租户 Job 的实现,采用 AOP 替代 BeanPostProcessor,提升启动速度 3 years ago
xingyu 437131cc7a Merge remote-tracking branch 'origin/master' into feature/auth
# Conflicts:
#	yudao-dependencies/pom.xml
3 years ago
YunaiV 8b50cd9661 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
 Conflicts:
	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
3 years ago
xingyu 5e9e41c045 fix: required 过期 3 years ago
YunaiV 40e1a879e3 登录:社交登录时,额外返回 openid 3 years ago
YunaiV 65d7b30011 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 3 years ago
dhb52 d7488e70b0 使用下划线分割ErrorCodeConstants的ErrorCode 3 years ago
lemoncc 2fd201c7fa
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum 3 years ago
YunaiV 4809e9b462 修复单元测试报错的问题 3 years ago
YunaiV 02bc9d28de 解决 MapStruct 的时区问题 3 years ago
shizhong eb4434ecbc 解决MapStruct的时区问题 3 years ago
YunaiV bfc72a9802 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/config/MemberPointConfigBaseVO.java
3 years ago
YunaiV 95254341a1 1. 会员用户的找回密码 API 的优化 3 years ago
YunaiV 5d4a7ffa3b 1. 会员用户的修改密码 API 的优化 3 years ago
YunaiV 87e5b2bed1 1. 会员用户的修改手机 API 的优化 3 years ago
wanglei 6446b753d3 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 3 years ago
YunaiV ee53d2ad51 修复租户套餐修改时,查询角色报错问题 3 years ago
YunaiV b5515799dc !557 修改创建菜单时permission为空,缓存KEY 为空的BUG 3 years ago
杜继强 14c7465bc6 修改创建菜单时permission为空,缓存KEY 为空的BUG ,判断 reqVO.permission 为空时,不做 @CacheEvict 的操作 3 years ago
YunaiV 1f3794db77 fix: 修复MailAccountService 更新/删除缓存未清空 3 years ago
YunaiV c4755c49b1 fix: 修复MailAccountService 更新/删除缓存未清空 3 years ago
zhangjiayu 508ad76cb8 fix: 修复MailAccountService 更新/删除缓存未清空 3 years ago
YunaiV dfa09c787a 短信渠道的本地缓存,使用 Job 轮询,替代 MQ 广播 3 years ago
YunaiV 27e70e73a3 敏感词的本地缓存,使用 Job 轮询,替代 MQ 广播 3 years ago
YunaiV 5e7e3d816c 彻底移除 RedisKeyDefine 3 years ago
YunaiV 95edd1d451 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-redis
 Conflicts:
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
3 years ago
YunaiV 5d6308e4bb 对齐 boot 与 cloud 的代码 3 years ago