Merge branch 'jng' into dev

docs/dev/conf.ini

@@ -10,7 +10,7 @@ Ak = "ALTAKxrqOQHnAN525Tb2GX4Bhe"
 Sk = "d2ecaa9d75114d3b9f42b99014198306"
 BucketName = "dci-file-new"
 BosUrl = ".bj.bcebos.com"
-BosBaseDir = "fonchain-main"
+BosBaseDir = "fiee"
 BosHttp = "https://"
 BosDomain = "cdns.fontree.cn"
 [oss]
@@ -18,7 +18,7 @@ AccessKeyId =  "LTAI5tLz1fSK53FQAEC9uNSb"
 AccessKeySecret = "oGB9chrQzQzITXR2IGv37Ji5WxZh4j"
 Endpoint =        "oss-cn-hangzhou.aliyuncs.com"
 BucketName =       "fontree-test"
-BaseDir =      "fonchain-main"
+BaseDir =      "fiee"
 CdnHost =      "https://cdn-test.szjixun.cn"
 
 [redis]
@@ -34,12 +34,3 @@ Password = "Gy.123456"
 
 [stripe]
 Webhookkey = "we_1QuursAB1Vm8VfJquKmHQSVg"
-
-
-[oss]
-AccessKeyId =  "LTAI5tLz1fSK53FQAEC9uNSb"
-AccessKeySecret = "oGB9chrQzQzITXR2IGv37Ji5WxZh4j"
-Endpoint =        "oss-cn-hangzhou.aliyuncs.com"
-BucketName =       "fontree-test"
-BaseDir =      "fiee"
-CdnHost =      "https://cdn-test.szjixun.cn"

go.mod

@@ -17,7 +17,7 @@ go 1.18
 //github.com/fonchain_enterprise/utils/ipAddrQuery => ../utils/ipAddrQuery
 //github.com/fonchain_enterprise/utils/jwt => ../utils/jwt
 //github.com/fonchain_enterprise/utils/logger => ../utils/logger
-replace github.com/fonchain_enterprise/utils/objstorage => ../../tyfon-新/utils/objstorage
+replace github.com/fonchain_enterprise/utils/objstorage => ../utils/objstorage
 
 require (
 	dubbo.apache.org/dubbo-go/v3 v3.0.2

pkg/router/router.go

@@ -64,7 +64,7 @@ func NewRouter() *gin.Engine {
 		}
 	}
 	// 上传
-	upData := privateGroup.Group("upload")
+	upData := r.Group("upload")
 	upData.Use(middleware.CheckLogin(service.AccountProvider))
 	{
 		upData.POST("img", upload.UploadImg)