lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,190 Commits 2 Branches 0 Tags 165 MiB
3e9768374b
Commit Graph

4190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV
eef233644c 1. 增加 yudao-sso-demo-by-code 项目，实现基于授权码模式的单点登录 
2. 完成 yudao-sso-demo-by-code 的跳转 SSO 流程
 2022-09-29 21:26:31 +08:00
YunaiV
2b784d180e 调整 sso 界面，移除多租户的选择 2022-09-29 21:17:08 +08:00
xingyu
72ee1206e6 Merge remote-tracking branch 'origin/master' into dev 2022-09-29 14:13:16 +08:00
xingyu
1aca24b636 feat: 升级依赖 2022-09-28 21:04:13 +08:00
YunaiV
034de50999 完善多租户的注释与代码 2022-09-24 21:54:03 +08:00
YunaiV
b73cdd15b5 同步 Master 最新代码 2022-09-24 18:25:18 +08:00
YunaiV
25e7c8dceb 同步 Master 最新代码 2022-09-24 18:16:27 +08:00
YunaiV
d26c78a0df Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-09-24 12:55:05 +08:00
YunaiV
1be09d092b ♻️优化“通过注解增加多租户缓存”的代码 2022-09-24 12:26:01 +08:00
芋道源码
597a923828
!257 通过注解增加多租户缓存 
Merge pull request !257 from CrazyAirhead/master
 2022-09-24 04:11:50 +00:00
luowenfeng
d3c37c41d2 feature(管理后台): 商品管理 2022-09-22 11:41:18 +08:00
luowenfeng
c7a2ed4a0b feature(管理后台): 商品管理 2022-09-22 11:40:19 +08:00
luowenfeng
77a676ee07 feature(管理后台): 商品列表 2022-09-21 19:40:07 +08:00
xingyu
65c86878e9 feat: 升级依赖 2022-09-21 16:17:53 +08:00
luowenfeng
fdb2d7339f feature(管理后台): 商品列表 2022-09-21 15:57:32 +08:00
luowenfeng
f122c0c509 feature(管理后台): 商品添加视频 2022-09-21 10:42:07 +08:00
xingyu
9054a772b0 feat: 升级依赖 2022-09-20 18:00:43 +08:00
luowenfeng
e2cd336a22 feature(管理后台): 规格值添加 2022-09-20 10:27:49 +08:00
shizhong
3e936f3959 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
 Conflicts:
	yudao-ui-admin/yarn.lock
 2022-09-16 11:05:25 +08:00
ex_yang.li@ca-nio.com
9cf470df94 创建交易订单-单元测试-冲突合并 2022-09-15 17:28:08 +08:00
ex_yang.li@ca-nio.com
f21ce954ec Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into ly_uniapp 
# Conflicts:
#	yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/api/price/PriceApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
#	yudao-server/src/main/resources/application.yaml
 2022-09-15 17:09:17 +08:00
ex_yang.li@ca-nio.com
5889093a64 创建交易订单-单元测试 2022-09-15 16:57:04 +08:00
luowenfeng
e1e55dc841 feature(商品添加): 规格调整连带商品调整 2022-09-14 11:57:30 +08:00
YunaiV
15798cea10 mall：价格计算的 API 简单实现 2022-09-12 21:37:24 +08:00
芋道源码
7643ed5a4b
!264 定时任务-调度日志-详细里面”执行时长“显示异常问题 
Merge pull request !264 from Vmo/master
 2022-09-10 13:48:02 +00:00
芋道源码
c8cc3a57f7
!265 商品模块 60% 
Merge pull request !265 from 芋道源码/feature/1.8.0-uniapp
 2022-09-10 13:45:28 +00:00
YunaiV
67d365475c 🐛修复创建订单的流程，使用到 API Bean 未声明的报错 2022-09-10 21:41:21 +08:00
YunaiV
38e88b02f5 🐛修复数据权限，不支持隐式内连接的问题 2022-09-10 21:37:16 +08:00
airhead
02c45e405f Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	yudao-dependencies/pom.xml
 2022-09-09 23:08:08 +08:00
airhead
72883aa975 fix(dependencies): 修改合并错误 2022-09-09 23:06:58 +08:00
airhead
6b429584bf fix(tenant): 租户缓存增加注释 2022-09-09 22:56:26 +08:00
airhead
0e1babd7f4 feat(redis): 注解支持多租户缓存 
1.增加多租户Cache
2.修复Mac M1启动报错
 2022-09-09 22:56:25 +08:00
idevmo
378067fce7 定时任务-调度日志-详细里面”执行时长“显示异常的问题 2022-09-09 10:16:44 +08:00
芋道源码
61b0624a59
!262 接口实现-交易订单创建(未完全实现) 
Merge pull request !262 from LeeYan9/ly_uniapp
 2022-09-05 13:16:11 +00:00
YunaiV
c06077e3a6 mall：code review 商品的代码 2022-09-05 21:02:44 +08:00
ex_yang.li@ca-nio.com
7bf20ec72e 创建订单接口定义 2022-09-05 20:44:04 +08:00
YunaiV
2cc60deb97 mall：code review 商品规格、规格值的代码 2022-09-05 20:29:27 +08:00
YunaiV
9632c33d27 mall：优化商品的分类、品牌的代码 2022-09-05 20:03:13 +08:00
YunaiV
1bd1c79ff3 mall：code review 商品模块的代码 2022-09-05 00:14:17 +08:00
YunaiV
37e948cc1b Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-09-04 23:15:36 +08:00
YunaiV
f4324a22f2 mall： code review 商品模块的代码 2022-09-04 23:15:29 +08:00
wuxiran
02aede0417 1、修改coupon的页面、以及增加coupon的enum 2022-09-04 22:52:28 +08:00
YunaiV
833fd33844 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	sql/optional/mall/mall.sql
 2022-09-04 21:06:28 +08:00
芋道源码
dd6dc2ac3d
!246 集成aj-captcha 
Merge pull request !246 from xingyu/master
 2022-09-04 09:45:54 +00:00
YunaiV
9715087b54 管理后台的 uniapp 验证码，增加开关 2022-09-04 17:44:26 +08:00
YunaiV
a484cd5193 优化图片验证码的后端实现 2022-09-04 12:44:02 +08:00
YunaiV
b134492fa9 vue3 验证码，增加开关 2022-09-04 12:35:23 +08:00
YunaiV
1a48301cee vue2 验证码，增加开关、修复对社交登录的支持 2022-09-04 12:18:12 +08:00
YunaiV
926c75d29a 优化图片验证码的后端实现 2022-09-04 11:26:37 +08:00
芋道源码
d918b14e90
!260 增加servicetask的完成和todo高亮，增加servicetask节点的hover显示内容 
Merge pull request !260 from FinalFinancialFreedom/N/A
 2022-09-03 02:25:58 +00:00