update: optimize general request logic

Author: Lsnsh

src/config/index.js

@@ -3,6 +3,8 @@ const API = {
   PATH: '/api/v1'
 };
 
+export const METHOD_ENUM = ['OPTIONS', 'GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'TRACE', 'CONNECT'];
+
 export default {
   // 项目api配置
   api: {

src/dc/util.js

@@ -1,19 +1,8 @@
-import pathToRegexp from 'path-to-regexp';
 import request from '../utils/request';
 import config from '../config/index';
 
-const METHOD_EMUN = ['OPTIONS', 'GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'TRACE', 'CONNECT'];
-
 export default (oOption = {}, fnDataModel) => {
   oOption.url = config.api.url + oOption.url;
-  if (oOption.urlData) {
-    oOption.url = fnCompileDynamicUrl(oOption.url, oOption.urlData);
-  }
-  oOption.method = String(oOption.method).toUpperCase();
-  if (METHOD_EMUN.indexOf(oOption.method) === -1) {
-    // 如果请求方式不是有效值,重置为默认值
-    oOption.method = 'GET';
-  }
   return new Promise((resolve, reject) => {
     request(oOption)
       .then(res => {
@@ -46,8 +35,3 @@ export default (oOption = {}, fnDataModel) => {
       });
   });
 };
-
-function fnCompileDynamicUrl(sUrl = '', oData = {}) {
-  let toPath = pathToRegexp.compile(sUrl);
-  return toPath(oData);
-}

src/utils/request.js

@@ -1,20 +1,43 @@
-export default (oOptions = {}) => {
+import pathToRegexp from 'path-to-regexp';
+import { METHOD_ENUM } from '../config/index';
+
+// 处理请求选项
+function fnHandleRequestOption(oOption) {
   // 定义默认的全局请求参数
   let oDefaultData = {};
   const sAccessToken = wx.getStorageSync('sAccessToken');
   if (sAccessToken) {
     oDefaultData.accesstoken = sAccessToken;
   }
   // 使传入的请求参数，覆盖默认参数
-  oOptions.data = {
+  oOption.data = {
     ...oDefaultData,
-    ...oOptions.data
+    ...oOption.data
   };
+  // 动态路径参数解析
+  if (oOption.urlData) {
+    oOption.url = fnCompileDynamicUrl(oOption.url, oOption.urlData);
+  }
+  // 请求方式验证
+  oOption.method = String(oOption.method).toUpperCase();
+  if (METHOD_ENUM.indexOf(oOption.method) === -1) {
+    // 如果请求方式不是有效值，重置为默认值
+    oOption.method = 'GET';
+  }
+  return oOption;
+}
+
+// 处理url path中的动态参数
+function fnCompileDynamicUrl(sUrl = '', oData = {}) {
+  let toPath = pathToRegexp.compile(sUrl);
+  return toPath(oData);
+}
 
+export default (oOption = {}) => {
   return new Promise((resolve, reject) => {
     try {
       wx.request({
-        ...oOptions,
+        ...fnHandleRequestOption(oOption),
         success(res) {
           if (res.data) {
             resolve(res.data);