Skip to content

Z
zhichan
Commit 62cbe741 by wkliang
Options

checkurl

parent 1b07ad45
Showing with 21 additions and 23 deletions
rej-reex/app/base/service/impl/reportcb/rejcbSve.js
...@@ -48,7 +48,7 @@ class RejcbService extends ServiceBase { ...@@ -48,7 +48,7 @@ class RejcbService extends ServiceBase {
step1.ifSplit = data[i].askForData.division == 1 ? "ifSplit1" : "ifSplit2" step1.ifSplit = data[i].askForData.division == 1 ? "ifSplit1" : "ifSplit2"
if (data[i].askForData.division) { if (data[i].askForData.division) {
step1.ifSplit1 = {} step1.ifSplit1 = {}
step1.ifSplit1.fgsqUrl = data[i].askForData.divisionDir || "" step1.ifSplit1.fgsqUrl = await this.checkurl(data[i].askForData.divisionDir) ? data[i].askForData.divisionDir : ""
step1.ifSplit1.fgsqName = "" step1.ifSplit1.fgsqName = ""
if (step1.ifSplit1.fgsqUrl) { if (step1.ifSplit1.fgsqUrl) {
let tmpifsplitArr = step1.ifSplit1.fgsqUrl.split('/') let tmpifsplitArr = step1.ifSplit1.fgsqUrl.split('/')
...@@ -101,7 +101,7 @@ class RejcbService extends ServiceBase { ...@@ -101,7 +101,7 @@ class RejcbService extends ServiceBase {
step2.agentPerson = '张飞龙' step2.agentPerson = '张飞龙'
step2.agentContactTel = '01084927588' step2.agentContactTel = '01084927588'
step2.fileWtName = "" step2.fileWtName = ""
step2.fileWtUrl = data[i].applicant.entrust || "" step2.fileWtUrl = await this.checkurl(data[i].applicant.entrust) ? data[i].applicant.entrust : ""
if (step2.fileWtUrl) { if (step2.fileWtUrl) {
let tmpwtArr = step2.fileWtUrl.split('/') let tmpwtArr = step2.fileWtUrl.split('/')
step2.fileWtName = tmpwtArr[tmpwtArr.length - 1] step2.fileWtName = tmpwtArr[tmpwtArr.length - 1]
...@@ -112,31 +112,31 @@ class RejcbService extends ServiceBase { ...@@ -112,31 +112,31 @@ class RejcbService extends ServiceBase {
let step3 = {} let step3 = {}
step3.factandreason = data[i].askForData.far step3.factandreason = data[i].askForData.far
step3.factandreasonPdfName = "" step3.factandreasonPdfName = ""
step3.factandreasonPdfUrl = data[i].askForData.farDir || "" step3.factandreasonPdfUrl = await this.checkurl(data[i].askForData.farDir) ? data[i].askForData.farDir : ""
if (step3.factandreasonPdfUrl) { if (step3.factandreasonPdfUrl) {
let tmpfarArr = step3.factandreasonPdfUrl.split('/') let tmpfarArr = step3.factandreasonPdfUrl.split('/')
step3.factandreasonPdfName = tmpfarArr[tmpfarArr.length - 1] step3.factandreasonPdfName = tmpfarArr[tmpfarArr.length - 1]
} }
step3.evidenceCatalogName = "" step3.evidenceCatalogName = ""
step3.evidenceCatalogUrl = data[i].askForData.evidenceDir || "" step3.evidenceCatalogUrl = await this.checkurl(data[i].askForData.evidenceDir) ? data[i].askForData.evidenceDir : ""
if (step3.evidenceCatalogUrl) { if (step3.evidenceCatalogUrl) {
let tmpeviDirArr = step3.evidenceCatalogUrl.split('/') let tmpeviDirArr = step3.evidenceCatalogUrl.split('/')
step3.evidenceCatalogName = tmpeviDirArr[tmpeviDirArr.length - 1] step3.evidenceCatalogName = tmpeviDirArr[tmpeviDirArr.length - 1]
} }
step3.evidenceName = "" step3.evidenceName = ""
step3.evidenceUrl = data[i].askForData.evidenceCon || "" step3.evidenceUrl = await this.checkurl(data[i].askForData.evidenceCon) ? data[i].askForData.evidenceCon : ""
if (step3.evidenceUrl) { if (step3.evidenceUrl) {
let tmpeviArr = step3.evidenceUrl.split('/') let tmpeviArr = step3.evidenceUrl.split('/')
step3.evidenceName = tmpeviArr[tmpeviArr.length - 1] step3.evidenceName = tmpeviArr[tmpeviArr.length - 1]
} }
step3.evidenceOfserviceName = "" step3.evidenceOfserviceName = ""
step3.evidenceOfserviceUrl = data[i].askForData.evidenceSend || "" step3.evidenceOfserviceUrl = await this.checkurl(data[i].askForData.evidenceSend) ? data[i].askForData.evidenceSend : ""
if (step3.evidenceOfserviceUrl) { if (step3.evidenceOfserviceUrl) {
let tmpesArr = step3.evidenceOfserviceUrl.split('/') let tmpesArr = step3.evidenceOfserviceUrl.split('/')
step3.evidenceOfserviceName = tmpesArr[tmpesArr.length - 1] step3.evidenceOfserviceName = tmpesArr[tmpesArr.length - 1]
} }
step3.fileYgName = "" step3.fileYgName = ""
step3.fileYgUrl = data[i].askForData.explain || "" step3.fileYgUrl = await this.checkurl(data[i].askForData.explain) ? data[i].askForData.explain : ""
if (step3.fileYgUrl) { if (step3.fileYgUrl) {
let tmpygArr = step3.fileYgUrl.split('/') let tmpygArr = step3.fileYgUrl.split('/')
step3.fileYgName = tmpygArr[tmpygArr.length - 1] step3.fileYgName = tmpygArr[tmpygArr.length - 1]
...@@ -173,14 +173,12 @@ class RejcbService extends ServiceBase { ...@@ -173,14 +173,12 @@ class RejcbService extends ServiceBase {
return await this.tcDao.model.update({ rejStatus: "待提报" }, { where: { caseId: { [this.db.Op.like]: `%TESTCB%` } } }) return await this.tcDao.model.update({ rejStatus: "待提报" }, { where: { caseId: { [this.db.Op.like]: `%TESTCB%` } } })
} }
async testpost () { async checkurl (url) {
console.log('into')
let url = 'https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_word2picb2bcb9fc564ef2a1f4b3cbe9352f39.jpg'
let res = await this.restClient.execGet(null, url) let res = await this.restClient.execGet(null, url)
if (res.status !== 200){ if (res.status !== 200){
return 'wrong url' return false
} else { } else {
return res return true
} }
} }
} }
......
rej-reex/app/base/utils/restClient.js
...@@ -94,17 +94,17 @@ class RestClient { ...@@ -94,17 +94,17 @@ class RestClient {
} }
async execGet (subData, url) { async execGet (subData, url) {
console.log(settings.env) console.log(settings.env)
// if (settings.env == 'dev') { if (settings.env == 'dev') {
// try { try {
// const rs = await axios.get(url); const rs = await axios.get(url);
// const ret = { const ret = {
// stdout: JSON.stringify(rs.data) stdout: JSON.stringify(rs.data)
// } }
// return ret; return ret;
// } catch (error) { } catch (error) {
// return error.response return error.response
// } }
// } }
try { try {
let cmd = this.FetchGetCmd(subData, url); let cmd = this.FetchGetCmd(subData, url);
var result = await this.exec(cmd); var result = await this.exec(cmd);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment