Merge pull request #11 from shiyindaxiaojie/feature

Feature

.github/workflows/maven-ci.yml

@@ -55,4 +55,4 @@ jobs:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           DOCKER_IMAGE: shiyindaxiaojie/cat-home
-          DOCKER_VERSION: v3.3.1
+          DOCKER_VERSION: v3.3.2

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 3.3.2 (2024-01-26)
+
+### BUGFIX
+
+- 修复 Docker 环境下配置 CAT 集群的问题
+
+## 3.3.1 (2023-09-07)
+
+### BUGFIX
+
+- 修复 `Server`、`Browser`、`Mobile` 监控跳转交互问题
+
 ## 3.3.0 (2023-06-30)
 
 ### FEATURES

cat-alarm/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.dianping.cat</groupId>
     <artifactId>cat-parent</artifactId>
-    <version>3.3.1</version>
+    <version>3.3.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cat-alarm</artifactId>

cat-client/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>cat-parent</artifactId>
-		<version>3.3.1</version>
+		<version>3.3.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-client</artifactId>

cat-consumer/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>cat-parent</artifactId>
-		<version>3.3.1</version>
+		<version>3.3.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-consumer</artifactId>

cat-core/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>cat-parent</artifactId>
-		<version>3.3.1</version>
+		<version>3.3.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-core</artifactId>

cat-hadoop/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>cat-parent</artifactId>
-		<version>3.3.1</version>
+		<version>3.3.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-hadoop</artifactId>

cat-home/pom.xml

@@ -3,7 +3,7 @@
    <parent>
       <groupId>com.dianping.cat</groupId>
       <artifactId>cat-parent</artifactId>
-      <version>3.3.1</version>
+      <version>3.3.2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>cat-home</artifactId>

docker/Dockerfile

@@ -1,7 +1,7 @@
 FROM tomcat:8.5.78-jdk8
 
 LABEL maintainer="梦想歌 <shiyindaxiaojie@gmail.com>"
-LABEL version="3.3.1"
+LABEL version="3.3.2"
 
 ENV TZ="Asia/Shanghai" \
     WORKDIR='/usr/local/tomcat/bin' \

docker/client.sh

@@ -1,3 +1,10 @@
 #!/usr/bin/env bash
 echo "initialize client.xml"
-sed -i "s/SERVER_URL/${SERVER_URL}/g" /data/appdatas/cat/client.xml;
+
+IFS=',' read -ra URL_ARRAY <<< "${SERVER_URLS}"
+
+sed -i '/<server ip="SERVER_URL" port="2280" http-port="8080"\/>/d' /data/appdatas/cat/client.xml
+
+for url in "${URL_ARRAY[@]}"; do
+    sed -i "/<servers>/a <server ip=\"${url}\" port=\"2280\" http-port=\"8080\"\/>" /data/appdatas/cat/client.xml
+done

pom.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.dianping.cat</groupId>
 	<artifactId>cat-parent</artifactId>
-	<version>3.3.1</version>
+	<version>3.3.2</version>
 	<name>cat</name>
 	<description>Central Application Tracking</description>
 	<packaging>pom</packaging>
@@ -48,8 +49,8 @@
 		<connection>scm:git:https://github.com/shiyindaxiaojie/cat.git</connection>
 		<developerConnection>scm:git:https://github.com/shiyindaxiaojie/cat.git</developerConnection>
 		<url>https://github.com/shiyindaxiaojie/cat</url>
-	  <tag>v3.3.1</tag>
-  </scm>
+		<tag>v3.3.1</tag>
+	</scm>
 
 	<issueManagement>
 		<system>Github</system>
@@ -91,7 +92,7 @@
 		<git-changelog-maven-plugin.version>1.95.2</git-changelog-maven-plugin.version>
 		<maven.test.skip>true</maven.test.skip>
 		<maven.javadoc.skip>true</maven.javadoc.skip>
-
+		<maven.deploy.skip>true</maven.deploy.skip>
 		<slf4j.version>1.7.32</slf4j.version>
 		<log4j2.version>2.17.2</log4j2.version>
 		<transmittable-thread-local.version>2.13.2</transmittable-thread-local.version>