v0.9.10 优化 process 增加会话服务器

jianyongchen · Nov 28, 2021 · 1fc21be · 1fc21be
1 parent 622c9a9
commit 1fc21be
Show file tree

Hide file tree

Showing 9 changed files with 177 additions and 48 deletions.
diff --git a/config/config.go b/config/config.go
@@ -20,6 +20,7 @@ var Conf Config
 type Config struct {
 	XiangConfig
 	Service  ServiceConfig  `json:"service,omitempty"`
+	Session  SessionConfig  `json:"session,omitempty"`
 	Database DatabaseConfig `json:"database,omitempty"`
 	JWT      JWTConfig      `json:"jwt,omitempty"`
 	Log      LogConfig      `json:"log,omitempty"`
@@ -58,6 +59,14 @@ type ServiceConfig struct {
 	Port  int      `json:"port,omitempty" env:"XIANG_SERVICE_PORT" envDefault:"5099"`      // 服务监听端口
 }
 
+// SessionConfig 会话服务器
+type SessionConfig struct {
+	Debug   bool   `json:"debug,omitempty" env:"XIANG_SESSION_DEBUG" envDefault:"false"`    // DEBUG 开关
+	Hosting bool   `json:"hosting,omitempty" env:"XIANG_SESSION_HOSTING" envDefault:"true"` // 会话服务器
+	Host    string `json:"host,omitempty" env:"XIANG_SESSION_HOST" envDefault:"127.0.0.1"`  // 会话服务器IP
+	Port    int    `json:"port,omitempty" env:"XIANG_SESSION_PORT" envDefault:"3322"`       // 会话服务器端口
+}
+
 // DatabaseConfig 数据库配置
 type DatabaseConfig struct {
 	Debug     bool     `json:"debug,omitempty" env:"XIANG_DB_DEBUG" envDefault:"false"`                                   // DEBUG 开关

diff --git a/data/bindata.go b/data/bindata.go
diff --git a/helper/process.go b/helper/process.go
@@ -33,10 +33,6 @@ func init() {
 
 	gou.RegisterProcessHandler("xiang.helper.Print", ProcessPrint)
 
-	gou.RegisterProcessHandler("xiang.helper.Get", ProcessGet)
-	gou.RegisterProcessHandler("xiang.helper.Post", ProcessPost)
-	gou.RegisterProcessHandler("xiang.helper.Send", ProcessSend)
-
 }
 
 // ProcessPrint xiang.helper.Print 打印语句

diff --git a/network/process.go b/network/process.go
@@ -5,4 +5,8 @@ import "github.com/yaoapp/gou"
 func init() {
 	// 注册处理器
 	gou.RegisterProcessHandler("xiang.network.ip", ProcessIP)
+	gou.RegisterProcessHandler("xiang.network.Get", ProcessGet)
+	gou.RegisterProcessHandler("xiang.network.Post", ProcessPost)
+	gou.RegisterProcessHandler("xiang.network.PostJSON", ProcessPostJSON)
+	gou.RegisterProcessHandler("xiang.network.Send", ProcessSend)
 }
diff --git a/helper/request.go → network/request.go b/helper/request.go → network/request.go
@@ -1,7 +1,8 @@
-package helper
+package network
 
 import (
 	"bytes"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"strings"
@@ -27,22 +28,35 @@ func RequestPost(url string, data interface{}, headers map[string]string) Respon
 	return RequestSend("POST", url, map[string]interface{}{}, data, headers)
 }
 
+// RequestPostJSON 发送POST请求
+func RequestPostJSON(url string, data interface{}, headers map[string]string) Response {
+	if headers == nil {
+		headers = map[string]string{}
+	}
+	headers["content-type"] = "application/json;charset=utf8"
+	return RequestSend("POST", url, map[string]interface{}{}, data, headers)
+}
+
 // RequestSend 发送Request请求
 func RequestSend(method string, url string, params map[string]interface{}, data interface{}, headers map[string]string) Response {
 
 	var body []byte
 	var err error
 	if data != nil {
-		body, err = jsoniter.Marshal(data)
-		if err != nil {
-			return Response{
-				Status: 500,
-				Body:   err.Error(),
-				Data:   map[string]interface{}{"code": 500, "message": err.Error()},
-				Headers: map[string]interface{}{
-					"Content-Type": "application/json;charset=utf8",
-				},
+		if strings.HasPrefix(strings.ToLower(headers["content-type"]), "application/json") {
+			body, err = jsoniter.Marshal(data)
+			if err != nil {
+				return Response{
+					Status: 500,
+					Body:   err.Error(),
+					Data:   map[string]interface{}{"code": 500, "message": err.Error()},
+					Headers: map[string]interface{}{
+						"Content-Type": "application/json;charset=utf8",
+					},
+				}
 			}
+		} else {
+			body = []byte(fmt.Sprintf("%v", data))
 		}
 	}
 
@@ -59,8 +73,10 @@ func RequestSend(method string, url string, params map[string]interface{}, data
 	}
 
 	// Request Header
-	for name, header := range headers {
-		req.Header.Set(name, header)
+	if headers != nil {
+		for name, header := range headers {
+			req.Header.Set(name, header)
+		}
 	}
 
 	resp, err := (&http.Client{}).Do(req)

diff --git a/helper/request.process.go → network/request.process.go b/helper/request.process.go → network/request.process.go
@@ -1,4 +1,4 @@
-package helper
+package network
 
 import (
 	"fmt"
@@ -25,6 +25,24 @@ func ProcessPost(process *gou.Process) interface{} {
 	return RequestPost(url, data, headers)
 }
 
+// ProcessPostJSON  xiang.helper.PostJSON HTTP Post
+func ProcessPostJSON(process *gou.Process) interface{} {
+	process.ValidateArgNums(1)
+	var data interface{}
+	headers := map[string]string{}
+	url := process.ArgsString(0)
+	if process.NumOfArgs() > 1 {
+		data = process.Args[1]
+	}
+	if process.NumOfArgs() > 2 {
+		inputHeaders := process.ArgsMap(2)
+		for name, value := range inputHeaders {
+			headers[name] = fmt.Sprintf("%v", value)
+		}
+	}
+	return RequestPostJSON(url, data, headers)
+}
+
 // ProcessSend  xiang.helper.Send HTTP Send
 func ProcessSend(process *gou.Process) interface{} {
 	process.ValidateArgNums(2)