From 20797914db1b6f99c21814f13059003876417566 Mon Sep 17 00:00:00 2001
From: jiang <jiang@bonus>
Date: Fri, 16 Aug 2024 15:50:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8A=A0=E5=AF=86=E5=92=8C?=
 =?UTF-8?q?=E5=AE=8C=E6=95=B4=E6=80=A7=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Editor/index.vue       |  3 +--
 src/components/FileUpload/index.vue   |  3 +--
 src/components/ImageUpload/index.vue  |  3 +--
 src/layout/components/Navbar.vue      |  6 ------
 src/utils/configure.js                |  4 ++--
 src/utils/request.js                  | 27 +++++++++++++--------------
 src/views/monitor/job/index.vue       |  2 +-
 src/views/monitor/job/log.vue         |  2 +-
 src/views/system/config/index.vue     |  2 +-
 src/views/system/dict/data.vue        |  2 +-
 src/views/system/dict/index.vue       |  2 +-
 src/views/system/logininfor/index.vue |  2 +-
 src/views/system/operlog/index.vue    |  2 +-
 src/views/system/post/index.vue       |  2 +-
 src/views/system/role/index.vue       |  2 +-
 src/views/system/user/index.vue       |  6 +++---
 16 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index cf664dd8..44c545c2 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -62,8 +62,7 @@ export default {
     return {
       uploadUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址
       headers: {
-        Authorization: "Bearer " + getToken(),
-        checkIntegrity:false, encryptRequest: false
+        Authorization: "Bearer " + getToken()
       },
       Quill: null,
       currentValue: "",
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 9decfb10..097b1d3b 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -74,8 +74,7 @@ export default {
       uploadList: [],
       uploadFileUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传文件服务器地址
       headers: {
-        Authorization: "Bearer " + getToken(),
-        checkIntegrity:false, encryptRequest: false
+        Authorization: "Bearer " + getToken()
       },
       fileList: [],
     };
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 71f81c6a..9c6a8439 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -78,8 +78,7 @@ export default {
       hideUpload: false,
       uploadImgUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址
       headers: {
-        Authorization: "Bearer " + getToken(),
-        checkIntegrity:false, encryptRequest: false
+        Authorization: "Bearer " + getToken()
       },
       fileList: []
     };
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 6ca10a7c..3c26ed0f 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -9,13 +9,7 @@
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="bonus-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
 
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="bonus-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
diff --git a/src/utils/configure.js b/src/utils/configure.js
index 8d637f03..b0396c22 100644
--- a/src/utils/configure.js
+++ b/src/utils/configure.js
@@ -38,7 +38,7 @@ const REGISTER_CONFIG = {
 
 // 配置设置
 const CONFIG = {
-  STRENGTH:STRENGTH_LEVELS.STRONG,//密码强度配置
+  STRENGTH: STRENGTH_LEVELS.STRONG,//密码强度配置
   IS_OPEN_REGISTER: REGISTER_CONFIG.PHONE_REGISTER || REGISTER_CONFIG.EMAIL_REGISTER, // 是否开启注册
   IS_CODE_LOGIN: LOGIN_CONFIG.CODE_EMAIL_LOGIN || LOGIN_CONFIG.CODE_PHONE_LOGIN, // 是否开启短信登录
   // 数据设置
@@ -64,7 +64,7 @@ function getCodePlaceholderText() {
   const loginOptions = []
   if (LOGIN_CONFIG.CODE_PHONE_LOGIN) loginOptions.push('手机号')
   if (LOGIN_CONFIG.CODE_EMAIL_LOGIN) loginOptions.push('邮箱')
-  return loginOptions.length ? loginOptions.join('/') : '';
+  return loginOptions.length ? loginOptions.join('/') : ''
 }
 
 module.exports = {
diff --git a/src/utils/request.js b/src/utils/request.js
index 4d41d6a0..fcf7420e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -55,7 +55,6 @@ service.interceptors.request.use(config => {
   // 处理 GET 请求
   if (config.method === 'get' && config.params) {
     let params = tansParams(config.params).slice(0, -1)
-    console.log(params)
     // 数据完整性校验
     if (CONFIG.dataSettings.integrityCheck && checkIntegrity) {
       config.headers['Params-Hash'] = hashWithSM3AndSalt(params)
@@ -70,14 +69,17 @@ service.interceptors.request.use(config => {
 
   if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
     let data = typeof config.data === 'object' ? JSON.stringify(config.data) : config.data
-    // 数据完整性校验
-    if (CONFIG.dataSettings.integrityCheck && checkIntegrity) {
-      config.headers['Params-Hash'] = hashWithSM3AndSalt(data)
-      config.data = data
-    }
-    // 加密数据
-    if (CONFIG.dataSettings.encryptRequest && encryptRequest) {
-      config.data  = encryptCBC(data)
+    let contentType = config.headers['Content-Type']
+    if (contentType.includes('application/json')) {
+      // 数据完整性校验
+      if (CONFIG.dataSettings.integrityCheck && checkIntegrity) {
+        config.headers['Params-Hash'] = hashWithSM3AndSalt(data)
+        config.data = data
+      }
+      // 加密数据
+      if (CONFIG.dataSettings.encryptRequest && encryptRequest) {
+        config.data = encryptCBC(data)
+      }
     }
     // 检查请求数据大小
     const requestSize = JSON.stringify({ url: config.url, data: data, time: Date.now() }).length
@@ -97,20 +99,17 @@ service.interceptors.request.use(config => {
     }
     cache.session.setJSON('sessionObj', requestObj)
   }
-
   return config
 }, error => {
   console.error(error)
   return Promise.reject(error)
 })
 
-// 响应拦截器
 // 响应拦截器
 service.interceptors.response.use(res => {
     if (res.headers.encryptresponse) {
       res.data = JSON.parse(decryptCBC(res.data))
     }
-    console.log(res)
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200
     // 获取错误信息
@@ -173,9 +172,9 @@ export function download(url, params, filename, config) {
   })
   return service.post(url, params, {
     transformRequest: [(params) => {
-      return params
+      return tansParams(params)
     }],
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded', encryptResponse: false},
     responseType: 'blob',
     ...config
   }).then(async(data) => {
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index c4566376..ee8a981b 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -506,7 +506,7 @@ export default {
     handleExport() {
       this.download('schedule/job/export', {
         ...this.queryParams
-      }, `job_${new Date().getTime()}.xlsx`,{ headers: { encryptResponse: false } })
+      }, `job_${new Date().getTime()}.xlsx`)
     }
   }
 };
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index a4f285a0..94cbf52b 100644
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -288,7 +288,7 @@ export default {
     handleExport() {
       this.download('schedule/job/log/export', {
         ...this.queryParams
-      }, `log_${new Date().getTime()}.xlsx`,{ headers: { encryptResponse: false } })
+      }, `log_${new Date().getTime()}.xlsx`)
     }
   }
 };
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 7b40278e..3ab81fc2 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -330,7 +330,7 @@ export default {
     handleExport() {
       this.download('system/config/export', {
         ...this.queryParams
-      }, `config_${new Date().getTime()}.xlsx`,{ headers: { encryptResponse: false } })
+      }, `config_${new Date().getTime()}.xlsx`)
     },
     /** 刷新缓存按钮操作 */
     handleRefreshCache() {
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 0034555e..c410b84c 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -395,7 +395,7 @@ export default {
     handleExport() {
       this.download('system/dict/data/export', {
         ...this.queryParams
-      }, `data_${new Date().getTime()}.xlsx`,{ headers: { encryptResponse: false } })
+      }, `data_${new Date().getTime()}.xlsx`)
     }
   }
 };
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index e6f17a11..b6ed788a 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -333,7 +333,7 @@ export default {
     handleExport() {
       this.download('system/dict/type/export', {
         ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`,{ headers: { encryptResponse: false } })
+      }, `type_${new Date().getTime()}.xlsx`)
     },
     /** 刷新缓存按钮操作 */
     handleRefreshCache() {
diff --git a/src/views/system/logininfor/index.vue b/src/views/system/logininfor/index.vue
index 65bb1083..d94c2186 100644
--- a/src/views/system/logininfor/index.vue
+++ b/src/views/system/logininfor/index.vue
@@ -248,7 +248,7 @@ export default {
     handleExport() {
       this.download('system/logininfor/export', {
         ...this.queryParams
-      }, `logininfor_${new Date().getTime()}.xlsx`, { headers: { encryptResponse: false } })
+      }, `logininfor_${new Date().getTime()}.xlsx`)
     }
   }
 }
diff --git a/src/views/system/operlog/index.vue b/src/views/system/operlog/index.vue
index 702b76bc..b29ca0d0 100644
--- a/src/views/system/operlog/index.vue
+++ b/src/views/system/operlog/index.vue
@@ -315,7 +315,7 @@ export default {
     handleExport() {
       this.download('system/operlog/export', {
         ...this.queryParams
-      }, `operlog_${new Date().getTime()}.xlsx`,{ headers: { encryptResponse: false } })
+      }, `operlog_${new Date().getTime()}.xlsx`)
     }
   }
 };
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index e0985de9..444bf634 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -302,7 +302,7 @@ export default {
     handleExport() {
       this.download('system/post/export', {
         ...this.queryParams
-      }, `post_${new Date().getTime()}.xlsx`,{ headers: { encryptResponse: false } })
+      }, `post_${new Date().getTime()}.xlsx`)
     }
   }
 };
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 4a02706d..0bc55437 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -625,7 +625,7 @@ export default {
     handleExport() {
       this.download('system/role/export', {
         ...this.queryParams
-      }, `role_${new Date().getTime()}.xlsx`, { headers: { encryptResponse: false } })
+      }, `role_${new Date().getTime()}.xlsx`)
     }
   }
 }
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 612a0cd2..e2b296f0 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -365,7 +365,7 @@ export default {
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: 'Bearer ' + getToken(), checkIntegrity:false, encryptRequest: false },
+        headers: { Authorization: 'Bearer ' + getToken() },
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + '/system/user/importData'
       },
@@ -667,7 +667,7 @@ export default {
     handleExport() {
       this.download('system/user/export', {
         ...this.queryParams
-      }, `user_${new Date().getTime()}.xlsx`,{ headers: { encryptResponse: false } })
+      }, `user_${new Date().getTime()}.xlsx`)
     },
     /** 导入按钮操作 */
     handleImport() {
@@ -676,7 +676,7 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`, { headers: { encryptResponse: false } }).then(response => {
+      this.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`).then(response => {
       })
     },
     // 文件上传中处理