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

# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-ui-admin/src/utils/dict.js

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

@@ -1,17 +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,
-                      socialType, socialCode, socialState) {
+export function login(username, password, captchaVerification, socialType, socialCode, socialState) {
   const data = {
     username,
     password,
-    code,
-    uuid,
+    captchaVerification,
     // 社交相关
-    socialType, socialCode, socialState
+    socialType,
+    socialCode,
+    socialState
   }
   return request({
     url: '/system/auth/login',
@@ -36,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({
@@ -108,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,
@@ -135,5 +126,23 @@ export function authorize(responseType, clientId, redirectUri, state,
   })
 }
 
+// 获取验证图片  以及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/product/brand.js

@@ -34,6 +34,15 @@ export function getBrand(id) {
   })
 }
 
+// 获得品牌list
+export function getBrandList() {
+  return request({
+    url: '/product/brand/list',
+    method: 'get'
+  })
+}
+
+
 // 获得品牌分页
 export function getBrandPage(query) {
   return request({

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

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 创建商品分类
-export function createCategory(data) {
+export function createProductCategory(data) {
   return request({
     url: '/product/category/create',
     method: 'post',
@@ -10,7 +10,7 @@ export function createCategory(data) {
 }
 
 // 更新商品分类
-export function updateCategory(data) {
+export function updateProductCategory(data) {
   return request({
     url: '/product/category/update',
     method: 'put',
@@ -19,7 +19,7 @@ export function updateCategory(data) {
 }
 
 // 删除商品分类
-export function deleteCategory(id) {
+export function deleteProductCategory(id) {
   return request({
     url: '/product/category/delete?id=' + id,
     method: 'delete'
@@ -27,37 +27,18 @@ export function deleteCategory(id) {
 }
 
 // 获得商品分类
-export function getCategory(id) {
+export function getProductCategory(id) {
   return request({
     url: '/product/category/get?id=' + id,
     method: 'get'
   })
 }
 
-// 获得商品分类
-export function listCategory(query) {
+// 获得商品分类列表
+export function getProductCategoryList(query) {
   return request({
-    url: '/product/category/listByQuery',
+    url: '/product/category/list',
     method: 'get',
     params: query
   })
 }
-
-// 获得商品分类分页
-export function getCategoryPage(query) {
-  return request({
-    url: '/product/category/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出商品分类 Excel
-export function exportCategoryExcel(query) {
-  return request({
-    url: '/product/category/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

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

@@ -1,6 +1,8 @@
 import request from '@/utils/request'
 
-// 创建规格名称
+// ------------------------ 属性项 -------------------
+
+// 创建属性项
 export function createProperty(data) {
   return request({
     url: '/product/property/create',
@@ -9,7 +11,7 @@ export function createProperty(data) {
   })
 }
 
-// 更新规格名称
+// 更新属性项
 export function updateProperty(data) {
   return request({
     url: '/product/property/update',
@@ -18,7 +20,7 @@ export function updateProperty(data) {
   })
 }
 
-// 删除规格名称
+// 删除属性项
 export function deleteProperty(id) {
   return request({
     url: '/product/property/delete?id=' + id,
@@ -26,7 +28,7 @@ export function deleteProperty(id) {
   })
 }
 
-// 获得规格名称
+// 获得属性项
 export function getProperty(id) {
   return request({
     url: '/product/property/get?id=' + id,
@@ -34,7 +36,7 @@ export function getProperty(id) {
   })
 }
 
-// 获得规格名称分页
+// 获得属性项分页
 export function getPropertyPage(query) {
   return request({
     url: '/product/property/page',
@@ -43,12 +45,69 @@ export function getPropertyPage(query) {
   })
 }
 
-// 导出规格名称 Excel
-export function exportPropertyExcel(query) {
+// 获得属性项列表
+export function getPropertyList(query) {
   return request({
-    url: '/product/property/export-excel',
+    url: '/product/property/list',
     method: 'get',
-    params: query,
-    responseType: 'blob'
+    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

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 创建商品spu
+// 创建商品 SPU
 export function createSpu(data) {
   return request({
     url: '/product/spu/create',
@@ -9,7 +9,7 @@ export function createSpu(data) {
   })
 }
 
-// 更新商品spu
+// 更新商品 SPU
 export function updateSpu(data) {
   return request({
     url: '/product/spu/update',
@@ -18,7 +18,7 @@ export function updateSpu(data) {
   })
 }
 
-// 删除商品spu
+// 删除商品 SPU
 export function deleteSpu(id) {
   return request({
     url: '/product/spu/delete?id=' + id,
@@ -26,15 +26,15 @@ export function deleteSpu(id) {
   })
 }
 
-// 获得商品spu
-export function getSpu(id) {
+// 获得商品 SPU 详情
+export function getSpuDetail(id) {
   return request({
-    url: '/product/spu/get?id=' + id,
+    url: '/product/spu/get-detail?id=' + id,
     method: 'get'
   })
 }
 
-// 获得商品spu分页
+// 获得商品 SPU 分页
 export function getSpuPage(query) {
   return request({
     url: '/product/spu/page',
@@ -43,12 +43,10 @@ export function getSpuPage(query) {
   })
 }
 
-// 导出商品spu Excel
-export function exportSpuExcel(query) {
+// 获得商品 SPU 精简列表
+export function getSpuSimpleList() {
   return request({
-    url: '/product/spu/export-excel',
+    url: '/product/spu/get-simple-list',
     method: 'get',
-    params: query,
-    responseType: 'blob'
   })
 }

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/mp/account.js

@@ -0,0 +1,68 @@
+import request from '@/utils/request'
+
+// 创建公众号账号
+export function createAccount(data) {
+  return request({
+    url: '/mp/account/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新公众号账号
+export function updateAccount(data) {
+  return request({
+    url: '/mp/account/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除公众号账号
+export function deleteAccount(id) {
+  return request({
+    url: '/mp/account/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得公众号账号
+export function getAccount(id) {
+  return request({
+    url: '/mp/account/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得公众号账号分页
+export function getAccountPage(query) {
+  return request({
+    url: '/mp/account/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取公众号账号精简信息列表
+export function getSimpleAccounts() {
+  return request({
+    url: '/mp/account/list-all-simple',
+    method: 'get',
+  })
+}
+
+// 生成公众号二维码
+export function generateAccountQrCode(id) {
+  return request({
+    url: '/mp/account/generate-qr-code?id=' + id,
+    method: 'put'
+  })
+}
+
+// 清空公众号 API 配额
+export function clearAccountQuota(id) {
+  return request({
+    url: '/mp/account/clear-quota?id=' + id,
+    method: 'put'
+  })
+}

yudao-ui-admin/src/api/mp/autoReply.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 创建公众号的自动回复
+export function createAutoReply(data) {
+  return request({
+    url: '/mp/auto-reply/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新公众号的自动回复
+export function updateAutoReply(data) {
+  return request({
+    url: '/mp/auto-reply/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除公众号的自动回复
+export function deleteAutoReply(id) {
+  return request({
+    url: '/mp/auto-reply/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得公众号的自动回复
+export function getAutoReply(id) {
+  return request({
+    url: '/mp/auto-reply/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得公众号的自动回复分页
+export function getAutoReplyPage(query) {
+  return request({
+    url: '/mp/auto-reply/page',
+    method: 'get',
+    params: query
+  })
+}

yudao-ui-admin/src/api/mp/draft.js

@@ -0,0 +1,38 @@
+import request from '@/utils/request'
+
+// 获得公众号草稿分页
+export function getDraftPage(query) {
+  return request({
+    url: '/mp/draft/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 创建公众号草稿
+export function createDraft(accountId, articles) {
+  return request({
+    url: '/mp/draft/create?accountId=' + accountId,
+    method: 'post',
+    data: {
+      articles
+    }
+  })
+}
+
+// 更新公众号草稿
+export function updateDraft(accountId, mediaId, articles) {
+  return request({
+    url: '/mp/draft/update?accountId=' + accountId + '&mediaId=' + mediaId,
+    method: 'put',
+    data: articles
+  })
+}
+
+// 删除公众号草稿
+export function deleteDraft(accountId, mediaId) {
+  return request({
+    url: '/mp/draft/delete?accountId=' + accountId + '&mediaId=' + mediaId,
+    method: 'delete',
+  })
+}

yudao-ui-admin/src/api/mp/freePublish.js

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 获得公众号素材分页
+export function getFreePublishPage(query) {
+  return request({
+    url: '/mp/free-publish/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除公众号素材
+export function deleteFreePublish(accountId, articleId) {
+  return request({
+    url: '/mp/free-publish/delete?accountId=' + accountId + '&articleId=' + articleId,
+    method: 'delete'
+  })
+}
+
+// 发布公众号素材
+export function submitFreePublish(accountId, mediaId) {
+  return request({
+    url: '/mp/free-publish/submit?accountId=' + accountId + '&mediaId=' + mediaId,
+    method: 'post'
+  })
+}

yudao-ui-admin/src/api/mp/material.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 获得公众号素材分页
+export function getMaterialPage(query) {
+  return request({
+    url: '/mp/material/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除公众号永久素材
+export function deletePermanentMaterial(id) {
+  return request({
+    url: '/mp/material/delete-permanent?id=' + id,
+    method: 'delete'
+  })
+}

yudao-ui-admin/src/api/mp/menu.js

@@ -0,0 +1,29 @@
+import request from '@/utils/request'
+
+// 获得公众号菜单列表
+export function getMenuList(accountId) {
+  return request({
+    url: '/mp/menu/list?accountId=' + accountId,
+    method: 'get',
+  })
+}
+
+// 保存公众号菜单
+export function saveMenu(accountId, menus) {
+  return request({
+    url: '/mp/menu/save',
+    method: 'post',
+    data: {
+      accountId,
+      menus
+    }
+  })
+}
+
+// 删除公众号菜单
+export function deleteMenu(accountId) {
+  return request({
+    url: '/mp/menu/delete?accountId=' + accountId,
+    method: 'delete',
+  })
+}

yudao-ui-admin/src/api/mp/message.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 获得公众号消息分页
+export function getMessagePage(query) {
+  return request({
+    url: '/mp/message/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 给粉丝发送消息
+export function sendMessage(data) {
+  return request({
+    url: '/mp/message/send',
+    method: 'post',
+    data: data
+  })
+}

yudao-ui-admin/src/api/mp/statistics.js

@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+// 获取消息发送概况数据
+export function getUpstreamMessage(query) {
+  return request({
+    url: '/mp/statistics/upstream-message',
+    method: 'get',
+    params: query
+  })
+}
+
+// 用户增减数据
+export function getUserSummary(query) {
+  return request({
+    url: '/mp/statistics/user-summary',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得用户累计数据
+export function getUserCumulate(query) {
+  return request({
+    url: '/mp/statistics/user-cumulate',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得接口分析数据
+export function getInterfaceSummary(query) {
+  return request({
+    url: '/mp/statistics/interface-summary',
+    method: 'get',
+    params: query
+  })
+}

yudao-ui-admin/src/api/mp/tag.js

@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+// 创建公众号标签
+export function createTag(data) {
+  return request({
+    url: '/mp/tag/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新公众号标签
+export function updateTag(data) {
+  return request({
+    url: '/mp/tag/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除公众号标签
+export function deleteTag(id) {
+  return request({
+    url: '/mp/tag/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得公众号标签
+export function getTag(id) {
+  return request({
+    url: '/mp/tag/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得公众号标签分页
+export function getTagPage(query) {
+  return request({
+    url: '/mp/tag/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取公众号标签精简信息列表
+export function getSimpleTags() {
+  return request({
+    url: '/mp/tag/list-all-simple',
+    method: 'get',
+  })
+}
+
+// 同步公众号标签
+export function syncTag(accountId) {
+  return request({
+    url: '/mp/tag/sync?accountId=' + accountId,
+    method: 'post'
+  })
+}

yudao-ui-admin/src/api/mp/user.js

@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+// 更新公众号粉丝
+export function updateUser(data) {
+  return request({
+    url: '/mp/user/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 获得公众号粉丝
+export function getUser(id) {
+  return request({
+    url: '/mp/user/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得公众号粉丝分页
+export function getUserPage(query) {
+  return request({
+    url: '/mp/user/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 同步公众号粉丝
+export function syncUser(accountId) {
+  return request({
+    url: '/mp/tag/sync?accountId=' + accountId,
+    method: 'post'
+  })
+}

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'
+  })
+}

yudao-ui-admin/src/api/system/mail/account.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 创建邮箱账号
+export function createMailAccount(data) {
+  return request({
+    url: '/system/mail-account/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新邮箱账号
+export function updateMailAccount(data) {
+  return request({
+    url: '/system/mail-account/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除邮箱账号
+export function deleteMailAccount(id) {
+  return request({
+    url: '/system/mail-account/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得邮箱账号
+export function getMailAccount(id) {
+  return request({
+    url: '/system/mail-account/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得邮箱账号分页
+export function getMailAccountPage(query) {
+  return request({
+    url: '/system/mail-account/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取邮箱账号的精简信息列表
+export function getSimpleMailAccountList() {
+  return request({
+    url: '/system/mail-account/list-all-simple',
+    method: 'get',
+  })
+}

yudao-ui-admin/src/api/system/mail/log.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 获得邮件日志
+export function getMailLog(id) {
+  return request({
+    url: '/system/mail-log/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得邮件日志分页
+export function getMailLogPage(query) {
+  return request({
+    url: '/system/mail-log/page',
+    method: 'get',
+    params: query
+  })
+}

yudao-ui-admin/src/api/system/mail/template.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 创建邮件模版
+export function createMailTemplate(data) {
+  return request({
+    url: '/system/mail-template/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新邮件模版
+export function updateMailTemplate(data) {
+  return request({
+    url: '/system/mail-template/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除邮件模版
+export function deleteMailTemplate(id) {
+  return request({
+    url: '/system/mail-template/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得邮件模版
+export function getMailTemplate(id) {
+  return request({
+    url: '/system/mail-template/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得邮件模版分页
+export function getMailTemplatePage(query) {
+  return request({
+    url: '/system/mail-template/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 发送测试邮件
+export function sendMail(data) {
+  return request({
+    url: '/system/mail-template/send-mail',
+    method: 'post',
+    data: data
+  })
+}

yudao-ui-admin/src/api/system/sms/smsTemplate.js

@@ -43,7 +43,7 @@ export function getSmsTemplatePage(query) {
   })
 }
 
-// 创建短信模板
+// 发送测试短信
 export function sendSms(data) {
   return request({
     url: '/system/sms-template/send-sms',