feat:xiugai

client/client.go

@@ -1,18 +1,19 @@
 package client
 
 import (
-	"app.yhyue.com/moapp/jybase/api"
 	"bytes"
 	"encoding/json"
 	"errors"
 	"io"
-	"jygit.jydev.jianyu360.cn/BaseService/ossService/constant"
-	"jygit.jydev.jianyu360.cn/BaseService/ossService/entity"
 	"log"
 	"mime/multipart"
 	"net/http"
 	"net/rpc"
 	"strconv"
+
+	"app.yhyue.com/moapp/jybase/api"
+	"jygit.jydev.jianyu360.cn/BaseService/ossService/client/constant"
+	"jygit.jydev.jianyu360.cn/BaseService/ossService/client/entity"
 )
 
 /* restful方式上传

client/client_rpc_test.go

@@ -2,8 +2,9 @@ package client
 
 import (
 	"io/ioutil"
-	"jygit.jydev.jianyu360.cn/BaseService/ossService/entity"
 	"testing"
+
+	"jygit.jydev.jianyu360.cn/BaseService/ossService/client/entity"
 )
 
 var (

client/go.mod

@@ -0,0 +1,5 @@
+module jygit.jydev.jianyu360.cn/BaseService/ossService/client
+
+go 1.20
+
+require app.yhyue.com/moapp/jybase v0.0.0-20250403014436-53740a2395aa

client/go.sum

@@ -0,0 +1,2 @@
+app.yhyue.com/moapp/jybase v0.0.0-20250403014436-53740a2395aa h1:F45Yi0O0W7ezagpb4EWc57CGNoQ60HN3Ut7npO/sto4=
+app.yhyue.com/moapp/jybase v0.0.0-20250403014436-53740a2395aa/go.mod h1:OEtMbsn7wY/7MLgV7yDUpVDKExUoj3B8h+4w4ZckJQQ=

logs/oss.log

@@ -1,4 +0,0 @@
-2025/03/21 15:12:00 HTTP server started on :8011
-2025/03/21 15:12:33 HTTP server started on :8011
-2025/03/21 15:18:09 HTTP server started on :8011
-2025/03/21 15:19:28 127.0.0.1 restful方式上传文件 all qie.jpeg false

config.json → server/config.json

@@ -2,7 +2,7 @@
   "port": ":8011",
   "oss_accounts": [
     {
-      "id": "account_detail",
+      "id": "main",
       "endpoint": "oss-cn-beijing.aliyuncs.com",
       "access_key_id": "LTAI4G5x9aoZx8dDamQ7vfZi",
       "access_key_secret": "Bk98FsbPYXcJe72n1bG3Ssf73acuNh"
@@ -11,7 +11,7 @@
   "buckets": [
     {
       "bucket_id": "detail",
-      "account_id": "account_detail",
+      "account_id": "main",
       "bucket_name": "jytest2022"
     }
   ],
@@ -31,26 +31,28 @@
     "indexName": "bidding"
   },
   "email": {
-    "mails":[
+    "mails": [
       {
-        "addr":"smtp.exmail.qq.com",
-        "port":465,
-        "pwd":"ue9Rg9Sf4CVtdm5a",
-        "user":"public03@topnet.net.cn",
-        "mailPoolSize":5,
-        "mailReTry":1
+        "addr": "smtp.exmail.qq.com",
+        "port": 465,
+        "pwd": "ue9Rg9Sf4CVtdm5a",
+        "user": "public03@topnet.net.cn",
+        "mailPoolSize": 5,
+        "mailReTry": 1
       },
       {
-        "addr":"smtp.exmail.qq.com",
-        "port":465,
-        "pwd":"Mu^$i21673",
-        "user":"public04@topnet.net.cn",
-        "mailPoolSize":4,
-        "mailReTry":1
+        "addr": "smtp.exmail.qq.com",
+        "port": 465,
+        "pwd": "Mu^$i21673",
+        "user": "public04@topnet.net.cn",
+        "mailPoolSize": 4,
+        "mailReTry": 1
       }
     ],
     "title": "oos代理服务告警",
-    "recipients": ["wangchuanjin@topnet.net.cn"]
+    "recipients": [
+      "wangchuanjin@topnet.net.cn"
+    ]
   },
   "weixin": {
     "webhook_url": "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=295f5f6a-f58c-4765-8bae-9bd718c566a5"
@@ -59,9 +61,9 @@
   "warnInterval": 600,
   "logger": {
     "filename": "./logs/oss.log",
-    "maxSize":    1024,
+    "maxSize": 1024,
     "maxBackups": 3,
-    "maxAge":     3,
-    "compress":   true
+    "maxAge": 3,
+    "compress": true
   }
 }

go.mod → server/go.mod

@@ -1,8 +1,6 @@
-module jygit.jydev.jianyu360.cn/BaseService/ossService
+module jygit.jydev.jianyu360.cn/BaseService/ossService/server
 
-go 1.23.0
-
-toolchain go1.23.4
+go 1.23
 
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20250320080310-ef9b45180b29

go.sum → server/go.sum

@@ -45,15 +45,12 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk=
-github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 github.com/alicebob/miniredis/v2 v2.30.2 h1:lc1UAUT9ZA7h4srlfBmBt2aorm5Yftk9nBjxz7EyY9I=
-github.com/alicebob/miniredis/v2 v2.30.2/go.mod h1:b25qWj4fCEsBeAAR2mlb0ufImGC6uH3VlUfb/HS5zKg=
 github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible h1:8psS8a+wKfiLt1iVDX79F7Y6wUM49Lcha2FMXt4UM8g=
 github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/aws/aws-sdk-go v1.35.20/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
-github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4=
@@ -101,7 +98,6 @@ github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNu
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/garyburd/redigo v1.6.2 h1:yE/pwKCrbLpLpQICzYTeZ7JsTA/C53wFTJHaEtRqniM=
 github.com/garyburd/redigo v1.6.2/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -131,7 +127,6 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
 github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=
-github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -201,7 +196,6 @@ github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8I
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
@@ -209,7 +203,6 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4Zs
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 h1:1JYBfzqrWPcCclBwxFCPAou9n+q86mfnu7NAeHfte7A=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0/go.mod h1:YDZoGHuwE+ov0c8smSH49WLF3F2LaWnYYuDVd+EWrc0=
 github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
-github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -235,7 +228,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 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=
@@ -260,17 +252,13 @@ github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJ
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
-github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/olivere/elastic v6.2.37+incompatible h1:UfSGJem5czY+x/LqxgeCBgjDn6St+z8OnsCuxwD3L0U=
 github.com/olivere/elastic v6.2.37+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8=
 github.com/olivere/elastic/v7 v7.0.22 h1:esBA6JJwvYgfms0EVlH7Z+9J4oQ/WUADF2y/nCNDw7s=
 github.com/olivere/elastic/v7 v7.0.22/go.mod h1:VDexNy9NjmtAkrjNoI7tImv7FR4tf5zUA3ickqu5Pc8=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/ginkgo/v2 v2.7.0 h1:/XxtEV3I3Eif/HobnVx9YmJgk8ENdRsuUmM+fLCFNow=
-github.com/onsi/ginkgo/v2 v2.7.0/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo=
 github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q=
-github.com/onsi/gomega v1.26.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/openzipkin/zipkin-go v0.4.1 h1:kNd/ST2yLLWhaWrkgchya40TJabe8Hioj9udfPcEO5A=
 github.com/openzipkin/zipkin-go v0.4.1/go.mod h1:qY0VqDSN1pOBN94dBc6w2GJlWLiovAyg7Qt6/I9HecM=
@@ -281,7 +269,6 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
-github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
 github.com/prometheus/client_golang v1.15.0 h1:5fCgGYogn0hFdhyhLbw7hEsWxufKtY9klyvdNfFlFhM=
 github.com/prometheus/client_golang v1.15.0/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -294,7 +281,6 @@ github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 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/smartystreets/assertions v1.1.1/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
 github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
 github.com/smartystreets/gunit v1.4.2/go.mod h1:ZjM1ozSIMJlAz/ay4SG8PeKF00ckUp+zMHZXV9/bvak=
@@ -302,7 +288,6 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
@@ -317,7 +302,6 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
@@ -334,7 +318,6 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/gopher-lua v1.1.0 h1:BojcDhfyDWgU2f2TOzYK/g5p2gxMrku8oupLDqlnSqE=
-github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 github.com/zeromicro/go-zero v1.5.2 h1:vpMlZacCMtgdtYzKI3OMyhS6mZ9UQctiAh0J7gIq31I=
 github.com/zeromicro/go-zero v1.5.2/go.mod h1:ndCd1nMMAdEMZgPfdm1fpavHUdBW0ykB6ckCRaSG10w=
 go.etcd.io/etcd/api/v3 v3.5.8 h1:Zf44zJszoU7zRV0X/nStPenegNXoFDWcB/MwrJbA+L4=
@@ -377,7 +360,6 @@ go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0
 go.uber.org/automaxprocs v1.5.2 h1:2LxUOGiR3O6tw8ui5sZa2LAaHnsviZdVOUZw4fvbnME=
 go.uber.org/automaxprocs v1.5.2/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
 go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
-go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
 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.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
@@ -672,15 +654,12 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
-gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
 gopkg.in/h2non/gock.v1 v1.1.2 h1:jBbHXgGBK/AoPVfJh5x4r/WxIrElvbLel8TCZkkZJoY=
-gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

server/logs/oss.log

@@ -0,0 +1,21 @@
+2025/03/21 15:12:00 HTTP server started on :8011
+2025/03/21 15:12:33 HTTP server started on :8011
+2025/03/21 15:18:09 HTTP server started on :8011
+2025/03/21 15:19:28 127.0.0.1 restful方式上传文件 all qie.jpeg false
+2025/03/21 16:10:07 HTTP server started on :8011
+2025/03/25 11:16:06 HTTP server started on :8011
+2025/03/25 11:18:06 127.0.0.1 restful方式上传文件 all 5a74334f40d2d9bbe80f2116.txt false
+2025/03/25 11:18:46 127.0.0.1 restful方式上传文件 aaa 5a74334f40d2d9bbe80f2116.txt
+2025/03/25 11:18:46 Bucket %s not found in cache, querying database aaa
+2025/03/25 11:18:46 下载失败：%v bucket id aaa not found
+2025/03/25 11:19:08 127.0.0.1 restful方式上传文件 all 5a74334f40d2d9bbe80f2116.txt
+2025/03/25 11:19:23 127.0.0.1 restful方式删除文件 all abcd
+2025/03/25 11:21:30 rpc方式获取正文 all 5a74334f40d2d9bbe80f2116.txt
+2025/03/25 11:22:23 127.0.0.1 restful方式上传文件 all 5a74334f40d2d9bbe80f2116.txt
+2025/03/25 11:22:23 127.0.0.1 restful方式上传文件 all 5a74334f40d2d9bbe80f2116.txt
+2025/03/25 11:22:39 rpc方式获取正文 all 5a74334f40d2d9bbe80f2116
+2025/03/25 11:22:47 127.0.0.1 根据标讯id获取正文 all 5a74334f40d2d9bbe80f2116.txt
+2025/03/25 11:32:57 HTTP server started on :8011
+2025/03/25 11:33:06 127.0.0.1 根据标讯id获取正文 all 5a74334f40d2d9bbe80f2116.txt
+2025/03/25 11:33:14 rpc方式获取正文 all 5a74334f40d2d9bbe80f2116
+2025/03/25 11:53:22 HTTP server started on :8011

main.go → server/main.go

@@ -1,16 +1,17 @@
 package main
 
 import (
-	"app.yhyue.com/moapp/jybase/endless"
 	"fmt"
-	"jygit.jydev.jianyu360.cn/BaseService/ossService/config"
-	"jygit.jydev.jianyu360.cn/BaseService/ossService/constant"
-	ossService "jygit.jydev.jianyu360.cn/BaseService/ossService/oss"
-	"jygit.jydev.jianyu360.cn/BaseService/ossService/util"
 	"log"
 	"net/http"
 	"net/rpc"
 	"time"
+
+	"app.yhyue.com/moapp/jybase/endless"
+	"jygit.jydev.jianyu360.cn/BaseService/ossService/client/constant"
+	"jygit.jydev.jianyu360.cn/BaseService/ossService/server/config"
+	ossService "jygit.jydev.jianyu360.cn/BaseService/ossService/server/oss"
+	"jygit.jydev.jianyu360.cn/BaseService/ossService/util"
 )
 
 func main() {
@@ -56,6 +57,6 @@ func main() {
 	http.HandleFunc(constant.GetBidDetailUrl, ossService.BidDetailHandler)
 	log.Println("HTTP server started on " + config.AppConfig.Port)
 	if err := endless.ListenAndServe(config.AppConfig.Port, nil, func() {}); err != nil {
-		log.Fatalln("HTTP server error: %v", err)
+		log.Fatalln("HTTP server error", err)
 	}
 }

oss/http.go → server/oss/http.go

@@ -1,15 +1,16 @@
 package oss
 
 import (
-	"app.yhyue.com/moapp/jybase/api"
-	. "app.yhyue.com/moapp/jybase/common"
 	"fmt"
 	"io"
-	"jygit.jydev.jianyu360.cn/BaseService/ossService/constant"
-	"jygit.jydev.jianyu360.cn/BaseService/ossService/util"
 	"log"
 	"net/http"
 	"strings"
+
+	"app.yhyue.com/moapp/jybase/api"
+	. "app.yhyue.com/moapp/jybase/common"
+	"jygit.jydev.jianyu360.cn/BaseService/ossService/client/constant"
+	"jygit.jydev.jianyu360.cn/BaseService/ossService/server/util"
 )
 
 /* restful方式上传
@@ -68,7 +69,7 @@ func DownloadHandler(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, api.Error_msg_1002+"object_name", http.StatusInternalServerError)
 		return
 	}
-	log.Println(GetIp(r), "restful方式上传文件", bucketID, objectName)
+	log.Println(GetIp(r), "restful方式下载文件", bucketID, objectName)
 	data, err := DownloadAttachment(bucketID, objectName)
 	if err != nil {
 		log.Println(constant.DownloadFail, err)

oss/oss.go → server/oss/oss.go

@@ -1,16 +1,17 @@
 package oss
 
 import (
-	"app.yhyue.com/moapp/jybase/es"
 	"bytes"
 	"compress/gzip"
 	"fmt"
-	ossSDK "github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"io"
 	"io/ioutil"
-	"jygit.jydev.jianyu360.cn/BaseService/ossService/config"
 	"log"
 	"sync"
+
+	"app.yhyue.com/moapp/jybase/es"
+	ossSDK "github.com/aliyun/aliyun-oss-go-sdk/oss"
+	"jygit.jydev.jianyu360.cn/BaseService/ossService/server/config"
 )
 
 // bucketMap 用来缓存bucket配置，避免重复查询数据库

oss/rpc.go → server/oss/rpc.go

@@ -1,13 +1,14 @@
 package oss
 
 import (
-	"app.yhyue.com/moapp/jybase/api"
 	"bytes"
 	"errors"
 	"io/ioutil"
-	"jygit.jydev.jianyu360.cn/BaseService/ossService/constant"
-	"jygit.jydev.jianyu360.cn/BaseService/ossService/entity"
 	"log"
+
+	"app.yhyue.com/moapp/jybase/api"
+	"jygit.jydev.jianyu360.cn/BaseService/ossService/client/constant"
+	"jygit.jydev.jianyu360.cn/BaseService/ossService/client/entity"
 )
 
 // OSSService 定义了RPC服务方法

util/email.go → server/util/email.go

@@ -2,7 +2,7 @@ package util
 
 import (
 	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/pusher"
-	"jygit.jydev.jianyu360.cn/BaseService/ossService/config"
+	"jygit.jydev.jianyu360.cn/BaseService/ossService/server/config"
 )
 
 // SendEmailNotification 发送邮件通知给多个收件人

util/heartbeat.go → server/util/heartbeat.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"time"
 
-	"jygit.jydev.jianyu360.cn/BaseService/ossService/config"
+	"jygit.jydev.jianyu360.cn/BaseService/ossService/server/config"
 
 	"github.com/go-redis/redis/v8"
 )

util/weixin.go → server/util/weixin.go

@@ -3,9 +3,10 @@ package util
 import (
 	"bytes"
 	"encoding/json"
-	"jygit.jydev.jianyu360.cn/BaseService/ossService/config"
 	"log"
 	"net/http"
+
+	"jygit.jydev.jianyu360.cn/BaseService/ossService/server/config"
 )
 
 type WeixinMessage struct {