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

� Conflicts:
�	sql/optional/mall/mall.sql

Author: YunaiV

.env.demo1024

@@ -17,6 +17,9 @@ VUE_APP_APP_NAME ='/admin-ui/'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

.env.dev

@@ -13,6 +13,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

.env.local

@@ -14,6 +14,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

.env.prod

@@ -15,6 +15,9 @@ VUE_APP_APP_NAME ='yudao-admin'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = false
 

.env.stage

@@ -15,6 +15,9 @@ PUBLIC_PATH = 'http://static.yudao.iocoder.cn/'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = false
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yudao-ui-admin",
-  "version": "1.6.3-snapshot",
+  "version": "1.6.4-snapshot",
   "description": "芋道管理系统",
   "author": "芋道",
   "license": "MIT",
@@ -51,6 +51,7 @@
     "highlight.js": "9.18.5",
     "js-beautify": "1.13.0",
     "jsencrypt": "3.0.0-rc.1",
+    "crypto-js": "^4.0.0",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",

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,
@@ -134,3 +125,6 @@ export function authorize(responseType, clientId, redirectUri, state,
     method: 'post'
   })
 }
+
+export class socialBindLogin {
+}