Skip to content

Commit 0c58f67

Browse files
dunwudunwu
committed
format codes
1 parent d336b79 commit 0c58f67

File tree

186 files changed

+2183
-2027
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+2183
-2027
lines changed

‎.editorconfig‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# EditorConfig helps developers define and maintain consistent
22
# coding styles between different editors and IDEs
33
# http://editorconfig.org
4-
# 所有文件换行使用 Unix like 风格（LF），bat 文件使用 win 风格（CRLF）
4+
# 所有文件换行以 Unix like 风格（LF），win 格式特定的除外（bat）
55
# 缩进 java 4 个空格，其他所有文件 2 个空格
66

77
root = true
@@ -11,9 +11,8 @@ root = true
1111
end_of_line = lf
1212

1313
# Change these settings to your own preference
14-
indent_size = 2
1514
indent_style = space
16-
max_line_length = 120
15+
indent_size = 2
1716

1817
# We recommend you to keep these unchanged
1918
charset = utf-8
@@ -23,9 +22,8 @@ insert_final_newline = true
2322
[*.bat]
2423
end_of_line = crlf
2524

26-
[*.java]
25+
[*.{java, sh}]
2726
indent_size = 4
2827

2928
[*.md]
30-
max_line_length = 0
3129
trim_trailing_whitespace = false

