From c08c90ba7c76ef71b28dc6381a7f33fe9696d41a Mon Sep 17 00:00:00 2001
From: Hai Liang Wang <hain@chatopera.com>
Date: Fri, 6 Aug 2021 11:13:53 +0800
Subject: [PATCH] https://github.com/chatopera/cskefu/issues/456 enable set
 login banner as notice with environment variable NOTICE_LOGIN_BANNER

---
 .../chatopera/cc/controller/LoginController.java | 10 ++++++----
 .../src/main/resources/application.properties    |  2 +-
 contact-center/app/src/main/resources/banner.txt | 16 ++++++++++++++--
 .../app/src/main/resources/templates/login.pug   |  3 +++
 4 files changed, 24 insertions(+), 7 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 0f81bb8..c95b3b2 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
@@ -85,8 +85,8 @@ public class LoginController extends Handler {
     @Value("${tongji.baidu.sitekey}")
     private String tongjiBaiduSiteKey;
 
-    @Value("${ads.login.banner}")
-    private String adsLoginBanner;
+    @Value("${notice.login.banner}")
+    private String noticeLoginBanner;
 
     /**
      * 登录页面
@@ -152,8 +152,10 @@ public class LoginController extends Handler {
             view.addObject("tongjiBaiduSiteKey", tongjiBaiduSiteKey);
         }
 
-        if (StringUtils.isNotBlank(adsLoginBanner) && StringUtils.equalsIgnoreCase(adsLoginBanner, "on")) {
-            view.addObject("adsLoginBanner", "on");
+        if (StringUtils.isNotBlank(noticeLoginBanner) && !StringUtils.equalsIgnoreCase(noticeLoginBanner, "off")) {
+            view.addObject("noticeLoginBanner", noticeLoginBanner);
+        } else {
+            view.addObject("noticeLoginBanner", "off");
         }
 
         return view;
diff --git a/contact-center/app/src/main/resources/application.properties b/contact-center/app/src/main/resources/application.properties
index e7b771a..3e2e9e8 100644
--- a/contact-center/app/src/main/resources/application.properties
+++ b/contact-center/app/src/main/resources/application.properties
@@ -228,4 +228,4 @@ channel.skype.crm=
 # Miscs
 ##############################################
 # 登陆页面公告
-ads.login.banner=placeholder
\ No newline at end of file
+notice.login.banner=商务洽谈、售后技术支持和云服务发票等 https://dwz.chatopera.com/A51h6m *本提示仅出现于演环境
\ No newline at end of file
diff --git a/contact-center/app/src/main/resources/banner.txt b/contact-center/app/src/main/resources/banner.txt
index 12ec5ea..72a3858 100644
--- a/contact-center/app/src/main/resources/banner.txt
+++ b/contact-center/app/src/main/resources/banner.txt
@@ -5,7 +5,19 @@
  '|...'  '|..|' .||. ||.  '|.' '|..'|'  '|...'  '|.'  '|...'  '|...' .||. ||.  '|.'  '|...' .||.
 
 ==================== Powered by Chatopera Inc. =================
-春松客服: 多渠道智能客服 v${git.build.version} build ${git.commit.id.abbrev}
+春松客服: 越是重视客户服务，越是好的企业 v${git.build.version} build ${git.commit.id.abbrev}
 版权所有 © 北京华夏春松科技有限公司️ https://www.chatopera.com/
-商业许可授权联系 info@chatopera.com
+商业许可授权联系商务顾问 https://dwz.chatopera.com/A51h6m
+
+第一次安装后，参考系统初始化文档，对系统进行初始化，再使用！！！
+https://docs.chatopera.com/products/cskefu/initialization.html
+
+使用过程中，进行维护：备份、回复、升级等，参考文档
+https://docs.chatopera.com/products/cskefu/osc/maintainence.html
+
+春松客服定制开发技能培训：春松客服大讲堂
+https://docs.chatopera.com/products/cskefu/osc/training.html
+
+开源社区反馈建议& 提交 BUG
+https://github.com/chatopera/cskefu/issues
 ----------------------------------------------------------------
\ No newline at end of file
diff --git a/contact-center/app/src/main/resources/templates/login.pug b/contact-center/app/src/main/resources/templates/login.pug
index 94fba1c..e821210 100644
--- a/contact-center/app/src/main/resources/templates/login.pug
+++ b/contact-center/app/src/main/resources/templates/login.pug
@@ -51,6 +51,9 @@ html
                 })();
             }
     body.login
+        if noticeLoginBanner != "off"
+            div(style="width: 100%; height:50px; background-color: #2bd99e; padding-top: 0px;display: flex;")
+                p(style="color: white;margin: auto; font-size: 15px")= noticeLoginBanner
         .login-box
             .login-logo
                 a
-- 
GitLab