Merge pull request apache#191 from PhilYue/fix/quickstart

Fix/quickstart

.gitignore

@@ -1,5 +1,13 @@
-./dubbo-go-pixiu
+
+# app
+dubbo-go-pixiu
+dubbo-go-pixiu.exe
+dubbgo_server.out
+samples/dubbogo/simple/server/app/app
+
 /logs
 /.idea
 /.vscode
-pkg/registry/zookeeper-4unittest/contrib/fatjar
+pkg/registry/zookeeper-4unittest/contrib/fatjar
+
+

Makefile

@@ -19,30 +19,31 @@
 
 cur_mkfile := $(abspath $(lastword $(MAKEFILE_LIST)))
 currentPath := $(patsubst %/, %, $(dir $(cur_mkfile)))
-$(info cur_makefile_path1=$(currentPath))
 pixiuPath := /cmd/pixiu/
 mainPath := $(currentPath)$(pixiuPath)
-$(info $(mainPath))
 
 targetName := dubbo-go-pixiu
 
 api-config-path:=${api-config}
-ifeq ("",$(api-config-path))
-        api-config-path = configs/api_config.yaml
+ifeq (,$(api-config-path))
+$(warning api-config-path is nil, default: configs/api_config.yaml)
+api-config-path = configs/api_config.yaml
 endif
 
 config-path:=${config-path}
-ifeq ("",$(config-path))
-        config-path = configs/conf.yaml
+ifeq (,$(config-path))
+$(warning config-path is nil, default: configs/conf.yaml)
+config-path = configs/conf.yaml
 endif
 
+$(info api-config-path = $(api-config-path))
+$(info config-path = $(config-path))
+
 os := $(shell go env GOOS)
-$(info os is $(os))
 ifeq (windows,$(os))
 	targetName = dubbo-go-pixiu.exe
 endif
 exe := $(mainPath)$(targetName)
-$(info path of exe is $(exe))
 build:
 	cd $(mainPath) && go build  -o $(targetName)
 

docs/sample/dubbo_sample_startup.sh

@@ -29,27 +29,31 @@ if [ "$1" != "skip_zookeeper" ]; then
   echo "zookeeper stated!"
 fi
 
+
+APP_PATH=../../samples/dubbogo/simple
+
 go env -w GOPROXY=https://goproxy.cn,direct
 
 echo "starting dubbogo provider!"
-if [ -z "$CONF_PROVIDER_FILE_PATH" ]; then
-  export CONF_PROVIDER_FILE_PATH=../../sample/dubbogo/server/config/server.yml
-fi
-go build ../../sample/dubbogo/server/app/
 
-provider_pid=$(ps -ef | grep ../../sample/dubbogo/server/app/ | grep -v 'grep' | awk '{print $2}')
+go build -o $APP_PATH/server/app/ $APP_PATH/server/app/
+
+provider_pid=$(ps -ef | grep $APP_PATH/server/app/ | grep -v 'grep' | awk '{print $2}')
 
 if [ -n "$provider_pid" ]; then
   echo "pid of old dubbogo provider is $provider_pid, kill it"
   kill -9 "$provider_pid"
 fi
-nohup go run ../../sample/dubbogo/server/app/ >dubbgo_server.out &
+nohup go run $APP_PATH/server/app/ >$APP_PATH/dubbgo_server.out &
 sleep 10
 echo "dubbogo provider started!"
 
-## to start pixiu
-
 echo "starting proxy!"
 
 cd ../../
-make run config-path=sample/dubbogo/proxy/conf.yaml api-config-path=sample/dubbogo/proxy/api_config.yaml
+
+if [ -z "$CONF_PROVIDER_FILE_PATH" ]; then
+  export CONF_PROVIDER_FILE_PATH=samples/dubbogo/simple/server/profiles/test/server.yml
+fi
+
+make run config-path=samples/dubbogo/simple/proxy/conf.yaml api-config-path=samples/dubbogo/simple/proxy/api_config.yaml