CasaOS - A simple, easy-to-use, elegant open-source Personal Cloud system.
update CasaOS-Common to fix runtime error
Tiger Wang2eac0408754a
diff --git a/.goreleaser.debug.yaml b/.goreleaser.debug.yamlnew file mode 100644index 0000000..885e3a0--- /dev/null+++ b/.goreleaser.debug.yaml@@ -0,0 +1,167 @@+# This is an example .goreleaser.yml file with some sensible defaults.+# Make sure to check the documentation at https://goreleaser.com+project_name: casaos+before:+ hooks:+ # You may remove this if you don't use go modules.+ - go mod tidy+builds:+ - id: casaos-amd64+ binary: build/sysroot/usr/bin/casaos+ env:+ - CGO_ENABLED=1+ - CC=x86_64-linux-gnu-gcc+ gcflags:+ - all=-N -l+ ldflags:+ - -extldflags "-static"+ tags:+ - musl+ - netgo+ goos:+ - linux+ goarch:+ - amd64+ hooks:+ post:+ - find build/sysroot -type f | xargs -L 1 realpath --relative-to=build/sysroot > build/sysroot.manifest+ - id: casaos-arm64+ binary: build/sysroot/usr/bin/casaos+ env:+ - CGO_ENABLED=1+ - CC=aarch64-linux-gnu-gcc+ gcflags:+ - all=-N -l+ ldflags:+ - -extldflags "-static"+ tags:+ - musl+ - netgo+ goos:+ - linux+ goarch:+ - arm64+ hooks:+ post:+ - find build/sysroot -type f | xargs -L 1 realpath --relative-to=build/sysroot > build/sysroot.manifest+ - id: casaos-arm-7+ binary: build/sysroot/usr/bin/casaos+ env:+ - CGO_ENABLED=1+ - CC=arm-linux-gnueabihf-gcc+ gcflags:+ - all=-N -l+ ldflags:+ - -extldflags "-static"+ tags:+ - musl+ - netgo+ goos:+ - linux+ goarch:+ - arm+ goarm:+ - "7"+ hooks:+ post:+ - find build/sysroot -type f | xargs -L 1 realpath --relative-to=build/sysroot > build/sysroot.manifest+ - id: casaos-migration-tool-amd64+ binary: build/sysroot/usr/bin/casaos-migration-tool+ main: ./cmd/migration-tool+ env:+ - CGO_ENABLED=1+ - CC=x86_64-linux-gnu-gcc+ gcflags:+ - all=-N -l+ ldflags:+ - -extldflags "-static"+ tags:+ - musl+ - netgo+ goos:+ - linux+ goarch:+ - amd64+ - id: casaos-migration-tool-arm64+ binary: build/sysroot/usr/bin/casaos-migration-tool+ main: ./cmd/migration-tool+ env:+ - CGO_ENABLED=1+ - CC=aarch64-linux-gnu-gcc+ gcflags:+ - all=-N -l+ ldflags:+ - -extldflags "-static"+ tags:+ - musl+ - netgo+ goos:+ - linux+ goarch:+ - arm64+ - id: casaos-migration-tool-arm-7+ binary: build/sysroot/usr/bin/casaos-migration-tool+ main: ./cmd/migration-tool+ env:+ - CGO_ENABLED=1+ - CC=arm-linux-gnueabihf-gcc+ gcflags:+ - all=-N -l+ ldflags:+ - -extldflags "-static"+ tags:+ - musl+ - netgo+ goos:+ - linux+ goarch:+ - arm+ goarm:+ - "7"+archives:+ - name_template: "{{ .Os }}-{{ .Arch }}-{{ .ProjectName }}-v{{ .Version }}"+ id: casaos+ builds:+ - casaos-amd64+ - casaos-arm64+ - casaos-arm-7+ replacements:+ arm: arm-7+ files:+ - build/**/*+ - name_template: "{{ .Os }}-{{ .Arch }}-{{ .ProjectName }}-migration-tool-v{{ .Version }}"+ id: casaos-migration-tool+ builds:+ - casaos-migration-tool-amd64+ - casaos-migration-tool-arm64+ - casaos-migration-tool-arm-7+ replacements:+ arm: arm-7+ files:+ - build/sysroot/etc/**/*+checksum:+ name_template: "checksums.txt"+snapshot:+ name_template: "{{ incpatch .Version }}"+changelog:+ sort: asc+ filters:+ exclude:+ - "^docs:"+ - "^test:"+# release:+# github:+# owner: IceWhaleTech+# name: CasaOS+# draft: true+# prerelease: auto+# mode: replace+# name_template: "v{{ .Version }}"+release:+ github:+ owner: IceWhaleTech+ name: CasaOS+ draft: true+ prerelease: auto+ mode: replace+ name_template: "v{{ .Version }}"diff --git a/go.mod b/go.modindex db9ca62..6c454be 100644--- a/go.mod+++ b/go.mod@@ -4,7 +4,7 @@ go 1.16require (github.com/Curtis-Milo/nat-type-identifier-go v0.0.0-20220215191915-18d42168c63d- github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220909125858-92fc5b2e0ae5+ github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220929035515-b1287110d6d8github.com/IceWhaleTech/CasaOS-Gateway v0.3.6github.com/Microsoft/go-winio v0.5.0 // indirectgithub.com/ambelovsky/go-structs v1.1.0 // indirectdiff --git a/go.sum b/go.sumindex 49a1770..0bf42e2 100644--- a/go.sum+++ b/go.sum@@ -84,8 +84,8 @@ github.com/Curtis-Milo/nat-type-identifier-go v0.0.0-20220215191915-18d42168c63dgithub.com/Curtis-Milo/nat-type-identifier-go v0.0.0-20220215191915-18d42168c63d/go.mod h1:lW9x+yEjqKdPbE3+cf2fGPJXCw/hChX3Omi9QHTLFsQ=github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220901034123-ca130f6b5ce9/go.mod h1:2MiivEMzvh41codhEKUcn46WK3Ffesop/04qa9jsvQk=-github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220909125858-92fc5b2e0ae5 h1:vgAf0jVKCBo3wyjOZ4z9tB77lVrgIfz2CcQX2+4JTSI=-github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220909125858-92fc5b2e0ae5/go.mod h1:2MiivEMzvh41codhEKUcn46WK3Ffesop/04qa9jsvQk=+github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220929035515-b1287110d6d8 h1:r8nhgQ6tnrn6ikXN9aLH/K4H4H64Nc0hZ6jyW2B22x0=+github.com/IceWhaleTech/CasaOS-Common v0.0.0-20220929035515-b1287110d6d8/go.mod h1:2MiivEMzvh41codhEKUcn46WK3Ffesop/04qa9jsvQk=github.com/IceWhaleTech/CasaOS-Gateway v0.3.6 h1:2tQQo85+jzbbjqIsKKn77QlAA73bc7vZsVCFvWnK4mg=github.com/IceWhaleTech/CasaOS-Gateway v0.3.6/go.mod h1:hnZwGUzcOyiufMpVO7l3gu2gAm6Ws4TY4Nlj3kMshXA=github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=diff --git a/middleware/gin.go b/middleware/gin.goindex d8fd836..a9b07b6 100644--- a/middleware/gin.go+++ b/middleware/gin.go@@ -13,6 +13,7 @@ package middlewareimport ("fmt""net/http"+ "runtime/debug""strings""github.com/IceWhaleTech/CasaOS/pkg/utils/loger"@@ -26,18 +27,18 @@ func Cors() gin.HandlerFunc {c.Header("Access-Control-Allow-Origin", "*")c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE,UPDATE")- //允许跨域设置可以返回其他子段,可以自定义字段+ // 允许跨域设置可以返回其他子段,可以自定义字段c.Header("Access-Control-Allow-Headers", "Authorization, Content-Length, X-CSRF-Token, Token,session,Language,Content-Type,Access-Control-Allow-Origin,Access-Control-Allow-Headers,Access-Control-Allow-Methods,Connection,Host,Origin,Referer,User-Agent,X-Requested-With")// 允许浏览器(客户端)可以解析的头部 (重要)c.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers")- //c.Writer.Header().Set("Access-Control-Allow-Headers", "Accept, Authorization, Content-Type, Content-Length, X-CSRF-Token, Token, session, Origin, Host, Connection, Accept-Encoding, Accept-Language, X-Requested-With")- //设置缓存时间+ // c.Writer.Header().Set("Access-Control-Allow-Headers", "Accept, Authorization, Content-Type, Content-Length, X-CSRF-Token, Token, session, Origin, Host, Connection, Accept-Encoding, Accept-Language, X-Requested-With")+ // 设置缓存时间c.Header("Access-Control-Max-Age", "172800")c.Header("Access-Control-Allow-Credentials", "true")c.Set("Content-Type", "application/json")//}- //允许类型校验+ // 允许类型校验if method == "OPTIONS" {c.JSON(http.StatusOK, "ok!")}@@ -45,18 +46,19 @@ func Cors() gin.HandlerFunc {defer func() {if err := recover(); err != nil {fmt.Println(err)+ debug.PrintStack()}}()c.Next()}}+func WriteLog() gin.HandlerFunc {return func(c *gin.Context) {if !strings.Contains(c.Request.URL.String(), "password") {loger.Info("request:", zap.Any("path", c.Request.URL.String()), zap.Any("param", c.Params), zap.Any("query", c.Request.URL.Query()), zap.Any("method", c.Request.Method))c.Next()}-}}