Browse Source

秘钥问题优化

xgb 1 week ago
parent
commit
f3ab55e640
5 changed files with 36 additions and 31 deletions
  1. 1 9
      .env.development
  2. 1 9
      .env.prod-bjzm
  3. 1 9
      .env.production
  4. 17 0
      src/api/common.js
  5. 16 4
      src/utils/obs.js

+ 1 - 9
.env.development

@@ -1,4 +1,4 @@
-# 页面标题
+# 页面标题
 VUE_APP_TITLE =测试平台SCRM销售端
 # 公司名称
 VUE_APP_COMPANY_NAME =测试有限公司
@@ -9,14 +9,6 @@ VUE_APP_ICP_URL =https://beian.miit.gov.cn
 # 网站LOG
 VUE_APP_LOG_URL =@/assets/logo/myhk.png
 
-# 存储桶配置
-VUE_APP_OBS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
-# 存储桶配置
-VUE_APP_OBS_SECRET_ACCESS_KEY = sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX
-# 存储桶配置
-VUE_APP_OBS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
-# 存储桶配置
-VUE_APP_OBS_BUCKET = zkzh-hw079058881
 # 存储桶配置
 VUE_APP_COS_BUCKET = fs-1319721001
 # 存储桶配置

+ 1 - 9
.env.prod-bjzm

@@ -1,4 +1,4 @@
-# 页面标题
+# 页面标题
 VUE_APP_TITLE =北京卓美悦康销售端
 # 公司名称
 VUE_APP_COMPANY_NAME =北京卓美悦康
@@ -9,14 +9,6 @@ VUE_APP_ICP_URL =https://beian.miit.gov.cn
 # 网站LOG
 VUE_APP_LOG_URL =@/assets/logo/bjzmky.png
 
-# 存储桶配置
-VUE_APP_OBS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
-# 存储桶配置
-VUE_APP_OBS_SECRET_ACCESS_KEY = sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX
-# 存储桶配置
-VUE_APP_OBS_SERVER = https://bjzmobs.cn-north-4.myhuaweicloud.com
-# 存储桶配置
-VUE_APP_OBS_BUCKET = bjzm
 # 存储桶配置
 VUE_APP_COS_BUCKET = bjzmky-1323137866
 # 存储桶配置

+ 1 - 9
.env.production

@@ -1,4 +1,4 @@
-# 页面标题
+# 页面标题
 VUE_APP_TITLE = 互联网医院管理系统
 # 公司名称
 VUE_APP_COMPANY_NAME = 重庆云联融智科技有限公司
@@ -9,14 +9,6 @@ VUE_APP_ICP_URL =https://beian.miit.gov.cn
 # 网站LOG
 VUE_APP_LOG_URL =@/assets/logo/myhk.png
 
-# 存储桶配置
-VUE_APP_OBS_ACCESS_KEY_ID = K2UTJGIN7UTZJR2XMXYG
-# 存储桶配置
-VUE_APP_OBS_SECRET_ACCESS_KEY = sbyeNJLbcYmH6copxeFP9pAoksM4NIT9Zw4x0SRX
-# 存储桶配置
-VUE_APP_OBS_SERVER = https://obs.cn-north-4.myhuaweicloud.com
-# 存储桶配置
-VUE_APP_OBS_BUCKET = zkzh-hw079058881
 # 存储桶配置
 VUE_APP_COS_BUCKET = fs-1319721001
 # 存储桶配置

+ 17 - 0
src/api/common.js

@@ -1,5 +1,22 @@
 import request from '@/utils/request'
 
+let obsConfigPromise = null
+
+export function getObsConfig() {
+    if (!obsConfigPromise) {
+        obsConfigPromise = request({
+            url: '/common/getObsConfig',
+            method: 'get'
+        }).then(response => {
+            return response.data
+        }).catch(error => {
+            obsConfigPromise = null
+            throw error
+        })
+    }
+    return obsConfigPromise
+}
+
 export function sendSmsCode(data) {
   return request({
     url: '/common/sendSmsCode',

+ 16 - 4
src/utils/obs.js

@@ -1,11 +1,23 @@
 import ObsClient from "esdk-obs-browserjs/src/obs"
+import { getObsConfig } from "@/api/common"
+
+let obsCfg = null
+
+async function getObsCfg() {
+    if (!obsCfg) {
+        const data = await getObsConfig()
+        obsCfg = data
+    }
+    return obsCfg
+}
 
 export const uploadToOBS = async (file, progressCallback, type, cancelCallback) => {
   try {
+    const cfg = await getObsCfg()
     const obsClient = new ObsClient({
-      access_key_id: process.env.VUE_APP_OBS_ACCESS_KEY_ID,
-      secret_access_key: process.env.VUE_APP_OBS_SECRET_ACCESS_KEY,
-      server: process.env.VUE_APP_OBS_SERVER,
+      access_key_id: cfg.accessKeyId,
+      secret_access_key: cfg.secretAccessKey,
+      server: cfg.server,
       timeout: 1200,
     })
 
@@ -42,7 +54,7 @@ export const uploadToOBS = async (file, progressCallback, type, cancelCallback)
 
       obsClient.putObject(
         {
-          Bucket: process.env.VUE_APP_OBS_BUCKET,
+          Bucket: cfg.bucket,
           Key: key,
           Body: file,
           ProgressCallback: callback,