修复 AuthKey为空的时候 也可以过.

server/home-user-auth/internal/svc/servicecontext.go

@@ -31,6 +31,10 @@ func NewServiceContext(c config.Config) *ServiceContext {
 
 func (svcCtx *ServiceContext) ParseJwtToken(r *http.Request) (jwt.MapClaims, error) {
 	AuthKey := r.Header.Get("Authorization")
+	if AuthKey == "" {
+		return nil, nil
+	}
+
 	if len(AuthKey) <= 50 {
 		return nil, errors.New(fmt.Sprint("Error parsing token, len:", len(AuthKey)))
 	}

server/home-user-auth/test/acceptcookielogic_test.go

@@ -2,6 +2,8 @@ package logic
 
 import (
 	"fmt"
+	fstests "fusenapi/utils/tests"
+
 	"testing"
 
 	"github.com/474420502/requests"
@@ -14,7 +16,7 @@ func TestAcceptCookieLogic(t *testing.T) {
 	var result gjson.Result
 
 	// 获取 session，并携带 JWT token
-	ses := GetSesssion(t, gserver)
+	ses := fstests.GetSesssion()
 
 	// 向服务器发送 GET 请求，获取 cookie 信息
 	resp, err = ses.Post(fmt.Sprintf("http://%s:%d/user/accept-cookie", cnf.Host, cnf.Port)).TestExecute(gserver)

server/home-user-auth/test/basic.go

@@ -6,9 +6,7 @@ import (
 	"fusenapi/server/home-user-auth/internal/handler"
 	"fusenapi/server/home-user-auth/internal/svc"
 	"log"
-	"testing"
 
-	"github.com/474420502/requests"
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
 )
@@ -19,10 +17,10 @@ var gserver *rest.Server
 
 func init() {
 	log.SetFlags(log.Llongfile)
-	gserver = GetTestServer()
+	gserver = GetTestServer(testConfigFile)
 }
 
-func GetTestServer() *rest.Server {
+func GetTestServer(testConfigFile string) *rest.Server {
 
 	conf.MustLoad(testConfigFile, &cnf)
 
@@ -35,52 +33,3 @@ func GetTestServer() *rest.Server {
 	fmt.Printf("Starting server at %s:%d...\n", cnf.Host, cnf.Port)
 	return server
 }
-
-func GetSesssion(t *testing.T, server requests.ITestServer) *requests.Session {
-	ses := requests.NewSession()
-	return ses
-}
-
-func GetSesssionWithUserToken(t *testing.T, server requests.ITestServer) *requests.Session {
-	ses := requests.NewSession()
-	tp := ses.Post(fmt.Sprintf("http://%s:%d/user/login", cnf.Host, cnf.Port))
-	tp.SetBodyJson(map[string]interface{}{
-		"name": "devenv@sina.cn",
-		"pwd":  "$2y$13$6UFDMZQMEfqFYiNLpiUCi.B3fpvGEamPAjIgzUqv/u7jT05nB3pOC",
-	})
-	resp, err := tp.TestExecute(server)
-	if err != nil {
-		t.Error(err)
-	}
-	result := resp.Json()
-	code := result.Get("code").Int()
-	if code != 200 {
-		t.Error("code is not 200")
-	}
-
-	token := result.Get("data.token")
-	if !token.Exists() {
-		t.Error("data.token is not exists")
-	}
-	ses.Header.Add("Authorization", token.String())
-
-	return ses
-}
-
-func GetSesssionWithGuestToken(t *testing.T, server requests.ITestServer) *requests.Session {
-	ses := requests.NewSession()
-	tp := ses.Post(fmt.Sprintf("http://%s:%d/accept/cookie", cnf.Host, cnf.Port))
-
-	resp, err := tp.TestExecute(server)
-	if err != nil {
-		t.Error(err)
-	}
-	result := resp.Json()
-	token := result.Get("data.token")
-	if !token.Exists() {
-		t.Error("data.token is not exists")
-	}
-	ses.Header.Add("Authorization", token.String())
-
-	return ses
-}

server/home-user-auth/test/useraddaddresslogic_test.go

@@ -3,6 +3,7 @@ package logic
 import (
 	"fmt"
 	"fusenapi/server/home-user-auth/internal/types"
+	fstests "fusenapi/utils/tests"
 	"testing"
 
 	"github.com/474420502/requests"
@@ -15,7 +16,7 @@ func TestCaseUserAddAddress(t *testing.T) {
 	var result gjson.Result
 
 	// 获取 session,并携带 JWT token
-	ses := GetSesssionWithUserToken(t, gserver)
+	ses := fstests.GetSesssionWithUserToken(t, gserver, cnf.Host, cnf.Port)
 
 	// 构建新增地址请求体
 	addrReq := types.RequestAddAddress{

server/home-user-auth/test/useraddresslistlogic_test.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"fmt"
+	fstests "fusenapi/utils/tests"
 	"testing"
 
 	"github.com/474420502/requests"
@@ -14,7 +15,7 @@ func TestCaseAddressList(t *testing.T) {
 	var result gjson.Result
 
 	// 获取 session，并携带 JWT token
-	ses := GetSesssionWithUserToken(t, gserver)
+	ses := fstests.GetSesssionWithUserToken(t, gserver, cnf.Host, cnf.Port)
 
 	// 向服务器发送 GET 请求，获取用户地址列表
 	resp, err = ses.Get(fmt.Sprintf("http://%s:%d/user/address-list", cnf.Host, cnf.Port)).TestExecute(gserver)

server/home-user-auth/test/userbasicinfologic_test.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"fmt"
+	fstests "fusenapi/utils/tests"
 	"testing"
 
 	"github.com/474420502/requests"
@@ -14,7 +15,7 @@ func TestCaseBasicInfoLogic(t *testing.T) {
 	var result gjson.Result
 
 	// 获取 session，并携带 JWT token
-	ses := GetSesssionWithUserToken(t, gserver)
+	ses := fstests.GetSesssionWithUserToken(t, gserver, cnf.Host, cnf.Port)
 
 	// 向服务器发送 GET 请求，获取用户基本信息
 	resp, err = ses.Get(fmt.Sprintf("http://%s:%d/user/basic-info", cnf.Host, cnf.Port)).TestExecute(gserver)

server/home-user-auth/test/userfontslogic_test.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"fmt"
+	fstests "fusenapi/utils/tests"
 	"testing"
 
 	"github.com/474420502/requests"
@@ -15,7 +16,7 @@ func TestCaseUserFontsLogic(t *testing.T) {
 	var result gjson.Result
 
 	// 获取 session，并携带 JWT token
-	ses := GetSesssionWithUserToken(t, gserver)
+	ses := fstests.GetSesssionWithUserToken(t, gserver, cnf.Host, cnf.Port)
 
 	// 向服务器发送 GET 请求，获取字体列表
 	resp, err = ses.Get(fmt.Sprintf("http://%s:%d/user/fonts", cnf.Host, cnf.Port)).TestExecute(gserver)

server/home-user-auth/test/usergettypelogic_test.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"fmt"
+	fstests "fusenapi/utils/tests"
 	"testing"
 
 	"github.com/474420502/requests"
@@ -14,7 +15,7 @@ func TestCaseGetTypeLogic(t *testing.T) {
 	var result gjson.Result
 
 	// 获取 session，并携带 JWT token
-	ses := GetSesssionWithUserToken(t, gserver)
+	ses := fstests.GetSesssionWithUserToken(t, gserver, cnf.Host, cnf.Port)
 
 	// 向服务器发送 GET 请求，获取用户类型信息
 	resp, err = ses.Get(fmt.Sprintf("http://%s:%d/user/get-type", cnf.Host, cnf.Port)).TestExecute(gserver)

server/home-user-auth/test/useroderdeletelogic_test.go

@@ -3,6 +3,7 @@ package logic
 import (
 	"fmt"
 	"fusenapi/server/home-user-auth/internal/types"
+	fstests "fusenapi/utils/tests"
 	"testing"
 
 	"github.com/474420502/requests"
@@ -15,7 +16,7 @@ func TestCaseLogic(t *testing.T) {
 	var result gjson.Result
 
 	// 获取 session，并携带 JWT token
-	ses := GetSesssionWithUserToken(t, gserver)
+	ses := fstests.GetSesssionWithUserToken(t, gserver, cnf.Host, cnf.Port)
 
 	// 向服务器发送 GET 请求，获取用户类型信息
 	tp := ses.Post(fmt.Sprintf("http://%s:%d/user/order-delete", cnf.Host, cnf.Port))

server/home-user-auth/test/usersavebasicinfologic_test.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"fusenapi/server/home-user-auth/internal/types"
+	fstests "fusenapi/utils/tests"
 	"testing"
 
 	"github.com/474420502/requests"
@@ -16,7 +17,7 @@ func TestCaseUserSaveBasicinfoLogic(t *testing.T) {
 	var result gjson.Result
 
 	// 获取 session，并携带 JWT token
-	ses := GetSesssionWithUserToken(t, gserver)
+	ses := fstests.GetSesssionWithUserToken(t, gserver, cnf.Host, cnf.Port)
 	var tp *requests.Temporary
 
 	tp = ses.Get(fmt.Sprintf("http://%s:%d/user/basic-info", cnf.Host, cnf.Port))

server/home-user-auth/test/userstatusconfiglogic_test.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"fmt"
+	fstests "fusenapi/utils/tests"
 	"testing"
 
 	"github.com/474420502/requests"
@@ -14,7 +15,7 @@ func TestCaseUserStatusConfigLogic(t *testing.T) {
 	var result gjson.Result
 
 	// 获取 session，并携带 JWT token
-	ses := GetSesssionWithUserToken(t, gserver)
+	ses := fstests.GetSesssionWithUserToken(t, gserver, cnf.Host, cnf.Port)
 
 	// 向服务器发送 GET 请求，获取用户类型信息
 	resp, err = ses.Post(fmt.Sprintf("http://%s:%d/user/status-config", cnf.Host, cnf.Port)).TestExecute(gserver)

server/webset/internal/handler/wetsetsettinghandler.go

@@ -53,7 +53,7 @@ func WetSetSettingHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 			userinfo = &auth.UserInfo{UserId: 0, GuestId: 0}
 		}
 
-		var req types.RequestFaq
+		var req types.RequestWebSet
 		// 如果端点有请求结构体，则使用httpx.Parse方法从HTTP请求体中解析请求数据
 		if err := httpx.Parse(r, &req); err != nil {
 			httpx.OkJsonCtx(r.Context(), w, &basic.Response{

server/webset/internal/logic/wetsetsettinglogic.go

@@ -1,6 +1,7 @@
 package logic
 
 import (
+	"encoding/json"
 	"fusenapi/constants"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
@@ -29,53 +30,57 @@ func NewWetSetSettingLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Wet
 	}
 }
 
-var TagTexts = map[int]map[string]string{
-	1: {"title": "order", "icon": "faq/order.png", "icon_name": "orders"},
-	2: {"title": "Shipping", "icon": "faq/shipping.png", "icon_name": "delivery"},
-	3: {"title": "Payment", "icon": "faq/payment.png", "icon_name": "wallet"},
-	4: {"title": "Return", "icon": "faq/return.png", "icon_name": "freight"},
-}
-
-func (l *WetSetSettingLogic) WetSetSetting(req *types.RequestFaq, userinfo *auth.UserInfo) (resp *basic.Response) {
+func (l *WetSetSettingLogic) WetSetSetting(req *types.RequestWebSet, userinfo *auth.UserInfo) (resp *basic.Response) {
 	// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
 	// userinfo 传入值时, 一定不为null
 
-	switch req.Type {
-	case "faq":
+	typeConf := constants.TypeWebSet(req.Type)
 
-		result := make(map[string]interface{})
-		result["title"] = "Common Problem"
-		result["introduction"] = "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout."
-
-		lists := make([]map[string]interface{}, 0)
-		for tagID, tagText := range TagTexts {
-			faqs, err := l.svcCtx.AllModels.FsFaq.FindOneByTagId(l.ctx, tagID, int64(constants.STATUS_ON))
-			if err == gorm.ErrRecordNotFound {
-				return resp.SetStatus(basic.CodeDbRecordNotFoundErr)
-			}
-
-			// items := getFaqItems(tagID)
-			for k, item := range items {
-				content := strings.Split(item.Content, "\n")
-				items[k].Content = content
-			}
-
-			res := make(map[string]interface{})
-			res["title"] = tagText["title"]
-			res["icon"] = tagText["icon"]
-			res["icon_name"] = tagText["icon_name"]
-			res["items"] = items
-
-			lists = append(lists, res)
+	//如果是这三个配置项 则读取缓存
+	var result map[string]interface{}
+	data, err := l.svcCtx.AllModels.FsWebSet.FindValueByKey(l.ctx, string(typeConf))
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return resp.SetStatus(basic.CodeDbRecordNotFoundErr)
 		}
-		result["list"] = lists
-
-		return resp.SetStatus(basic.CodeOK, result)
-	case "clause":
-	case "policy":
-	default:
 		return resp.SetStatus(basic.CodeDbSqlErr)
 	}
 
+	//读取配置项
+	err = json.Unmarshal([]byte(*data.Value), &result)
+	if err != nil {
+		return resp.SetStatus(basic.CodeJsonErr)
+	}
+	//组装配置项的内容数据
+	for k, v := range result["list"].(map[string]interface{}) {
+		//按空格分隔内容
+		result["list"].(map[string]interface{})[k].(map[string]interface{})["content"] = strings.Split(v.(string), "\n")
+	}
+
+	// TODO: 缓存
+	if typeConf == constants.CLAUSE_CONFIG || typeConf == constants.FAQ_CONFIG || typeConf == constants.POLICY_CONFIG {
+		// cache := redis.NewClient(&redis.Options{
+		//     Addr:     "localhost:6379",
+		//     Password: "",  // no password set
+		//     DB:       0,  // use default DB
+		// })
+		// if cache.Exists(ctx.Query("type")).Val() > 0 {
+		//     result = cache.HGetAll(ctx.Query("type")).Val()
+		// } else {
+		//     //读取配置项
+		//     model := WebSet{Key: typeStr}
+		//     db.First(&model)
+		//     result = json.Unmarshal([]byte(model.Value), &result)
+		//     //组装配置项的内容数据
+		//     for k, v := range result["list"].(map[string]interface{}) {
+		//         //按空格分隔内容
+		//         result["list"].(map[string]interface{})[k].(map[string]interface{})["content"] = strings.Split(v.(string), "\n")
+		//     }
+		//     cache.HMSet(ctx.Query("type"), result)
+		// }
+	} else {
+
+	}
+
 	return resp.SetStatus(basic.CodeOK)
 }

server/webset/internal/svc/servicecontext.go

@@ -31,6 +31,10 @@ func NewServiceContext(c config.Config) *ServiceContext {
 
 func (svcCtx *ServiceContext) ParseJwtToken(r *http.Request) (jwt.MapClaims, error) {
 	AuthKey := r.Header.Get("Authorization")
+	if AuthKey == "" {
+		return nil, nil
+	}
+
 	if len(AuthKey) <= 50 {
 		return nil, errors.New(fmt.Sprint("Error parsing token, len:", len(AuthKey)))
 	}

server/webset/internal/types/types.go

@@ -5,7 +5,7 @@ import (
 	"fusenapi/utils/basic"
 )
 
-type RequestFaq struct {
+type RequestWebSet struct {
 	Type string `form:"type"`
 }
 

server/webset/test/basic.go

@@ -0,0 +1,35 @@
+package logic
+
+import (
+	"fmt"
+	"fusenapi/server/webset/internal/config"
+	"fusenapi/server/webset/internal/handler"
+	"fusenapi/server/webset/internal/svc"
+	"log"
+
+	"github.com/zeromicro/go-zero/core/conf"
+	"github.com/zeromicro/go-zero/rest"
+)
+
+var testConfigFile = "../etc/wetset.yaml"
+var cnf config.Config
+var gserver *rest.Server
+
+func init() {
+	log.SetFlags(log.Llongfile)
+	gserver = GetTestServer(testConfigFile)
+}
+
+func GetTestServer(testConfigFile string) *rest.Server {
+
+	conf.MustLoad(testConfigFile, &cnf)
+
+	server := rest.MustNewServer(cnf.RestConf)
+	defer server.Stop()
+
+	ctx := svc.NewServiceContext(cnf)
+	handler.RegisterHandlers(server, ctx)
+
+	fmt.Printf("Starting server at %s:%d...\n", cnf.Host, cnf.Port)
+	return server
+}

server/webset/test/wetset_test.go

@@ -0,0 +1,47 @@
+package logic
+
+import (
+	"fmt"
+	fstests "fusenapi/utils/tests"
+	"log"
+	"testing"
+
+	"github.com/474420502/requests"
+	"github.com/tidwall/gjson"
+)
+
+func TestWetSetLogic(t *testing.T) {
+	var err error
+	var resp *requests.Response
+	var result gjson.Result
+
+	// 获取 session，并携带 JWT token
+	ses := fstests.GetSesssion()
+	// 向服务器发送 GET 请求，获取 cookie 信息
+	resp, err = ses.Get(fmt.Sprintf("http://%s:%d/wet-set/setting", cnf.Host, cnf.Port)).TestExecute(gserver)
+	if err != nil {
+		t.Error(err)
+	}
+
+	// 使用 gjson 解析返回的 json 数据
+	result = resp.Json() // gjson
+
+	log.Println(result)
+	// 检查返回值中的 code 字段是否存在，并且值是否为 200
+	code := result.Get("code").Int()
+	if code != 200 {
+		t.Errorf("Invalid code value: %d", code)
+	}
+
+	// 检查返回值中的 msg 字段是否存在，并且值是否为 "success"
+	msg := result.Get("msg").String()
+	if msg != "success" {
+		t.Errorf(`Invalid msg value: "%s"`, msg)
+	}
+
+	// 检查返回值中的 data 字段是否存在，并且值是否符合预期
+	token := result.Get("data.token").String()
+	if len(token) == 0 {
+		t.Error("Missing token field")
+	}
+}