diff --git a/docker/docker-compose-test.yml b/docker/docker-compose-test.yml index 9593717d..7c8fc61e 100644 --- a/docker/docker-compose-test.yml +++ b/docker/docker-compose-test.yml @@ -66,6 +66,41 @@ services: SET_CONTAINER_TIMEZONE: "true" CONTAINER_TIMEZONE: Asia/Shanghai + java: + image: openjdk:8-jre + container_name: java + logging: + driver: "json-file" + options: + max-size: "10m" # 最多存10MB,完全够实时回看 + max-file: "2" # 保留2个文件,总占用 ≤20MB + ports: + - 8080:8080 + - 8888:8888 + - 8889:8889/udp + - 5061:5061/udp + - 5061:5061/tcp + privileged: true + networks: + network: + ipv4_address: 177.7.0.13 + depends_on: + - emqx + - redis + - mysql + - tdengine + - zlmedia-record + volumes: + - ./java/application-prod.yml:/application-prod.yml + - ./java/fastbee-admin.jar:/server.jar + - ./java/libtaos.so:/usr/lib/libtaos.so + - ./java/uploadPath:/uploadPath + - ./java/logs:/logs + - /etc/localtime:/etc/localtime + environment: + TZ: Asia/Shanghai + entrypoint: java -jar /server.jar + zlmedia-record: image: kerwincui/zlmedia-record:2.0 container_name: zlmedia-record diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 7f97fd2a..fa154571 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -69,6 +69,11 @@ services: java: image: openjdk:8-jre container_name: java + logging: + driver: "json-file" + options: + max-size: "10m" + max-file: "2" ports: - 8080:8080 - 8888:8888 diff --git a/yack-view/index.html b/yack-view/index.html index f004c01f..dd896036 100644 --- a/yack-view/index.html +++ b/yack-view/index.html @@ -4,13 +4,13 @@ - - + + - FastBee View + 岩安测控 可视化大屏 diff --git a/yack-view/src/assets/images/login/input.png b/yack-view/src/assets/images/login/input.png index 3ae63ccf..fb703c31 100644 Binary files a/yack-view/src/assets/images/login/input.png and b/yack-view/src/assets/images/login/input.png differ diff --git a/yack-view/src/assets/logo.png b/yack-view/src/assets/logo.png index 3ae63ccf..fb703c31 100644 Binary files a/yack-view/src/assets/logo.png and b/yack-view/src/assets/logo.png differ diff --git a/yack-view/src/components/GoSystemInfo/index.vue b/yack-view/src/components/GoSystemInfo/index.vue index b4c5f414..8a2849f2 100644 --- a/yack-view/src/components/GoSystemInfo/index.vue +++ b/yack-view/src/components/GoSystemInfo/index.vue @@ -14,7 +14,7 @@ 产品说明: - FastBee 可视化大屏(fastbee-view)为岩安测控物联网平台配套的可视化设计器,在开源可视化技术栈基础上进行了二次开发与业务定制。 + 岩安测控可视化大屏为岩安测控物联网平台(ycdat.cn)配套的可视化设计器,在开源可视化技术栈基础上进行了二次开发与业务定制。 diff --git a/yack-view/src/settings/designSetting.ts b/yack-view/src/settings/designSetting.ts index 46b628dc..0ee3be80 100644 --- a/yack-view/src/settings/designSetting.ts +++ b/yack-view/src/settings/designSetting.ts @@ -6,7 +6,7 @@ import designColor from './designColor.json' export const lang = LangEnum.ZH // 水印文字 -export const watermarkText = "GoView 低代码平台" +export const watermarkText = "岩安测控 可视化大屏" // 分组名称 export const groupTitle = "分组" diff --git a/yack-view/src/settings/pathConst.ts b/yack-view/src/settings/pathConst.ts index d19feada..7d27b336 100644 --- a/yack-view/src/settings/pathConst.ts +++ b/yack-view/src/settings/pathConst.ts @@ -1,10 +1,10 @@ // * 外部路径地址 -// 项目文档地址 -export const docPath = "https://wumei.live/doc/" +// 官网地址 +export const docPath = "https://ycdat.cn" -// 项目源码 -export const giteeSourceCodePath = "https://gitee.com/kerwincui/wumei-smart/" +// 项目源码(保留,供内部使用) +export const giteeSourceCodePath = "https://ycdat.cn" // 赞助 -export const sponsorPath = "https://wumei.live/doc/pages/sponsor/" +export const sponsorPath = "https://ycdat.cn"