update

Author: chenjie

codegen/tml/config/template_config.go

@@ -14,6 +14,7 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
+	"strings"
 	"sync/atomic"
 	"time"
 	"unsafe"
@@ -44,7 +45,10 @@ var AC *AppConfig
 var watcher *fsnotify.Watcher
 var closech chan struct{}
 
-func init() {
+func Init() {
+	if strings.ToLower(os.Getenv("REMOTE_CONFIG")) == "true" {
+		//get remote config
+	}
 	data, e := os.ReadFile("SourceConfig.json")
 	if e != nil {
 		log.Error("[SourceConfig] read config file error:", e)
@@ -86,6 +90,7 @@ func init() {
 	closech = make(chan struct{})
 	go watch()
 }
+
 func watch() {
 	defer close(closech)
 	for {
@@ -146,10 +151,11 @@ type RpcConfig struct {
 //WebConfig -
 type WebConfig struct {
 	//server
-	WebTimeout    ctime.Duration $json:"web_timeout"$ //default 500ms
-	WebStaticFile string         $json:"web_staticfile"$
-	WebCertFile   string         $json:"web_certfile"$
-	WebKeyFile    string         $json:"web_keyfile"$
+	UsePprof        bool           $json:"use_pprof"$
+	WebTimeout      ctime.Duration $json:"web_timeout"$ //default 500ms
+	WebStaticFile   string         $json:"web_staticfile"$
+	WebCertFile     string         $json:"web_certfile"$
+	WebKeyFile      string         $json:"web_keyfile"$
 	//cors
 	WebCors *WebCorsConfig $json:"web_cors"$
 }

codegen/tml/configfile/template_configfile.go

@@ -14,6 +14,7 @@ const textsource = `{
 		"rpc_heart_probe":"1.5s"
 	},
 	"web":{
+		"use_pprof":false,
 		"web_timeout":"200ms",
 		"web_staticfile":"./src",
 		"web_certfile":"",

codegen/tml/dao/template_dao.go

@@ -25,7 +25,7 @@ import (
 func NewApi() error {
 	//var e error
 	//rc := config.GetRpcConfig()
-	//if ExampleRpcApi, e = example.NewExampleRpcClient(time.Duration(rc.RpcTimeout), time.Duration(rc.RpcConnTimeout), time.Duration(rc.RpcHeartTimeout), time.Duration(rc.RpcHeartProbe), api.Group, api.Name, []byte(os.Getenv("RPC_VERIFY_DATA")), nil, nil); e != nil {
+	//if ExampleRpcApi, e = example.NewExampleRpcClient(time.Duration(rc.RpcTimeout), time.Duration(rc.RpcConnTimeout), time.Duration(rc.RpcHeartTimeout), time.Duration(rc.RpcHeartProbe), api.Group, api.Name, os.Getenv("RPC_VERIFY_DATA"), nil, nil); e != nil {
 	//        return e
 	//}
 	//wc := config.GetWebConfig()

codegen/tml/gomod/template_gomod.go

@@ -12,7 +12,7 @@ go 1.16
 
 require (
 	github.com/go-sql-driver/mysql v1.5.0
-	github.com/chenjie199234/Corelib v0.0.10
+	github.com/chenjie199234/Corelib v0.0.11
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/golang/protobuf v1.4.3
 	github.com/segmentio/kafka-go v0.4.8

codegen/tml/kubernetes/kubernetes.go

@@ -15,7 +15,11 @@ ENV DISCOVERY_SERVER_GROUP=<DISCOVERY_SERVER_GROUP> \
     DISCOVERY_SERVER_NAME=<DISCOVERY_SERVER_NAME> \
     DISCOVERY_SERVER_PORT=<DISCOVERY_SERVER_PORT>
 ENV DISCOVERY_SERVER_VERIFY_DATA=<DISCOVERY_SERVER_VERIFY_DATA> \
+    OLD_RPC_VERIFY_DATA=<OLD_RPC_VERIFY_DATA> \
     RPC_VERIFY_DATA=<RPC_VERIFY_DATA> \
+    OLD_PPROF_VERIFY_DATA=<OLD_PPROF_VERIFY_DATA> \
+    PPROF_VERIFY_DATA=<PPROF_VERIFY_DATA> \
+    REMOTE_CONFIG=<REMOTE_CONFIG> \
     RUN_ENV=<RUN_ENV>
 COPY main probe.sh AppConfig.json SourceConfig.json ./
 ENTRYPOINT ["./main"]`
@@ -56,8 +60,6 @@ spec:
               memory: 256Mi
               cpu: 250m
           env:
-            - name: APP_NAME
-              value: {{.ProjectName}}
             - name: DEPLOY_ENV
               value: kubernetes
           livenessProbe:

codegen/tml/mainfile/template_main.go

@@ -26,15 +26,14 @@ import (
 )
 
 func main() {
-	//stop watching config hot update
-	defer config.Close()
-	discoveryserververifydata := os.Getenv("DISCOVERY_SERVER_VERIFY_DATA")
-	if discoveryserververifydata != "" {
-		if e := discovery.NewDiscoveryClient(nil, api.Group, api.Name, []byte(discoveryserververifydata), nil); e != nil {
+	if os.Getenv("DISCOVERY_SERVER_VERIFY_DATA") != "" {
+		if e := discovery.NewDiscoveryClient(nil, api.Group, api.Name, os.Getenv("DISCOVERY_SERVER_VERIFY_DATA"), nil); e != nil {
 			log.Error(e)
 			return
 		}
 	}
+	config.Init()
+	defer config.Close()
 	//start the whole business service
 	if e := service.StartService(); e != nil {
 		log.Error(e)
@@ -61,8 +60,9 @@ func main() {
 		}
 		wg.Done()
 	}()
-	stop := make(chan struct{}, 1)
-	go func() {
+	//try to register self to the discovery server
+	stop := make(chan struct{})
+	go func(){
 		//delay 200ms to register self,if error happened in this 200ms,this server will not be registered
 		tmer := time.NewTimer(time.Millisecond * 200)
 		select {
@@ -87,8 +87,8 @@ func main() {
 	}()
 	signal.Notify(ch, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
 	<-ch
-	stop <- struct{}{}
-	//stop the whole business service
+	close(stop)
+		//stop the whole business service
 	service.StopService()
 	//stop low level net service
 	//grpc server,if don't need,please comment this

codegen/tml/readme/template_readme.go

@@ -3,49 +3,74 @@ package readme
 import (
 	"fmt"
 	"os"
+	"strings"
 	"text/template"
 )
 
 const text = `# {{.}}
-{{.}}是一个微服务.<br/>
-运行cmd脚本可查看使用方法.windows下将./cmd.sh换为cmd.bat<br/>
-./cmd.sh pb 解析proto文件,生成打桩代码<br/>
-./cmd.sh run 运行该程序<br/>
-./cmd.sh build 编译该程序,会在根目录下生成一个可执行文件<br/>
-./cmd.sh new 在该项目中创建一个新的子服务<br/>
-./cmd.sh help 输出帮助信息<br/>
-./cmd.sh kubernetes 增加或者更新kubernetes的配置<br/>
+$$$
+{{.}}是一个微服务.
+运行cmd脚本可查看使用方法.windows下将./cmd.sh换为cmd.bat
+./cmd.sh pb 解析proto文件,生成打桩代码
+./cmd.sh run 运行该程序
+./cmd.sh build 编译该程序,会在根目录下生成一个可执行文件
+./cmd.sh new 在该项目中创建一个新的子服务
+./cmd.sh help 输出帮助信息
+./cmd.sh kubernetes 增加或者更新kubernetes的配置
+$$$
+
+
+## 环境变量
+$$$
+DISCOVERY_SERVER_GROUP 			指定注册中心服务器所属的group名字
+DISCOVERY_SERVER_NAME 			指定注册中心服务器自身的名字
+DISCOVERY_SERVER_PORT  			指定注册中心服务器监听的端口
+DISCOVERY_SERVER_VERIFY_DATA 		连接注册中心服务器使用的校验数据
+OLD_RPC_VERIFY_DATA 			自身启动rpc服务时,当进行校验数据更新时才使用
+RPC_VERIFY_DATA 			自身启动rpc服务时,当前正在使用的最新的校验数据
+OLD_PPROF_VERIFY_DATA 			web服务器使用pprof时才有效,当进行校验数据更新时才使用
+PPROF_VERIFY_DATA 			web服务器使用pprof时才有效,当前正在使用的最新的校验数据
+REMOTE_CONFIG 				是否使用远程配置中心的配置[true/false]
+RUN_ENV 				当前运行环境,如:test,pre,prod
+DEPLOY_ENV 				部署环境,如:k8s,host
+$$$
 
 ## 配置文件
-AppConfig.json该文件配置了该服务需要使用的业务配置,可热更新<br/>
-SourceConfig.json该文件配置了该服务需要使用的资源配置,不热更新<br/>
+$$$
+AppConfig.json该文件配置了该服务需要使用的业务配置,可热更新
+SourceConfig.json该文件配置了该服务需要使用的资源配置,不热更新
+$$$
 
 ## 初始化git
-在项目根目录下执行以下命令初始化git本地仓库<br/>
-git init<br/>
-git add .<br/>
-git commit -m "code generate"<br/>
-在git远程服务器上创建仓库,然后执行以下命令,将本地仓库与远程仓库关联<br/>
-git remote add origin path/to/your/remote/repo<br/>
-git push -u origin master<br/>
+$$$
+在项目根目录下执行以下命令初始化git本地仓库
+git init
+git add .
+git commit -m "code generate"
+在git远程服务器上创建仓库,然后执行以下命令,将本地仓库与远程仓库关联
+git remote add origin path/to/your/remote/repo
+git push -u origin main
+$$$
 
 ## 开发
-切换到开发分支<br/>
-git checkout -b your/branch/name/recommend/to/use/feature/name<br/>
-开发完成后先提交到开发分支<br/>
-git add .<br/>
-git commit -m "your/commit/to/this/code/change"<br/>
-将代码推送到git远程服务器,执行下面命令会要求set-upstream,直接复制git输出的命令运行<br/>
-git push<br/>
-登陆到git远程服务器前端页面,创建merge,将代码提交到master,等待review和审批(记得勾选删除开发分支选项)<br/>
-merge完成后在自己的本地仓库执行<br/>
-git checkout master<br/>
-git pull<br/>
-以下为可选步骤,用于删除本地开发分支和本地远程分支<br/>
-git checkout master<br/>
-git pull<br/>
-git branch -D your/branch/name/recommend/to/use/feature/name<br/>
-git remote prune origin<br/>`
+$$$
+切换到开发分支
+git checkout -b your/branch/name/recommend/to/use/feature/name
+开发完成后先提交到开发分支
+git add .
+git commit -m "your/commit/to/this/code/change"
+将代码推送到git远程服务器,执行下面命令会要求set-upstream,直接复制git输出的命令运行
+git push
+登陆到git远程服务器前端页面,创建merge,将代码提交到master,等待review和审批(记得勾选删除开发分支选项)
+merge完成后在自己的本地仓库执行
+git checkout main
+git pull
+以下为可选步骤,用于删除本地开发分支和本地远程分支
+git checkout main
+git pull
+git branch -D your/branch/name/recommend/to/use/feature/name
+git remote prune origin
+$$$`
 
 const path = "./"
 const name = "README.md"
@@ -55,7 +80,7 @@ var file *os.File
 
 func init() {
 	var e error
-	tml, e = template.New("api").Parse(text)
+	tml, e = template.New("api").Parse(strings.Replace(text, "$", "`", -1))
 	if e != nil {
 		panic(fmt.Sprintf("create template for %s error:%s", path+name, e))
 	}

codegen/tml/server/xrpc/template_xrpc.go

@@ -38,7 +38,15 @@ func StartRpcServer() {
 		MaxBufferedWriteMsgNum: 1024,
 	}
 	var e error
-	if s, e = rpc.NewRpcServer(rpcc, api.Group, api.Name, []byte(os.Getenv("RPC_VERIFY_DATA"))); e != nil {
+	oldvd := os.Getenv("OLD_RPC_VERIFY_DATA")
+	if oldvd == "<OLD_RPC_VERIFY_DATA>" {
+		oldvd = ""
+	}
+	newvd := os.Getenv("RPC_VERIFY_DATA")
+	if newvd == "<RPC_VERIFY_DATA>" {
+		newvd = ""
+	}
+	if s, e = rpc.NewRpcServer(rpcc, api.Group, api.Name, oldvd, newvd); e != nil {
 		log.Error("[xrpc] new rpc server error:", e)
 		return
 	}

codegen/tml/server/xweb/template_xweb.go

@@ -9,6 +9,7 @@ import (
 const text = `package xweb
 
 import (
+	"os"
 	"time"
 
 	"{{.}}/api"
@@ -25,12 +26,23 @@ var s *web.WebServer
 //StartWebServer -
 func StartWebServer() {
 	c := config.GetWebConfig()
+	newvd := os.Getenv("PPROF_VERIFY_DATA")
+	if newvd == "<PPROF_VERIFY_DATA>" {
+		newvd = ""
+	}
+	oldvd := os.Getenv("OLD_PPROF_VERIFY_DATA")
+	if oldvd == "<OLD_PPROF_VERIFY_DATA>" {
+		oldvd = ""
+	}
 	webc := &web.Config{
+		UsePprof:           c.UsePprof,
 		Timeout:            time.Duration(c.WebTimeout),
 		StaticFileRootPath: c.WebStaticFile,
 		MaxHeader:          1024,
 		ReadBuffer:         1024,
 		WriteBuffer:        1024,
+		PprofVerifyData:    newvd,
+		OldPprofVerifyData: oldvd,
 	}
 	if c.WebCors != nil {
 		webc.Cors = &web.CorsConfig{

discovery/client.go

@@ -32,7 +32,7 @@ type DiscoveryServerFinder func(manually chan struct{})
 
 //serveruniquename = servername:ip:port
 type DiscoveryClient struct {
-	verifydata []byte
+	verifydata string
 	instance   *stream.Instance
 	regdata    []byte
 	status     int //0-closing,1-working
@@ -62,7 +62,7 @@ type servernode struct {
 var clientinstance *DiscoveryClient
 
 //finder is to find the discovery servers
-func NewDiscoveryClient(c *stream.InstanceConfig, selfgroup, selfname string, vdata []byte, finder DiscoveryServerFinder) error {
+func NewDiscoveryClient(c *stream.InstanceConfig, selfgroup, selfname string, verifydata string, finder DiscoveryServerFinder) error {
 	if e := common.NameCheck(selfname, false, true, false, true); e != nil {
 		return e
 	}
@@ -92,7 +92,7 @@ func NewDiscoveryClient(c *stream.InstanceConfig, selfgroup, selfname string, vd
 		finder = defaultfinder
 	}
 	temp := &DiscoveryClient{
-		verifydata: vdata,
+		verifydata: verifydata,
 		status:     1,
 		finder:     finder,
 		manually:   make(chan struct{}, 1),
@@ -182,7 +182,7 @@ func UpdateDiscoveryServers(serveraddrs []string) {
 	}
 }
 func (c *DiscoveryClient) start(addr, servername string) {
-	tempverifydata := common.Byte2str(clientinstance.verifydata) + "|" + servername
+	tempverifydata := clientinstance.verifydata + "|" + servername
 	if r := c.instance.StartTcpClient(addr, common.Str2byte(tempverifydata)); r == "" {
 		c.lker.RLock()
 		server, ok := c.servers[servername+":"+addr]
@@ -380,7 +380,7 @@ func getinfos(appname string, t int) (map[string][]string, []byte) {
 }
 
 func (c *DiscoveryClient) verifyfunc(ctx context.Context, serveruniquename string, peerVerifyData []byte) ([]byte, bool) {
-	if !bytes.Equal(peerVerifyData, c.verifydata) {
+	if !bytes.Equal(peerVerifyData, common.Str2byte(c.verifydata)) {
 		return nil, false
 	}
 	c.lker.RLock()

discovery/client_test.go

@@ -43,7 +43,7 @@ func Test_Client1(t *testing.T) {
 			SocketWBufLen:          1024,
 			MaxBufferedWriteMsgNum: 256,
 		},
-	}, "testgroup", "testclient1", []byte{'t', 'e', 's', 't'}, finder)
+	}, "testgroup", "testclient1", "test", finder)
 	rch, e := NoticeRpcChanges("testgroup.testclient2")
 	if e != nil {
 		panic("notice grpc change error:" + e.Error())
@@ -116,7 +116,7 @@ func Test_Client2(t *testing.T) {
 			SocketWBufLen:          1024,
 			MaxBufferedWriteMsgNum: 256,
 		},
-	}, "testgroup", "testclient2", []byte{'t', 'e', 's', 't'}, finder)
+	}, "testgroup", "testclient2", "test", finder)
 	rch, e := NoticeRpcChanges("testgroup.testclient1")
 	if e != nil {
 		panic("notice grpc change error:" + e.Error())