p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,099 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

481 Commits

Author SHA1 Message Date
YunaiV 23df8633f4 📖 CRM：code review 数据权限的实现 2023-12-09 10:50:47 +08:00
puhui999 5c395fc1c4 CRM: 完善 code review 数据权限提到的问题，重新封装 CrmQueryWrapperUtils 2023-12-08 15:27:58 +08:00
YunaiV 98697ee075 ⬆️ 2023-12-07 20:48:11 +08:00
YunaiV a9ae7b0865 ✅ 完善 UReport2 的集成 2023-12-07 07:37:32 +08:00
YunaiV 076bf13687 📈 REPORT：code review ureport2 实现 2023-12-06 21:02:26 +08:00
liuhongfeng 0d3efe4f80 【优化】ureport2菜单，初始化数据，按照规范重新进行命名处理 2023-12-06 21:02:26 +08:00
YunaiV 5e9cbb9cad report：code review ureport 的集成 2023-12-06 21:02:26 +08:00
liuhongfeng 5894d2be01 【修改】ureport2 集成的SQL语句，并适配数据库存储方式 2023-12-06 21:02:26 +08:00
liuhongfeng 8507fa9172 【新增】ureport2 集成 2023-12-06 21:02:25 +08:00
YunaiV 9451287264 ✨ CRM：同步最新功能，基本跑通客户信息的维护 2023-12-06 20:28:53 +08:00
YunaiV c94f71a3df 🔨 CRM：优化产品分类代码的实现 2023-12-06 12:56:35 +08:00
芋道源码 7724d6e830
!765 Vue2 + Element UI 代码生成器 
Merge pull request !765 from 芋道源码/feature/sub-table
 2023-11-28 12:28:30 +00:00
puhui999 6d228828f4 application-local.yaml 恢复 2023-11-27 16:34:55 +08:00
YunaiV 0233b092b8 websocket：重新封装 websocket 组件，支持 sender 广播 2023-11-24 00:32:52 +08:00
YunaiV 1941a7b3e6 websocket：重新封装 websocket 组件，支持 token 认证，并增加 WebSocketMessageListener 方便处理消息 2023-11-22 23:17:50 +08:00
YunaiV 827897807f 提升启动速度 2023-11-19 18:46:16 +08:00
YunaiV e40c0e3057 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	pom.xml
#	sql/mysql/pay_wallet.sql
#	yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
 2023-11-19 18:39:55 +08:00
YunaiV 6270975902 优化启动速度 2023-11-19 00:37:30 +08:00
YunaiV 5122aee924 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-ui-admin/src/views/system/user/index.vue
 2023-11-18 20:44:06 +08:00
puhui999 df69fecbb4 代码生成：重构 vue2 模版，适配树表和主子表（80%） 2023-11-17 17:03:35 +08:00
YunaiV feba904fd8 多租户：登录界面，根据 host 域名获取对应的租户编号 2023-11-06 19:47:21 +08:00
YunaiV c162b39e1e 多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突 2023-11-06 19:04:01 +08:00
YunaiV 989d7c44d0 code review 店铺装修 2023-11-04 22:52:41 +08:00
YunaiV 5bb91f139e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-11-03 23:34:37 +08:00
YunaiV 456b0c8ddd mq：增加 kafka 配置项 2023-11-02 12:25:50 +08:00
YunaiV 20725e3dfd mq：增加 rabbitmq 配置项 2023-11-02 08:22:05 +08:00
YunaiV b8d5a665be mq：增加 rocketmq 配置项 2023-11-02 00:07:38 +08:00
YunaiV c066ea46f9 mq 重构：默认的 redis 实现： 
1）默认 channel 和 stream key
2）移除 enabled 开关，通过 listener 是否存在来实现
3）调整包名，为接入 rocketmq 作为 mq 实现做准备
 2023-10-30 21:15:22 +08:00
