diff --git a/.gitignore b/.gitignore index 27fd2ba..d708d05 100755 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,9 @@ *.iml target/ .DS_Store -openzalyDB.sqlite3 -stdout.log -openzaly-server.jar +*.sqlite3 +*.log +windchat-server.jar site-file/ site-logs/ openzaly-server.config diff --git a/build.sh b/build.sh index a2ce872..d6fea3f 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ #!/bin/bash # ---------------------------------------------------------------------------- -# Copyright 2018-2028 Akaxin Group +# Copyright 2018-2028 WindChat Group # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -24,4 +24,4 @@ cd `dirname $0` mvn -T 2C clean package -cp openzaly-boot/target/openzaly-boot-*-SNAPSHOT.jar openzaly-server.jar +cp windchat-boot/target/windchat-boot-*-SNAPSHOT.jar windchat-server.jar diff --git a/restart.sh b/restart.sh index 5c48f07..0e2bb5b 100755 --- a/restart.sh +++ b/restart.sh @@ -3,24 +3,6 @@ PORT=$1 PORT2=$2 #### echo akaxin logo and desc -echo " - - / \ - / . \ - \ . \ - / \ \ / _ _ __ _ __ __ ___ _ _ - / . \ | / / \ / \ | |/ / / \ \ \/ / |_ _| | \ | | - / . _ \ / / . \ / _ \ | ' / / _ \ \ / | | | \| | - \ / / \ - . / / ___ \ | . \ / ___ \ / \ | | | |\ | - \ / / | \ / /_/ \_\ |_|\_\ /_/ \_\ /_/\_\ |___| |_| \_| - / . \ \ / - \ . \ - \ / - \ / - -Akaxin is an open source and free proprietary IM software,you can build private openzaly-server for everyone in any server. - -" ##set tcp port if [ -n $PORT ]; then diff --git a/start.sh b/start.sh index 1b91ea6..7587bc7 100755 --- a/start.sh +++ b/start.sh @@ -23,8 +23,8 @@ PID=$(ps -ef|grep $JAVA_JAR|grep $PORT |head -1| awk '{printf $2}') ###if server is running, exit and echo error if [ $PID > 0 ]; then - echo "[ERROR] windchat is running [PID:"$PID"]" - echo "[ERROR] windchat start failure" + echo "[ERROR] WindChat is running [PID:"$PID"]" + echo "[ERROR] WindChat start failure" echo "" exit fi @@ -34,10 +34,10 @@ java -Dsite.port=$PORT -Dhttp.port=$PORT2 -jar openzaly-server.jar >>stdout.log PID=$(ps -ef|grep $JAVA_JAR|grep $PORT |head -1| awk '{printf $2}') if [ $? -eq 0 ]; then - echo "[OK] openzaly-server tcp-port:"$PORT",http-port:$PORT2,PID:$PID" - echo "[OK] openzaly-server is started successfully [PID:"$PID"]" + echo "[OK] WindChat tcp-port:"$PORT",http-port:$PORT2,PID:$PID" + echo "[OK] WindChat is started successfully [PID:"$PID"]" else - echo "[ERROR] openzaly-server is started failed" + echo "[ERROR] WindChat is started failed" echo "exit..." echo "" exit diff --git a/stop.sh b/stop.sh index 5ebe86e..1a25366 100755 --- a/stop.sh +++ b/stop.sh @@ -4,44 +4,20 @@ PORT=$1 IS_RESTART=$2 JAVA_JAR="openzaly-server" -## IS_RESTART not exist ,echo info -if [ -z $IS_RESTART ]; then -#### echo akaxin logo and desc -echo " - - / \ - / . \ - \ . \ - / \ \ / _ _ __ _ __ __ ___ _ _ - / . \ | / / \ / \ | |/ / / \ \ \/ / |_ _| | \ | | - / . _ \ / / . \ / _ \ | ' / / _ \ \ / | | | \| | - \ / / \ - . / / ___ \ | . \ / ___ \ / \ | | | |\ | - \ / / | \ / /_/ \_\ |_|\_\ /_/ \_\ /_/\_\ |___| |_| \_| - / . \ \ / - \ . \ - \ / - \ / - -Akaxin is an open source and free proprietary IM software,you can build private openzaly-server for everyone in any server. - -" -fi - - ##set tcp port if [ -n $PORT ]; then PORT=2021 fi -echo "[OK] openzaly-server is closing [PORT:"$PORT"]" +echo "[OK] WindChat is closing [PORT:"$PORT"]" PID=$(ps -ef|grep $JAVA_JAR|grep $PORT |head -1| awk '{printf $2}') #if [ $? -eq 0 ]; then if [ $PID ]; then - echo "[OK] openzaly-server is running on [PID:"$PID"]" + echo "[OK] WindChat is running on [PID:"$PID"]" else - echo "[ERROR] openzaly-server stop failure, as it's not running." + echo "[ERROR] WindChat stop failure, as it's not running." echo "" exit fi @@ -50,9 +26,9 @@ fi kill -9 ${PID} if [ $? -eq 0 ];then - echo "[OK] openzaly-server is stoped [PORT:"$PORT" PID:"$PID"]" + echo "[OK] WindChat is stoped [PORT:"$PORT" PID:"$PID"]" else - echo "[ERROR] openzaly-server stop failure." + echo "[ERROR] WindChat stop failure." fi echo "" \ No newline at end of file