diff --git a/contact-center/Dockerfile b/contact-center/Dockerfile index ed02eb6a..ebe484d6 100644 --- a/contact-center/Dockerfile +++ b/contact-center/Dockerfile @@ -3,6 +3,11 @@ MAINTAINER Hai Liang Wang ARG DEBIAN_FRONTEND=noninteractive ARG VCS_REF +ARG APPLICATION_CUSTOMER_ENTITY +ARG APPLICATION_BUILD_DATESTR + +ENV APPLICATION_CUSTOMER_ENTITY=$APPLICATION_CUSTOMER_ENTITY +ENV APPLICATION_BUILD_DATESTR=$APPLICATION_BUILD_DATESTR LABEL org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-url="https://github.com/chatopera/cosin" diff --git a/contact-center/admin/build.sh b/contact-center/admin/build.sh index 62e31852..c3c14f15 100755 --- a/contact-center/admin/build.sh +++ b/contact-center/admin/build.sh @@ -8,6 +8,8 @@ baseDir=$(cd `dirname "$0"`;pwd) appHome=$baseDir/.. registryName=dockerhub.qingcloud.com imagename=chatopera/contact-center +TIMESTAMP=`date "+%Y%m%d.%H%M%S"` + # functions # main @@ -24,5 +26,7 @@ if [ ! $? -eq 0 ]; then fi docker build --build-arg VCS_REF=$PACKAGE_VERSION \ + --build-arg APPLICATION_BUILD_DATESTR=$TIMESTAMP \ + --build-arg APPLICATION_CUSTOMER_ENTITY=$APPLICATION_CUSTOMER_ENTITY \ --no-cache \ --force-rm=true --tag $registryName/$imagename:$PACKAGE_VERSION . \ No newline at end of file diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/ApplicationController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/ApplicationController.java index 670b7fdf..9b63f9fa 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/ApplicationController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/ApplicationController.java @@ -24,6 +24,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; @@ -35,6 +36,18 @@ import java.util.TimeZone; public class ApplicationController extends Handler { private final static Logger logger = LoggerFactory.getLogger(ApplicationController.class); + @Value("${git.build.version}") + private String appVersionNumber; + + @Value("${git.commit.id.abbrev}") + private String appVersionAbbrev; + + @Value("${application.build.datestr}") + private String appBuildDate; + + @Value("${application.customer.entity}") + private String appCustomerEntity; + @Autowired private Cache cache; @@ -50,6 +63,13 @@ public class ApplicationController extends Handler { view.addObject("istenantshare", super.isEnabletneant()); view.addObject("timeDifference", timezone.getRawOffset()); + + // 增加版本信息 + view.addObject("appBuildDate", appBuildDate); + view.addObject("appVersionAbbrev", appVersionAbbrev); + view.addObject("appVersionNumber", appVersionNumber); + view.addObject("appCustomerEntity", appCustomerEntity); + if (super.isEnabletneant()) { // 多租户启用 非管理员 一定要选择租户才能进入界面 if (!logined.isAdmin() && StringUtils.isNotBlank( diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AppsController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AppsController.java index 1bbed3e3..ccf2c7cc 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AppsController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/apps/AppsController.java @@ -33,6 +33,7 @@ import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; @@ -49,7 +50,6 @@ import java.util.List; @Controller public class AppsController extends Handler { - private final static Logger logger = LoggerFactory.getLogger(AppsController.class); @Autowired @@ -133,7 +133,6 @@ public class AppsController extends Handler { // 获取agentStatus map.put("agentStatus", cache.findOneAgentStatusByAgentnoAndOrig(user.getId(), orgi)); - return request(super.createAppsTempletResponse("/apps/desktop/index")); } diff --git a/contact-center/app/src/main/resources/application.properties b/contact-center/app/src/main/resources/application.properties index 70acf81c..13b8e68e 100644 --- a/contact-center/app/src/main/resources/application.properties +++ b/contact-center/app/src/main/resources/application.properties @@ -17,6 +17,9 @@ # 在集群状态下,每个Node都有自己唯一的ID application.node.id=localhost +application.build.datestr=PLACEHOLDER +application.customer.entity=Trial + ############################################## # 安全设置 diff --git a/contact-center/app/src/main/resources/templates/apps/index.html b/contact-center/app/src/main/resources/templates/apps/index.html index a00f319d..9b6abdb2 100644 --- a/contact-center/app/src/main/resources/templates/apps/index.html +++ b/contact-center/app/src/main/resources/templates/apps/index.html @@ -175,8 +175,9 @@ <#if user??>${user.uname!''}<#if tenant??&&tenant.tenantname??>(${tenant.tenantname!''})
-
个人资料
-
退出系统
+
个人资料
+
退出系统
+
关于产品
@@ -370,6 +371,16 @@