checkurl

rej-reex/app/base/api/impl/reportcb/rejcb.js

@@ -9,6 +9,7 @@ class RejAPI extends APIBase {
 
   async getRejDataCb (pobj, q, req) {
     try {
+      console.log(this.rejcbSve)
       let result = await this.rejcbSve.getRejData();
       if (result.count) {
         result.code = 200

rej-reex/app/base/service/impl/reportcb/rejcbSve.js

@@ -29,12 +29,12 @@ class RejcbService extends ServiceBase {
         }
       })
     }
-    let data = this.dealData(queryData)
+    let data = await this.dealData(queryData)
     return data;
   }
 
   // 组织驳回复审提报数据
-  dealData (data) {
+  async dealData (data) {
     let res = {}
     res.count = data.length
     res.data = []
@@ -48,7 +48,7 @@ class RejcbService extends ServiceBase {
       step1.ifSplit = data[i].askForData.division == 1 ? "ifSplit1" : "ifSplit2"
       if (data[i].askForData.division) {
         step1.ifSplit1 = {}
-        step1.ifSplit1.fgsqUrl = await this.checkurl(data[i].askForData.divisionDir) ? data[i].askForData.divisionDir : ""
+        step1.ifSplit1.fgsqUrl = await this.checkurl(encodeURI(data[i].askForData.divisionDir)) ? data[i].askForData.divisionDir : ""
         step1.ifSplit1.fgsqName = ""
         if (step1.ifSplit1.fgsqUrl) {
           let tmpifsplitArr = step1.ifSplit1.fgsqUrl.split('/')
@@ -101,7 +101,7 @@ class RejcbService extends ServiceBase {
       step2.agentPerson = '张飞龙'
       step2.agentContactTel = '01084927588'
       step2.fileWtName = ""
-      step2.fileWtUrl = await this.checkurl(data[i].applicant.entrust) ? data[i].applicant.entrust : ""
+      step2.fileWtUrl = await this.checkurl(encodeURI(data[i].applicant.entrust)) ? data[i].applicant.entrust : ""
       if (step2.fileWtUrl) {
         let tmpwtArr = step2.fileWtUrl.split('/')
         step2.fileWtName = tmpwtArr[tmpwtArr.length - 1]
@@ -112,31 +112,31 @@ class RejcbService extends ServiceBase {
       let step3 = {}
       step3.factandreason = data[i].askForData.far
       step3.factandreasonPdfName = ""
-      step3.factandreasonPdfUrl = await this.checkurl(data[i].askForData.farDir) ? data[i].askForData.farDir : ""
+      step3.factandreasonPdfUrl = await this.checkurl(encodeURI(data[i].askForData.farDir)) ? data[i].askForData.farDir : ""
       if (step3.factandreasonPdfUrl) {
         let tmpfarArr = step3.factandreasonPdfUrl.split('/')
         step3.factandreasonPdfName = tmpfarArr[tmpfarArr.length - 1]
       }
       step3.evidenceCatalogName = ""
-      step3.evidenceCatalogUrl = await this.checkurl(data[i].askForData.evidenceDir) ? data[i].askForData.evidenceDir : ""
+      step3.evidenceCatalogUrl = await this.checkurl(encodeURI(data[i].askForData.evidenceDir)) ? data[i].askForData.evidenceDir : ""
       if (step3.evidenceCatalogUrl) {
         let tmpeviDirArr = step3.evidenceCatalogUrl.split('/')
         step3.evidenceCatalogName = tmpeviDirArr[tmpeviDirArr.length - 1]
       }
       step3.evidenceName = ""
-      step3.evidenceUrl =  await this.checkurl(data[i].askForData.evidenceCon) ? data[i].askForData.evidenceCon : ""
+      step3.evidenceUrl =  await this.checkurl(encodeURI(data[i].askForData.evidenceCon)) ? data[i].askForData.evidenceCon : ""
       if (step3.evidenceUrl) {
         let tmpeviArr = step3.evidenceUrl.split('/')
         step3.evidenceName = tmpeviArr[tmpeviArr.length - 1]
       }
       step3.evidenceOfserviceName = ""
-      step3.evidenceOfserviceUrl = await this.checkurl(data[i].askForData.evidenceSend) ? data[i].askForData.evidenceSend : ""
+      step3.evidenceOfserviceUrl = await this.checkurl(encodeURI(data[i].askForData.evidenceSend)) ? data[i].askForData.evidenceSend : ""
       if (step3.evidenceOfserviceUrl) {
         let tmpesArr = step3.evidenceOfserviceUrl.split('/')
         step3.evidenceOfserviceName = tmpesArr[tmpesArr.length - 1]
       }
       step3.fileYgName = ""
-      step3.fileYgUrl = await this.checkurl(data[i].askForData.explain) ? data[i].askForData.explain : ""
+      step3.fileYgUrl = await this.checkurl(encodeURI(data[i].askForData.explain)) ? data[i].askForData.explain : ""
       if (step3.fileYgUrl) {
         let tmpygArr = step3.fileYgUrl.split('/')
         step3.fileYgName = tmpygArr[tmpygArr.length - 1]
@@ -175,7 +175,7 @@ class RejcbService extends ServiceBase {
 
   async checkurl (url) {
     let res = await this.restClient.execGet(null, url)
-    if (res.status !== 200){
+    if (res.status){
       return false
     } else {
       return true

rej-reex/app/base/utils/restClient.js

@@ -93,7 +93,6 @@ class RestClient {
     return result;
   }
   async execGet (subData, url) {
-    console.log(settings.env)
     if (settings.env == 'dev') {
       try {
         const rs = await axios.get(url);
@@ -102,6 +101,7 @@ class RestClient {
         }
         return ret;
       } catch (error) {
+        console.log(error)
         return error.response
       }
     }