diff --git a/server/cmd/api/main.go b/server/cmd/api/main.go index 51fb0bc..127bfd7 100644 --- a/server/cmd/api/main.go +++ b/server/cmd/api/main.go @@ -82,6 +82,10 @@ func main() { subTableService := service.NewSubTableService(subTableRepo, dbRepo) neo4jService := service.NewNeo4jService(dbRepo) modelService := service.NewModelService(modelRepo) + uploadService, err := service.NewUploadService(cfg) + if err != nil { + log.Printf("Warning: Failed to initialize upload service: %v (files will not be available)", err) + } // 6. 初始化 Handler dbHandler := handler.NewDatabaseHandler(dbService) @@ -89,6 +93,10 @@ func main() { neo4jHandler := handler.NewNeo4jHandler(neo4jService) modelHandler := handler.NewModelHandler(modelService) systemHandler := handler.NewSystemHandler() + var uploadHandler *handler.UploadHandler + if uploadService != nil { + uploadHandler = handler.NewUploadHandler(uploadService) + } // 7. 设置路由 r := gin.New() @@ -180,6 +188,17 @@ func main() { // 系统信息模块 r.GET("/system/info", systemHandler.GetSystemInfo) + // 文件上传模块 + if uploadHandler != nil { + // 本地文件静态服务 + if cfg.UploadMode == "local" { + r.Static("/files", cfg.UploadLocalPath) + } + // 上传路由 + r.POST("/upload", uploadHandler.Upload) + r.DELETE("/upload/:filename", uploadHandler.Delete) + } + // 8. 启动服务 log.Printf("Server starting on :%s", cfg.Port) if err := r.Run(":" + cfg.Port); err != nil { diff --git a/server/config/config.yaml b/server/config/config.yaml index b4882d3..7f16dd8 100644 --- a/server/config/config.yaml +++ b/server/config/config.yaml @@ -4,3 +4,15 @@ jwt_secret: "dev-secret-key" # Docker 内访问用 db:3306，本地访问用 localhost:6036 database_url: "root:root@tcp(localhost:6036)/x_agents?charset=utf8mb4&parseTime=True&loc=Local" python_service_url: "http://localhost:8081" + +# 文件上传配置 (local 或 minio) +upload_mode: "local" +upload_local_path: "resource/files" +server_base_url: "http://localhost:8082" + +# MinIO 配置 +minio_endpoint: "localhost:9000" +minio_access_key: "" +minio_secret_key: "" +minio_bucket: "x-agents" +minio_use_ssl: false diff --git a/server/go.mod b/server/go.mod index 8c2a7ed..47aef32 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,15 +1,15 @@ module x-agents/server -go 1.21 +go 1.25 require ( github.com/gin-gonic/gin v1.9.1 github.com/go-sql-driver/mysql v1.7.0 github.com/golang-jwt/jwt/v5 v5.2.0 - github.com/google/uuid v1.5.0 + github.com/google/uuid v1.6.0 github.com/lib/pq v1.10.9 github.com/spf13/viper v1.18.2 - golang.org/x/crypto v0.16.0 + golang.org/x/crypto v0.46.0 gorm.io/driver/mysql v1.5.2 gorm.io/gorm v1.25.5 ) @@ -17,9 +17,11 @@ require ( require ( github.com/bytedance/sonic v1.9.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-ini/ini v1.67.0 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect @@ -29,16 +31,23 @@ require ( github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/cpuid/v2 v2.2.4 // indirect + github.com/klauspost/compress v1.18.2 // indirect + github.com/klauspost/cpuid/v2 v2.2.11 // indirect + github.com/klauspost/crc32 v1.3.0 // indirect github.com/leodido/go-urn v1.2.4 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-isatty v0.0.19 // indirect + github.com/minio/crc64nvme v1.1.1 // indirect + github.com/minio/md5-simd v1.1.2 // indirect + github.com/minio/minio-go/v7 v7.0.99 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect + github.com/philhofer/fwd v1.2.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect + github.com/rs/xid v1.6.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/shirou/gopsutil/v3 v3.24.5 // indirect @@ -47,6 +56,7 @@ require ( github.com/spf13/cast v1.6.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.6.0 // indirect + github.com/tinylib/msgp v1.6.1 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect @@ -54,11 +64,12 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect + go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/arch v0.3.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect - golang.org/x/net v0.19.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/net v0.48.0 // indirect + golang.org/x/sys v0.39.0 // indirect + golang.org/x/text v0.32.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/server/go.sum b/server/go.sum index bf1fc27..163dea2 100644 --- a/server/go.sum +++ b/server/go.sum @@ -8,6 +8,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= @@ -18,6 +20,8 @@ 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= github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= +github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= +github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= @@ -43,6 +47,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= @@ -51,9 +57,16 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk= +github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= +github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/klauspost/cpuid/v2 v2.2.11 h1:0OwqZRYI2rFrjS4kvkDnqJkKHdHaRnCm68/DY4OxRzU= +github.com/klauspost/cpuid/v2 v2.2.11/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/crc32 v1.3.0 h1:sSmTt3gUt81RP655XGZPElI0PelVTZ6YwCRnPSupoFM= +github.com/klauspost/crc32 v1.3.0/go.mod h1:D7kQaZhnkX/Y0tstFGf8VUzv2UofNGqCjnC3zdHB0Hw= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -68,6 +81,12 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/minio/crc64nvme v1.1.1 h1:8dwx/Pz49suywbO+auHCBpCtlW1OfpcLN7wYgVR6wAI= +github.com/minio/crc64nvme v1.1.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg= +github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= +github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= +github.com/minio/minio-go/v7 v7.0.99 h1:2vH/byrwUkIpFQFOilvTfaUpvAX3fEFhEzO+DR3DlCE= +github.com/minio/minio-go/v7 v7.0.99/go.mod h1:EtGNKtlX20iL2yaYnxEigaIvj0G0GwSDnifnG8ClIdw= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -77,6 +96,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/philhofer/fwd v1.2.0 h1:e6DnBTl7vGY+Gz322/ASL4Gyp1FspeMvx1RNDoToZuM= +github.com/philhofer/fwd v1.2.0/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -84,6 +105,8 @@ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= +github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= @@ -114,6 +137,8 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= +github.com/tinylib/msgp v1.6.1 h1:ESRv8eL3u+DNHUoSAAQRE50Hm162zqAnBoGv9PzScPY= +github.com/tinylib/msgp v1.6.1/go.mod h1:RSp0LW9oSxFut3KzESt5Voq4GVWyS+PSulT77roAqEA= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= @@ -128,15 +153,21 @@ go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= +go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= +go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU= +golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0= golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU= +golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -147,8 +178,12 @@ golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk= +golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU= +golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= diff --git a/server/internal/config/config.go b/server/internal/config/config.go index 431e5a4..27f6920 100644 --- a/server/internal/config/config.go +++ b/server/internal/config/config.go @@ -15,7 +15,17 @@ type Config struct { Port string JWTSecret string DatabaseURL string - PythonServiceURL string + PythonServiceURL string + // 文件上传配置 + UploadMode string // "local" 或 "minio" + UploadLocalPath string // 本地存储路径，如 "resource/files" + ServerBaseURL string // 服务器基础 URL，用于生成本地文件 URL + // MinIO 配置 + MinIOEndpoint string + MinIOAccessKey string + MinIOSecretKey string + MinIOBucket string + MinIOUseSSL bool } func Load() *Config { @@ -30,16 +40,35 @@ func Load() *Config { viper.SetDefault("jwt_secret", "your-secret-key-change-in-production") viper.SetDefault("python_service_url", "http://localhost:8081") viper.SetDefault("database_url", "root:root@tcp(localhost:3306)/x_agents?charset=utf8mb4&parseTime=True&loc=Local") + // 文件上传默认配置 + viper.SetDefault("upload_mode", "local") + viper.SetDefault("upload_local_path", "resource/files") + viper.SetDefault("server_base_url", "http://localhost:8080") + viper.SetDefault("minio_endpoint", "localhost:9000") + viper.SetDefault("minio_access_key", "") + viper.SetDefault("minio_secret_key", "") + viper.SetDefault("minio_bucket", "x-agents") + viper.SetDefault("minio_use_ssl", false) if err := viper.ReadInConfig(); err != nil { log.Printf("Using default config: %v", err) } return &Config{ - Port: viper.GetString("port"), - JWTSecret: viper.GetString("jwt_secret"), - DatabaseURL: viper.GetString("database_url"), + Port: viper.GetString("port"), + JWTSecret: viper.GetString("jwt_secret"), + DatabaseURL: viper.GetString("database_url"), PythonServiceURL: viper.GetString("python_service_url"), + // 文件上传配置 + UploadMode: viper.GetString("upload_mode"), + UploadLocalPath: viper.GetString("upload_local_path"), + ServerBaseURL: viper.GetString("server_base_url"), + // MinIO 配置 + MinIOEndpoint: viper.GetString("minio_endpoint"), + MinIOAccessKey: viper.GetString("minio_access_key"), + MinIOSecretKey: viper.GetString("minio_secret_key"), + MinIOBucket: viper.GetString("minio_bucket"), + MinIOUseSSL: viper.GetBool("minio_use_ssl"), } } diff --git a/server/internal/handler/upload_handler.go b/server/internal/handler/upload_handler.go new file mode 100644 index 0000000..d515b70 --- /dev/null +++ b/server/internal/handler/upload_handler.go @@ -0,0 +1,60 @@ +package handler + +import ( + "net/http" + + "github.com/gin-gonic/gin" + "x-agents/server/internal/service" +) + +type UploadHandler struct { + uploadService *service.UploadService +} + +func NewUploadHandler(uploadService *service.UploadService) *UploadHandler { + return &UploadHandler{uploadService: uploadService} +} + +// Upload 上传文件 +func (h *UploadHandler) Upload(c *gin.Context) { + file, err := c.FormFile("file") + if err != nil { + c.JSON(http.StatusBadRequest, gin.H{"success": false, "message": "No file uploaded"}) + return + } + + // 检查文件大小（最大 100MB） + if file.Size > 100*1024*1024 { + c.JSON(http.StatusBadRequest, gin.H{"success": false, "message": "File too large (max 100MB)"}) + return + } + + result, err := h.uploadService.Upload(file) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"success": false, "message": err.Error()}) + return + } + + if !result.Success { + c.JSON(http.StatusInternalServerError, result) + return + } + + c.JSON(http.StatusOK, result) +} + +// Delete 删除文件 +func (h *UploadHandler) Delete(c *gin.Context) { + filename := c.Param("filename") + if filename == "" { + c.JSON(http.StatusBadRequest, gin.H{"success": false, "message": "Filename is required"}) + return + } + + if err := h.uploadService.DeleteFile(filename); err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"success": false, "message": err.Error()}) + return + } + + c.JSON(http.StatusOK, gin.H{"success": true, "message": "File deleted"}) +} diff --git a/server/internal/service/upload_service.go b/server/internal/service/upload_service.go new file mode 100644 index 0000000..bc2233a --- /dev/null +++ b/server/internal/service/upload_service.go @@ -0,0 +1,166 @@ +package service + +import ( + "context" + "fmt" + "io" + "mime/multipart" + "net/url" + "os" + "path/filepath" + "strings" + "time" + + "github.com/minio/minio-go/v7" + "github.com/minio/minio-go/v7/pkg/credentials" + "github.com/google/uuid" + "x-agents/server/internal/config" +) + +type UploadService struct { + cfg *config.Config + minioClient *minio.Client +} + +// UploadResponse 上传响应 +type UploadResponse struct { + Success bool `json:"success"` + URL string `json:"url"` + FileKey string `json:"fileKey"` // 文件标识，用于删除等操作 + Message string `json:"message"` +} + +func NewUploadService(cfg *config.Config) (*UploadService, error) { + s := &UploadService{cfg: cfg} + + // 如果是 MinIO 模式，初始化 MinIO 客户端 + if cfg.UploadMode == "minio" { + if cfg.MinIOEndpoint == "" || cfg.MinIOAccessKey == "" || cfg.MinIOSecretKey == "" { + return nil, fmt.Errorf("MinIO configuration is incomplete") + } + + client, err := minio.New(cfg.MinIOEndpoint, &minio.Options{ + Creds: credentials.NewStaticV4(cfg.MinIOAccessKey, cfg.MinIOSecretKey, ""), + Secure: cfg.MinIOUseSSL, + }) + if err != nil { + return nil, fmt.Errorf("failed to create MinIO client: %w", err) + } + + // 检查 bucket 是否存在，不存在则创建 + exists, err := client.BucketExists(context.Background(), cfg.MinIOBucket) + if err != nil { + return nil, fmt.Errorf("failed to check MinIO bucket: %w", err) + } + if !exists { + if err := client.MakeBucket(context.Background(), cfg.MinIOBucket, minio.MakeBucketOptions{}); err != nil { + return nil, fmt.Errorf("failed to create MinIO bucket: %w", err) + } + } + + s.minioClient = client + } + + return s, nil +} + +// Upload 上传文件 +func (s *UploadService) Upload(file *multipart.FileHeader) (*UploadResponse, error) { + // 打开文件 + f, err := file.Open() + if err != nil { + return &UploadResponse{Success: false, Message: err.Error()}, nil + } + defer f.Close() + + // 生成唯一文件名 + ext := filepath.Ext(file.Filename) + filename := fmt.Sprintf("%s%s", uuid.New().String(), ext) + fileKey := strings.TrimSuffix(filename, ext) + + // 根据模式选择存储方式 + if s.cfg.UploadMode == "minio" { + return s.uploadToMinIO(f, filename, fileKey, file.Size) + } + return s.uploadToLocal(f, filename, fileKey) +} + +// uploadToMinIO 上传到 MinIO +func (s *UploadService) uploadToMinIO(f multipart.File, filename, fileKey string, size int64) (*UploadResponse, error) { + _, err := s.minioClient.PutObject(context.Background(), s.cfg.MinIOBucket, filename, f, size, minio.PutObjectOptions{ + ContentType: "application/octet-stream", + }) + if err != nil { + return &UploadResponse{Success: false, Message: fmt.Sprintf("MinIO upload failed: %v", err)}, nil + } + + // 生成预签名 URL（有效期 24 小时） + presignedURL, err := s.minioClient.PresignedGetObject(context.Background(), s.cfg.MinIOBucket, filename, 24*time.Hour, nil) + if err != nil { + return &UploadResponse{Success: false, Message: fmt.Sprintf("failed to generate URL: %v", err)}, nil + } + + return &UploadResponse{ + Success: true, + URL: presignedURL.String(), + FileKey: fileKey, + Message: "Upload successful", + }, nil +} + +// uploadToLocal 上传到本地 +func (s *UploadService) uploadToLocal(f multipart.File, filename, fileKey string) (*UploadResponse, error) { + // 确保目录存在 + uploadPath := s.cfg.UploadLocalPath + if err := os.MkdirAll(uploadPath, 0755); err != nil { + return &UploadResponse{Success: false, Message: fmt.Sprintf("failed to create directory: %v", err)}, nil + } + + // 创建文件 + dst, err := os.Create(filepath.Join(uploadPath, filename)) + if err != nil { + return &UploadResponse{Success: false, Message: err.Error()}, nil + } + defer dst.Close() + + // 复制内容 + if _, err := io.Copy(dst, f); err != nil { + return &UploadResponse{Success: false, Message: err.Error()}, nil + } + + // 生成 URL + fileURL := fmt.Sprintf("%s/files/%s", s.cfg.ServerBaseURL, filename) + + return &UploadResponse{ + Success: true, + URL: fileURL, + FileKey: fileKey, + Message: "Upload successful", + }, nil +} + +// DeleteFile 删除文件 +func (s *UploadService) DeleteFile(filename string) error { + if s.cfg.UploadMode == "minio" { + return s.minioClient.RemoveObject(context.Background(), s.cfg.MinIOBucket, filename, minio.RemoveObjectOptions{}) + } + + // 本地删除 + path := filepath.Join(s.cfg.UploadLocalPath, filename) + return os.Remove(path) +} + +// GetFileURL 获取文件 URL（用于已存在的文件） +func (s *UploadService) GetFileURL(filename string) (string, error) { + if s.cfg.UploadMode == "minio" { + presignedURL, err := s.minioClient.PresignedGetObject(context.Background(), s.cfg.MinIOBucket, filename, 24*time.Hour, nil) + if err != nil { + return "", err + } + return presignedURL.String(), nil + } + + // 本地文件 + escaped := url.PathEscape(filename) + return fmt.Sprintf("%s/files/%s", s.cfg.ServerBaseURL, escaped), nil +}