Merge branch 'dev-lzh' into dev

# Conflicts:
#	api/bundle/bundle.pb.go
#	api/bundle/bundle_triple.pb.go

api/bundle/bundle.validator.pb.go

@@ -7,8 +7,8 @@ import (
 	fmt "fmt"
 	math "math"
 	proto "github.com/golang/protobuf/proto"
-	_ "google.golang.org/protobuf/types/descriptorpb"
 	_ "github.com/mwitkow/go-proto-validators"
+	_ "google.golang.org/protobuf/types/descriptorpb"
 	github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
 )
 

api/secFilings/secFilings.validator.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: secFilings.proto
+// source: api/secFilings/secFilings.proto
 
 package secFilings
 

api/secFilings/secFilings_triple.pb.go

@@ -1,8 +1,8 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-triple v1.0.8
-// - protoc             v3.20.3
-// source: secFilings.proto
+// - protoc             v5.29.2
+// source: api/secFilings/secFilings.proto
 
 package secFilings
 
@@ -503,5 +503,5 @@ var SecFilings_ServiceDesc = grpc_go.ServiceDesc{
 		},
 	},
 	Streams:  []grpc_go.StreamDesc{},
-	Metadata: "secFilings.proto",
+	Metadata: "api/secFilings/secFilings.proto",
 }

docs/test/conf.ini

@@ -13,13 +13,6 @@ BosUrl = ".bj.bcebos.com"
 BosBaseDir = "fiee"
 BosHttp = "https://"
 BosDomain = "cdns.fontree.cn"
-[oss]
-AccessKeyId =  "LTAI5tLz1fSK53FQAEC9uNSb"
-AccessKeySecret = "oGB9chrQzQzITXR2IGv37Ji5WxZh4j"
-Endpoint =        "oss-cn-hangzhou.aliyuncs.com"
-BucketName =       "fontree-test"
-BaseDir =      "fiee"
-CdnHost =      "https://cdn-test.szjixun.cn"
 
 [oss]
 AccessKeyId="LTAI5tLz1fSK53FQAEC9uNSb"

pkg/common/msg.go

