From 353ddd788d8e8525b5e4e651e7275b90a394351a Mon Sep 17 00:00:00 2001
From: simple321vip <simple321@vip.qq.com>
Date: Sat, 10 Sep 2022 12:42:29 +0800
Subject: [PATCH] to add a service client for volin-trader server

---
 src/api/blog.ts          | 18 +++++++++---------
 src/api/blogView.ts      | 12 ++++++------
 src/api/bookmark.ts      | 12 ++++++------
 src/api/bookmark_type.ts | 10 +++++-----
 src/api/cloud.ts         |  4 ++--
 src/api/cta_strategy.ts  | 16 ++++++++--------
 src/api/login.ts         |  4 ++--
 src/api/onenote.ts       | 12 ++++++------
 src/api/trader.ts        |  4 ++--
 src/api/user.ts          |  8 ++++----
 src/utils/request.ts     | 30 +++++++++++++++++++++++++++++-
 yarn.lock                |  2 +-
 12 files changed, 80 insertions(+), 52 deletions(-)

diff --git a/src/api/blog.ts b/src/api/blog.ts
index 7964b55..f6f8249 100644
--- a/src/api/blog.ts
+++ b/src/api/blog.ts
@@ -1,11 +1,11 @@
-import request from '../utils/request'
+import { service } from '../utils/request'
 
 const headers = {
   'Content-Type': 'application/json;charsetset=UTF-8'
 }
 
 const listAll = () => {
-  return request({
+  return service({
     url: '/auth/api/v1/author/blog/list',
     method: 'GET',
     headers: headers
@@ -13,7 +13,7 @@ const listAll = () => {
 }
 
 const updateBtName = (data: Object) => {
-  return request({
+  return service({
     url: '/auth/api/v1/author/blog_type',
     method: 'POST',
     headers: headers,
@@ -22,7 +22,7 @@ const updateBtName = (data: Object) => {
 }
 
 const putBlogType = (data: Object) => {
-  return request({
+  return service({
     url: '/auth/api/v1/author/blog_type',
     method: 'PUT',
     headers: headers,
@@ -31,7 +31,7 @@ const putBlogType = (data: Object) => {
 }
 
 const removeBlogType = (data: Object) => {
-  return request({
+  return service({
     url: '/auth/api/v1/author/blog_type',
     method: 'DELETE',
     headers: headers,
@@ -40,7 +40,7 @@ const removeBlogType = (data: Object) => {
 }
 
 const getContent = (id: string) => {
-  return request({
+  return service({
     url: '/auth/api/v1/author/blog/content/' + id,
     method: 'GET',
     headers: headers,
@@ -48,7 +48,7 @@ const getContent = (id: string) => {
 }
 
 const putBlog = (postData: Object) => {
-  return request({
+  return service({
     url: '/auth/api/v1/author/blog/content',
     method: 'PUT',
     headers: headers,
@@ -57,7 +57,7 @@ const putBlog = (postData: Object) => {
 }
 
 const updateContent = (postData: Object) => {
-  return request({
+  return service({
     url: '/auth/api/v1/author/blog/content',
     method: 'POST',
     headers: headers,
@@ -66,7 +66,7 @@ const updateContent = (postData: Object) => {
 }
 
 const deleteContent = (bid: string) => {
-  return request({
+  return service({
     url: '/auth/api/v1/author/blog/' + bid,
     method: 'DELETE',
     headers: headers,
diff --git a/src/api/blogView.ts b/src/api/blogView.ts
index 76a2efc..b779a6f 100644
--- a/src/api/blogView.ts
+++ b/src/api/blogView.ts
@@ -1,4 +1,4 @@
-import request from '../utils/request'
+import { service } from '../utils/request'
 import Qs from 'qs'
 
 const headers = {
@@ -6,7 +6,7 @@ const headers = {
 }
 
 const getBlogs = (params: Object) => {
-  return request({
+  return service({
     url: '/auth/api/v1/reader/blogs',
     method: 'GET',
     params: params,
@@ -17,7 +17,7 @@ const getBlogs = (params: Object) => {
 }
 
 const getBtName = () => {
-  return request({
+  return service({
     url: '/auth/api/v1/reader/blog_type',
     method: 'GET',
     headers: headers
@@ -25,7 +25,7 @@ const getBtName = () => {
 }
 
 const getBlog = (bid: string) => {
-  return request({
+  return service({
     url: '/auth/api/v1/reader/blog/' + bid,
     method: 'GET',
     headers: headers
@@ -33,14 +33,14 @@ const getBlog = (bid: string) => {
 }
 
 const publishAll = () => {
-  return request({
+  return service({
     url: '/auth/api/v1/reader/blogs/publish/all',
     method: 'GET'
   })
 }
 
 const publish = (bid: string) => {
-  return request({
+  return service({
     url: '/auth/api/v1/reader/blogs/publish/' + bid,
     method: 'GET'
   })
diff --git a/src/api/bookmark.ts b/src/api/bookmark.ts
index 39c3179..c16ac59 100644
--- a/src/api/bookmark.ts
+++ b/src/api/bookmark.ts
@@ -1,4 +1,4 @@
-import request from '../utils/request'
+import { service } from '../utils/request'
 import Qs from 'qs'
 
 /**
@@ -7,7 +7,7 @@ import Qs from 'qs'
  * @returns 
  */
 const search_bookmark = (params: Object) => {
-  return request({
+  return service({
     url: '/auth/api/v1/bookmark',
     method: 'GET',
     params: params,
@@ -18,7 +18,7 @@ const search_bookmark = (params: Object) => {
 }
 
 const put_bookmark = (params: Object) => {
-  return request({
+  return service({
     url: '/auth/api/v1/bookmark/insert',
     method: 'PUT',
     data: params
@@ -26,7 +26,7 @@ const put_bookmark = (params: Object) => {
 }
 
 const update_bookmark = (params: Object) => {
-  return request({
+  return service({
     url: '/auth/api/v1/bookmark/update',
     method: 'POST',
     data: params
@@ -34,14 +34,14 @@ const update_bookmark = (params: Object) => {
 }
 
 const delete_bookmark = (query: number) => {
-  return request({
+  return service({
     url: '/auth/api/v1/bookmark/delete/' + query,
     method: 'DELETE',
   })
 }
 
 const delete_bookmarks = (params: Object) => {
-  return request({
+  return service({
     url: '/auth/api/v1/bookmark',
     method: 'DELETE',
     headers: {},
diff --git a/src/api/bookmark_type.ts b/src/api/bookmark_type.ts
index 346e4b3..db02f32 100644
--- a/src/api/bookmark_type.ts
+++ b/src/api/bookmark_type.ts
@@ -1,7 +1,7 @@
-import request from '../utils/request'
+import { service } from '../utils/request'
 
 const put_bookmark_type = (params: Object) => {
-  return request({
+  return service({
     url: '/auth/api/v1/bookmark_type/insert',
     method: 'PUT',
     data: params
@@ -9,7 +9,7 @@ const put_bookmark_type = (params: Object) => {
 }
 
 const get_bookmark_type = () => {
-  return request({
+  return service({
     url: '/auth/api/v1/bookmark_type',
     method: 'GET',
     data: {}
@@ -17,14 +17,14 @@ const get_bookmark_type = () => {
 }
 
 const delete_bookmark_type = (type_id: string) => {
-  return request({
+  return service({
     url: '/auth/api/v1/bookmark_type/' + type_id,
     method: 'DELETE'
   })
 }
 
 const post_bookmark_type = (params: Object) => {
-  return request({
+  return service({
     url: '/auth/api/v1/bookmark_type',
     method: 'POST',
     data: params
diff --git a/src/api/cloud.ts b/src/api/cloud.ts
index f222a62..4676d00 100644
--- a/src/api/cloud.ts
+++ b/src/api/cloud.ts
@@ -1,11 +1,11 @@
-import request from '../utils/request'
+import { service } from '../utils/request'
 
 const headers = {
   'Content-Type': 'application/json;charsetset=UTF-8'
 }
 
 const getAudioInfo = (url: string) => {
-  return request({
+  return service({
     url: '/auth/api/v1/common/audio-info',
     method: 'GET',
     params: { url: url },
diff --git a/src/api/cta_strategy.ts b/src/api/cta_strategy.ts
index 694497a..64a4e9e 100644
--- a/src/api/cta_strategy.ts
+++ b/src/api/cta_strategy.ts
@@ -1,10 +1,10 @@
-import request from '../utils/request'
+import { service2 } from '../utils/request'
 
 "CTA strategy"
 
 "strategy list"
 const get_strategy_list = () => {
-  return request({
+  return service2({
     url: '/auth/api/v1/trader',
     method: 'PUT',
   })
@@ -12,7 +12,7 @@ const get_strategy_list = () => {
 
 "upload a strategy"
 const upload_strategy = () => {
-  return request({
+  return service2({
     url: '/auth/api/v1/trader',
     method: 'PUT',
   })
@@ -20,7 +20,7 @@ const upload_strategy = () => {
 
 "load a strategy"
 const load_strategy = (strategy_id: string) => {
-  return request({
+  return service2({
     url: '/auth/api/v1/trader',
     method: 'PUT',
   })
@@ -28,7 +28,7 @@ const load_strategy = (strategy_id: string) => {
 
 "unload a strategy"
 const unload_strategy = (strategy_id: string) => {
-  return request({
+  return service2({
     url: '/auth/api/v1/trader',
     method: 'PUT',
   })
@@ -36,7 +36,7 @@ const unload_strategy = (strategy_id: string) => {
 
 "start a strategy"
 const start_strategy = (strategy_id: string) => {
-  return request({
+  return service2({
     url: '/auth/api/v1/trader',
     method: 'PUT',
   })
@@ -44,7 +44,7 @@ const start_strategy = (strategy_id: string) => {
 
 "stop a strategy"
 const stop_strategy = (strategy_id: string) => {
-  return request({
+  return service2({
     url: '/auth/api/v1/trader',
     method: 'PUT',
   })
@@ -52,7 +52,7 @@ const stop_strategy = (strategy_id: string) => {
 
 "remove a strategy"
 const remove_strategy = (strategy_id: string) => {
-  return request({
+  return service2({
     url: '/auth/api/v1/trader',
     method: 'PUT',
   })
diff --git a/src/api/login.ts b/src/api/login.ts
index 3b52c97..f2332c5 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -1,11 +1,11 @@
-import request from '../utils/request'
+import { service } from '../utils/request'
 
 const headers = {
   'Content-Type': 'application/json;charsetset=UTF-8'
 }
 
 const getQrCode = () => {
-  return request({
+  return service({
     url: '/auth/authorize/baidu',
     method: 'GET',
     headers: headers,
diff --git a/src/api/onenote.ts b/src/api/onenote.ts
index 9992560..9ae4f93 100644
--- a/src/api/onenote.ts
+++ b/src/api/onenote.ts
@@ -1,7 +1,7 @@
-import request from '../utils/request'
+import { service } from '../utils/request'
 
 const get_notes = (params: Object) => {
-  return request({
+  return service({
     url: '/auth/api/v1/one_note',
     method: 'GET',
     params: params
@@ -9,7 +9,7 @@ const get_notes = (params: Object) => {
 }
 
 const update_page = (params: Object) => {
-  return request({
+  return service({
     url: '/auth/api/v1/one_note/update_page',
     method: 'POST',
     data: params
@@ -17,7 +17,7 @@ const update_page = (params: Object) => {
 }
 
 const update_section = (params: Object) => {
-  return request({
+  return service({
     url: '/auth/api/v1/one_note/update_section',
     method: 'POST',
     data: params
@@ -25,14 +25,14 @@ const update_section = (params: Object) => {
 }
 
 const insert_section = () => {
-  return request({
+  return service({
     url: '/auth/api/v1/one_note/insert_section',
     method: 'PUT'
   })
 }
 
 const insert_page = (params: Object) => {
-  return request({
+  return service({
     url: '/auth/one_note/insert_page',
     method: 'PUT',
     data: params
diff --git a/src/api/trader.ts b/src/api/trader.ts
index e5912eb..8b6c460 100644
--- a/src/api/trader.ts
+++ b/src/api/trader.ts
@@ -1,7 +1,7 @@
-import request from '../utils/request'
+import { service } from '../utils/request'
 
 const get_stock_data = (data: Object) => {
-  return request({
+  return service({
     url: '/auth/api/v1/trader',
     method: 'PUT',
     data: data
diff --git a/src/api/user.ts b/src/api/user.ts
index 9b9aabb..9356738 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -1,6 +1,6 @@
-import request from '../utils/request'
+import { service } from '../utils/request'
 const authorize = (params: any) => {
-  return request({
+  return service({
     url: '/auth/api/v1/authorize',
     method: 'post',
     data: params
@@ -8,7 +8,7 @@ const authorize = (params: any) => {
 }
 
 const obtainUserInfo = (token: string) => {
-  return request({
+  return service({
     url: '/auth/api/v1/user_info',
     method: 'GET',
     params: { token: token }
@@ -16,7 +16,7 @@ const obtainUserInfo = (token: string) => {
 }
 
 const logout = (id: string) => {
-  return request({
+  return service({
     url: '/auth/api/v1/logout/' + id,
     method: 'GET'
   })
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 7924966..cf19357 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,6 +1,7 @@
 import axios from 'axios'
 import { getToken, getTenant } from '../utils/auth'
 
+// violin-book
 const service = axios.create(
   {
     baseURL: import.meta.env.VITE_APP_URL as string,
@@ -8,6 +9,14 @@ const service = axios.create(
   }
 )
 
+// violin-trader
+const service2 = axios.create(
+  {
+    baseURL: import.meta.env.VITE_APP_URL2 as string,
+    timeout: 5000
+  }
+)
+
 service.interceptors.request.use(
   config => {
     if (typeof getToken() === 'string') {
@@ -26,6 +35,25 @@ service.interceptors.request.use(
   }
 )
 
+service2.interceptors.request.use(
+  config => {
+    if (typeof getToken() === 'string') {
+      (config as any).headers['Authorization'] = 'Bearer' + getToken()
+    }
+    const tenant = getTenant()
+    if (typeof tenant === 'string') {
+      (config as any).headers['id'] = JSON.parse(tenant).id
+    }
+
+    return config
+  },
+  error => {
+    console.log(error)
+    return Promise.reject(error)
+  }
+)
+
+
 // service.interceptors.response.use(
 //   response => {
 //     if (response.headers['content-dispostion']
@@ -54,4 +82,4 @@ service.interceptors.request.use(
 //   }
 // )
 
-export default service
\ No newline at end of file
+export { service, service2 }
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 26155b9..251204c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -870,7 +870,7 @@ mingo@1:
   resolved "https://registry.yarnpkg.com/mingo/-/mingo-1.3.3.tgz#6922c4d147efc771a01425a2c4c8f7784478c546"
   integrity sha512-Y4wGTD/M7AMqF8QxKaBGps+axq/Z48hdtRAeiKtInkEXMLzUWUwT0OPDzrB26xrav9GF1AOYJfwVWPcLwnkgTA==
 
-moment@^2.29.2:
+moment@^2.29.4:
   version "2.29.4"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==