From 9f878a353cd49b7b10bb0a95610ad236bc920dd2 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Thu, 14 May 2026 19:04:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dclogin=E5=A4=9A?= =?UTF-8?q?=E9=80=89=E7=B1=BB=E5=9E=8B=E7=99=BB=E5=BD=95=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/login/service/login-service.ts | 2 +- .../plugins/plugin-oauth/oauth2/plugin-clogin.ts | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/ui/certd-server/src/modules/login/service/login-service.ts b/packages/ui/certd-server/src/modules/login/service/login-service.ts index a31660b1a..30b85c9a8 100644 --- a/packages/ui/certd-server/src/modules/login/service/login-service.ts +++ b/packages/ui/certd-server/src/modules/login/service/login-service.ts @@ -245,7 +245,7 @@ export class LoginService { async loginByOpenId(req: { openId: string, type:string }) { const {openId, type} = req; const oauthBound = await this.oauthBoundService.findOne({ - where:{openId, type: type.replace(':', '')} + where:{openId, type} }); if (oauthBound == null) { return null diff --git a/packages/ui/certd-server/src/plugins/plugin-oauth/oauth2/plugin-clogin.ts b/packages/ui/certd-server/src/plugins/plugin-oauth/oauth2/plugin-clogin.ts index 522da7a9e..5d22cb58e 100644 --- a/packages/ui/certd-server/src/plugins/plugin-oauth/oauth2/plugin-clogin.ts +++ b/packages/ui/certd-server/src/plugins/plugin-oauth/oauth2/plugin-clogin.ts @@ -2,18 +2,18 @@ import { AddonInput, BaseAddon, IsAddon } from "@certd/lib-server"; import { BuildLoginUrlReq, BuildLogoutUrlReq, IOauthProvider, OnCallbackReq } from "../api.js"; const CLOGIN_TYPES = [ - { label: "QQ", value: "qq", icon: "logos:tencent-qq" }, - { label: "微信", value: "wx", icon: "logos:wechat-icon" }, + { label: "QQ", value: "qq", icon: "icon-park:tencent-qq:#0099ff" }, + { label: "微信", value: "wx", icon: "simple-icons:wechat:#34C759" }, { label: "支付宝", value: "alipay", icon: "simple-icons:alipay:#0099ff" }, - { label: "微博", value: "sina", icon: "logos:sina-weibo" }, - { label: "百度", value: "baidu", icon: "logos:baidu" }, + { label: "微博", value: "sina", icon: "uiw:weibo:#FF3B30" }, + { label: "百度", value: "baidu", icon: "simple-icons:baidu:#007AFF" }, { label: "华为", value: "huawei", icon: "simple-icons:huawei:#ff0000" }, - { label: "小米", value: "xiaomi", icon: "logos:xiaomi-icon" }, - { label: "谷歌", value: "google", icon: "logos:google-icon" }, + { label: "小米", value: "xiaomi", icon: "simple-icons:xiaomi:#FF9500" }, + { label: "谷歌", value: "google", icon: "flat-color-icons:google" }, { label: "微软", value: "microsoft", icon: "logos:microsoft-icon" }, { label: "Facebook", value: "facebook", icon: "logos:facebook" }, { label: "Twitter", value: "twitter", icon: "logos:twitter" }, - { label: "钉钉", value: "dingtalk", icon: "logos:dingtalk" }, + { label: "钉钉", value: "dingtalk", icon: "ant-design:dingding-outlined:#007AFF" }, { label: "Gitee", value: "gitee", icon: "simple-icons:gitee:#c71d23" }, { label: "Github", value: "github", icon: "logos:github-icon" }, ];