xingyu4j
							
						 
					 | 
					
						
						
							
						
						7083d991fe
					 | 
					
						
						
							
							refactor: verify
						
						
						
						
						
						
					 | 
					
						2022-11-17 10:37:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6d48bd1ed8
					 | 
					
						
						
							
							promotion:完善限时折扣的添加逻辑
						
						
						
						
						
						
					 | 
					
						2022-11-06 00:48:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d4b7f4aaa0
					 | 
					
						
						
							
							promotion:增加限时折扣的基础代码
						
						
						
						
						
						
					 | 
					
						2022-11-05 19:13:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						00f90e75d9
					 | 
					
						
						
							
							promotion:增加满减送活动的关闭功能
						
						
						
						
						
						
					 | 
					
						2022-11-05 10:52:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						86b6b85934
					 | 
					
						
						
							
							promotion:增加优惠劵的前端分页界面 80%
						
						
						
						
						
						
					 | 
					
						2022-11-04 00:27:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8ae8a4a652
					 | 
					
						
						
							
							promotion:完善优惠劵模板的单元测试、禁用功能
						
						
						
						
						
						
					 | 
					
						2022-11-02 22:44:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bd661296c0
					 | 
					
						
						
							
							promotion:完善优惠劵模板的功能
						
						
						
						
						
						
					 | 
					
						2022-11-02 22:19:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3c10058dbd
					 | 
					
						
						
							
							promotion:实现部分优惠劵模板的前端逻辑
						
						
						
						
						
						
					 | 
					
						2022-11-01 00:37:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						e1e55dc841
					 | 
					
						
						
							
							feature(商品添加): 规格调整连带商品调整
						
						
						
						
						
						
					 | 
					
						2022-09-14 11:57:30 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						4207b2b61d
					 | 
					
						
						
							
							feature(uniapp商品): 商品加载
						
						
						
						
						
						
					 | 
					
						2022-08-31 18:52:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wuxiran
							
						 
					 | 
					
						
						
							
						
						c8ec5c8952
					 | 
					
						
						
							
							mall:上传enum类,做后端模板添加判定、前端页面添加
						
						
						
						
						
						
					 | 
					
						2022-08-16 00:26:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						b78378ce44
					 | 
					
						
						
							
							AJ-Captcha vue2 增加验证码二次校验
						
						
						
						
						
						
					 | 
					
						2022-08-03 13:38:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						4a92081937
					 | 
					
						
						
							
							vue2 新增行为验证码
						
						
						
						
						
						
					 | 
					
						2022-08-03 13:38:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bf5df656ed
					 | 
					
						
						
							
							初始化管理后台的 uniapp 版本
						
						
						
						
						
						
					 | 
					
						2022-08-03 11:52:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						969c387764
					 | 
					
						
						
							
							mall:完善商品分类的管理后台界面
						
						
						
						
						
						
					 | 
					
						2022-07-30 20:28:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2372c25e8d
					 | 
					
						
						
							
							完善 Redis 缓存的查询
						
						
						
						
						
						
					 | 
					
						2022-07-08 20:39:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						a0f7f0ff12
					 | 
					
						
						
							
							!211 Redis 监控添加缓存列表
						
						
						
						
						
						
						
						Merge pull request !211 from 圆梦巨人/feature/cache-list 
						
						
					 | 
					
						2022-07-08 11:15:03 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						c0b1f62afd
					 | 
					
						
						
							
							fix(Redis监控): fix review
						
						
						
						
						
						
					 | 
					
						2022-07-08 11:47:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9270924597
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back
						
						
						
						
						
						
						
						 Conflicts:
	README.md
	yudao-framework/pom.xml
	yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml
	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/config/SecurityConfiguration.java 
						
						
					 | 
					
						2022-07-08 09:41:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						a7067ea6fd
					 | 
					
						
						
							
							feature(Redis监控): 添加缓存列表
						
						
						
						
						
						
					 | 
					
						2022-07-07 14:50:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						40954e4e46
					 | 
					
						
						
							
							feature(Redis监控): 添加缓存列表
						
						
						
						
						
						
					 | 
					
						2022-07-07 12:38:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8751471aa1
					 | 
					
						
						
							
							优化管理后台的社交登录
						
						
						
						
						
						
					 | 
					
						2022-07-05 22:00:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaxiaoYY
							
						 
					 | 
					
						
						
							
						
						247d299cca
					 | 
					
						
						
							
							Banner模块 for review
						
						
						
						
						
						
					 | 
					
						2022-05-31 16:08:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bb26bc4012
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
						
						 Conflicts:
	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/UserController.java
	yudao-ui-admin/src/components/ImageUpload/index.vue 
						
						
					 | 
					
						2022-05-29 11:05:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						741dda8d75
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back
						
						
						
						
						
						
					 | 
					
						2022-05-26 19:19:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d18463866e
					 | 
					
						
						
							
							新增 sso 页面
						
						
						
						
						
						
					 | 
					
						2022-05-24 00:01:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shuaidawang
							
						 
					 | 
					
						
						
							
						
						bd944c4a8b
					 | 
					
						
						
							
							商品规格和spu前端代码生成
						
						
						
						
						
						
					 | 
					
						2022-05-18 17:12:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						aa8fb4acf0
					 | 
					
						
						
							
							搭建 oauth/authorize 的初步逻辑
						
						
						
						
						
						
					 | 
					
						2022-05-14 20:10:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ce60ec0815
					 | 
					
						
						
							
							修改 OAuth2ClientDO 实体,支持自动授权的范围的设置
						
						
						
						
						
						
					 | 
					
						2022-05-14 15:11:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f46d81dab5
					 | 
					
						
						
							
							增加 OAuth2 客户端
						
						
						
						
						
						
					 | 
					
						2022-05-11 00:43:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5cf68961e1
					 | 
					
						
						
							
							1. 修改在线会话的实现
						
						
						
						
						
						
						
						2. 接入到会员管理 OAuth2.0 
						
						
					 | 
					
						2022-05-10 23:20:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a3687132b6
					 | 
					
						
						
							
							增加 refresh token 接口,并接入到前端项目
						
						
						
						
						
						
					 | 
					
						2022-05-09 22:46:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3351ebbbb4
					 | 
					
						
						
							
							去除 Spring Security 的 logout handler,使用自己定义的 logout 接口
						
						
						
						
						
						
					 | 
					
						2022-05-08 00:38:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a233ab1395
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
						
						 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm 
						
						
					 | 
					
						2022-05-04 23:44:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7753bd4c44
					 | 
					
						
						
							
							1. code review 后台的短信验证码登陆
						
						
						
						
						
						
						
						2. 解决 SQL Server LIMIT 1 存在报错的问题 
						
						
					 | 
					
						2022-05-02 22:57:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4453ac27ff
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-smsLogin
						
						
						
						
						
						
						
						 Conflicts:
	sql/ruoyi-vue-pro.sql
	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/framework/security/config/SecurityConfiguration.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthService.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
	yudao-ui-admin/src/api/login.js
	yudao-ui-admin/src/store/modules/user.js 
						
						
					 | 
					
						2022-05-02 21:36:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cuicui
							
						 
					 | 
					
						
						
							
						
						4015724417
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/bpm-back
						
						
						
						
						
						
					 | 
					
						2022-04-30 20:52:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b34e2691f8
					 | 
					
						
						
							
							支持主流数据库的代码生成
						
						
						
						
						
						
					 | 
					
						2022-04-29 23:14:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7ce7baa2d2
					 | 
					
						
						
							
							增加数据源管理
						
						
						
						
						
						
					 | 
					
						2022-04-27 23:15:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								酱包
							
						 
					 | 
					
						
						
							
						
						5139117b13
					 | 
					
						
						
							
							更新登录模板
						
						
						
						
						
						
						
						支持短信验证码登录 
						
						
					 | 
					
						2022-04-27 11:31:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c402077961
					 | 
					
						
						
							
							进一步重构社交登陆的实现
						
						
						
						
						
						
					 | 
					
						2022-04-27 00:35:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7227664f77
					 | 
					
						
						
							
							进一步重构社交登陆的实现
						
						
						
						
						
						
					 | 
					
						2022-04-26 23:36:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeromeSoar
							
						 
					 | 
					
						
						
							
						
						cc6c3d2759
					 | 
					
						
						
							
							品牌代码生成
						
						
						
						
						
						
					 | 
					
						2022-04-25 16:11:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeromeSoar
							
						 
					 | 
					
						
						
							
						
						d3edaec2b1
					 | 
					
						
						
							
							商品分类维护
						
						
						
						
						
						
					 | 
					
						2022-04-24 17:01:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeromeSoar
							
						 
					 | 
					
						
						
							
						
						4e67b6bbcf
					 | 
					
						
						
							
							商品分类代码生成
						
						
						
						
						
						
					 | 
					
						2022-04-24 14:42:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						696756b3c8
					 | 
					
						
						
							
							实现 SensitiveWord API 实现类
						
						
						
						
						
						
					 | 
					
						2022-04-09 10:48:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |