commit

amd64/report-server/entity/e_record.go

@@ -6,5 +6,5 @@ type Record struct {
 	ScoreOnline  float64 `json:"scoreOnline"`
 	ScoreOffline float64 `json:"scoreOffline"`
 	ScoreFinal   float64 `json:"scoreFinal"`
-	Details      string  `json:"string"`
+	Details      string  `json:"details"`
 }

amd64/report-server/handler/h_report.go

@@ -1,7 +1,9 @@
 package handler
 
 import (
-	"cicv-data-closedloop/common/entity"
+	"cicv-data-closedloop/amd64/report-server/entity"
+	commonEntity "cicv-data-closedloop/common/entity"
+	"cicv-data-closedloop/common/util"
 	"github.com/gin-gonic/gin"
 	"net/http"
 )
@@ -25,6 +27,21 @@ func Page(c *gin.Context) {
 	//	return
 	//}
 	//c_log.GlobalLogger.Info("数据库查询成功：", tests)
+	var result []entity.Record
+	for i := 0; i < 100; i++ {
+		result = append(result, entity.Record{
+			Team:         "test" + util.NewShortUUID(),
+			Topic:        "team" + util.NewShortUUID(),
+			ScoreOnline:  100.0,
+			ScoreOffline: 100.0,
+			ScoreFinal:   100.0,
+			Details:      "sdlkfjsaljfldsakjfkls",
+		})
+	}
 
-	c.JSON(http.StatusOK, entity.DefaultSuccessHttpResult)
+	c.JSON(http.StatusOK, commonEntity.Response{
+		Code: 200,
+		Msg:  "分页查询成功。",
+		Data: result,
+	})
 }

amd64/report-server/main.go

@@ -1,9 +1,9 @@
 package main
 
 import (
+	"cicv-data-closedloop/amd64/report-server/handler"
 	"cicv-data-closedloop/common/config/c_db"
 	"cicv-data-closedloop/common/config/c_log"
-	"cicv-data-closedloop/common/gin/handler"
 	"cicv-data-closedloop/common/gin/middleware"
 	_ "embed"
 	"github.com/gin-gonic/gin"
@@ -56,23 +56,20 @@ func init() {
 	)
 }
 
-// @title yuexin-pay系统接口文档
-// @description 该后端主要用于对接支付接口
-// @host localhost:12345
-// @BasePath /yuexin-pay
-// @version v20240226
 func main() {
 	c_log.GlobalLogger.Info("配置文件为：", ApplicationYaml)
 	// 创建 gin 实例
 	router := gin.Default()
 	// 使用中间件
+	//router.Use(cors.Default())
+	router.Use(middleware.Cors())
 	router.Use(middleware.LogRequest())                                                              // 请求日志打印
 	router.Use(middleware.ValidateHeaders(ApplicationYaml.Web.WhiteList, ApplicationYaml.Web.Token)) // 全局请求头校验
 	// 通过路由组设置全局前缀
 	projectPrefix := router.Group(ApplicationYaml.Web.RoutePrefix)
 	// 接口
-	projectPrefix.POST("/page", handler.Hello) // 分页查询
-	projectPrefix.POST("/pdf", handler.Hello)  // pdf下载
+	projectPrefix.POST("/page", handler.Page) // 分页查询
+	//projectPrefix.POST("/pdf", handler.Hello)  // pdf下载
 	// 端口
 	err := router.Run(":" + ApplicationYaml.Web.Port)
 	if err != nil {

common/gin/middleware/m_cors.go

@@ -0,0 +1,24 @@
+package middleware
+
+import (
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+func Cors() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		method := c.Request.Method
+		origin := c.Request.Header.Get("Origin")
+		if origin != "" {
+			c.Header("Access-Control-Allow-Origin", "*") // 可将将 * 替换为指定的域名
+			c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE, UPDATE")
+			c.Header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Authorization")
+			c.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Cache-Control, Content-Language, Content-Type")
+			c.Header("Access-Control-Allow-Credentials", "true")
+		}
+		if method == "OPTIONS" {
+			c.AbortWithStatus(http.StatusNoContent)
+		}
+		c.Next()
+	}
+}

common/util/u_string.go

@@ -1,7 +1,17 @@
 package util
 
-import "fmt"
+import (
+	"fmt"
+	"github.com/google/uuid"
+)
 
 func ToString(value interface{}) string {
 	return fmt.Sprintf("%v", value)
 }
+
+func NewUUID() string {
+	return uuid.New().String()[:8]
+}
+func NewShortUUID() string {
+	return uuid.New().String()[:8]
+}

go.mod

@@ -28,6 +28,7 @@ require (
 	github.com/chenzhuoyu/iasm v0.9.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
+	github.com/gin-contrib/cors v1.5.0 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect

go.sum

@@ -96,6 +96,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
 github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
+github.com/gin-contrib/cors v1.5.0 h1:DgGKV7DDoOn36DFkNtbHrjoRiT5ExCe+PC9/xp7aKvk=
+github.com/gin-contrib/cors v1.5.0/go.mod h1:TvU7MAZ3EwrPLI2ztzTt3tqgvBCq+wn8WpZmfADjupI=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
@@ -215,6 +217,7 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=