From a489cfdc6cb17e66d5269a3b34fe4a9c7889bfab Mon Sep 17 00:00:00 2001 From: "addressxy@vip.qq.com" Date: Mon, 14 Mar 2022 17:24:35 +0800 Subject: [PATCH] update --- cloudapp/src/app/main/main.component.ts | 52 +++++++++++++++++-- cloudapp/src/app/models/cnmarc.ts | 2 +- cloudapp/src/app/models/marc21.ts | 2 +- .../src/app/settings/settings.component.ts | 10 ++-- cloudapp/src/i18n/en.json | 3 +- cloudapp/src/i18n/zh.json | 2 + 6 files changed, 58 insertions(+), 13 deletions(-) diff --git a/cloudapp/src/app/main/main.component.ts b/cloudapp/src/app/main/main.component.ts index 99cf6aa..1d1b375 100644 --- a/cloudapp/src/app/main/main.component.ts +++ b/cloudapp/src/app/main/main.component.ts @@ -38,7 +38,7 @@ export class MainComponent implements OnInit, OnDestroy { institutionType:'a', classification:'690', holding: '905', - lookupUrl: '/proxy/cgi-bin/fetch_z311.cgi?uname=exlibris&upass=china&key=KEY', + lookupUrl: '/proxy/cgi-bin/fetch_z311.cgi?uname=proquest&upass=L0china&key=KEY', lookupPrefix:'', classificationNumber: 'd', titleNumber: 'e', @@ -50,7 +50,7 @@ export class MainComponent implements OnInit, OnDestroy { institutionType:'a', classification:'690', holding: '090', - lookupUrl: '/proxy/cgi-bin/fetch_z311.cgi?uname=exlibris&upass=china&key=KEY', + lookupUrl: '/proxy/cgi-bin/fetch_z311.cgi?uname=proquest&upass=L0china&key=KEY', lookupPrefix:'', classificationNumber: 'd', titleNumber: 'u', @@ -65,11 +65,25 @@ export class MainComponent implements OnInit, OnDestroy { private translate: TranslateService, private http: HttpClient, private alert: AlertService) { + } ngOnInit() { this.pageLoad$ = this.eventsService.onPageLoad(this.onPageLoad); + //检测窗口大小 + // window.onresize = ()=>{ + // if(window.innerWidth > 450){ + // console.log( 'onresize:11') + // }else{ + // console.log( 'onresize:222') + // } + // } this.getSettings() + + // this.getcckb('ccc').then((res: any) => { + // console.log(res) + // }) + } ngOnDestroy(): void { @@ -99,6 +113,8 @@ export class MainComponent implements OnInit, OnDestroy { } else { this.apiResult = {}; } + + } setSettings(value: any) { @@ -705,7 +721,7 @@ export class MainComponent implements OnInit, OnDestroy { data => { this.http.get("https://api.exldevnetwork.net.cn" + lookupUrl.replace("KEY", key), { headers: { - 'X-Proxy-Host': 'http://aleph20.exlibris.com.cn:8992', + 'X-Proxy-Host': 'http://n5cloud.library.nenu.edu.cn', 'Authorization': 'Bearer ' + data } }).subscribe(function (data) { @@ -724,6 +740,32 @@ export class MainComponent implements OnInit, OnDestroy { } + getcckb(key: string) { + var json = {"apikey":"562930543E3E090957C595704CF28BE4"}; + return new Promise((resolve, reject) => { + this.eventsService.getAuthToken().subscribe( + data => { + this.http.post("https://api.exldevnetwork.net.cn" + "/cckbapi/almaBooklist", json,{ + headers: { + 'X-Proxy-Host': 'http://n5cloud.library.nenu.edu.cn', + 'Authorization': 'Bearer ' + data + } + }).subscribe(function (data) { + // this.loading = false; + resolve(data) + }, error => { + // this.loading = false; + // this.alert.error(this.translate.instant('i18n.error', {url: "https://api.exldevnetwork.net.cn" + lookupUrl.replace("KEY", key)}), {autoClose: true, delay: 3000}); + reject(error) + }) + } + ); + + // resolve({seq: Math.ceil(Math.random() * 99)}) + }) + + } + updateAnies(anies: string) { let request: Request = { url: this.pageEntities[0].link, @@ -789,7 +831,7 @@ export class MainComponent implements OnInit, OnDestroy { if (settings.lookupUrl) { this.form.value.lookupUrl = settings.lookupUrl } else { - this.form.value.lookupUrl = '/proxy/cgi-bin/fetch_z311.cgi?uname=exlibris&upass=china&key=KEY' + this.form.value.lookupUrl = '/proxy/cgi-bin/fetch_z311.cgi?uname=proquest&upass=L0china&key=KEY' } if (settings.lookupPrefix) { this.form.value.lookupPrefix = settings.lookupPrefix @@ -857,7 +899,7 @@ export class MainComponent implements OnInit, OnDestroy { if (settings.lookupUrl) { this.form21.value.lookupUrl = settings.lookupUrl } else { - this.form21.value.lookupUrl = '/proxy/cgi-bin/fetch_z311.cgi?uname=exlibris&upass=china&key=KEY' + this.form21.value.lookupUrl = '/proxy/cgi-bin/fetch_z311.cgi?uname=proquest&upass=L0china&key=KEY' } if (settings.lookupPrefix) { this.form21.value.lookupPrefix = settings.lookupPrefix diff --git a/cloudapp/src/app/models/cnmarc.ts b/cloudapp/src/app/models/cnmarc.ts index d9ddfec..f7036ef 100644 --- a/cloudapp/src/app/models/cnmarc.ts +++ b/cloudapp/src/app/models/cnmarc.ts @@ -3,7 +3,7 @@ export class Cnmarc { institutionType:String = 'a'; classification:String = '' holding:String = '905'; - lookupUrl:String = '/proxy/cgi-bin/fetch_z311.cgi?uname=exlibris&upass=china&key=KEY'; + lookupUrl:String = '/proxy/cgi-bin/fetch_z311.cgi?uname=proquest&upass=L0china&key=KEY'; lookupPrefix:String =''; classificationNumber:String = 'd'; titleNumber:String = 'e'; diff --git a/cloudapp/src/app/models/marc21.ts b/cloudapp/src/app/models/marc21.ts index 487b45b..d1033fe 100644 --- a/cloudapp/src/app/models/marc21.ts +++ b/cloudapp/src/app/models/marc21.ts @@ -3,7 +3,7 @@ export class Marc21 { institutionType:String = 'a'; classification:String = '' holding:String = '905'; - lookupUrl:String = '/proxy/cgi-bin/fetch_z311.cgi?uname=exlibris&upass=china&key=KEY'; + lookupUrl:String = '/proxy/cgi-bin/fetch_z311.cgi?uname=proquest&upass=L0china&key=KEY'; lookupPrefix:String =''; classificationNumber:String = 'a'; titleNumber:String = 'b'; diff --git a/cloudapp/src/app/settings/settings.component.ts b/cloudapp/src/app/settings/settings.component.ts index fb4fd09..07a3b39 100644 --- a/cloudapp/src/app/settings/settings.component.ts +++ b/cloudapp/src/app/settings/settings.component.ts @@ -39,7 +39,7 @@ export class SettingsComponent implements OnInit, OnDestroy { institutionType:'a', classification:'690a', holding: '905', - lookupUrl: '/proxy/cgi-bin/fetch_z311.cgi?uname=exlibris&upass=china&key=KEY', + lookupUrl: '/proxy/cgi-bin/fetch_z311.cgi?uname=proquest&upass=L0china&key=KEY', lookupPrefix:'', classificationNumber: 'd', titleNumber: 'e', @@ -54,7 +54,7 @@ export class SettingsComponent implements OnInit, OnDestroy { institutionType:'a', classification:'093a', holding: '905', - lookupUrl: '/proxy/cgi-bin/fetch_z311.cgi?uname=exlibris&upass=china&key=KEY', + lookupUrl: '/proxy/cgi-bin/fetch_z311.cgi?uname=proquest&upass=L0china&key=KEY', lookupPrefix:'', classificationNumber: 'd', titleNumber: 'u', @@ -216,7 +216,7 @@ export class SettingsComponent implements OnInit, OnDestroy { data => { this.http.get("https://api.exldevnetwork.net.cn" + this.form.value.lookupUrl.replace("KEY", key), { headers: { - 'X-Proxy-Host': 'http://aleph20.exlibris.com.cn:8992', + 'X-Proxy-Host': 'http://n5cloud.library.nenu.edu.cn', 'Authorization': 'Bearer ' + data } }).subscribe(function (data) { @@ -266,7 +266,7 @@ export class SettingsComponent implements OnInit, OnDestroy { if (settings.lookupUrl) { this.form.value.lookupUrl = settings.lookupUrl } else { - this.form.value.lookupUrl = '/proxy/cgi-bin/fetch_z311.cgi?uname=exlibris&upass=china&key=KEY' + this.form.value.lookupUrl = '/proxy/cgi-bin/fetch_z311.cgi?uname=proquest&upass=L0china&key=KEY' } if (settings.lookupPrefix) { this.form.value.lookupPrefix = settings.lookupPrefix @@ -332,7 +332,7 @@ export class SettingsComponent implements OnInit, OnDestroy { if (settings.lookupUrl) { this.form21.value.lookupUrl = settings.lookupUrl } else { - this.form21.value.lookupUrl = '/proxy/cgi-bin/fetch_z311.cgi?uname=exlibris&upass=china&key=KEY' + this.form21.value.lookupUrl = '/proxy/cgi-bin/fetch_z311.cgi?uname=proquest&upass=L0china&key=KEY' } if (settings.lookupPrefix) { this.form21.value.lookupPrefix = settings.lookupPrefix diff --git a/cloudapp/src/i18n/en.json b/cloudapp/src/i18n/en.json index 9e8cae2..c95e83c 100644 --- a/cloudapp/src/i18n/en.json +++ b/cloudapp/src/i18n/en.json @@ -33,6 +33,7 @@ "digits": "digits", "errorconfigtip": "Please configure the parameters first", "call-nosub": "Classification field/sub-field", - "Publishedyear": "Pub. Year included in the call-no. " + "Publishedyear": "Pub. Year included in the call-no. " + } } diff --git a/cloudapp/src/i18n/zh.json b/cloudapp/src/i18n/zh.json index c7221c6..b5cf5ca 100644 --- a/cloudapp/src/i18n/zh.json +++ b/cloudapp/src/i18n/zh.json @@ -34,5 +34,7 @@ "errorconfigtip": "请先配置各项参数", "call-nosub": "分类字段/子字段", "Publishedyear": "索书号含出版年" + + } }