Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp

# Conflicts:
#	pom.xml
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/admin-ui/static/js/4.js
#	yudao-server/src/main/resources/admin-ui/static/js/chunk-vendors.js
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-ui-admin/yarn.lock

yudao-ui-admin/src/api/bpm/task.js

@@ -39,6 +39,13 @@ export function rejectTask(data) {
     data: data
   })
 }
+export function backTask(data) {
+  return request({
+    url: '/bpm/task/back',
+    method: 'PUT',
+    data: data
+  })
+}
 
 export function updateTaskAssignee(data) {
   return request({

yudao-ui-admin/src/api/infra/redis.js

@@ -8,10 +8,47 @@ export function getCache() {
   })
 }
 
-// TODO
-export function getKeyList() {
+// 获取模块
+export function getKeyDefineList() {
   return request({
-    url: '/infra/redis/get-key-list',
+    url: '/infra/redis/get-key-define-list',
     method: 'get'
   })
 }
+
+// 获取键名列表
+export function getKeyList(keyTemplate) {
+  return request({
+    url: '/infra/redis/get-key-list',
+    method: 'get',
+    params: {
+      keyTemplate
+    }
+  })
+}
+
+// 获取缓存内容
+export function getKeyValue(key) {
+  return request({
+    url: '/infra/redis/get-key-value?key=' + key,
+    method: 'get'
+  })
+}
+
+// 根据键名删除缓存
+export function deleteKey(key) {
+  return request({
+    url: '/infra/redis/delete-key?key=' + key,
+    method: 'delete'
+  })
+}
+
+export function deleteKeys(keyTemplate) {
+  return request({
+    url: '/infra/redis/delete-keys?',
+    method: 'delete',
+    params: {
+      keyTemplate
+    }
+  })
+}

yudao-ui-admin/src/api/login.js

@@ -1,14 +1,17 @@
 import request from '@/utils/request'
-import {getRefreshToken} from "@/utils/auth";
-import service from "@/utils/request";
+import { getRefreshToken } from '@/utils/auth'
+import service from '@/utils/request'
 
 // 登录方法
-export function login(username, password, code, uuid) {
+export function login(username, password, captchaVerification, socialType, socialCode, socialState) {
   const data = {
     username,
     password,
-    code,
-    uuid
+    captchaVerification,
+    // 社交相关
+    socialType,
+    socialCode,
+    socialState
   }
   return request({
     url: '/system/auth/login',
@@ -33,15 +36,6 @@ export function logout() {
   })
 }
 
-// 获取验证码
-export function getCodeImg() {
-  return request({
-    url: '/system/captcha/get-image',
-    method: 'get',
-    timeout: 20000
-  })
-}
-
 // 社交授权的跳转
 export function socialAuthRedirect(type, redirectUri) {
   return request({
@@ -51,9 +45,9 @@ export function socialAuthRedirect(type, redirectUri) {
 }
 
 // 社交快捷登录，使用 code 授权码
-export function socialQuickLogin(type, code, state) {
+export function socialLogin(type, code, state) {
   return request({
-    url: '/system/auth/social-quick-login',
+    url: '/system/auth/social-login',
     method: 'post',
     data: {
       type,
@@ -63,21 +57,6 @@ export function socialQuickLogin(type, code, state) {
   })
 }
 
-// 社交绑定登录，使用 code 授权码 + + 账号密码
-export function socialBindLogin(type, code, state, username, password) {
-  return request({
-    url: '/system/auth/social-bind-login',
-    method: 'post',
-    data: {
-      type,
-      code,
-      state,
-      username,
-      password
-    }
-  })
-}
-
 // 获取登录验证码
 export function sendSmsCode(mobile, scene) {
   return request({
@@ -120,20 +99,20 @@ export function getAuthorize(clientId) {
 }
 
 export function authorize(responseType, clientId, redirectUri, state,
-                          autoApprove, checkedScopes, uncheckedScopes) {
+  autoApprove, checkedScopes, uncheckedScopes) {
   // 构建 scopes
-  const scopes = {};
+  const scopes = {}
   for (const scope of checkedScopes) {
-    scopes[scope] = true;
+    scopes[scope] = true
   }
   for (const scope of uncheckedScopes) {
-    scopes[scope] = false;
+    scopes[scope] = false
   }
   // 发起请求
   return service({
     url: '/system/oauth2/authorize',
-    headers:{
-      'Content-type': 'application/x-www-form-urlencoded',
+    headers: {
+      'Content-type': 'application/x-www-form-urlencoded'
     },
     params: {
       response_type: responseType,
@@ -146,3 +125,24 @@ export function authorize(responseType, clientId, redirectUri, state,
     method: 'post'
   })
 }
+
+// 获取验证图片  以及token
+export function reqGet(data) {
+  return request({
+    url: 'system/captcha/get',
+    method: 'post',
+    data
+  })
+}
+
+// 滑动或者点选验证
+export function reqCheck(data) {
+  return request({
+    url: '/system/captcha/check',
+    method: 'post',
+    data
+  })
+}
+
+export class socialBindLogin {
+}

yudao-ui-admin/src/api/mall/market/banner.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 创建Banner
+export function createBanner(data) {
+  return request({
+    url: '/market/banner/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新Banner
+export function updateBanner(data) {
+  return request({
+    url: '/market/banner/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除Banner
+export function deleteBanner(id) {
+  return request({
+    url: '/market/banner/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得Banner
+export function getBanner(id) {
+  return request({
+    url: '/market/banner/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得Banner分页
+export function getBannerPage(query) {
+  return request({
+    url: '/market/banner/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出Banner Excel
+export function exportBannerExcel(query) {
+  return request({
+    url: '/market/banner/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

yudao-ui-admin/src/api/mall/product/brand.js

@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+// 创建品牌
+export function createBrand(data) {
+  return request({
+    url: '/product/brand/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新品牌
+export function updateBrand(data) {
+  return request({
+    url: '/product/brand/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除品牌
+export function deleteBrand(id) {
+  return request({
+    url: '/product/brand/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得品牌
+export function getBrand(id) {
+  return request({
+    url: '/product/brand/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得品牌list
+export function getBrandList() {
+  return request({
+    url: '/product/brand/list',
+    method: 'get'
+  })
+}
+
+
+// 获得品牌分页
+export function getBrandPage(query) {
+  return request({
+    url: '/product/brand/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出品牌 Excel
+export function exportBrandExcel(query) {
+  return request({
+    url: '/product/brand/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

yudao-ui-admin/src/api/mall/product/category.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 创建商品分类
+export function createProductCategory(data) {
+  return request({
+    url: '/product/category/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新商品分类
+export function updateProductCategory(data) {
+  return request({
+    url: '/product/category/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除商品分类
+export function deleteProductCategory(id) {
+  return request({
+    url: '/product/category/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得商品分类
+export function getProductCategory(id) {
+  return request({
+    url: '/product/category/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得商品分类列表
+export function getProductCategoryList(query) {
+  return request({
+    url: '/product/category/list',
+    method: 'get',
+    params: query
+  })
+}

yudao-ui-admin/src/api/mall/product/property.js

@@ -0,0 +1,113 @@
+import request from '@/utils/request'
+
+// ------------------------ 属性项 -------------------
+
+// 创建属性项
+export function createProperty(data) {
+  return request({
+    url: '/product/property/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新属性项
+export function updateProperty(data) {
+  return request({
+    url: '/product/property/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除属性项
+export function deleteProperty(id) {
+  return request({
+    url: '/product/property/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得属性项
+export function getProperty(id) {
+  return request({
+    url: '/product/property/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得属性项分页
+export function getPropertyPage(query) {
+  return request({
+    url: '/product/property/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得属性项列表
+export function getPropertyList(query) {
+  return request({
+    url: '/product/property/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得属性项列表
+export function getPropertyListAndValue(query) {
+  return request({
+    url: '/product/property/get-value-list',
+    method: 'get',
+    params: query
+  })
+}
+
+// ------------------------ 属性值 -------------------
+
+// 获得属性值分页
+export function getPropertyValuePage(query) {
+  return request({
+    url: '/product/property/value/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得属性值
+export function getPropertyValue(id) {
+  return request({
+    url: '/product/property/value/get?id=' + id,
+    method: 'get'
+  })
+}
+
+
+// 创建属性值
+export function createPropertyValue(data) {
+  return request({
+    url: '/product/property/value/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新属性值
+export function updatePropertyValue(data) {
+  return request({
+    url: '/product/property/value/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除属性值
+export function deletePropertyValue(id) {
+  return request({
+    url: '/product/property/value/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+export class exportPropertyExcel {
+}

yudao-ui-admin/src/api/mall/product/sku.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 获得商品 SKU 选项的列表
+export function getSkuOptionList() {
+  return request({
+    url: '/product/sku/get-option-list',
+    method: 'get',
+  })
+}

yudao-ui-admin/src/api/mall/product/spu.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 创建商品 SPU
+export function createSpu(data) {
+  return request({
+    url: '/product/spu/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新商品 SPU
+export function updateSpu(data) {
+  return request({
+    url: '/product/spu/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除商品 SPU
+export function deleteSpu(id) {
+  return request({
+    url: '/product/spu/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得商品 SPU 详情
+export function getSpuDetail(id) {
+  return request({
+    url: '/product/spu/get-detail?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得商品 SPU 分页
+export function getSpuPage(query) {
+  return request({
+    url: '/product/spu/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得商品 SPU 精简列表
+export function getSpuSimpleList() {
+  return request({
+    url: '/product/spu/get-simple-list',
+    method: 'get',
+  })
+}

yudao-ui-admin/src/api/mall/promotion/coupon.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 删除优惠劵
+export function deleteCoupon(id) {
+  return request({
+    url: '/promotion/coupon/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得优惠劵分页
+export function getCouponPage(query) {
+  return request({
+    url: '/promotion/coupon/page',
+    method: 'get',
+    params: query
+  })
+}

yudao-ui-admin/src/api/mall/promotion/couponTemplate.js

@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+// 创建优惠劵模板
+export function createCouponTemplate(data) {
+  return request({
+    url: '/promotion/coupon-template/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新优惠劵模板
+export function updateCouponTemplate(data) {
+  return request({
+    url: '/promotion/coupon-template/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 更新优惠劵模板的状态
+export function updateCouponTemplateStatus(id, status) {
+  const data = {
+    id,
+    status
+  }
+  return request({
+    url: '/promotion/coupon-template/update-status',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除优惠劵模板
+export function deleteCouponTemplate(id) {
+  return request({
+    url: '/promotion/coupon-template/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得优惠劵模板
+export function getCouponTemplate(id) {
+  return request({
+    url: '/promotion/coupon-template/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得优惠劵模板分页
+export function getCouponTemplatePage(query) {
+  return request({
+    url: '/promotion/coupon-template/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出优惠劵模板 Excel
+export function exportCouponTemplateExcel(query) {
+  return request({
+    url: '/promotion/coupon-template/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

yudao-ui-admin/src/api/mall/promotion/discountActivity.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 创建限时折扣活动
+export function createDiscountActivity(data) {
+  return request({
+    url: '/promotion/discount-activity/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新限时折扣活动
+export function updateDiscountActivity(data) {
+  return request({
+    url: '/promotion/discount-activity/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 关闭限时折扣活动
+export function closeDiscountActivity(id) {
+  return request({
+    url: '/promotion/discount-activity/close?id=' + id,
+    method: 'put'
+  })
+}
+
+// 删除限时折扣活动
+export function deleteDiscountActivity(id) {
+  return request({
+    url: '/promotion/discount-activity/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得限时折扣活动
+export function getDiscountActivity(id) {
+  return request({
+    url: '/promotion/discount-activity/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得限时折扣活动分页
+export function getDiscountActivityPage(query) {
+  return request({
+    url: '/promotion/discount-activity/page',
+    method: 'get',
+    params: query
+  })
+}

yudao-ui-admin/src/api/mall/promotion/rewardActivity.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 创建满减送活动
+export function createRewardActivity(data) {
+  return request({
+    url: '/promotion/reward-activity/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新满减送活动
+export function updateRewardActivity(data) {
+  return request({
+    url: '/promotion/reward-activity/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 关闭满减送活动
+export function closeRewardActivity(id) {
+  return request({
+    url: '/promotion/reward-activity/close?id=' + id,
+    method: 'put'
+  })
+}
+
+// 删除满减送活动
+export function deleteRewardActivity(id) {
+  return request({
+    url: '/promotion/reward-activity/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得满减送活动
+export function getRewardActivity(id) {
+  return request({
+    url: '/promotion/reward-activity/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得满减送活动分页
+export function getRewardActivityPage(query) {
+  return request({
+    url: '/promotion/reward-activity/page',
+    method: 'get',
+    params: query
+  })
+}

yudao-ui-admin/src/api/mall/promotion/seckillActivity.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 创建秒杀活动
+export function createSeckillActivity(data) {
+  return request({
+    url: '/promotion/seckill-activity/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新秒杀活动
+export function updateSeckillActivity(data) {
+  return request({
+    url: '/promotion/seckill-activity/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 关闭限时折扣活动
+export function closeSeckillActivity(id) {
+  return request({
+    url: '/promotion/seckill-activity/close?id=' + id,
+    method: 'put'
+  })
+}
+
+// 删除秒杀活动
+export function deleteSeckillActivity(id) {
+  return request({
+    url: '/promotion/seckill-activity/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得秒杀活动
+export function getSeckillActivity(id) {
+  return request({
+    url: '/promotion/seckill-activity/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得秒杀活动分页
+export function getSeckillActivityPage(query) {
+  return request({
+    url: '/promotion/seckill-activity/page',
+    method: 'get',
+    params: query
+  })
+}

yudao-ui-admin/src/api/mall/promotion/seckillTime.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 创建秒杀时段
+export function createSeckillTime(data) {
+  return request({
+    url: '/promotion/seckill-time/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新秒杀时段
+export function updateSeckillTime(data) {
+  return request({
+    url: '/promotion/seckill-time/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除秒杀时段
+export function deleteSeckillTime(id) {
+  return request({
+    url: '/promotion/seckill-time/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得秒杀时段
+export function getSeckillTime(id) {
+  return request({
+    url: '/promotion/seckill-time/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得秒杀时段分页
+export function getSeckillTimePage(query) {
+  return request({
+    url: '/promotion/seckill-time/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取所有的秒杀时段
+export function getSeckillTimeList() {
+  return request({
+    url: '/promotion/seckill-time/list',
+    method: 'get'
+  })
+}
+
+// 导出秒杀时段 Excel
+export function exportSeckillTimeExcel(query) {
+  return request({
+    url: '/promotion/seckill-time/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

yudao-ui-admin/src/api/mall/trade/afterSale.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 获得交易售后
+export function getAfterSale(id) {
+  return request({
+    url: '/trade/after-sale/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得交易售后分页
+export function getAfterSalePage(query) {
+  return request({
+    url: '/trade/after-sale/page',
+    method: 'get',
+    params: query
+  })
+}

yudao-ui-admin/src/api/mall/trade/order.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 获得交易订单分页
+export function getOrderPage(query) {
+  return request({
+    url: '/trade/order/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得交易订单详情
+export function getOrderDetail(id) {
+  return request({
+    url: '/trade/order/get-detail?id=' + id,
+    method: 'get',
+  })
+}

yudao-ui-admin/src/api/system/area.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+// 获得地区树
+export function getAreaTree() {
+  return request({
+    url: '/system/area/tree',
+    method: 'get'
+  })
+}
+
+// 获得 IP 对应的地区名
+export function getAreaByIp(ip) {
+  return request({
+    url: '/system/area/get-by-ip?ip=' + ip,
+    method: 'get'
+  })
+}