diff --git a/.gitignore b/.gitignore index 6c96c5c..c6e7cc2 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,7 @@ build .DS_Store .env npm-debug.log + +#go +debug.test + diff --git a/goserver/main.go b/goserver/main.go index 2a76072..d95f1a9 100644 --- a/goserver/main.go +++ b/goserver/main.go @@ -2,9 +2,12 @@ package main import ( "database/sql" + "encoding/json" "fmt" "log" + "net/http" "strconv" + "strings" "time" "github.com/gin-gonic/gin" @@ -65,63 +68,144 @@ func init() { type ObjectTwistcasting struct { Uid int64 Platform string - UserId int64 + UserId string UserName string LiveUrl string - Tags string + Tags []string Followers int64 Views int64 Gratuity int64 LiveTitle string - LiveStartTime time.Time - LiveEndTime time.Time - UpdateTime time.Time + LiveStartTime *time.Time + LiveEndTime *time.Time + UpdateTime *time.Time } -func TwistcastingQuery(cxt *gin.Context) { +type Result struct { + Code int + Error string + Data interface{} +} + +func TwitcastingQuery(cxt *gin.Context) { var err error - sstart := cxt.Query("start") - send := cxt.Query("end") - _, err = strconv.Atoi(sstart) + page, err := strconv.Atoi(cxt.Query("page")) if err != nil { cxt.Error(err) } - _, err = strconv.Atoi(send) + psize, err := strconv.Atoi(cxt.Query("psize")) if err != nil { cxt.Error(err) } + if psize > 100 { + cxt.Error(fmt.Errorf("page size <= 100")) + } - ssql := fmt.Sprintf(SqlQuery, sstart, send) + start := (page - 1) * 200 + // end := start + 200 + ssql := fmt.Sprintf(SqlQuery, strconv.Itoa(start), strconv.Itoa(psize)) rows, err := StoreStreamer.Query(ssql) if err != nil { - log.Panic(err) + cxt.Error(err) } var ots []*ObjectTwistcasting for rows.Next() { ot := &ObjectTwistcasting{} - rows.Scan( + var lstm, letm, utm sql.NullTime + var tags string + err = rows.Scan( &ot.Uid, &ot.Platform, &ot.UserId, + &ot.UserName, &ot.LiveUrl, - &ot.Tags, + &tags, &ot.Followers, &ot.Views, &ot.Gratuity, &ot.LiveTitle, - &ot.LiveStartTime, - &ot.LiveEndTime, - &ot.UpdateTime, + &lstm, + &letm, + &utm, ) + if err != nil { + cxt.Error(err) + return + } + if !lstm.Valid { + ot.LiveStartTime = nil + } else { + ot.LiveStartTime = &lstm.Time + } + if !letm.Valid { + ot.LiveEndTime = nil + } else { + ot.LiveEndTime = &letm.Time + } + if !utm.Valid { + ot.UpdateTime = nil + } else { + ot.UpdateTime = &utm.Time + } + + if err = json.Unmarshal([]byte(tags), &ot.Tags); err != nil { + log.Println(tags) + } + ots = append(ots, ot) } + + r := &Result{Code: 200} + r.Data = ots log.Println(len(ots)) + if retdata, err := json.Marshal(r); err != nil { + cxt.Error(err) + } else { + cxt.JSON(r.Code, string(retdata)) + } +} + +func Cors() gin.HandlerFunc { + return func(c *gin.Context) { + method := c.Request.Method //请求方法 + origin := c.Request.Header.Get("Origin") //请求头部 + var headerKeys []string // 声明请求头keys + for k, _ := range c.Request.Header { + headerKeys = append(headerKeys, k) + } + headerStr := strings.Join(headerKeys, ", ") + if headerStr != "" { + headerStr = fmt.Sprintf("access-control-allow-origin, access-control-allow-headers, %s", headerStr) + } else { + headerStr = "access-control-allow-origin, access-control-allow-headers" + } + if origin != "" { + c.Writer.Header().Set("Access-Control-Allow-Origin", "*") + c.Header("Access-Control-Allow-Origin", "*") // 这是允许访问所有域 + c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE,UPDATE") //服务器支持的所有跨域请求的方法,为了避免浏览次请求的多次'预检'请求 + // header的类型 + c.Header("Access-Control-Allow-Headers", "Authorization, Content-Length, X-CSRF-Token, Token,session,X_Requested_With,Accept, Origin, Host, Connection, Accept-Encoding, Accept-Language,DNT, X-CustomHeader, Keep-Alive, User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Pragma") + // 允许跨域设置 可以返回其他子段 + c.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers,Cache-Control,Content-Language,Content-Type,Expires,Last-Modified,Pragma,FooBar") // 跨域关键设置 让浏览器可以解析 + c.Header("Access-Control-Max-Age", "172800") // 缓存请求信息 单位为秒 + c.Header("Access-Control-Allow-Credentials", "false") // 跨域请求是否需要带cookie信息 默认设置为true + c.Set("content-type", "application/json") // 设置返回格式是json + } + + //放行所有OPTIONS方法 + if method == "OPTIONS" { + c.JSON(http.StatusOK, "Options Request!") + } + // 处理请求 + c.Next() // 处理请求 + } } func main() { engine := gin.New() //r := gin.Default() //使用默认中间件 engine.Use(gin.Logger()) - engine.GET("twistcasting/data", TwistcastingQuery) + engine.Use(Cors()) + engine.GET("twitcasting/query", TwitcastingQuery) engine.Run(":5500") } diff --git a/goserver/main_test.go b/goserver/main_test.go new file mode 100644 index 0000000..ef64976 --- /dev/null +++ b/goserver/main_test.go @@ -0,0 +1,7 @@ +package main + +import "testing" + +func TestMain(t *testing.T) { + main() +} diff --git a/package.json b/package.json index 6cbf281..e78aa47 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@testing-library/jest-dom": "^5.9.0", "@testing-library/react": "^10.2.1", "@testing-library/user-event": "^11.1.0", - "antd": "^4.5.2", + "antd": "^4.5.4", "craco-less": "^1.17.0", "react": "^16.13.1", "react-dom": "^16.13.1", diff --git a/src/App.js b/src/App.js index 9d3d74f..25d5c6c 100644 --- a/src/App.js +++ b/src/App.js @@ -7,6 +7,7 @@ import 'antd/dist/antd.css'; import React from 'react'; import './App.less'; import DataTable from './Table'; +import DataTableTest from './TableTest'; const { Header, Content, Footer, Sider } = Layout; @@ -29,6 +30,7 @@ class App extends React.Component { trigger={null} collapsible collapsed={this.state.collapsed} + inlineCollapsed={this.state.collapsed} > } > 数据展示 @@ -52,7 +54,7 @@ class App extends React.Component {
- +