xingyu
							
						 
					 | 
					
						
						
							
						
						16eaa5f407
					 | 
					
						
						
							
							feat: 升级依赖
						
						
						
						
						
						
					 | 
					
						2022-10-05 17:07:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						0143749988
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dev
						
						
						
						
						
						
					 | 
					
						2022-10-05 14:53:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bf700ab1fc
					 | 
					
						
						
							
							增加 yudao-sso-demo-by-password 示例,基于密码模式,实现 SSO 单点登录
						
						
						
						
						
						
					 | 
					
						2022-10-04 23:11:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						05951783de
					 | 
					
						
						
							
							增加 yudao-sso-demo-by-password 示例,基于密码模式,实现 SSO 单点登录
						
						
						
						
						
						
					 | 
					
						2022-10-04 17:51:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6be30c0887
					 | 
					
						
						
							
							优化 yudao-sso-demo-by-code 的代码
						
						
						
						
						
						
					 | 
					
						2022-10-03 17:52:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f634ecf7c3
					 | 
					
						
						
							
							完善 pom.xml 的注释
						
						
						
						
						
						
					 | 
					
						2022-10-02 13:05:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						9cde6c45ab
					 | 
					
						
						
							
							!272 增加“基于授权码模式,实现 SSO 单点登录“示例
						
						
						
						
						
						
						
						Merge pull request !272 from 芋道源码/feature/sso-example 
						
						
					 | 
					
						2022-10-02 04:43:44 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						585d2a523b
					 | 
					
						
						
							
							修复登录的 redirect 地址,存在参数时,登录成功回跳的时候地址不正确的问题
						
						
						
						
						
						
					 | 
					
						2022-10-01 21:37:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ab40254bc1
					 | 
					
						
						
							
							完成 yudao-sso-demo-by-code 退出登录
						
						
						
						
						
						
					 | 
					
						2022-10-01 21:26:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ff54f16907
					 | 
					
						
						
							
							完成 yudao-sso-demo-by-code 刷新访问令牌
						
						
						
						
						
						
					 | 
					
						2022-10-01 20:49:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ea71002ed6
					 | 
					
						
						
							
							完成 yudao-sso-demo-by-code 实现修改用户的信息
						
						
						
						
						
						
					 | 
					
						2022-10-01 20:30:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fc7a6c782a
					 | 
					
						
						
							
							完成 yudao-sso-demo-by-code 实现获得用户信息
						
						
						
						
						
						
					 | 
					
						2022-10-01 10:52:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b7b31f03d3
					 | 
					
						
						
							
							完成 yudao-sso-demo-by-code 实现 token 过滤器
						
						
						
						
						
						
					 | 
					
						2022-10-01 08:35:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhijiantianya@gmail.com
							
						 
					 | 
					
						
						
							
						
						67436ea4c6
					 | 
					
						
						
							
							mall: 下单的代码 review
						
						
						
						
						
						
					 | 
					
						2022-09-30 09:53:45 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						952e6aa4a8
					 | 
					
						
						
							
							!266 接口实现-交易订单 单元测试
						
						
						
						
						
						
						
						Merge pull request !266 from LeeYan9/ly_uniapp 
						
						
					 | 
					
						2022-09-30 08:56:13 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhijiantianya@gmail.com
							
						 
					 | 
					
						
						
							
						
						fbee21de5f
					 | 
					
						
						
							
							mall: 商品的代码 review
						
						
						
						
						
						
					 | 
					
						2022-09-30 08:54:28 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhijiantianya@gmail.com
							
						 
					 | 
					
						
						
							
						
						c25791047f
					 | 
					
						
						
							
							mall: 商品的代码 review
						
						
						
						
						
						
					 | 
					
						2022-09-30 08:30:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0df44b51e4
					 | 
					
						
						
							
							完成 yudao-sso-demo-by-code 使用 code 授权码,获得访问令牌的逻辑
						
						
						
						
						
						
					 | 
					
						2022-09-29 23:59:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |