From b4ebe285e84e7f50be5318495ed4dd5368a17f3c Mon Sep 17 00:00:00 2001 From: AllianceTing <2426446427@qq.com> Date: Mon, 10 Jul 2023 21:48:53 +0800 Subject: [PATCH] docs: modify scripts style(#7) Signed-off-by: AllianceTing <2426446427@qq.com> --- Makefile | 2 +- cmd/api/admin_api/main.go | 5 +++-- cmd/api/chat_api/main.go | 5 +++-- cmd/rpc/admin/main.go | 1 + cmd/rpc/chat/main.go | 1 + internal/api/chat.go | 1 - internal/api/router.go | 3 ++- internal/rpc/admin/applet.go | 5 ++++- internal/rpc/admin/check.go | 1 + internal/rpc/admin/client_config.go | 1 + internal/rpc/admin/invitation.go | 5 ++++- internal/rpc/admin/ip_forbidden.go | 4 +++- internal/rpc/admin/register_add_friend.go | 5 ++++- internal/rpc/admin/register_add_group.go | 5 ++++- internal/rpc/admin/token.go | 1 + internal/rpc/admin/user.go | 7 +++++-- internal/rpc/admin/user_ip_limit_login.go | 4 +++- internal/rpc/chat/password.go | 1 + internal/rpc/chat/user.go | 1 + pkg/common/chatrpcstart/start.go | 9 ++++----- pkg/common/config/parse.go | 7 ++----- pkg/common/db/database/chat.go | 6 ++++-- pkg/common/db/model/admin/admin.go | 4 ++-- pkg/common/db/model/chat/account.go | 4 ++-- pkg/common/db/model/chat/user_login_record.go | 1 - pkg/common/db/model/chat/verify_code.go | 4 ++-- pkg/common/dbconn/gorm.go | 4 ++-- pkg/common/mw/user.go | 4 +++- pkg/common/tokenverify/token_verify.go | 14 +++++++------- pkg/sms/sms.go | 2 +- scripts/admin_rpc_start.sh | 11 +++++++---- scripts/build_all_service.sh | 2 +- scripts/build_docker.sh | 5 ++++- scripts/check_all.sh | 2 ++ scripts/docker_start_all.sh | 7 +++++-- scripts/start_all.sh | 2 +- scripts/stop_all.sh | 2 +- 37 files changed, 93 insertions(+), 55 deletions(-) diff --git a/Makefile b/Makefile index be3831a02..c5c6ffb08 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ OUT_DIR=$(REPO_ROOT)/_output # define the default goal # - +# define shell SHELL := /bin/bash DIRS=$(shell ls) GO=go diff --git a/cmd/api/admin_api/main.go b/cmd/api/admin_api/main.go index 93bcfca3c..3c5022871 100644 --- a/cmd/api/admin_api/main.go +++ b/cmd/api/admin_api/main.go @@ -24,11 +24,12 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/mw" openKeeper "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry/zookeeper" - "github.com/OpenIMSDK/chat/internal/api" - "github.com/OpenIMSDK/chat/pkg/common/config" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" + "github.com/OpenIMSDK/chat/internal/api" + "github.com/OpenIMSDK/chat/pkg/common/config" + "github.com/gin-gonic/gin" ) diff --git a/cmd/api/chat_api/main.go b/cmd/api/chat_api/main.go index d754c38f1..b50289a13 100644 --- a/cmd/api/chat_api/main.go +++ b/cmd/api/chat_api/main.go @@ -24,11 +24,12 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/mw" openKeeper "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry/zookeeper" - "github.com/OpenIMSDK/chat/internal/api" - "github.com/OpenIMSDK/chat/pkg/common/config" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" + "github.com/OpenIMSDK/chat/internal/api" + "github.com/OpenIMSDK/chat/pkg/common/config" + "github.com/gin-gonic/gin" ) diff --git a/cmd/rpc/admin/main.go b/cmd/rpc/admin/main.go index ba9f1e692..082edcfb0 100644 --- a/cmd/rpc/admin/main.go +++ b/cmd/rpc/admin/main.go @@ -16,6 +16,7 @@ package main import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" + "github.com/OpenIMSDK/chat/pkg/common/chatrpcstart" "github.com/OpenIMSDK/chat/internal/rpc/admin" diff --git a/cmd/rpc/chat/main.go b/cmd/rpc/chat/main.go index 61c014347..93a02b861 100644 --- a/cmd/rpc/chat/main.go +++ b/cmd/rpc/chat/main.go @@ -16,6 +16,7 @@ package main import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" + "github.com/OpenIMSDK/chat/pkg/common/chatrpcstart" "github.com/OpenIMSDK/chat/internal/rpc/chat" diff --git a/internal/api/chat.go b/internal/api/chat.go index 8dd496bc4..0bec1663b 100644 --- a/internal/api/chat.go +++ b/internal/api/chat.go @@ -32,7 +32,6 @@ import ( ) func NewChat(chatConn, adminConn grpc.ClientConnInterface) *ChatApi { - return &ChatApi{chatClient: chat.NewChatClient(chatConn), adminClient: admin.NewAdminClient(adminConn)} } diff --git a/internal/api/router.go b/internal/api/router.go index 9384970f3..310105e87 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -18,8 +18,9 @@ import ( "context" "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry" - "github.com/OpenIMSDK/chat/pkg/common/config" "github.com/gin-gonic/gin" + + "github.com/OpenIMSDK/chat/pkg/common/config" ) func NewChatRoute(router gin.IRouter, discov discoveryregistry.SvcDiscoveryRegistry) { diff --git a/internal/rpc/admin/applet.go b/internal/rpc/admin/applet.go index adb464d30..4fdb3e570 100644 --- a/internal/rpc/admin/applet.go +++ b/internal/rpc/admin/applet.go @@ -16,10 +16,13 @@ package admin import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "strings" "time" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" + + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" + "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" "github.com/google/uuid" diff --git a/internal/rpc/admin/check.go b/internal/rpc/admin/check.go index 36be7fc38..c34c89a4a 100644 --- a/internal/rpc/admin/check.go +++ b/internal/rpc/admin/check.go @@ -17,6 +17,7 @@ package admin import ( "context" "fmt" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/chat/pkg/common/db/dbutil" diff --git a/internal/rpc/admin/client_config.go b/internal/rpc/admin/client_config.go index 92ec0e9c6..c30ca0bd0 100644 --- a/internal/rpc/admin/client_config.go +++ b/internal/rpc/admin/client_config.go @@ -16,6 +16,7 @@ package admin import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" diff --git a/internal/rpc/admin/invitation.go b/internal/rpc/admin/invitation.go index 69c8eb23f..21b006538 100644 --- a/internal/rpc/admin/invitation.go +++ b/internal/rpc/admin/invitation.go @@ -16,11 +16,14 @@ package admin import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "math/rand" "strings" "time" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" + + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" + "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" diff --git a/internal/rpc/admin/ip_forbidden.go b/internal/rpc/admin/ip_forbidden.go index 9dcb9edd9..08b50740b 100644 --- a/internal/rpc/admin/ip_forbidden.go +++ b/internal/rpc/admin/ip_forbidden.go @@ -16,9 +16,11 @@ package admin import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "time" + + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" + admin2 "github.com/OpenIMSDK/chat/pkg/common/db/table/admin" "github.com/OpenIMSDK/chat/pkg/common/mctx" "github.com/OpenIMSDK/chat/pkg/proto/admin" diff --git a/internal/rpc/admin/register_add_friend.go b/internal/rpc/admin/register_add_friend.go index 72f40e783..6a4f1d279 100644 --- a/internal/rpc/admin/register_add_friend.go +++ b/internal/rpc/admin/register_add_friend.go @@ -16,10 +16,13 @@ package admin import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "strings" "time" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" + + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" + "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" diff --git a/internal/rpc/admin/register_add_group.go b/internal/rpc/admin/register_add_group.go index 02636de7d..3209f4b52 100644 --- a/internal/rpc/admin/register_add_group.go +++ b/internal/rpc/admin/register_add_group.go @@ -16,10 +16,13 @@ package admin import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "strings" "time" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" + + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" + "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" diff --git a/internal/rpc/admin/token.go b/internal/rpc/admin/token.go index ae10df318..e3da03975 100644 --- a/internal/rpc/admin/token.go +++ b/internal/rpc/admin/token.go @@ -16,6 +16,7 @@ package admin import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/chat/pkg/common/config" diff --git a/internal/rpc/admin/user.go b/internal/rpc/admin/user.go index 08f95bda4..366d6213a 100644 --- a/internal/rpc/admin/user.go +++ b/internal/rpc/admin/user.go @@ -16,11 +16,14 @@ package admin import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" - "github.com/OpenIMSDK/chat/pkg/common/constant" "strings" "time" + + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" + + "github.com/OpenIMSDK/chat/pkg/common/constant" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb" diff --git a/internal/rpc/admin/user_ip_limit_login.go b/internal/rpc/admin/user_ip_limit_login.go index 1336c9a7d..330f76dec 100644 --- a/internal/rpc/admin/user_ip_limit_login.go +++ b/internal/rpc/admin/user_ip_limit_login.go @@ -16,9 +16,11 @@ package admin import ( "context" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "time" + + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" + "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" diff --git a/internal/rpc/chat/password.go b/internal/rpc/chat/password.go index 675058a5c..2b1e325ad 100644 --- a/internal/rpc/chat/password.go +++ b/internal/rpc/chat/password.go @@ -16,6 +16,7 @@ package chat import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" diff --git a/internal/rpc/chat/user.go b/internal/rpc/chat/user.go index 48a7c814f..d2b3a0276 100644 --- a/internal/rpc/chat/user.go +++ b/internal/rpc/chat/user.go @@ -16,6 +16,7 @@ package chat import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" diff --git a/pkg/common/chatrpcstart/start.go b/pkg/common/chatrpcstart/start.go index c06c33fca..3a599c98c 100644 --- a/pkg/common/chatrpcstart/start.go +++ b/pkg/common/chatrpcstart/start.go @@ -2,6 +2,10 @@ package chatrpcstart import ( "fmt" + "net" + "strconv" + "time" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/mw" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/network" @@ -9,13 +13,8 @@ import ( openKeeper "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry/zookeeper" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" "github.com/OpenIMSDK/Open-IM-Server/pkg/utils" - "github.com/OpenIMSDK/chat/pkg/common/config" - chatMw "github.com/OpenIMSDK/chat/pkg/common/mw" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "net" - "strconv" - "time" ) func Start(rpcPort int, rpcRegisterName string, prometheusPort int, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error, options ...grpc.ServerOption) error { diff --git a/pkg/common/config/parse.go b/pkg/common/config/parse.go index aaa75503e..2643b087e 100644 --- a/pkg/common/config/parse.go +++ b/pkg/common/config/parse.go @@ -18,19 +18,16 @@ import ( "bytes" "errors" "fmt" - openIMConfig "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" - "github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant" - openKeeper "github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry/zookeeper" - "gopkg.in/yaml.v3" "os" "path/filepath" "runtime" "time" + ) var ( _, b, _, _ = runtime.Caller(0) - // Root folder of this project + // Root folder of this project. Root = filepath.Join(filepath.Dir(b), "../../..") ) diff --git a/pkg/common/db/database/chat.go b/pkg/common/db/database/chat.go index 2c9e8d7e1..e9959ac75 100644 --- a/pkg/common/db/database/chat.go +++ b/pkg/common/db/database/chat.go @@ -16,12 +16,14 @@ package database import ( "context" + "time" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/tx" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" + "gorm.io/gorm" + "github.com/OpenIMSDK/chat/pkg/common/db/model/chat" table "github.com/OpenIMSDK/chat/pkg/common/db/table/chat" - "gorm.io/gorm" - "time" ) type ChatDatabaseInterface interface { diff --git a/pkg/common/db/model/admin/admin.go b/pkg/common/db/model/admin/admin.go index 11f83d223..33f133374 100644 --- a/pkg/common/db/model/admin/admin.go +++ b/pkg/common/db/model/admin/admin.go @@ -18,11 +18,11 @@ import ( "context" "crypto/md5" "encoding/hex" + "time" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" - "github.com/OpenIMSDK/chat/pkg/common/db/table/admin" "gorm.io/gorm" - "time" ) func NewAdmin(db *gorm.DB) *Admin { diff --git a/pkg/common/db/model/chat/account.go b/pkg/common/db/model/chat/account.go index cbcf6f365..1128fbd6e 100644 --- a/pkg/common/db/model/chat/account.go +++ b/pkg/common/db/model/chat/account.go @@ -16,10 +16,10 @@ package chat import ( "context" + "time" + "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" - "github.com/OpenIMSDK/chat/pkg/common/db/table/chat" "gorm.io/gorm" - "time" ) func NewAccount(db *gorm.DB) chat.AccountInterface { diff --git a/pkg/common/db/model/chat/user_login_record.go b/pkg/common/db/model/chat/user_login_record.go index a040bf377..34ff3f49f 100644 --- a/pkg/common/db/model/chat/user_login_record.go +++ b/pkg/common/db/model/chat/user_login_record.go @@ -17,7 +17,6 @@ package chat import ( "context" - "gorm.io/gorm" "github.com/OpenIMSDK/chat/pkg/common/db/table/chat" diff --git a/pkg/common/db/model/chat/verify_code.go b/pkg/common/db/model/chat/verify_code.go index 6175c11ff..c9a06058c 100644 --- a/pkg/common/db/model/chat/verify_code.go +++ b/pkg/common/db/model/chat/verify_code.go @@ -16,10 +16,10 @@ package chat import ( "context" + "time" + "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" - "github.com/OpenIMSDK/chat/pkg/common/db/table/chat" "gorm.io/gorm" - "time" ) func NewVerifyCode(db *gorm.DB) *VerifyCode { diff --git a/pkg/common/dbconn/gorm.go b/pkg/common/dbconn/gorm.go index 65366da43..0d9058790 100644 --- a/pkg/common/dbconn/gorm.go +++ b/pkg/common/dbconn/gorm.go @@ -16,15 +16,15 @@ package dbconn import ( "fmt" + "time" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/mw/specialerror" "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" - "github.com/OpenIMSDK/chat/pkg/common/config" mysqlDriver "github.com/go-sql-driver/mysql" "gorm.io/driver/mysql" "gorm.io/gorm" "gorm.io/gorm/logger" - "time" ) func NewMysqlGormDB() (*gorm.DB, error) { diff --git a/pkg/common/mw/user.go b/pkg/common/mw/user.go index 53dc2adca..dbd8441be 100644 --- a/pkg/common/mw/user.go +++ b/pkg/common/mw/user.go @@ -2,9 +2,11 @@ package mw import ( "context" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" - "github.com/OpenIMSDK/chat/pkg/common/constant" "google.golang.org/grpc" + + "github.com/OpenIMSDK/chat/pkg/common/constant" ) func AddUserType() grpc.DialOption { diff --git a/pkg/common/tokenverify/token_verify.go b/pkg/common/tokenverify/token_verify.go index eac9461ca..0463331a0 100644 --- a/pkg/common/tokenverify/token_verify.go +++ b/pkg/common/tokenverify/token_verify.go @@ -15,12 +15,11 @@ package tokenverify import ( + "time" + "github.com/OpenIMSDK/Open-IM-Server/pkg/errs" - "github.com/OpenIMSDK/chat/pkg/common/config" - "github.com/OpenIMSDK/chat/pkg/common/constant" utils "github.com/OpenIMSDK/open_utils" "github.com/golang-jwt/jwt/v4" - "time" ) const ( @@ -41,10 +40,11 @@ func buildClaims(userID string, userType int32, ttl int64) claims { UserID: userID, UserType: userType, RegisteredClaims: jwt.RegisteredClaims{ - ExpiresAt: jwt.NewNumericDate(now.Add(time.Duration(ttl*24) * time.Hour)), //Expiration time - IssuedAt: jwt.NewNumericDate(now), //Issuing time - NotBefore: jwt.NewNumericDate(before), //Begin Effective time - }} + ExpiresAt: jwt.NewNumericDate(now.Add(time.Duration(ttl*24) * time.Hour)), // Expiration time + IssuedAt: jwt.NewNumericDate(now), // Issuing time + NotBefore: jwt.NewNumericDate(before), // Begin Effective time + }, + } } func CreateToken(UserID string, userType int32, ttl int64) (string, error) { diff --git a/pkg/sms/sms.go b/pkg/sms/sms.go index ba3a91429..231dd5f23 100644 --- a/pkg/sms/sms.go +++ b/pkg/sms/sms.go @@ -17,8 +17,8 @@ package sms import ( "context" "fmt" - "github.com/OpenIMSDK/chat/pkg/common/config" "strings" + ) func New() (SMS, error) { diff --git a/scripts/admin_rpc_start.sh b/scripts/admin_rpc_start.sh index d1a9724ea..51e223991 100755 --- a/scripts/admin_rpc_start.sh +++ b/scripts/admin_rpc_start.sh @@ -12,14 +12,14 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - +echo "start running admin_rpc_starts.sh..." #Include shell font styles and some basic information +echo "start sourcing resources" source ./style_info.cfg source ./path_info.cfg source ./function.sh - - - +echo "source resources ending" +echo "" list1=$(cat $config_path | grep openImPushPort | awk -F '[:]' '{print $NF}') list2=$(cat $config_path | grep pushPrometheusPort | awk -F '[:]' '{print $NF}') list_to_string $list1 @@ -29,6 +29,7 @@ prome_ports=($ports_array) #Check if the service exists #If it is exists,kill this process +echo "checking services exists..." check=$(ps aux | grep -w ./${push_name} | grep -v grep | wc -l) if [ $check -ge 1 ]; then oldPid=$(ps aux | grep -w ./${push_name} | grep -v grep | awk '{print $2}') @@ -37,7 +38,9 @@ fi #Waiting port recycling sleep 1 cd ${push_binary_root} +echo "services checking finished" +echo "start back-end launching services... continue appending log file to logs/openIM.log" for ((i = 0; i < ${#rpc_ports[@]}; i++)); do nohup ./${push_name} -port ${rpc_ports[$i]} -prometheus_port ${prome_ports[$i]} >>../logs/openIM.log 2>&1 & done diff --git a/scripts/build_all_service.sh b/scripts/build_all_service.sh index b56312bba..d22fbec8d 100755 --- a/scripts/build_all_service.sh +++ b/scripts/build_all_service.sh @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. - +echo "start running build_all_service.sh..." source ./style_info.cfg source ./path_info.cfg source ./function.sh diff --git a/scripts/build_docker.sh b/scripts/build_docker.sh index 7c2b59679..bb4b7da87 100755 --- a/scripts/build_docker.sh +++ b/scripts/build_docker.sh @@ -11,9 +11,12 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +echo "start building..." +image=openim/openim_chat:v1.1.0 +echo "current image version ====> ${image}" -image=openim/openim_chat:v1.0.2 chmod +x ./*.sh +echo "starting running bash shell ./build_all_service.sh" ./build_all_service.sh cd ../ docker build -t $image . -f ./deploy.Dockerfile diff --git a/scripts/check_all.sh b/scripts/check_all.sh index 0d21b6527..5f701b6dd 100755 --- a/scripts/check_all.sh +++ b/scripts/check_all.sh @@ -17,6 +17,7 @@ source ./style_info.cfg source ./path_info.cfg source ./function.sh + service_port_name=( openImChatApiPort openImAdminApiPort @@ -24,6 +25,7 @@ service_port_name=( openImAdminPort openImChatPort ) + switch=$(cat $config_path | grep demoswitch |awk -F '[:]' '{print $NF}') for i in ${service_port_name[*]}; do list=$(cat $config_path | grep -w ${i} | awk -F '[:]' '{print $NF}') diff --git a/scripts/docker_start_all.sh b/scripts/docker_start_all.sh index 22a30e260..14c872070 100755 --- a/scripts/docker_start_all.sh +++ b/scripts/docker_start_all.sh @@ -13,11 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. - +echo "start running docker_start_all.sh..." chmod +x ./*.sh +echo "start running internal bash ====> ./start_all.sh" ./start_all.sh +echo "running ./start_all.sh succeed " i=1 while ((i == 1)) do sleep 5 -done \ No newline at end of file +done +echo "docker docker is started successfully" \ No newline at end of file diff --git a/scripts/start_all.sh b/scripts/start_all.sh index f0481574e..4db2f37e9 100755 --- a/scripts/start_all.sh +++ b/scripts/start_all.sh @@ -35,7 +35,7 @@ openImAdminApiPort openImAdminPort openImChatPort ) - +# prometheus will be used latex service_prometheus_port_name=( ) diff --git a/scripts/stop_all.sh b/scripts/stop_all.sh index 0953b0067..ce8b9e6f6 100755 --- a/scripts/stop_all.sh +++ b/scripts/stop_all.sh @@ -14,7 +14,7 @@ # limitations under the License. #fixme This scripts is to stop the service - +echo "stop all services beginning ..." source ./style_info.cfg source ./path_info.cfg