From 33ff9aab035e083f0fb63e1b4676628c95192e96 Mon Sep 17 00:00:00 2001 From: Hai Liang Wang Date: Wed, 20 May 2020 07:54:04 +0800 Subject: [PATCH] https://gitlab.chatopera.com/chatopera/cosinee/issues/965 add contact info in login page --- .../java/com/chatopera/cc/controller/LoginController.java | 8 +++++++- .../app/src/main/resources/application.properties | 1 + .../app/src/main/resources/static/css/login.css | 2 +- .../app/src/main/resources/templates/login.html | 5 ++++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/LoginController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/LoginController.java index eac6588..36394a8 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/LoginController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/LoginController.java @@ -94,6 +94,9 @@ public class LoginController extends Handler { @Value("${tongji.baidu.sitekey}") private String tongjiBaiduSiteKey; + @Value("${ads.login.banner}") + private String adsLoginBanner; + /** * 登录页面 * @@ -155,10 +158,13 @@ public class LoginController extends Handler { } if (StringUtils.isNotBlank(tongjiBaiduSiteKey) && !StringUtils.equalsIgnoreCase(tongjiBaiduSiteKey, "placeholder")) { - logger.info("tongjiBaiduSiteKey: {}", tongjiBaiduSiteKey); view.addObject("tongjiBaiduSiteKey", tongjiBaiduSiteKey); } + if(StringUtils.isNotBlank(adsLoginBanner) && StringUtils.equalsIgnoreCase(adsLoginBanner, "on")){ + view.addObject("adsLoginBanner", "on"); + } + return view; } diff --git a/contact-center/app/src/main/resources/application.properties b/contact-center/app/src/main/resources/application.properties index a80fc15..0bfda32 100644 --- a/contact-center/app/src/main/resources/application.properties +++ b/contact-center/app/src/main/resources/application.properties @@ -185,6 +185,7 @@ cskefu.callout.watch.interval=60000 # 企业聊天机器人 ############################################## bot.baseurl=https://bot.chatopera.com +ads.login.banner=placeholder ############################################## # 业务功能相关设置 diff --git a/contact-center/app/src/main/resources/static/css/login.css b/contact-center/app/src/main/resources/static/css/login.css index 9055e66..af2620c 100644 --- a/contact-center/app/src/main/resources/static/css/login.css +++ b/contact-center/app/src/main/resources/static/css/login.css @@ -70,7 +70,7 @@ html { *overflow:auto; font-family:"Microsoft Yahei","Helvetica","Simsun","Arial background-repeat: no-repeat; background-position: 50%; background-size: 100%; - padding: 20px 0; + padding: 0 0; position: relative; } .login-box-body, .register-box-body{ diff --git a/contact-center/app/src/main/resources/templates/login.html b/contact-center/app/src/main/resources/templates/login.html index 8192e0f..5e700a8 100644 --- a/contact-center/app/src/main/resources/templates/login.html +++ b/contact-center/app/src/main/resources/templates/login.html @@ -55,7 +55,10 @@ -
+<#if adsLoginBanner??> +

商务洽谈：(+86)136-9149-0568; 售后技术支持：(+86)158-0121-3126; 云服务发票等：info@chatopera.com *本提示仅出现于演示环境

+ +