feat(sys-client): add sys-extension-api support for client;

labring · Dec 24, 2021 · db33a72 · db33a72
1 parent 4a39c79
commit db33a72
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 34 deletions.
diff --git a/packages/system-client/.env.development b/packages/system-client/.env.development
@@ -1,6 +1,4 @@
 # just a flag
 ENV = 'development'
 
-# sys api base url
-VUE_APP_BASE_API_SYS = '/sys-api'
 VUE_APP_APP_CONSOLE_URI = 'http://localhost:9528/app-console'
diff --git a/packages/system-client/.env.production b/packages/system-client/.env.production
@@ -1,6 +1,4 @@
 # just a flag
 ENV = 'production'
 
-# sys api base url
-VUE_APP_BASE_API_SYS = '/sys-api'
 VUE_APP_APP_CONSOLE_URI = '/app-console'
diff --git a/packages/system-client/.env.staging b/packages/system-client/.env.staging
@@ -2,6 +2,3 @@ NODE_ENV = production
 
 # just a flag
 ENV = 'staging'
-
-# sys api base url
-VUE_APP_BASE_API_SYS = '/sys-api'
diff --git a/packages/system-client/package-lock.json b/packages/system-client/package-lock.json
diff --git a/packages/system-client/package.json b/packages/system-client/package.json
@@ -17,6 +17,7 @@
     "copy2gw": "sh copy2gateway.sh"
   },
   "dependencies": {
+    "@types/ws": "^8.2.2",
     "axios": "^0.21.1",
     "bson": "^4.5.3",
     "clipboard": "2.0.4",
@@ -33,7 +34,8 @@
     "screenfull": "4.2.0",
     "vue": "2.6.10",
     "vue-router": "3.0.2",
-    "vuex": "3.1.0"
+    "vuex": "3.1.0",
+    "ws": "^8.4.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^12.0.1",
@@ -94,4 +96,4 @@
     "type": "git",
     "url": "git+https://github.com/Maslow/less-framework.git"
   }
-}
+}
diff --git a/packages/system-client/src/api/application.js b/packages/system-client/src/api/application.js
@@ -9,7 +9,7 @@ import request from '@/utils/request'
  */
 export function getMyApplications() {
   return request({
-    url: '/apps/my',
+    url: '/sys-api/apps/my',
     method: 'get'
   })
 }
@@ -21,7 +21,7 @@ export function getMyApplications() {
  */
 export async function getApplicationByAppid(appid) {
   const res = await request({
-    url: `/apps/${appid}`,
+    url: `/sys-api/apps/${appid}`,
     method: 'get'
   })
 
@@ -35,7 +35,7 @@ export async function getApplicationByAppid(appid) {
  */
 export async function createApplication({ name }) {
   const res = await request({
-    url: `/apps/create`,
+    url: `/sys-api/apps/create`,
     method: 'post',
     data: {
       name
@@ -51,7 +51,7 @@ export async function createApplication({ name }) {
  */
 export async function updateApplication(appid, { name }) {
   const res = await request({
-    url: `/apps/${appid}`,
+    url: `/sys-api/apps/${appid}`,
     method: 'post',
     data: {
       name
@@ -67,7 +67,7 @@ export async function updateApplication(appid, { name }) {
  */
 export async function removeApplication(appid) {
   const res = await request({
-    url: `/apps/${appid}`,
+    url: `/sys-api/apps/${appid}`,
     method: 'delete'
   })
   return res
@@ -80,7 +80,7 @@ export async function removeApplication(appid) {
  */
 export async function startApplicationService(appid) {
   const res = await request({
-    url: `/apps/${appid}/service/start`,
+    url: `/sys-api/apps/${appid}/service/start`,
     method: 'post'
   })
   return res
@@ -93,7 +93,7 @@ export async function startApplicationService(appid) {
  */
 export async function stopApplicationService(appid) {
   const res = await request({
-    url: `/apps/${appid}/service/stop`,
+    url: `/sys-api/apps/${appid}/service/stop`,
     method: 'post'
   })
   return res
@@ -106,7 +106,7 @@ export async function stopApplicationService(appid) {
  */
 export async function removeApplicationService(appid) {
   const res = await request({
-    url: `/apps/${appid}/service/remove`,
+    url: `/sys-api/apps/${appid}/service/remove`,
     method: 'post'
   })
   return res
@@ -119,7 +119,7 @@ export async function removeApplicationService(appid) {
  */
 export async function exportApplication(appid) {
   const res = await request({
-    url: `/apps/${appid}/export`,
+    url: `/sys-api/apps/${appid}/export`,
     method: 'get',
     responseType: 'blob'
   })
@@ -136,7 +136,7 @@ export async function importApplication(appid, file) {
   const form = new FormData()
   form.append('file', file)
   const res = await request({
-    url: `/apps/${appid}/import`,
+    url: `/sys-api/apps/${appid}/import`,
     method: 'post',
     data: form,
     headers: { 'Content-Type': 'multipart/form-data' }

diff --git a/packages/system-client/src/api/cloud.js b/packages/system-client/src/api/cloud.js
@@ -0,0 +1,9 @@
+
+import { getToken } from '@/utils/auth'
+import { Cloud } from 'laf-client-sdk'
+
+export const cloud = new Cloud({
+  baseUrl: '/sys-extension-api',
+  dbProxyUrl: '/proxy/system',
+  getAccessToken: getToken
+})
diff --git a/packages/system-client/src/api/user.js b/packages/system-client/src/api/user.js
@@ -7,7 +7,7 @@ import request from '@/utils/request'
  */
 export function login(data) {
   return request({
-    url: '/account/login',
+    url: '/sys-api/account/login',
     method: 'post',
     data
   })
@@ -20,7 +20,7 @@ export function login(data) {
  */
 export function getUserProfile() {
   return request({
-    url: '/account/profile',
+    url: '/sys-api/account/profile',
     method: 'get'
   })
 }
@@ -30,7 +30,7 @@ export function getUserProfile() {
  */
 export function signup(data) {
   return request({
-    url: '/account/signup',
+    url: '/sys-api/account/signup',
     method: 'post',
     data
   })
@@ -41,7 +41,7 @@ export function signup(data) {
  */
 export function edit(data) {
   return request({
-    url: '/account/edit',
+    url: '/sys-api/account/edit',
     method: 'post',
     data
   })

diff --git a/packages/system-client/src/utils/request.js b/packages/system-client/src/utils/request.js
@@ -6,7 +6,6 @@ import { showInfo } from './show'
 
 // create an axios instance
 const service = axios.create({
-  baseURL: process.env.VUE_APP_BASE_API_SYS, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 60000 // request timeout
 })

diff --git a/packages/system-client/vue.config.js b/packages/system-client/vue.config.js
@@ -40,12 +40,13 @@ module.exports = {
     // before: require('./mock/mock-server.js'),
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
-      [process.env.VUE_APP_BASE_API_SYS]: {
+      '/sys-api': {
         target: 'http://console.local-dev.host:8080/',
-        changeOrigin: true,
-        // pathRewrite: {
-        //   ['^' + process.env.VUE_APP_BASE_API_SYS]: ''
-        // }
+        changeOrigin: true
+      },
+      '/sys-extension-api': {
+        target: 'http://console.local-dev.host:8080/',
+        changeOrigin: true
       }
     },
     disableHostCheck: true