@@ -94,10 +94,6 @@ var EnMessages = map[string]string{
 	"状态值无效":             "Invalid status value",
 	"套餐已上架,请勿重复操作":      "Plan is already published, do not repeat the operation",
 	"套餐已下架,请勿重复操作":      "Plan is already unpublished, do not repeat the operation",
-	"请先实名":              "Please use your real name first",
-	"实名审核中":             "Real-name verification is underway",
-	"实名审核失败":            "The real-name verification failed",
-	"未知实名状态":            "Unknown real-name status",
 }
 
 var DeDEMessages = map[string]string{
@@ -186,10 +182,6 @@ var DeDEMessages = map[string]string{
 	"状态值无效":             "Ungültiger Statuswert",
 	"套餐已上架,请勿重复操作":      "Paket ist bereits veröffentlicht, bitte nicht wiederholen",
 	"套餐已下架,请勿重复操作":      "Paket ist bereits zurückgezogen, bitte nicht wiederholen",
-	"请先实名":              "Bitte, nur der name",
-	"实名审核中":             "Contest läuft",
-	"实名审核失败":            "Die confirmation hat versagt",
-	"未知实名状态":            "Noch nicht registriert",
 }
 
 var JaJPMessages = map[string]string{
@@ -279,10 +271,6 @@ var JaJPMessages = map[string]string{
 	"状态值无效":             "状態値が無効です",
 	"套餐已上架,请勿重复操作":      "プランはすでに公開済みです、重複操作は避けてください",
 	"套餐已下架,请勿重复操作":      "プランはすでに非公開です、重複操作は避けてください",
-	"请先实名":              "まずは実名でお願いします",
-	"实名审核中":             "実名審査中です",
-	"实名审核失败":            "実名検証失敗です",
-	"未知实名状态":            "未知の実名状態です",
 }
 
 var ZhTWMessages = map[string]string{
@@ -372,18 +360,4 @@ var ZhTWMessages = map[string]string{
 	"状态值无效":             "狀態值無效",
 	"套餐已上架,请勿重复操作":      "套餐已上架，請勿重複操作",
 	"套餐已下架,请勿重复操作":      "套餐已下架，請勿重複操作",
-	"请先实名":              "請先實名",
-	"实名审核中":             "實名審覈中",
-	"实名审核失败":            "實名審覈失敗",
-	"未知实名状态":            "未知實名狀態",
-	"已存在标题相同的数据":        "已存在標題相同的數據",
-	"展示数量不能超过5个":        "展示數量不能超過5個",
-	"查询失败":              "查詢失敗",
-	"操作失败":              "操作失敗",
-
-	"参数缺失":   "參數缺失",
-	"创建失败":   "創建失敗",
-	"更新失败":   "更新失敗",
-	"删除失败":   "刪除失敗",
-	"更新状态失败": "更新狀態失敗",
 }

pkg/middleware/check_login.go

@@ -155,7 +155,6 @@ func CheckWebLogin(provider *account.AccountClientImpl) gin.HandlerFunc {
 			Domain: info.Domain,
 			ID:     info.ID,
 			Name:   info.NickName,
-			//Account:        info.Account,
 			//NickName:       info.NickName,
 			//PositionUsers:  qres.PositionUsers,
 			//Extend:         infoRes.Info.Extend,

pkg/middleware/logging.go

@@ -3,6 +3,7 @@ package middleware
 import (
 	"bytes"
 	"io"
+	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
@@ -24,16 +25,16 @@ func NewLogger() gin.HandlerFunc {
 		latencyTime := endTime.Sub(startTime) // 请求方式
 		path := c.Request.URL.Path
 		query := c.Request.URL.RawQuery
+		val := c.GetHeader("Accept-Language")
+		if val == "" {
+			c.Request.Header.Set("Accept-Language", "zh-CN")
+		}
 		if _, err := c.FormFile("file"); err != nil {
 			data, _ := io.ReadAll(c.Request.Body)
 			log.Printf("[%s] %s %d %s %s %s %s %s %s", path, c.Request.Method, c.Writer.Status(), query,
 				string(data), c.ClientIP(), c.Request.UserAgent(), c.Errors.ByType(gin.ErrorTypePrivate).String(), latencyTime.String())
 
-			c.Request.Body = io.NopCloser(bytes.NewBuffer(data))
-		}
-		val := c.GetHeader("Accept-Language")
-		if val == "" {
-			c.Request.Header.Set("Accept-Language", "zh-CN")
+			c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data))
 		}
 		c.Next()
 	}

pkg/router/bundle.go

@@ -12,6 +12,7 @@ func BundleRouter(r *gin.RouterGroup) {
 	bundleRoute := r.Group("bundle")
 	bundleRoute.Use(middleware.CheckWebLogin(service.AccountProvider))
 	bundleAppRoute := r.Group("bundle")
+	bundleAppNoAuthRoute := r.Group("bundle")
 	bundleAppRoute.Use(middleware.CheckLogin(service.AccountFieeProvider))
 	// 套餐
 	{
@@ -44,7 +45,11 @@ func BundleRouter(r *gin.RouterGroup) {
 		bundleAppRouteV1 := bundleAppRoute.Group("common")
 		{
 			bundleAppRouteV1.POST("bundle-list", bundle.BundleList)
-			bundleAppRoute.POST("bundle-list", bundle.BundleList)
+		}
+		bundleAppRouteV2 := bundleAppRoute.Group("app/system/v2")
+		{
+			bundleAppRouteV2.POST("bundle-detail", bundle.BundleDetailV2)
+			bundleAppRouteV2.POST("add-value/only", bundle.OnlyAddValueListByOrderNo)
 
 			bundleAppRoute.POST("pending-confirmation-list", bundle.GetToBeComfirmedWorks) // 作品状态变更的待确认记录
 			bundleAppRoute.POST("confirm-cast-log", bundle.CastLogConfirm)                 // 对变更记录进行确认
@@ -53,13 +58,10 @@ func BundleRouter(r *gin.RouterGroup) {
 			bundleAppRoute.POST("work-detail", bundle.GetWorkDetail)
 			bundleAppRoute.POST("work-confirm", bundle.WorkConfirm)
 		}
-		bundleAppRouteV2 := bundleAppRoute.Group("app/system/v2")
+		bundleAppNoAuthRouteV2 := bundleAppNoAuthRoute.Group("app/system/v2")
 		{
-			bundleAppRouteV2.POST("bundle-list", bundle.BundleListV2)
-			bundleAppRouteV2.POST("bundle-detail", bundle.BundleDetailV2)
-			bundleAppRouteV2.POST("add-value/only", bundle.OnlyAddValueListByOrderNo)
-		}
-
+			bundleAppNoAuthRouteV2.POST("bundle-list", bundle.BundleListH5V2)
+		}
 	}
 
 }

pkg/router/secfiling.go

@@ -10,7 +10,6 @@ import (
 
 func SecFilingRouter(r *gin.RouterGroup) {
 	SecFilingRouter := r.Group("sec-filing")
-	SecNoAuthRouter := r.Group("sec-filing")
 	SecFilingRouter.Use(middleware.CheckWebLogin(service.AccountProvider))
 
 	// sec-filing
@@ -26,10 +25,5 @@ func SecFilingRouter(r *gin.RouterGroup) {
 		secFilingRoute.POST("form/list", secfilings.GetFormList)
 
 	}
-	secNoAUthRouter := SecNoAuthRouter.Group("web")
-	{
-		secNoAUthRouter.POST("list", secfilings.WebListSecFiling)
-		secNoAUthRouter.POST("detail", secfilings.DetailSecFiling)
-	}
 
 }

pkg/service/asChat/handler.go

@@ -134,6 +134,9 @@ func (cr ChatHandler) NewMessage(c *gin.Context) {
 		service.ErrWithCode(c, code)
 		return
 	}
+	if request.LocalStamp == 0 {
+		request.LocalStamp = time.Now().Unix()
+	}
 	err := logic.NewMessage(c, &cr.cache, chatUser, request)
 	if err != nil {
 		service.Error(c, err)
@@ -260,8 +263,9 @@ func (cr ChatHandler) MessageList(c *gin.Context) {
 	//		return
 	//	}
 	//}
-	messages := cr.cache.GetChatRecord(request.SessionId)
-	//messages := []*accountFiee.ChatRecordData{}
+	// 启用或禁用缓存
+	//messages := cr.cache.GetChatRecord(request.SessionId)
+	messages := []*accountFiee.ChatRecordData{}
 	var returnDataIdList = make([]int64, 0)
 	defer func() {
 		//获取最新数据时，重置新消息数量统计
@@ -277,6 +281,7 @@ func (cr ChatHandler) MessageList(c *gin.Context) {
 					}
 				}
 			}
+			fmt.Println("defer CoverChatRecord , message len:", len(messages))
 			err := cr.cache.CoverChatRecord(request.SessionId, messages)
 			if err != nil {
 				log.Print("设置消息已读失败", zap.Error(err))
@@ -302,6 +307,7 @@ func (cr ChatHandler) MessageList(c *gin.Context) {
 			return
 		}
 		messages = recordResp.List
+		fmt.Println("GetChatRecordList len:", len(messages))
 		err = cr.cache.CoverChatRecord(request.SessionId, messages)
 		if err != nil {
 			log.Print("覆盖聊天记录失败", zap.Error(err))
@@ -332,7 +338,7 @@ func (cr ChatHandler) MessageList(c *gin.Context) {
 				return messages[i].ID > messages[j].ID
 			}
 		})
-		fmt.Printf("data is %+v\n", messages)
+		//fmt.Printf("data is %+v\n", messages)
 		total := 0
 		for i, message := range messages {
 			switch request.Direction {
@@ -367,8 +373,6 @@ func (cr ChatHandler) MessageList(c *gin.Context) {
 			resp[i].Message.Media = []dto.MessageMedia{}
 		}
 	}
-	if accessUser.Role == 1 {
-	}
 	service.Success(c, resp)
 }
 

pkg/service/asChat/logic/chat.go

@@ -42,6 +42,7 @@ func NewMessage(ctx context.Context, cache *chatCache.ChatCache, sender *account
 				fmt.Println(request.LocalStamp - msgRecord.LocalStamp)
 				if msgRecord.Message.Text == request.Message.Text && request.LocalStamp-msgRecord.LocalStamp < 1 { //秒级
 					cacheMap[request.AtUserId] = request
+					fmt.Println("\n\n跳过消息发送\n\t跳过消息发送\n\t\t跳过消息发送\n\n")
 					return nil
 				} else {
 					cacheMap[request.AtUserId] = request

pkg/service/asChat/robot/robot.go

@@ -167,15 +167,18 @@ func (r *Robot) Run() {
 			//加入聊天室规则
 			hasHit := false
 			for _, rule := range r.joinSessionRules {
+				rule := rule
 				hit := rule.Hit(event, r.Info)
 				fmt.Printf("规则【%s】校验结果:%v\n", rule.GetTitle(), hit)
 				if hit {
 					hasHit = true
 					if rule.RunTime().IsZero() {
+						go func() {
 							err := rule.Run(r.cache)
 							if err != nil {
 								log.Printf("robot 执行任务失败：%v\n", err)
 							}
+						}()
 					} else {
 						r.RegisterDelayTask(rule)
 					}
@@ -183,16 +186,19 @@ func (r *Robot) Run() {
 			}
 			if !hasHit {
 				for _, rule := range r.keywordsRules {
+					rule := rule
 					hit := rule.Hit(event, r.Info)
 					fmt.Printf("规则【%s】校验结果:%v\n", rule.GetTitle(), hit)
 					if hit {
 						hasHit = true
 						fmt.Println("命中规则:", rule.GetTitle())
 						if rule.RunTime().IsZero() {
+							go func() {
 								err := rule.Run(r.cache)
 								if err != nil {
 									log.Printf("robot 执行任务失败：%v\n", err)
 								}
+							}()
 						} else {
 							r.RegisterDelayTask(rule)
 						}
@@ -201,16 +207,19 @@ func (r *Robot) Run() {
 			}
 			if !hasHit {
 				for _, rule := range r.noReplyAfterRules {
+					rule := rule
 					hit := rule.Hit(event, r.Info)
 					fmt.Printf("规则【%s】校验结果:%v\n", rule.GetTitle(), hit)
 					if hit {
 						hasHit = true
 						fmt.Println("命中规则:", rule.GetTitle())
 						if rule.RunTime().IsZero() {
+							go func() {
 								err := rule.Run(r.cache)
 								if err != nil {
 									log.Printf("robot 执行任务失败：%v\n", err)
 								}
+							}()
 						} else {
 							r.RegisterDelayTask(rule)
 						}

pkg/service/asChat/robot/ruler_keywords.go

@@ -27,6 +27,12 @@ func NewReplyWhenHitKeywords(title string, keywords []string) IRobotTask {
 	return &RobotTaskWithKeyworkds{title: title, keywords: keywords}
 }
 func (r *RobotTaskWithKeyworkds) Hit(event ws.ListenEventData, sender *accountFiee.ChatUserData) (hit bool) {
+	//fmt.Printf("event.EventType != ws.EventChatMessage:%v\n", event.EventType != ws.EventChatMessage)
+	//fmt.Printf("event.Msg: %v\n", event.Msg == "")
+	//fmt.Printf("event.Client == nil: %v\n", event.Client == nil)
+	//fmt.Printf("event.ChatUser == nil: %v\n", event.ChatUser == nil)
+	//fmt.Printf("event.ChatUser.Role != 1: %v\n", event.ChatUser.Role != 1)
+	//fmt.Printf("r.keywords: %+v\n", r.keywords)
 	if event.EventType != ws.EventChatMessage || event.Msg == "" || event.Client == nil || event.ChatUser == nil {
 		return
 	}

pkg/service/bundle/bundleBalance.go

@@ -6,6 +6,7 @@ import (
 	"fonchain-fiee/api/bundle"
 	"fonchain-fiee/api/cast"
 	"fonchain-fiee/pkg/service"
+	"log"
 	"strconv"
 
 	bundleModel "fonchain-fiee/pkg/model/bundle"
@@ -157,7 +158,7 @@ func WorkConfirm(c *gin.Context) { // 确认作品并扣除余量
 		service.Error(c, err)
 		return
 	}
-
+	log.Print("req.ConfirmRemark:", req.ConfirmRemark)
 	if req.ConfirmStatus == 2 { // 驳回完直接结束
 		res, err := service.CastProvider.UpdateStatus(c, &cast.UpdateStatusReq{
 			WorkAction:    cast.WorkActionENUM_CONFIRM,

pkg/service/bundle/bundleProfile.go

@@ -141,13 +141,14 @@ func HandShelf(c *gin.Context) {
 	}
 	service.Success(c, res)
 }
-
 func OnlyAddValueListByOrderNo(c *gin.Context) {
 	var req bundle.OnlyAddValueListByOrderNoRequest
+
 	if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil {
 		service.Error(c, err)
 		return
 	}
+
 	res, err := service.BundleProvider.OnlyAddValueListByOrderNo(context.Background(), &req)
 	if err != nil {
 		service.Error(c, err)

pkg/service/bundle/pay.go

@@ -167,6 +167,26 @@ func CreateAntomPay(c *gin.Context) {
 		// 检查 订单信息 type是1说明既有主套餐又有增值服务
 		detail, detailErr := service.BundleProvider.OrderRecordsDetail(context.Background(), &bundle.OrderRecordsDetailRequest{
 			OrderNo: req.OutTradeNo,
+			////金额校验
+			//orderAmountInCents := int64(math.Round(float64(detail.OrderRecord.TotalAmount * 100)))
+			//reqAmountInCents := int64(math.Round(float64(req.ProductAllPrice)))
+			//if orderAmountInCents != reqAmountInCents {
+			//	fmt.Println("orderAmountInCents :", orderAmountInCents)
+			//	fmt.Println("reqAmountInCents :", reqAmountInCents)
+			//	fmt.Println("111111111111111111111111111111111111")
+			//	service.Error(c, errors.New(common.InvalidOrderAmount))
+			//	return
+			//}
+			//
+			//fmt.Println("detail.OrderRecord.Status :", detail.OrderRecord.Status)
+			//fmt.Println("detail.OrderRecord.CheckoutSessionId :", detail.OrderRecord.CheckoutSessionId)
+			//fmt.Println("detail.OrderRecord.PayTime :", detail.OrderRecord.PayTime)
+			//
+			//// 如果 当前订单 是 已签未支付  且 存在 checkoutSessionId 需要 查询 支付结果
+			//if detail.OrderRecord.Status == bundleModel.OrderSigned && detail.OrderRecord.CheckoutSessionId != "" && detail.OrderRecord.PayTime == "" {
+			//	// 查询支付结果
+			//	stripeInfosRes, stripeInfosErr := service.PaymentProvider.QueryAntomPayByCheckoutSessionId(context.Background(), &payment.AntomPayQueryRequest{
+			//		CheckoutSessionIds: []string{detail.OrderRecord.CheckoutSessionId},
 		})
 		if detailErr != nil {
 			fmt.Println("=============== antom创建支付，查询主订单信息报错：", detailErr)
@@ -237,6 +257,8 @@ func CreateAntomPay(c *gin.Context) {
 		orderAmountInCents := int64(math.Round(float64(detail.OrderRecord.TotalAmount) * 100))
 		reqAmountInCents := req.ProductAllPrice
 		if orderAmountInCents != reqAmountInCents {
+			fmt.Println("orderAmountInCents :", orderAmountInCents)
+			fmt.Println("reqAmountInCents :", reqAmountInCents)
 			fmt.Println("111111111111111111111111111111111111")
 			service.Error(c, errors.New(common.InvalidOrderAmount))
 			return
@@ -314,6 +336,8 @@ func CreateAntomPay(c *gin.Context) {
 			//金额校验
 			reqAmountInCents := req.ProductAllPrice
 			if orderAmountInCents != reqAmountInCents {
+				fmt.Println("orderAmountInCents :", orderAmountInCents)
+				fmt.Println("reqAmountInCents :", reqAmountInCents)
 				fmt.Println("111111111111111111111111111111111111")
 				service.Error(c, errors.New(common.InvalidOrderAmount))
 				return
@@ -418,6 +442,8 @@ func CreateAntomPay(c *gin.Context) {
 			TimeUnit:                    timeUnit,
 			AssociatedorderNumber:       req.OutTradeNo, //增值服务订单号
 			Type:                        2,              //自行购买
+			OperatorName:                orderLimit.UserName,
+			OperatorId:                  orderLimit.UserId,
 		})
 		if err != nil {
 			service.Error(c, err)

pkg/service/init.go

@@ -1,6 +1,9 @@
 package service
 
 import (
+	"dubbo.apache.org/dubbo-go/v3/common/constant"
+	"dubbo.apache.org/dubbo-go/v3/config"
+	_ "dubbo.apache.org/dubbo-go/v3/imports"
 	"fmt"
 	"fonchain-fiee/api/account"
 	"fonchain-fiee/api/accountFiee"
@@ -14,10 +17,6 @@ import (
 	"fonchain-fiee/api/secFilings"
 	pkConfig "fonchain-fiee/pkg/config"
 	"os"
-
-	"dubbo.apache.org/dubbo-go/v3/common/constant"
-	"dubbo.apache.org/dubbo-go/v3/config"
-	_ "dubbo.apache.org/dubbo-go/v3/imports"
 )
 
 var AccountProvider = new(account.AccountClientImpl)

pkg/service/secfilings/secfilings.go

@@ -220,16 +220,3 @@ func GetFormList(c *gin.Context) {
 	}
 	service.Success(c, res)
 }
-func WebListSecFiling(c *gin.Context) {
-	var req secFilings.WebListSecFilingReq
-	if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil {
-		service.Error(c, err)
-		return
-	}
-	res, err := service.SecFilingProvider.WebListSecFiling(c, &req)
-	if err != nil {
-		service.Error(c, err)
-		return
-	}
-	service.Success(c, res)
-}