‎codes/linux/build/helper.sh‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# 打印UI页头信息
44
function printHeadInfo() {
5-
cat << EOF
5+
cat << EOF
66
***********************************************************************************
77
* 欢迎使用项目引导式发布脚本。
88
* 输入任意键进入脚本操作。
@@ -12,7 +12,7 @@ EOF
1212

1313
# 打印UI页尾信息
1414
function printFootInfo() {
15-
cat << EOF
15+
cat << EOF
1616
1717
1818
***********************************************************************************
@@ -25,18 +25,18 @@ EOF
2525

2626
# 检查文件是否存在，不存在则退出脚本
2727
function checkFileExist() {
28-
if [ ! -f "$1" ]
29-
then
30-
echo "关键文件 $1 找不到，脚本执行结束"
31-
exit 1
32-
fi
28+
if [ ! -f "$1" ]
29+
then
30+
echo "关键文件 $1 找不到，脚本执行结束"
31+
exit 1
32+
fi
3333
}
3434

3535
# 检查文件夹是否存在，不存在则创建
3636
function createFolderIfNotExist() {
37-
if [ ! -d "$1" ];then
38-
mkdir -p "$1"
39-
fi
37+
if [ ! -d "$1" ]; then
38+
mkdir -p "$1"
39+
fi
4040
}
4141

4242
# 记录发布的版本信息
@@ -45,18 +45,18 @@ function createFolderIfNotExist() {
4545
# 第三个参数为代码分支
4646
# 第四个参数为运行环境
4747
function saveVersionInfo() {
48-
if [ "$1" == "" ] || [ "$2" == "" ] || [ "$3" == "" ] || [ "$4" == "" ]; then
49-
echo "缺少参数，退出"
50-
exit 1
51-
fi
52-
53-
VERSION_LOG_FILE=$1/$2-version.log
54-
rm -rf ${VERSION_LOG_FILE}
55-
touch ${VERSION_LOG_FILE}
56-
chmod 777 ${VERSION_LOG_FILE}
57-
58-
echo -e "\n=================== $2 ===================" >> ${VERSION_LOG_FILE}
59-
echo "Branch is: $3" >> ${VERSION_LOG_FILE}
60-
echo "Profile is: $4" >> ${VERSION_LOG_FILE}
61-
echo "CommitID is : $(git log --pretty=oneline -1)" >> ${VERSION_LOG_FILE}
48+
if [ "$1" == "" ] || [ "$2" == "" ] || [ "$3" == "" ] || [ "$4" == "" ]; then
49+
echo "缺少参数，退出"
50+
exit 1
51+
fi
52+
53+
VERSION_LOG_FILE=$1/$2-version.log
54+
rm -rf ${VERSION_LOG_FILE}
55+
touch ${VERSION_LOG_FILE}
56+
chmod 777 ${VERSION_LOG_FILE}
57+
58+
echo -e "\n=================== $2 ===================" >> ${VERSION_LOG_FILE}
59+
echo "Branch is: $3" >> ${VERSION_LOG_FILE}
60+
echo "Profile is: $4" >> ${VERSION_LOG_FILE}
61+
echo "CommitID is : $(git log --pretty=oneline -1)" >> ${VERSION_LOG_FILE}
6262
}

‎codes/linux/build/java-app-boot.sh‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77

88
# 检查脚本参数，如必要参数未传入，退出脚本。
99
function checkInput() {
10-
if [ "${app}" == "" ] || [ "${oper}" == "" ] || [ "${javaArgs}" == "" ] || [ "${classpathArgs}" == "" ] || [ "${bootstrapClass}" == "" ]; then
11-
echo "请输入脚本参数：app oper javaArgs classpathArgs bootstrapClass"
12-
echo " app: 应用名。"
13-
echo " oper: 运行环境（必填）。可选值：start|stop|restart"
14-
echo " javaArgs: JVM 参数（必填）。"
15-
echo " classpathArgs: classpath参数（必填）。"
16-
echo " bootstrapClass: 启动类（必填）。"
17-
exit 0
18-
fi
10+
if [ "${app}" == "" ] || [ "${oper}" == "" ] || [ "${javaArgs}" == "" ] || [ "${classpathArgs}" == "" ] || [ "${bootstrapClass}" == "" ]; then
11+
echo "请输入脚本参数：app oper javaArgs classpathArgs bootstrapClass"
12+
echo " app: 应用名。"
13+
echo " oper: 运行环境（必填）。可选值：start|stop|restart"
14+
echo " javaArgs: JVM 参数（必填）。"
15+
echo " classpathArgs: classpath参数（必填）。"
16+
echo " bootstrapClass: 启动类（必填）。"
17+
exit 0
18+
fi
1919
}
2020

2121
# 检查文件夹是否存在，不存在则创建
2222
function createFolderIfNotExist() {
23-
if [ ! -d "$1" ];then
24-
mkdir -p "$1"
25-
fi
23+
if [ ! -d "$1" ]; then
24+
mkdir -p "$1"
25+
fi
2626
}
2727

2828
# 检查服务是否已经启动
@@ -37,46 +37,46 @@ function checkStarted() {
3737
}
3838

3939
function main() {
40-
case "${oper}" in
41-
start )
42-
echo -n "starting server: "
43-
# 检查服务是否已经启动
44-
if checkStarted ;then
45-
echo "ERROR: server already started!"
46-
echo "PID: ${pids}"
47-
exit 1
48-
fi
40+
case "${oper}" in
41+
start)
42+
echo -n "starting server: "
43+
# 检查服务是否已经启动
44+
if checkStarted; then
45+
echo "ERROR: server already started!"
46+
echo "PID: ${pids}"
47+
exit 1
48+
fi
4949

50-
args="${javaArgs} -classpath ${classpathArgs} ${bootstrapClass}"
51-
echo -e "statup params:\n ${args}"
50+
args="${javaArgs} -classpath ${classpathArgs} ${bootstrapClass}"
51+
echo -e "statup params:\n ${args}"
5252

53-
#启动服务
54-
touch ${LOG_DIR}/${app}-startup.log
55-
nohup java ${args} > ${LOG_DIR}/${app}-startup.log 2>&1 &
56-
# echo -e "执行参数：\n${args}"
57-
echo -e "\nthe server is started..."
58-
;;
59-
stop )
60-
echo -n "stopping server: "
61-
#dubbo提供优雅停机, 不能使用kill -9
62-
if checkStarted ;then
63-
kill ${pids}
64-
echo -e "\nthe server is stopped..."
65-
else
66-
echo -e "\nno server to be stopped..."
67-
fi
68-
;;
69-
restart )
70-
$0 ${app} stop "${javaArgs}" "${classpathArgs}" "${bootstrapClass}"
71-
sleep 5
72-
$0 ${app} start "${javaArgs}" "${classpathArgs}" "${bootstrapClass}"
73-
;;
74-
* )
75-
echo "Invalid oper: ${oper}."
76-
exit 1
77-
esac
53+
#启动服务
54+
touch ${LOG_DIR}/${app}-startup.log
55+
nohup java ${args} > ${LOG_DIR}/${app}-startup.log 2>&1 &
56+
# echo -e "执行参数：\n${args}"
57+
echo -e "\nthe server is started..."
58+
;;
59+
stop)
60+
echo -n "stopping server: "
61+
#dubbo提供优雅停机, 不能使用kill -9
62+
if checkStarted; then
63+
kill ${pids}
64+
echo -e "\nthe server is stopped..."
65+
else
66+
echo -e "\nno server to be stopped..."
67+
fi
68+
;;
69+
restart)
70+
$0 ${app} stop "${javaArgs}" "${classpathArgs}" "${bootstrapClass}"
71+
sleep 5
72+
$0 ${app} start "${javaArgs}" "${classpathArgs}" "${bootstrapClass}"
73+
;;
74+
*)
75+
echo "Invalid oper: ${oper}."
76+
exit 1
77+
esac
7878

79-
exit 0
79+
exit 0
8080
}
8181

8282
######################################## MAIN ########################################

‎codes/linux/build/java-app-release.sh‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,41 @@
77

88
# 检查脚本参数，如必要参数未传入，退出脚本。
99
checkInput() {
10-
if [ "${branch}" == "" ] || [ "${profile}" == "" ]; then
11-
echo "请输入脚本参数：branch profile"
12-
echo " branch: git分支（必填）。如 feature/1.1.16, master"
13-
echo " profile: 运行环境（必填）。可选值：development | test"
14-
echo "例：./java-app-release.sh feature/1.1.16 test"
15-
exit 0
16-
fi
10+
if [ "${branch}" == "" ] || [ "${profile}" == "" ]; then
11+
echo "请输入脚本参数：branch profile"
12+
echo " branch: git分支（必填）。如 feature/1.1.16, master"
13+
echo " profile: 运行环境（必填）。可选值：development | test"
14+
echo "例：./java-app-release.sh feature/1.1.16 test"
15+
exit 0
16+
fi
1717
}
1818

