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

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

@@ -3,12 +3,15 @@ import {getRefreshToken} from "@/utils/auth";
 import service from "@/utils/request";
 
 // 登录方法
-export function login(username, password, code, uuid) {
+export function login(username, password, code, uuid,
+                      socialType, socialCode, socialState) {
   const data = {
     username,
     password,
     code,
-    uuid
+    uuid,
+    // 社交相关
+    socialType, socialCode, socialState
   }
   return request({
     url: '/system/auth/login',
@@ -51,9 +54,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 +66,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({

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,54 @@
+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'
+  })
+}
+
+// 获得品牌分页
+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,63 @@
+import request from '@/utils/request'
+
+// 创建商品分类
+export function createCategory(data) {
+  return request({
+    url: '/product/category/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新商品分类
+export function updateCategory(data) {
+  return request({
+    url: '/product/category/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除商品分类
+export function deleteCategory(id) {
+  return request({
+    url: '/product/category/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得商品分类
+export function getCategory(id) {
+  return request({
+    url: '/product/category/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得商品分类
+export function listCategory(query) {
+  return request({
+    url: '/product/category/listByQuery',
+    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

@@ -0,0 +1,54 @@
+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
+  })
+}
+
+// 导出规格名称 Excel
+export function exportPropertyExcel(query) {
+  return request({
+    url: '/product/property/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

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

@@ -0,0 +1,54 @@
+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 getSpu(id) {
+  return request({
+    url: '/product/spu/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得商品spu分页
+export function getSpuPage(query) {
+  return request({
+    url: '/product/spu/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出商品spu Excel
+export function exportSpuExcel(query) {
+  return request({
+    url: '/product/spu/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}