From 5d8e52e398bff7bc8f83e8f5b8a387175b958c98 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 24 二月 2023 10:20:18 +0800
Subject: [PATCH] 2023.2.24

---
 service/baserequest.js |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/service/baserequest.js b/service/baserequest.js
index 3a5e333..35bca96 100644
--- a/service/baserequest.js
+++ b/service/baserequest.js
@@ -11,7 +11,7 @@
 const util = require("../utils/util.js")
 
 const originProperties = ['url', 'data', 'header', 'method', 'success', 'fail', 'complete'];
-// const baseUrl = "http://192.168.0.137:8080"
+// const baseUrl = "http://192.168.1.12:8080"
 // const baseUrl = "https://fyami.com.cn:447"
 const baseUrl = "https://fyami.com.cn"
 
@@ -21,7 +21,8 @@
 const baseIconUrl = `${bu}/images/weixin/eplaw/`
 const baseFileUrl = `${bu}/meeting/file/`
 
-function request(fun) {
+function request(fun, hostUrl) {
+  const bUrl = hostUrl ? hostUrl : baseUrl
   if (fun.params != undefined) {
     var param = ""
     Object.keys(fun.params).forEach(key => {
@@ -33,10 +34,10 @@
       }
     });
     var url = fun.url
-    fun.url = baseUrl + url + "?" + param
+    fun.url = bUrl + url + "?" + param
   } else {
     var url = fun.url
-    fun.url = baseUrl + url
+    fun.url = bUrl + url
   }
   var fun1 = util.deepCopy(fun)
   fun1.success = function (res) {
@@ -44,16 +45,20 @@
     console.log("|--璁块棶: ", fun.url);
     console.log("|--缁撴灉: ", res);
 
-    if (fun.onHead) {
-      fun.onHead(res.header)
+    if (res.statusCode == 200) {
+      if (fun.onHead) {
+        fun.onHead(res.header)
+      }
+      fun.success(res.data) 
+    } else {
+      fun.fail(res.statusCode)
     }
-    fun.success(res.data)
     // if(res.data.success) {
     //   var head = res.data['head']
     //   if (head != undefined && fun.page != undefined) {
     //     fun.page(head.page, head.totalPage)
     //   }
-    //   fun.success(res.data.data)
+    //   fun.success(res.data.data)                                                                                                                           
     // } else {
     //   fun.fail(res.data)
     // }
@@ -75,13 +80,13 @@
 }
 
 module.exports = {
-  get: function (fun) {
+  get: function (fun, hostUrl) {
     fun['method'] = 'GET'
-    request(fun)
+    request(fun, hostUrl)
   },
-  post: function (fun) {
+  post: function (fun, hostUrl) {
     fun['method'] = 'POST'
-    request(fun)
+    request(fun, hostUrl)
   },
   basePicUrl: basePicUrl,
   baseUrl: baseUrl,

--
Gitblit v1.9.3