72 Commits (29d2aad176feeaec091982935f7f679a54a76927)

Author SHA1 Message Date
YunaiV 92632c046c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue
3 years ago
YunaiV 7a4a6a3046 product:优化管理后台相关的接口
area:增加地区列表界面
3 years ago
YunaiV 4a2cb33cd7 product:优化商品属性值的代码 3 years ago
YunaiV 98ca807d4b product:优化商品属性项的代码 3 years ago
YunaiV c5408965eb trade:增加管理后台的订单详情接口 3 years ago
YunaiV fac3e7c726 product:商品规格,调整成商品属性,避免和 sku 概念冲突 3 years ago
halfninety 61c4053cbb 前端修改秒杀相关文件存放地址 3 years ago
halfninety 7bc1ae5f35 秒杀活动增删改查 3 years ago
halfninety cd62c4d220 秒杀时段相关 3 years ago
halfninety 83ee1c6129 秒杀活动,添加商品,分页查询 3 years ago
YunaiV 00e66216c5 trade:【交易售后】查询分页列表的前端 3 years ago
xingyu4j 7083d991fe refactor: verify 3 years ago
YunaiV 6d48bd1ed8 promotion:完善限时折扣的添加逻辑 3 years ago
YunaiV d4b7f4aaa0 promotion:增加限时折扣的基础代码 3 years ago
YunaiV 00f90e75d9 promotion:增加满减送活动的关闭功能 3 years ago
YunaiV 86b6b85934 promotion:增加优惠劵的前端分页界面 80% 3 years ago
YunaiV 8ae8a4a652 promotion:完善优惠劵模板的单元测试、禁用功能 3 years ago
YunaiV bd661296c0 promotion:完善优惠劵模板的功能 3 years ago
YunaiV 3c10058dbd promotion:实现部分优惠劵模板的前端逻辑 3 years ago
luowenfeng e1e55dc841 feature(商品添加): 规格调整连带商品调整 4 years ago
YunaiV 1bd1c79ff3 mall:code review 商品模块的代码 4 years ago
YunaiV 37e948cc1b Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 4 years ago
wuxiran 02aede0417 1、修改coupon的页面、以及增加coupon的enum 4 years ago
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
4 years ago
luowenfeng 4207b2b61d feature(uniapp商品): 商品加载 4 years ago
wuxiran c8ec5c8952 mall:上传enum类,做后端模板添加判定、前端页面添加 4 years ago
xingyu b78378ce44 AJ-Captcha vue2 增加验证码二次校验 4 years ago
xingyu 4a92081937 vue2 新增行为验证码 4 years ago
YunaiV bf5df656ed 初始化管理后台的 uniapp 版本 4 years ago
YunaiV 969c387764 mall:完善商品分类的管理后台界面 4 years ago
YunaiV 2372c25e8d 完善 Redis 缓存的查询 4 years ago
芋道源码 a0f7f0ff12
!211 Redis 监控添加缓存列表
Merge pull request !211 from 圆梦巨人/feature/cache-list
4 years ago
luowenfeng c0b1f62afd fix(Redis监控): fix review 4 years ago
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
4 years ago
luowenfeng a7067ea6fd feature(Redis监控): 添加缓存列表 4 years ago
luowenfeng 40954e4e46 feature(Redis监控): 添加缓存列表 4 years ago
YunaiV 8751471aa1 优化管理后台的社交登录 4 years ago
xiaxiaoYY 247d299cca Banner模块 for review 4 years ago
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
4 years ago
YunaiV 741dda8d75 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm-back 4 years ago
YunaiV d18463866e 新增 sso 页面 4 years ago
shuaidawang bd944c4a8b 商品规格和spu前端代码生成 4 years ago
YunaiV aa8fb4acf0 搭建 oauth/authorize 的初步逻辑 4 years ago
YunaiV ce60ec0815 修改 OAuth2ClientDO 实体,支持自动授权的范围的设置 4 years ago
YunaiV f46d81dab5 增加 OAuth2 客户端 4 years ago
YunaiV 5cf68961e1 1. 修改在线会话的实现
2. 接入到会员管理 OAuth2.0
4 years ago
YunaiV a3687132b6 增加 refresh token 接口,并接入到前端项目 4 years ago
YunaiV 3351ebbbb4 去除 Spring Security 的 logout handler,使用自己定义的 logout 接口 4 years ago
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
4 years ago
YunaiV 7753bd4c44 1. code review 后台的短信验证码登陆
2. 解决 SQL Server LIMIT 1 存在报错的问题
4 years ago