YunaiV 0657c357bf Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/crm 2023-10-29 14:25:38 +08:00
YunaiV c11300d33a 解决启动问题 2023-10-24 19:54:49 +08:00
YunaiV dd2f5ba2c3 统一 boot 和 cloud 代码 2023-10-24 18:48:02 +08:00
YunaiV fc2d30cfaf pay：修复单元测试报错 2023-10-24 08:09:47 +08:00
YunaiV 94c2ad5d1d 修复报错的单元测试 2023-10-22 08:55:27 +08:00
YunaiV 785fbeeb5b code review：限时折扣活动 2023-10-21 18:16:09 +08:00
芋道源码 90fb2c62b8
!683 mall模块 
Merge pull request !683 from zxiaoxiu/discount
 2023-10-21 09:23:50 +00:00
YunaiV 7e312aae02 初始化 crm 模块 2023-10-15 20:16:46 +08:00
puhui999 b009f0b058 application-local.yaml 恢复 2023-10-15 16:43:04 +08:00
puhui999 55eed1377a 营销活动: 新增文章管理 2023-10-15 16:16:41 +08:00
YunaiV b30754a0a4 同步最新 mall 代码 2023-10-12 21:58:56 +08:00
owen df16278a03 统计：会员统计 2023-10-09 23:27:10 +08:00
YunaiV ac55a9657c promotion：完善秒杀模块 2023-10-03 18:41:41 +08:00
YunaiV c66b4e7bc0 code review：日志清理 Job 2023-10-03 11:02:33 +08:00
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
 2023-10-03 10:33:22 +08:00
YunaiV 1f910992d6 trade：新增是否自提的配置项 2023-10-02 21:18:52 +08:00
j-sentinel 2f0483ce9f [新增][定时任务]重新申请 ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 2023-10-02 19:18:36 +08:00
j-sentinel 11921fab5a [新增][定时任务]ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理 2023-10-01 16:53:17 +08:00
owen 929ff4286a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-29 21:08:49 +08:00
owen 171161e6c7 统计：交易统计 2023-09-29 21:08:15 +08:00
YunaiV 666ba351a2 trade：退款理由的维护 2023-09-29 13:35:40 +08:00
YunaiV f9bf41d773 code review：分佣剩余部分的 review 2023-09-28 22:22:38 +08:00
YunaiV 9cd36abf10 同步 master 分支代码 2023-09-28 15:28:40 +08:00
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
 2023-09-28 15:18:59 +08:00
YunaiV 26dfbfb2ac trade：发货逻辑，增加订单日志 2023-09-27 09:55:04 +08:00
YunaiV 53bd1b9ec1 trade：订单评论超时时，自动评论 2023-09-26 23:50:54 +08:00
YunaiV a8c78f3097 trade：增加自动收货的 job 2023-09-26 19:27:37 +08:00
YunaiV 1b154699c6 code review：处理错误的 mysql 连接 2023-09-20 00:10:18 +08:00
YunaiV ab800aa891 1. 简化 JsonUtils 初始化方式，去掉 BeanPostProcessor 
2. 减少日志打印

目的：优化启动速度
 2023-09-16 18:05:50 +08:00
YunaiV 50371b3676 1. 禁用 member 模块 
2. 减少 mybatis 日志打印
3. 降低 local 环境的初始连接

目的：提升项目的启动速度
 2023-09-16 17:04:59 +08:00
YunaiV 62c4838ba7 默认禁用 spring boot admin 的启动 2023-09-16 15:30:02 +08:00
YunaiV 6a371f06b0 默认禁用 spring data redis repositories，一方面没用到，一方面提高启动速度 2023-09-16 13:29:47 +08:00
YunaiV f0f5b52150 默认禁用 quartz 依赖，保证启动速度 2023-09-16 12:50:36 +08:00
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
 2023-09-15 15:27:59 +08:00
xiaqing 9d262e8e7f 新增两个APP端接口 
1.获取用户个人签到信息
2.用户签到接接口
 2023-09-15 15:20:39 +08:00
YunaiV f2ee213caa 更新商城的演示地址 2023-09-11 16:42:38 +08:00
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
 2023-09-11 16:19:55 +08:00
YunaiV 314dee430e bugfix：微信公众号登录报 access token 的问题 2023-09-11 11:06:42 +08:00
YunaiV 40e1a879e3 登录：社交登录时，额外返回 openid 2023-09-10 18:01:53 +08:00
YunaiV 5a940b1d2c 修复 knife4j get 参数无法正确展示的问题 2023-09-09 15:04:22 +08:00
YunaiV bf92727b27 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
 2023-09-06 21:40:53 +08:00
YunaiV fcca69d243 修复 revision 在 Maven install、deploy 时，不替换为版本号的问题 2023-09-06 20:41:52 +08:00
zhijiantianya@gmail.com beb385aab4 修复 revision 在 Maven install、deploy 时，不替换为版本号的问题 2023-09-06 20:04:29 +08:00
YunaiV 6a819da0b6 分佣：增加用户分销统计 API mock 2023-09-03 21:21:33 +08:00
YunaiV d82729e4c6 同步最新会员中心 SQL 2023-08-27 21:15:44 +08:00
YunaiV 0d1fc1138a 增加 app 的签到 mock 接口、积分记录分页、签到记录分页 2023-08-21 22:20:59 +08:00
YunaiV c3e4e23459 同步最新 Member 菜单 2023-08-20 20:01:18 +08:00
xiaqing db1f44305d 会员积分和会员签到模块todo修改 2023-08-19 14:09:47 +08:00
xiaqing 2e9dfac9ab 会员积分和会员签到模块todo修改 2023-08-19 14:09:22 +08:00
YunaiV e4a2c738b2 订单： 
1. 增加查询物流接口
 2023-08-15 20:18:22 +08:00
YunaiV be2ee905df code review：积分模块的实现 2023-08-11 23:49:20 +08:00
芋道源码 4177071758
!560 todo修改 
Merge pull request !560 from QingX/feature/mall_product
 2023-08-11 14:44:52 +00:00
YunaiV 5fcd0a21da Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-08-11 22:44:20 +08:00
YunaiV 9ff67b479f !562 优化 redisCache 2023-08-11 21:46:53 +08:00
芋道源码 8960a82978
!562 优化 redisCache 
Merge pull request !562 from wanwan/feature/redis_cache_optimize_20230810
 2023-08-11 12:09:10 +00:00
YunaiV b53bfb0976 Merge branch 'feature/deps' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-08-11 19:21:44 +08:00
wanwan 134e5ca20f feat: 将 redisCache 的扫描策略设置成 scan 2023-08-10 15:27:19 +08:00
wanwan e1fe21f24c Revert "feat: 将 redisCache 的扫描策略设置成 scan" 
This reverts commit 72d2dcc68f.
 2023-08-10 15:26:25 +08:00
jlc@yoc.tech 72d2dcc68f feat: 将 redisCache 的扫描策略设置成 scan 2023-08-10 11:26:44 +08:00
xiaqing d397758dd1 还原配置文件 2023-08-09 22:39:12 +08:00
xiaqing 33323c1483 会员签到针对代码格式、功能优化 
1.优化todo建议
2.删除无用代码
 2023-08-09 16:13:35 +08:00
芋道源码 7a7ae3b8ec
!545 完善 review 拼团、秒杀活动的实现提到的问题 
Merge pull request !545 from puhui999/feature/mall_product
 2023-08-05 11:54:13 +00:00
puhui999 92b10e2ecf Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-07-31 18:37:13 +08:00
YunaiV 68049b85b9 基于 Redis 实现的 pubsub、stream 消息队列，支持开启或关闭。默认为关闭状态，项目启动更快 2023-07-29 12:04:50 +08:00
xingyu 402a3809a3 chore: up springboot 2.7.14 2023-07-29 11:23:13 +08:00
puhui999 446951bd11 fix：封装函数 convertCDUMap 作用：数据划分为需要新增的、还是删除的、还是更新的。 2023-07-28 16:30:38 +08:00
YunaiV 7f657ee931 优化 mp-java 库的依赖管理 2023-07-27 23:15:49 +08:00
YunaiV c33186569d 优化 mp 账号的刷新机制，使用 Job 轮询，替换 MQ 广播 2023-07-27 20:25:15 +08:00
YunaiV 91aacefc3d Merge branch 'master-cq' of https://gitee.com/congqinggit/ruoyi-vue-pro 
 Conflicts:
	sql/postgresql/ruoyi-vue-pro.sql
 2023-07-25 20:13:17 +08:00
芋道源码 870873e480
!540 修复部分问题，升级依赖 
Merge pull request !540 from xingyu/feature/captcha
 2023-07-25 11:20:04 +00:00
YunaiV 7f0901e0bb 优化项目启动速度， 2023-07-25 08:39:28 +08:00
YunaiV 3a24d05bdc mall + pay： 
1. 修复单元测试的报错
 2023-07-24 07:04:11 +08:00
xingyu c95a1d0a7d chore: up springboot 2.10.13 2023-07-21 17:53:40 +08:00
YunaiV 68a4ef98ca mall + pay： 
1. 拆分支付回调、退款回调的 URL
2. 修复微信支付回调的时间解析错误
 2023-07-17 11:47:45 +08:00
YunaiV 2485a5ebc9 mall + pay： 
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
 2023-07-10 17:35:26 +08:00
YunaiV e615be971e mall + pay： 
1、测试通过微信小程序支付
 2023-07-08 12:44:50 +08:00
YunaiV 67d60e32f8 mall + pay： 
1、调整微信支付，修复 v2 传递的时间不正确
2、调整 mp js ticket 接口到 system 模块
 2023-07-06 00:19:05 +08:00
YunaiV 20eb0a2a88 mall + pay： 
1、调整 returnUrl 的实现
 2023-07-04 23:43:16 +08:00
YunaiV 23e3c4d0d9 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-07-02 23:45:48 +08:00
芋道源码 11c4c950b7
回退 'Pull Request !518 : 添加华为云 maven 升级依赖' 2023-07-02 15:41:26 +00:00
YunaiV 040a66965c mall + member： 
1、review 积分
 2023-07-02 23:19:13 +08:00
congqing c1e020a286 将master数据库中pg数据库的引用数据库名称变量改为master 2023-06-28 23:28:19 +08:00
xingyu bdb18b4ced chore: up springboot 2.7.13 2023-06-26 16:26:38 +08:00
xiaqing e5c556f106 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-25 15:49:30 +08:00
YunaiV 6573849f56 mall + promotion：mock 拼团列表 2023-06-18 00:35:22 +08:00
芋道源码 798e322f08
!506 积分模块 
Merge pull request !506 from QingX/feature/mall_product
 2023-06-17 09:41:41 +00:00
xiaqing 8e3a65d84c 本地连接修改 2023-06-17 16:39:28 +08:00
xingyu 25df1e2ecd revert: config 2023-06-14 17:58:51 +08:00
xingyu cd33f68e2b chore: up springboot 2.10.12 2023-06-14 16:50:46 +08:00
xingyu 573ad59edc Merge remote-tracking branch 'origin/master' into feature/mall_product 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
 2023-06-14 15:18:12 +08:00
xiaqing 73d0e9d08a 初始化积分模块 
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
 2023-06-10 20:44:31 +08:00
YunaiV dd93215139 mall + trade：review 商品管理 2023-06-03 22:59:34 +08:00
芋道源码 12d6c14b1c
!469 修复 vue3 代码生成 api 模版错误 && 修复过期属性 
Merge pull request !469 from xingyu/fix/vue3_codegen
 2023-05-15 14:36:53 +00:00
芋道源码 dbdf1d9fb0
!468 feat: Docker最简支持 
Merge pull request !468 from dhb52/master
 2023-05-15 14:34:05 +00:00
xingyu 5b13c07e01 chore: up springboot 2.7.11 2023-05-06 16:28:53 +08:00
dhb52 c139be1966 perf: yudao-server/Dockerfile添加$ARGS参数 2023-04-25 22:54:11 +08:00
YunaiV 711a2763ed 修复 ProjectReactor 一键改包的报错 2023-04-24 20:14:00 +08:00
YunaiV 502fa11f1d Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-04-19 18:10:59 +08:00
YunaiV b30fc28021 商城：product：完善 ProductSpuDO 表 2023-04-19 10:55:43 +08:00
YunaiV 8eac97ae12 移除 Vue3 专属菜单，统一菜单！ 2023-04-13 23:38:27 +08:00
xingyuv e3d74b1713 chore: 升级最新依赖 2023-04-13 15:44:20 +08:00
xingyuv 5aff120d77 chore: reset 2023-04-13 15:11:44 +08:00
xingyuv 01902c4345 chore: up minio 8.5.2 2023-04-13 14:53:36 +08:00
芋道源码 ce80c6f9d8
!453 代码生成时，增加 UI 类型的选择，可生成 Vue2、Vue3 多种管理后台的代码，支持 CRUD Schema 模式 
Merge pull request !453 from 芋道源码/feature/codegen-front
 2023-04-13 00:17:25 +00:00
YunaiV d500332a18 代码生成，支持配置前端 UI 类型 2023-04-13 07:53:41 +08:00
YunaiV de782479be 优化 ProjectReactor 提示 2023-04-09 11:19:55 +08:00
YunaiV 5c0161d762 修复租户名的重复问题 2023-04-09 11:12:24 +08:00
YunaiV f07191437e 改造代码生成器，支持多种前端模版 2023-03-19 01:17:26 +08:00
weicong.li 0751e57dd8 fix: 若同个服务器内其他数据库有相同的工作流表，flowable不会建表的问题 2023-03-06 16:00:36 +08:00
YunaiV 6115a1ee34 admin-ui 演示环境，迁移到 https://gitee.com/yudaocode/yudao-ui-static 地址 2023-03-05 02:10:16 +08:00
芋道源码 c419c1e107
!417 支付收银台，接入支付宝的 PC、Wap、二维码、条码、App 等支付方式 
Merge pull request !417 from 芋道源码/feature/dev-yunai
 2023-02-22 14:43:10 +00:00
YunaiV eefd9a71fc pay：默认禁用 pay 模块，进一步提升启动速度 2023-02-22 22:38:16 +08:00
YunaiV 14893c4cff pay: 优化回调的逻辑 2023-02-20 23:41:03 +08:00
芋道源码 3dba944d5f
!410 去除重复内容并更换为本地化时区 
Merge pull request !410 from 小桂子/N/A
 2023-02-19 08:43:27 +00:00
YunaiV 96ecd5028d 1. 优化支付订单回调任务，避免重复打 SQL 查询日志 
2. 修复定时任务的回调，回调成功未更新状态的问题。
 2023-02-16 23:54:23 +08:00
YunaiV eb660ca619 pay：示例订单，增加发起退款的操作 2023-02-15 22:40:56 +08:00
小桂子 96282abca0
去除重复内容并更换为本地化时区 
Signed-off-by: 小桂子 <xgzwlkj@xgzwk.com>
 2023-02-10 17:53:46 +00:00
小桂子 79c8fd7855
去除重复内容，并改时区为本地时区 
Signed-off-by: 小桂子 <xgzwlkj@xgzwk.com>
 2023-02-10 15:13:16 +00:00
芋道源码 877e2376be
!404 修复项目启动，链接数据查询时控制台报错java.sql.SQLNonTransientConnectionException: Could not create connection to database server. Attempt 
Merge pull request !404 from zhang/master
 2023-02-09 23:38:46 +00:00
YunaiV b7198bd373 修复 jimu 报表的样式问题 2023-02-08 21:46:00 +08:00
okill.cn 13c60e8352 修复启动项目时查询数据，控制台报错java.sql.SQLNonTransientConnectionException: Could not create connection to database server. Attempt 
Signed-off-by: okill.cn <2029364173@qq.com>
 2023-02-08 00:41:41 +08:00
YunaiV fb45a70bce 集成 Go-View 大屏设计器 2023-02-07 23:08:14 +08:00