From df661cb3c5421095596000eb84f5f3a5bbed7556 Mon Sep 17 00:00:00 2001 From: eson <474420502@qq.com> Date: Thu, 11 Mar 2021 18:53:20 +0800 Subject: [PATCH] =?UTF-8?q?TODO:=20=E5=9B=BE=E7=89=87=E6=8E=92=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 + package.json | 1 + server/.gitignore | 1 + server/go.mod | 5 ++ server/go.sum | 42 +++++++++++++++ server/main.go | 115 ++++++++++++++++++++++++++++++++++++++++ server/middleware.go | 45 ++++++++++++++++ src/App.vue | 6 ++- src/Config.vue | 12 +++++ src/components/Main.vue | 75 +++++++++++++++----------- src/main.js | 17 +----- src/plugins/video.js | 11 ---- yarn.lock | 9 +++- 13 files changed, 281 insertions(+), 60 deletions(-) create mode 100644 server/.gitignore create mode 100644 server/go.mod create mode 100644 server/go.sum create mode 100644 server/main.go create mode 100644 server/middleware.go create mode 100644 src/Config.vue delete mode 100644 src/plugins/video.js diff --git a/.gitignore b/.gitignore index 403adbc..dd3e0da 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ pnpm-debug.log* *.njsproj *.sln *.sw? +movie +*.mp4 diff --git a/package.json b/package.json index 9658576..c7d265e 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "axios": "^0.21.1", "core-js": "^3.6.5", "vue": "^2.6.11", "vue-dplayer": "^0.0.10", diff --git a/server/.gitignore b/server/.gitignore new file mode 100644 index 0000000..254defd --- /dev/null +++ b/server/.gitignore @@ -0,0 +1 @@ +server diff --git a/server/go.mod b/server/go.mod new file mode 100644 index 0000000..008d8af --- /dev/null +++ b/server/go.mod @@ -0,0 +1,5 @@ +module server + +go 1.16 + +require github.com/gin-gonic/gin v1.6.3 // indirect diff --git a/server/go.sum b/server/go.sum new file mode 100644 index 0000000..b0eea91 --- /dev/null +++ b/server/go.sum @@ -0,0 +1,42 @@ +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +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.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= +github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY= +github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= +github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= +github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/server/main.go b/server/main.go new file mode 100644 index 0000000..99145d8 --- /dev/null +++ b/server/main.go @@ -0,0 +1,115 @@ +package main + +import ( + "bytes" + "fmt" + "io/fs" + "log" + "net/http" + "os/exec" + "path/filepath" + "strconv" + "strings" + + "github.com/gin-gonic/gin" +) + +// Movie 电影结构 +type Movie struct { + Name string `json:"filename"` + Image string `json:"image"` +} + +var movies []Movie + +func initMovie() { + var movieDict map[string]string = make(map[string]string) + + matches, err := filepath.Glob("movie/*") + if err != nil { + log.Println(err) + } + + for _, filename := range matches { + base := filepath.Base(filename) + + ext := filepath.Ext(base) + base = base[:strings.IndexByte(base, '.')] + + if _, ok := movieDict[base]; ok { + delete(movieDict, base) + } else { + movieDict[base] = filename + } + + log.Println(base, ext) + } + + for key, filename := range movieDict { + width := 160 + height := 120 + log.Println(filename) + cmd := exec.Command("ffmpeg", "-i", filename, "-vframes", "1", "-s", fmt.Sprintf("%dx%d", width, height), "movie/"+key+".webp") + var buffer bytes.Buffer + cmd.Stdout = &buffer + if cmd.Run() != nil { + panic("could not generate frame") + } + } + + filepath.Walk("./movie", func(path string, info fs.FileInfo, err error) error { + if !info.IsDir() && filepath.Ext(info.Name()) != "webp" { + base := info.Name() + log.Println(path, info.Name()) + movies = append(movies, Movie{ + Name: info.Name(), + Image: base[:strings.IndexByte(base, '.')] + ".webp", + }) + } + return nil + }) + + log.Printf("%##v", movies) +} + +func main() { + initMovie() + + eg := gin.Default() + eg.Use(Cors()) + + eg.Static("/res", "movie/") + + movie := eg.Group("movie") + movie.GET("/", func(c *gin.Context) { + var page int = 0 + spage := c.Query("page") + if spage != "" { + p, err := strconv.Atoi(spage) + if err != nil { + log.Println(err) + } + page = p - 1 + } + + var limit int = 10 + slimit := c.Query("limit") + if slimit != "" { + l, err := strconv.Atoi(slimit) + if err != nil { + log.Println(err) + } + limit = l + } + + start := page * limit + log.Println(limit) + c.JSON(0, gin.H{ + "code": http.StatusOK, + "message": "", + "data": movies[start : start+limit], + }) + }) + + eg.Run(":4444") +} diff --git a/server/middleware.go b/server/middleware.go new file mode 100644 index 0000000..f5677ff --- /dev/null +++ b/server/middleware.go @@ -0,0 +1,45 @@ +package main + +import ( + "net/http" + + "github.com/gin-gonic/gin" +) + +// Cors 跨域中间间 +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", "true") // 跨域请求是否需要带cookie信息 默认设置为true + c.Set("content-type", "application/json") // 设置返回格式是json + } + + //放行所有OPTIONS方法 + if method == "OPTIONS" { + c.JSON(http.StatusOK, "Options Request!") + } + // 处理请求 + c.Next() // 处理请求 + } +} diff --git a/src/App.vue b/src/App.vue index 866fc3e..0c5d4da 100644 --- a/src/App.vue +++ b/src/App.vue @@ -56,5 +56,9 @@ export default { data: () => ({ // }), + + mounted: () => ({ + + }) }; - + \ No newline at end of file diff --git a/src/Config.vue b/src/Config.vue new file mode 100644 index 0000000..75edc8c --- /dev/null +++ b/src/Config.vue @@ -0,0 +1,12 @@ + + + + + diff --git a/src/components/Main.vue b/src/components/Main.vue index 3865cbd..75e6fd4 100644 --- a/src/components/Main.vue +++ b/src/components/Main.vue @@ -1,44 +1,55 @@ diff --git a/src/main.js b/src/main.js index 7fcd8be..910b648 100644 --- a/src/main.js +++ b/src/main.js @@ -2,22 +2,9 @@ import Vue from 'vue' import App from './App.vue' import vuetify from './plugins/vuetify'; - - - Vue.config.productionTip = false - - - + new Vue({ - vuetify, - render: h => h(App) -}).$mount('#app') - - -import VideoPlayer from 'vue-video-player' -require('video.js/dist/video-js.css') -require('vue-video-player/src/custom-theme.css') -Vue.use(VideoPlayer) +}).$mount('#app') \ No newline at end of file diff --git a/src/plugins/video.js b/src/plugins/video.js deleted file mode 100644 index dfd5826..0000000 --- a/src/plugins/video.js +++ /dev/null @@ -1,11 +0,0 @@ -import Vue from 'vue' -import VueVideoPlayer from 'vue-video-player' - -// require videojs style -import 'video.js/dist/video-js.css' -// import 'vue-video-player/src/custom-theme.css' - -Vue.use(VueVideoPlayer, /* { - options: global default options, - events: global videojs events -} */) \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 8d92d21..cd54931 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1861,6 +1861,13 @@ axios@0.19.2: dependencies: follow-redirects "1.5.10" +axios@^0.21.1: + version "0.21.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" + integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== + dependencies: + follow-redirects "^1.10.0" + babel-eslint@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" @@ -3989,7 +3996,7 @@ follow-redirects@1.5.10: dependencies: debug "=3.1.0" -follow-redirects@^1.0.0: +follow-redirects@^1.0.0, follow-redirects@^1.10.0: version "1.13.3" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267" integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==