From 03ae058adc5d1d027d4aa2bde6cbf1ffcd9d5360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E8=8D=A3=E6=AD=86?= Date: Thu, 6 Feb 2020 14:50:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?DEC-11996=20feat:=20=E3=80=90=E5=8D=8E?= =?UTF-8?q?=E4=B8=BA=E5=AE=89=E5=85=A8=E3=80=91=E5=86=85=E5=AD=98=E7=AD=89?= =?UTF-8?q?=E6=95=8F=E6=84=9F=E4=BF=A1=E6=81=AF=E9=9C=80=E8=A6=81=E9=89=B4?= =?UTF-8?q?=E6=9D=83=E6=89=8D=E8=83=BD=E8=8E=B7=E5=BE=97,=E5=89=8D?= =?UTF-8?q?=E5=8F=B0websocket=E4=BA=8B=E4=BB=B6=E6=90=BA=E5=B8=A6token?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/crud/decision.api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/crud/decision.api.ts b/src/modules/crud/decision.api.ts index 55096b1..d046519 100644 --- a/src/modules/crud/decision.api.ts +++ b/src/modules/crud/decision.api.ts @@ -96,7 +96,7 @@ export class DecisionApi implements Api { private sendEditStatusEvent(name: string, type: string): Promise { return new Promise(resolve => { if (Dec && Dec.socket.connected) { - Dec.socket.emit(type, BI.encode(name), (re: any) => { + Dec.socketEmit(type, BI.encode(name), (re: any) => { resolve(re); }); } else { From d227b60eca8558570681d269d6f9f751da16896b Mon Sep 17 00:00:00 2001 From: "Frank.Qiu" Date: Tue, 11 Feb 2020 15:21:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?DEC-11995=20feat=EF=BC=9A=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E4=BC=A0=E8=BE=93=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/maintain/forms/components/form.jdbc.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts index 7badcea..f15b410 100644 --- a/src/modules/pages/maintain/forms/components/form.jdbc.ts +++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts @@ -732,7 +732,7 @@ export class FormJdbc extends BI.Widget { driver: this.form.driver.getValue(), url: this.form.url.getValue(), user: this.form.user.getValue(), - password: this.oldPassword === this.form.password.getValue() ? this.oldPassword : BI.encode(this.form.password.getValue()), + password: this.oldPassword === this.form.password.getValue() ? this.oldPassword : BI.Providers.getProvider('dec.provider.cipher').getCipher(this.form.password.getValue()), queryType: '', newCharsetName: originalCharsetName ? 'gbk' : '', // 后台要求，originalCharsetName不为空时，newCharsetName为gbk originalCharsetName,