From c8fc72b3d683644a44bd79511cd581a0e68b8316 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Mon, 16 Aug 2021 16:44:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=B0=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=BB=BB=E4=BD=95=E7=B3=BB=E7=BB=9F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF=E7=9A=84=E5=AF=BC=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/service/impl/OAuthServiceImpl.java   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/login-base/src/main/java/ink/wgink/login/base/service/impl/OAuthServiceImpl.java b/login-base/src/main/java/ink/wgink/login/base/service/impl/OAuthServiceImpl.java
index 3148105b..e69e31dd 100644
--- a/login-base/src/main/java/ink/wgink/login/base/service/impl/OAuthServiceImpl.java
+++ b/login-base/src/main/java/ink/wgink/login/base/service/impl/OAuthServiceImpl.java
@@ -36,27 +36,27 @@ public class OAuthServiceImpl implements IOAuthService {
         // 服务地址
         pageParams.put(IUserCenterConst.SERVER_URL, serverProperties.getUrl());
         // 系统LOGO
-        pageParams.put(IUserCenterConst.SYSTEM_LOGO, config.get(IUserCenterConst.SYSTEM_LOGO).toString());
+        pageParams.put(IUserCenterConst.SYSTEM_LOGO, config.isEmpty() ? null : config.get(IUserCenterConst.SYSTEM_LOGO));
         // 背景图片
-        pageParams.put(IUserCenterConst.LOGIN_BACKGROUND_IMAGES, config.get(IUserCenterConst.LOGIN_BACKGROUND_IMAGES).toString());
+        pageParams.put(IUserCenterConst.LOGIN_BACKGROUND_IMAGES, config.isEmpty() ? null : config.get(IUserCenterConst.LOGIN_BACKGROUND_IMAGES));
         // 系统标题
-        pageParams.put(IUserCenterConst.SYSTEM_TITLE, config.get(IUserCenterConst.SYSTEM_TITLE).toString());
+        pageParams.put(IUserCenterConst.SYSTEM_TITLE, config.isEmpty() ? null : config.get(IUserCenterConst.SYSTEM_TITLE));
         // 系统标题大小，默认26
-        pageParams.put(IUserCenterConst.SYSTEM_TITLE_SIZE, Integer.parseInt(config.get(IUserCenterConst.SYSTEM_TITLE_SIZE).toString()));
+        pageParams.put(IUserCenterConst.SYSTEM_TITLE_SIZE, config.isEmpty() ? null : Integer.parseInt(config.get(IUserCenterConst.SYSTEM_TITLE_SIZE).toString()));
         // 系统子标题
-        pageParams.put(IUserCenterConst.SYSTEM_SUB_TITLE, config.get(IUserCenterConst.SYSTEM_SUB_TITLE).toString());
+        pageParams.put(IUserCenterConst.SYSTEM_SUB_TITLE, config.isEmpty() ? null : config.get(IUserCenterConst.SYSTEM_SUB_TITLE));
         // 系统子标题大小，默认16
-        pageParams.put(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE, Integer.parseInt(config.get(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE).toString()));
+        pageParams.put(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE, config.isEmpty() ? null : Integer.parseInt(config.get(IUserCenterConst.SYSTEM_SUB_TITLE_SIZE).toString()));
         // 版权年份
-        pageParams.put(IUserCenterConst.COPY_RIGHT_YEAR, config.get(IUserCenterConst.COPY_RIGHT_YEAR).toString());
+        pageParams.put(IUserCenterConst.COPY_RIGHT_YEAR, config.isEmpty() ? null : config.get(IUserCenterConst.COPY_RIGHT_YEAR));
         // 版权所属
-        pageParams.put(IUserCenterConst.COPY_LEFT, config.get(IUserCenterConst.COPY_LEFT).toString());
+        pageParams.put(IUserCenterConst.COPY_LEFT, config.isEmpty() ? null : config.get(IUserCenterConst.COPY_LEFT));
         // 官方链接
-        pageParams.put(IUserCenterConst.OFFICIAL_URL, config.get(IUserCenterConst.OFFICIAL_URL).toString());
+        pageParams.put(IUserCenterConst.OFFICIAL_URL, config.isEmpty() ? null : config.get(IUserCenterConst.OFFICIAL_URL));
         // 开启验证码
-        pageParams.put(ISystemConstant.VERIFICATION_CODE, config.get(ISystemConstant.VERIFICATION_CODE).toString());
+        pageParams.put(ISystemConstant.VERIFICATION_CODE, config.isEmpty() ? null : config.get(ISystemConstant.VERIFICATION_CODE));
         // 登录框位置
-        pageParams.put(IUserCenterConst.LOGIN_BOX_POSITION, config.get(IUserCenterConst.LOGIN_BOX_POSITION).toString());
+        pageParams.put(IUserCenterConst.LOGIN_BOX_POSITION, config.isEmpty() ? null : config.get(IUserCenterConst.LOGIN_BOX_POSITION));
         // 登录表单action
         pageParams.put(IUserCenterConst.LOGIN_FORM_ACTION, baseProperties.getLoginProcess().startsWith("/") ? baseProperties.getLoginProcess().substring(1) : baseProperties.getLoginProcess());
         return pageParams;