From cc0b8333d47c54d7f13d72c9e09015c7ab3dc326 Mon Sep 17 00:00:00 2001 From: Hai Liang Wang Date: Sun, 23 Jul 2023 09:40:40 +0800 Subject: [PATCH 1/2] #884 set release version with properties Signed-off-by: Hai Liang Wang --- .../java/com/cskefu/cc/controller/ApplicationController.java | 2 +- contact-center/app/src/main/resources/application.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contact-center/app/src/main/java/com/cskefu/cc/controller/ApplicationController.java b/contact-center/app/src/main/java/com/cskefu/cc/controller/ApplicationController.java index 6fa79179..8c3412e8 100644 --- a/contact-center/app/src/main/java/com/cskefu/cc/controller/ApplicationController.java +++ b/contact-center/app/src/main/java/com/cskefu/cc/controller/ApplicationController.java @@ -52,7 +52,7 @@ public class ApplicationController extends Handler { @Autowired private ACDWorkMonitor acdWorkMonitor; - @Value("${git.build.version}") + @Value("${cskefu.build.version}") private String appVersionNumber; @Value("${git.commit.id.abbrev}") diff --git a/contact-center/app/src/main/resources/application.properties b/contact-center/app/src/main/resources/application.properties index 649aea85..f39822a5 100644 --- a/contact-center/app/src/main/resources/application.properties +++ b/contact-center/app/src/main/resources/application.properties @@ -146,6 +146,7 @@ cskefu.callout.watch.interval=60000 ############################################## # Modules ############################################## +cskefu.build.version=v8 cskefu.modules.contacts=true cskefu.modules.cca=true cskefu.modules.entim=false From 279266e3a06a0687cd7e6cd6f7afb86ed145d86b Mon Sep 17 00:00:00 2001 From: Hai Liang Wang Date: Sun, 23 Jul 2023 09:49:15 +0800 Subject: [PATCH 2/2] #884 tune words Signed-off-by: Hai Liang Wang --- contact-center/app/src/main/resources/templates/apps/index.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contact-center/app/src/main/resources/templates/apps/index.pug b/contact-center/app/src/main/resources/templates/apps/index.pug index e6ec03d8..2cfe8656 100644 --- a/contact-center/app/src/main/resources/templates/apps/index.pug +++ b/contact-center/app/src/main/resources/templates/apps/index.pug @@ -305,7 +305,7 @@ html(xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xm }); // 展示系统构建信息 function showSystemBuildInfo() { - layer.confirm('

春松客服® Release: #{appVersionNumber}

Build: #{appBuildDate}.#{appVersionAbbrev}
Copyright (2018-2023) Beijing Huaxia Chunsong Technology Co., Ltd., 开源许可协议: Chunsong Public License, version 1.0
文档中心 | 加入开源社区 | 购买企业服务', + layer.confirm('

春松客服® Release #{appVersionNumber}

Build: #{appBuildDate}.#{appVersionAbbrev}
Copyright (2018-2023) Beijing Huaxia Chunsong Technology Co., Ltd., 开源许可协议: Chunsong Public License, version 1.0
文档中心 | 加入开源社区 | 购买企业服务', {icon: -1, title: '关于产品', btn: ["关闭"]}, function (index, layero) { //do something layer.close(index);