Skip to content

Commit 28d985a

Browse files
ZQKCZQKC
authored
Merge pull request #58 from didi/dev
版本调整为1.1.0
2 parents c23870e + 2397cbf commit 28d985a

13 files changed

Lines changed: 164 additions & 16 deletions

File tree

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM fabric8/java-alpine-openjdk8-jdk
22
MAINTAINER xuzhengxi
33
ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
4-
ADD ./web/target/kafka-manager-web-1.0.0-SNAPSHOT.jar kafka-manager-web.jar
4+
ADD ./web/target/kafka-manager-web-1.1.0-SNAPSHOT.jar kafka-manager-web.jar
55
ADD ./docker/kafka-manager/application-standalone.yml application.yml
66
ENTRYPOINT ["java","-jar","/kafka-manager-web.jar","--spring.config.location=./application.yml"]
77
EXPOSE 8080

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ create database kafka_manager owner=admin template=template0 encoding='UTF-8' lc
9595
############# application.yml 是配置文件
9696
cp web/src/main/resources/application.yml web/target/
9797
cd web/target/
98-
nohup java -jar kafka-manager-web-1.0.0-SNAPSHOT.jar --spring.config.location=./application.yml > /dev/null 2>&1 &
98+
nohup java -jar kafka-manager-web-1.1.0-SNAPSHOT.jar --spring.config.location=./application.yml > /dev/null 2>&1 &
9999
```
100100

101101
### 使用

‎common/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.xiaojukeji.kafka</groupId>
77
<artifactId>kafka-manager-common</artifactId>
8-
<version>1.0.0-SNAPSHOT</version>
8+
<version>1.1.0-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010

1111
<parent>
1212
<artifactId>kafka-manager</artifactId>
1313
<groupId>com.xiaojukeji.kafka</groupId>
14-
<version>1.0.0-SNAPSHOT</version>
14+
<version>1.1.0-SNAPSHOT</version>
1515
</parent>
1616

1717
<properties>

‎console/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>kafka-manager</artifactId>
77
<groupId>com.xiaojukeji.kafka</groupId>
8-
<version>1.0.0-SNAPSHOT</version>
8+
<version>1.1.0-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>kafka-manager-console</artifactId>

‎dao/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.xiaojukeji.kafka</groupId>
77
<artifactId>kafka-manager-dao</artifactId>
8-
<version>1.0.0-SNAPSHOT</version>
8+
<version>1.1.0-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010

1111
<parent>
1212
<artifactId>kafka-manager</artifactId>
1313
<groupId>com.xiaojukeji.kafka</groupId>
14-
<version>1.0.0-SNAPSHOT</version>
14+
<version>1.1.0-SNAPSHOT</version>
1515
</parent>
1616

1717
<properties>

‎docker/kafka-manager/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM java:8
22
MAINTAINER xuzhengxi
33
ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
4-
ADD ../../web/target/kafka-manager-web-1.0.0-SNAPSHOT.jar kafka-manager-web.jar
4+
ADD ../../web/target/kafka-manager-web-1.1.0-SNAPSHOT.jar kafka-manager-web.jar
55
ADD ./application.yml application.yml
66
ENTRYPOINT ["java","-jar","/kafka-manager-web.jar","--spring.config.location=./application.yml"]
77
EXPOSE 8080

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.xiaojukeji.kafka</groupId>
77
<artifactId>kafka-manager</artifactId>
88
<packaging>pom</packaging>
9-
<version>1.0.0-SNAPSHOT</version>
9+
<version>1.1.0-SNAPSHOT</version>
1010

1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
@@ -15,7 +15,7 @@
1515
</parent>
1616

1717
<properties>
18-
<kafka-manager.revision>1.0.0-SNAPSHOT</kafka-manager.revision>
18+
<kafka-manager.revision>1.1.0-SNAPSHOT</kafka-manager.revision>
1919
<jackson.version>2.9.0</jackson.version>
2020

2121
<!-- maven properties -->
@@ -77,7 +77,7 @@
7777
<dependency>
7878
<groupId>com.alibaba</groupId>
7979
<artifactId>fastjson</artifactId>
80-
<version>1.2.58</version>
80+
<version>1.2.68</version>
8181
</dependency>
8282
<dependency>
8383
<groupId>org.apache.zookeeper</groupId>

‎service/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.xiaojukeji.kafka</groupId>
77
<artifactId>kafka-manager-service</artifactId>
8-
<version>1.0.0-SNAPSHOT</version>
8+
<version>1.1.0-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010

1111
<parent>
1212
<artifactId>kafka-manager</artifactId>
1313
<groupId>com.xiaojukeji.kafka</groupId>
14-
<version>1.0.0-SNAPSHOT</version>
14+
<version>1.1.0-SNAPSHOT</version>
1515
</parent>
1616

1717
<properties>
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.xiaojukeji.kafka</groupId>
3333
<artifactId>kafka-manager-dao</artifactId>
34-
<version>1.0.0-SNAPSHOT</version>
34+
<version>1.1.0-SNAPSHOT</version>
3535
</dependency>
3636

3737
<!-- spring -->

‎web/bin/shutdown.sh‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/env bash
2+
3+
cd `dirname $0`/../lib
4+
lib_dir=`pwd`
5+
6+
pid=`ps ax | grep -i 'kafka-manager-web' | grep ${lib_dir} | grep java | grep -v grep | awk '{print $1}'`
7+
if [ -z "$pid" ] ; then
8+
echo "No kafka-manager-web running."
9+
exit -1;
10+
fi
11+
12+
echo "The kafka-manager-web(${pid}) is running..."
13+
14+
kill ${pid}
15+
16+
echo "Send shutdown request to kafka-manager-web(${pid}) OK"

‎web/bin/startup.sh‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#!/usr/bin/env bash
2+
3+
error_exit ()
4+
{
5+
echo "ERROR: $1 !!"
6+
exit 1
7+
}
8+
9+
if [ -z "$JAVA_HOME" ]; then
10+
error_exit "Please set the JAVA_HOME variable in your environment, We need java(x64)! jdk8 or later is better!"
11+
12+
fi
13+
14+
export WEB_SERVER="kafka-manager-web-*"
15+
export JAVA_HOME
16+
export JAVA="$JAVA_HOME/bin/java"
17+
export BASE_DIR=`cd $(dirname $0)/..; pwd`
18+
export DEFAULT_SEARCH_LOCATIONS="classpath:/,classpath:/config/,file:./,file:./config/"
19+
export CUSTOM_SEARCH_LOCATIONS=${DEFAULT_SEARCH_LOCATIONS},file:${BASE_DIR}/conf/
20+
21+
#===========================================================================================
22+
# JVM Configuration
23+
#===========================================================================================
24+
25+
JAVA_OPT="${JAVA_OPT} -server -Xms2g -Xmx2g -Xmn1g -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=320m"
26+
JAVA_OPT="${JAVA_OPT} -XX:-OmitStackTraceInFastThrow -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${BASE_DIR}/logs/java_heapdump.hprof"
27+
JAVA_OPT="${JAVA_OPT} -Xloggc:${BASE_DIR}/logs/gc.log -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M"
28+
JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/lib/${WEB_SERVER}.jar"
29+
JAVA_OPT="${JAVA_OPT} --spring.config.location=${CUSTOM_SEARCH_LOCATIONS}"
30+
JAVA_OPT="${JAVA_OPT} --logging.config=${BASE_DIR}/conf/logback-spring.xml"
31+
JAVA_OPT="${JAVA_OPT} --server.max-http-header-size=524288"
32+
33+
if [ ! -d "${BASE_DIR}/logs" ]; then
34+
mkdir ${BASE_DIR}/logs
35+
fi
36+
37+
echo "$JAVA ${JAVA_OPT}"
38+
39+
# check the start.out log output file
40+
if [ ! -f "${BASE_DIR}/logs/start.out" ]; then
41+
touch "${BASE_DIR}/logs/start.out"
42+
fi
43+
# start
44+
echo "$JAVA ${JAVA_OPT}" > ${BASE_DIR}/logs/start.out 2>&1 &
45+
nohup $JAVA ${JAVA_OPT} >> ${BASE_DIR}/logs/start.out 2>&1 &
46+
echo "kafka-manager is starting，you can check the ${BASE_DIR}/logs/start.out"

0 commit comments

Comments
 (0)