1919
# 检查文件是否存在，不存在则退出脚本
2020
checkFileExist() {
21-
if [ ! -f "$1" ]
22-
then
23-
echo "关键文件 $1 找不到，脚本执行结束"
24-
exit 0
25-
fi
21+
if [ ! -f "$1" ]
22+
then
23+
echo "关键文件 $1 找不到，脚本执行结束"
24+
exit 0
25+
fi
2626
}
2727

2828
# 检查文件夹是否存在，不存在则创建
2929
createFolderIfNotExist() {
30-
if [ ! -d "$1" ];then
31-
mkdir -p "$1"
32-
fi
30+
if [ ! -d "$1" ]; then
31+
mkdir -p "$1"
32+
fi
3333
}
3434

3535
# 记录发布的版本信息
3636
saveVersionInfo() {
37-
rm -rf ${VERSION_LOG_FILE}
38-
touch ${VERSION_LOG_FILE}
39-
chmod 777 ${VERSION_LOG_FILE}
40-
41-
echo -e "\n=================== Version Info ===================" >> ${VERSION_LOG_FILE}
42-
echo "Branch is: ${branch}" >> ${VERSION_LOG_FILE}
43-
echo "Profile is: ${profile}" >> ${VERSION_LOG_FILE}
44-
echo "CommitID is : $(git log --pretty=oneline -1)" >> ${VERSION_LOG_FILE}
37+
rm -rf ${VERSION_LOG_FILE}
38+
touch ${VERSION_LOG_FILE}
39+
chmod 777 ${VERSION_LOG_FILE}
40+
41+
echo -e "\n=================== Version Info ===================" >> ${VERSION_LOG_FILE}
42+
echo "Branch is: ${branch}" >> ${VERSION_LOG_FILE}
43+
echo "Profile is: ${profile}" >> ${VERSION_LOG_FILE}
44+
echo "CommitID is : $(git log --pretty=oneline -1)" >> ${VERSION_LOG_FILE}
4545
}
4646

4747
######################################## MAIN ########################################
@@ -50,7 +50,8 @@ export LANG="zh_CN.UTF-8"
5050

5151
# 设置全局常量
5252
LOG_DIR=/home/zp/log/
53-
SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd)
53+
SCRIPT_DIR=$(cd "$(dirname "$0")";
54+
pwd)
5455
SOURCE_DIR=/home/zp/source/
5556
APP_NAME=XXX
5657
RESOURCES_DIR=/home/zp/source/${APP_NAME}/src/main/resources
@@ -73,10 +74,10 @@ echo ">>>>>>>>>>>>>> 2. 更新代码"
7374
${UPDATE_CODE_SCRIPT_FILE} ${APP_NAME} ${branch} ${SOURCE_DIR}
7475
execode=$?
7576
if [ "${execode}" == "0" ]; then
76-
echo "更新代码成功"
77+
echo "更新代码成功"
7778
else
78-
echo "更新代码失败"
79-
exit 1
79+
echo "更新代码失败"
80+
exit 1
8081
fi
8182
8283
echo ">>>>>>>>>>>>>> 3. 替换配置"
@@ -87,12 +88,12 @@ cd ${SOURCE_DIR}/ck-lion
8788
mvn clean package -e -Dmaven.test.skip=true | tee ${MAVEN_LOG_FILE}
8889
eexecode=$?
8990
if [ "${execode}" == "0" ]; then
90-
echo "构建编译成功"
91-
echo "编译详情见：${MAVEN_LOG_FILE}"
91+
echo "构建编译成功"
92+
echo "编译详情见：${MAVEN_LOG_FILE}"
9293
else
93-
echo "构建编译失败"
94-
echo "编译详情见：${MAVEN_LOG_FILE}"
95-
exit 1
94+
echo "构建编译失败"
95+
echo "编译详情见：${MAVEN_LOG_FILE}"
96+
exit 1
9697
fi
9798
9899
echo ">>>>>>>>>>>>>> 5. 启动应用"
@@ -101,10 +102,10 @@ echo 3 > /proc/sys/vm/drop_caches
101102
${SCRIPT_DIR}/java-app-run.sh ${profile} start
102103
execode=$?
103104
if [ "${execode}" == "0" ]; then
104-
echo "启动应用成功"
105+
echo "启动应用成功"
105106
else
106-
echo "启动应用失败"
107-
exit 1
107+
echo "启动应用失败"
108+
exit 1
108109
fi
109110
110111
echo ">>>>>>>>>>>>>> 6. 记录发布的版本信息"

0 commit comments

Comments
 (0)