288 Commits (2d43c1f9beac3a67fc4f358e89759d4997caa6b1)

Author SHA1 Message Date
YunaiV bfe3dc95fe ERP:增加供应商的实现 2 years ago
YunaiV 6a6e95fcb6 对齐 BOOT 与 CLOUD 的代码 2 years ago
YunaiV 290f45dd6e Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml
2 years ago
YunaiV 078ead536b 🐛 REPORT:支持 SaaS 租户模式 2 years ago
YunaiV 5de6a8bd23 📖 code review:操作日志的实现 2 years ago
YunaiV 82a25474f6 Merge remote-tracking branch 'origin/develop' into develop 2 years ago
YunaiV 7542b6a78d Member:完善微信相关配置 2 years ago
puhui999 3e91ac73c4 CRM:完善数据分页查询条件构造 CrmQueryWrapperUtils 2 years ago
YunaiV 98697ee075 ⬆️ 2 years ago
liuhongfeng 0d3efe4f80 【优化】ureport2菜单,初始化数据,按照规范重新进行命名处理 2 years ago
YunaiV 5e9cbb9cad report:code review ureport 的集成 2 years ago
liuhongfeng 5894d2be01 【修改】ureport2 集成的SQL语句,并适配数据库存储方式 2 years ago
liuhongfeng 8507fa9172 【新增】ureport2 集成 2 years ago
芋道源码 7724d6e830
!765 Vue2 + Element UI 代码生成器
Merge pull request !765 from 芋道源码/feature/sub-table
2 years ago
puhui999 6d228828f4 application-local.yaml 恢复 2 years ago
YunaiV 0233b092b8 websocket:重新封装 websocket 组件,支持 sender 广播 2 years ago
YunaiV 1941a7b3e6 websocket:重新封装 websocket 组件,支持 token 认证,并增加 WebSocketMessageListener 方便处理消息 2 years ago
puhui999 df69fecbb4 代码生成:重构 vue2 模版,适配树表和主子表(80%) 2 years ago
YunaiV feba904fd8 多租户:登录界面,根据 host 域名获取对应的租户编号 2 years ago
YunaiV c162b39e1e 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2 years ago
YunaiV 456b0c8ddd mq:增加 kafka 配置项 2 years ago
YunaiV 20725e3dfd mq:增加 rabbitmq 配置项 2 years ago
YunaiV b8d5a665be mq:增加 rocketmq 配置项 2 years ago
YunaiV c066ea46f9 mq 重构:默认的 redis 实现:
1)默认 channel 和 stream key
2)移除 enabled 开关,通过 listener 是否存在来实现
3)调整包名,为接入 rocketmq 作为 mq 实现做准备
2 years ago
YunaiV fc2d30cfaf pay:修复单元测试报错 2 years ago
puhui999 b009f0b058 application-local.yaml 恢复 2 years ago
puhui999 55eed1377a 营销活动: 新增文章管理 2 years ago
owen df16278a03 统计:会员统计 2 years ago
YunaiV ac55a9657c promotion:完善秒杀模块 3 years ago
YunaiV c66b4e7bc0 code review:日志清理 Job 3 years ago
YunaiV 1bc1be14fb Merge branch 'feature/mall_product' of https://gitee.com/lanxindx/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml
3 years ago
YunaiV 1f910992d6 trade:新增是否自提的配置项 3 years ago
j-sentinel 2f0483ce9f [新增][定时任务]重新申请 ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 3 years ago
j-sentinel 11921fab5a [新增][定时任务]ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 3 years ago
YunaiV 666ba351a2 trade:退款理由的维护 3 years ago
YunaiV f9bf41d773 code review:分佣剩余部分的 review 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
YunaiV 26dfbfb2ac trade:发货逻辑,增加订单日志 3 years ago
YunaiV 53bd1b9ec1 trade:订单评论超时时,自动评论 3 years ago
YunaiV a8c78f3097 trade:增加自动收货的 job 3 years ago
YunaiV 1b154699c6 code review:处理错误的 mysql 连接 3 years ago
YunaiV ab800aa891 1. 简化 JsonUtils 初始化方式,去掉 BeanPostProcessor
2. 减少日志打印

目的:优化启动速度
3 years ago
YunaiV 50371b3676 1. 禁用 member 模块
2. 减少 mybatis 日志打印
3. 降低 local 环境的初始连接

目的:提升项目的启动速度
3 years ago
YunaiV 62c4838ba7 默认禁用 spring boot admin 的启动 3 years ago
YunaiV 6a371f06b0 默认禁用 spring data redis repositories,一方面没用到,一方面提高启动速度 3 years ago
YunaiV f0f5b52150 默认禁用 quartz 依赖,保证启动速度 3 years ago
xiaqing e893cfd757 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordService.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
3 years ago
xiaqing 9d262e8e7f 新增两个APP端接口
1.获取用户个人签到信息
2.用户签到接接口
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
YunaiV 314dee430e bugfix:微信公众号登录报 access token 的问题 3 years ago