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

Author: YunaiV

.env.dev

@@ -5,7 +5,7 @@ ENV = 'development'
 VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.225.2'
+VUE_APP_BASE_API = 'http://localhost:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.npmrc

@@ -0,0 +1,4 @@
+phantomjs_cdnurl=http://cnpmjs.org/downloads
+chromedriver_cdnurl=http://cdn.npm.taobao.org/dist/chromedriver
+sass_binary_site=https://npm.taobao.org/mirrors/node-sass/
+registry=https://registry.npmmirror.com

package.json

@@ -12,7 +12,8 @@
     "build:dev": "vue-cli-service build --mode dev",
     "build:demo1024": "vue-cli-service build --mode demo1024",
     "preview": "node build/index.js --preview",
-    "lint": "eslint --ext .js,.vue src"
+    "lint": "eslint --ext .js,.vue src",
+    "clean": "rimraf node_modules"
   },
   "husky": {
     "hooks": {
@@ -62,11 +63,11 @@
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",
-    "bpmn-js-token-simulation": "^0.10.0",
-    "min-dash": "^3.5.2",
-    "xml-js": "^1.6.11",
-    "@babel/parser": "^7.7.4",
-    "throttle-debounce": "^2.1.0"
+    "bpmn-js-token-simulation": "0.10.0",
+    "min-dash": "3.5.2",
+    "xml-js": "1.6.11",
+    "@babel/parser": "7.7.4",
+    "throttle-debounce": "2.1.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",

src/api/login.js

@@ -1,4 +1,6 @@
 import request from '@/utils/request'
+import {getRefreshToken} from "@/utils/auth";
+import service from "@/utils/request";
 
 // 登录方法
 export function login(username, password, code, uuid) {
@@ -26,7 +28,7 @@ export function getInfo() {
 // 退出方法
 export function logout() {
   return request({
-    url: '/system/logout',
+    url: '/system/auth/logout',
     method: 'post'
   })
 }
@@ -75,3 +77,72 @@ export function socialBindLogin(type, code, state, username, password) {
     }
   })
 }
+
+// 获取登录验证码
+export function sendSmsCode(mobile, scene) {
+  return request({
+    url: '/system/auth/send-sms-code',
+    method: 'post',
+    data: {
+      mobile,
+      scene
+    }
+  })
+}
+
+// 短信验证码登录
+export function smsLogin(mobile, code) {
+  return request({
+    url: '/system/auth/sms-login',
+    method: 'post',
+    data: {
+      mobile,
+      code
+    }
+  })
+}
+
+// 刷新访问令牌
+export function refreshToken() {
+  return service({
+    url: '/system/auth/refresh-token?refreshToken=' + getRefreshToken(),
+    method: 'post'
+  })
+}
+
+// ========== OAUTH 2.0 相关 ==========
+
+export function getAuthorize(clientId) {
+  return request({
+    url: '/system/oauth2/authorize?clientId=' + clientId,
+    method: 'get'
+  })
+}
+
+export function authorize(responseType, clientId, redirectUri, state,
+                          autoApprove, checkedScopes, uncheckedScopes) {
+  // 构建 scopes
+  const scopes = {};
+  for (const scope of checkedScopes) {
+    scopes[scope] = true;
+  }
+  for (const scope of uncheckedScopes) {
+    scopes[scope] = false;
+  }
+  // 发起请求
+  return service({
+    url: '/system/oauth2/authorize',
+    headers:{
+      'Content-type': 'application/x-www-form-urlencoded',
+    },
+    params: {
+      response_type: responseType,
+      client_id: clientId,
+      redirect_uri: redirectUri,
+      state: state,
+      auto_approve: autoApprove,
+      scope: JSON.stringify(scopes)
+    },
+    method: 'post'
+  })
+}

src/api/system/oauth2/oauth2Client.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 创建 OAuth2 客户端
+export function createOAuth2Client(data) {
+  return request({
+    url: '/system/oauth2-client/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新 OAuth2 客户端
+export function updateOAuth2Client(data) {
+  return request({
+    url: '/system/oauth2-client/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除 OAuth2 客户端
+export function deleteOAuth2Client(id) {
+  return request({
+    url: '/system/oauth2-client/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得 OAuth2 客户端
+export function getOAuth2Client(id) {
+  return request({
+    url: '/system/oauth2-client/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得 OAuth2 客户端分页
+export function getOAuth2ClientPage(query) {
+  return request({
+    url: '/system/oauth2-client/page',
+    method: 'get',
+    params: query
+  })
+}

src/api/system/oauth2/oauth2Token.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 获得访问令牌分页
+export function getAccessTokenPage(query) {
+  return request({
+    url: '/system/oauth2-token/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除访问令牌
+export function deleteAccessToken(accessToken) {
+  return request({
+    url: '/system/oauth2-token/delete?accessToken=' + accessToken,
+    method: 'delete'
+  })
+}