Browse Source

删除无用注释,字段

wangbo 7 months ago
parent
commit
b3480ad6ee
4 changed files with 19 additions and 72 deletions
  1. 8 0
      .idea/modules.xml
  2. 6 1
      .idea/osm_sdk.iml
  3. 2 67
      osm_sdk.go
  4. 3 4
      request.go

+ 8 - 0
.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/osm_sdk.iml" filepath="$PROJECT_DIR$/.idea/osm_sdk.iml" />
+    </modules>
+  </component>
+</project>

+ 6 - 1
.idea/osm_sdk.iml

@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
+<module type="WEB_MODULE" version="4">
   <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
 </module>

+ 2 - 67
osm_sdk.go

@@ -83,28 +83,6 @@ func getUrl(objName string) (string, error) {
 	return resp.Info, nil
 }
 
-//func ZoomUrl(obj, s string) (string, error) {
-//	if strutils.HasBlank(obj) {
-//		log.Println("oss发现违规参数")
-//		return "", nil
-//	}
-//	return Bkt.SignURL(prefix+obj, oss.HTTPGet, 60, oss.Process(s))
-//}
-//
-//func ZoomUrlPfx(obj, s string, addPfx bool) (string, error) {
-//	if strutils.HasBlank(obj) {
-//		log.Println("oss发现违规参数")
-//		return "", nil
-//	}
-//
-//	if addPfx {
-//		return Bkt.SignURL(prefix+obj, oss.HTTPGet, 60, oss.Process(s))
-//	}
-//
-//	return Bkt.SignURL(obj, oss.HTTPGet, 60, oss.Process(s))
-//
-//}
-
 func ZoomUrl(objName, profess string) (string, error) {
 	return zoomUrl(objName, profess)
 }
@@ -124,9 +102,8 @@ func zoomUrl(objName, process string) (string, error) {
 				Namespace: namespace,
 				Name:      name,
 			},
-			ObjName:      objName,
-			Process:      process,
-			RequireInfos: nil,
+			ObjName: objName,
+			Process: process,
 		})
 	if err != nil {
 		return "", err
@@ -146,14 +123,6 @@ func zoomUrl(objName, process string) (string, error) {
 
 }
 
-//func Exist(obj string) (bool, error) {
-//	if strutils.HasBlank(obj) {
-//		return false, nil
-//	}
-//
-//	return Bkt.IsObjectExist(prefix + obj)
-//}
-
 func Exist(objName string) (bool, error) {
 	return exist(objName)
 }
@@ -306,14 +275,6 @@ func lsDetails(dirPath string) ([]ObjectInfo, error) {
 
 }
 
-//func Mv(f, t string) error {
-//	if err := Cp(f, t); err != nil {
-//		return err
-//	}
-//
-//	return Bkt.DeleteObject(prefix + f)
-//}
-
 func Move(srcObjName, dstObjName string) (string, error) {
 	return dstObjName, move(srcObjName, dstObjName, nil)
 }
@@ -354,11 +315,6 @@ func move(srcObjName, dstObjName string, requireInfos []string) error {
 	return nil
 }
 
-//func CpOrigin(f, t string) error {
-//	_, err := Bkt.CopyObject(f, t)
-//	return err
-//}
-
 func Copy(srcObjName, dstObjName string) (string, error) {
 	return dstObjName, copying(srcObjName, dstObjName, nil)
 }
@@ -560,19 +516,6 @@ func getUrlWithMetaData(objName string) (UrlWithMetaData, error) {
 	return resp.Info, nil
 }
 
-//func Cp(f, t string) error {
-//	return CpOrigin(prefix+f, prefix+t)
-//}
-//
-//func TouchFormatImg(reader io.Reader, to string) error {
-//	if reader == nil || strutils.HasBlank(to) {
-//		log.Println("oss上传发现违规参数")
-//		return nil
-//	}
-//
-//	return Bkt.PutObject(prefix+to, reader, oss.ContentType("image/jpg"))
-//}
-
 //func GetObjectBytes(obj string) ([]byte, error) {
 //	if strutils.HasBlank(obj) {
 //		return nil, errors.New("参数错误")
@@ -635,11 +578,3 @@ func getUrlWithMetaData(objName string) (UrlWithMetaData, error) {
 //
 //	return buf.Bytes(), nil
 //}
-
-//func MvWithoutPrefix(f, t string) error {
-//	if _, err := Bkt.CopyObject(f, t); err != nil {
-//		return err
-//	}
-//
-//	return Bkt.DeleteObject(f)
-//}

+ 3 - 4
request.go

@@ -27,9 +27,8 @@ type (
 	}
 	ZoomUrlJsonBody struct {
 		ConfigKey
-		ObjName      string   `json:"srcObjName" binding:"required"`
-		Process      string   `json:"dstObjName" binding:"required"`
-		RequireInfos []string `json:"requireInfos"`
-		Prefix       string   `json:"prefix"`
+		ObjName string `json:"srcObjName" binding:"required"`
+		Process string `json:"process" binding:"required"`
+		Prefix  string `json:"prefix"`
 	}
 )