Merge remote-tracking branch 'origin/main'

pull/1067/head
withchao 2 years ago
commit 870104f11d

@ -2,11 +2,12 @@ package main
import ( import (
"flag" "flag"
"github.com/openimsdk/open-im-server/v3/tools/url2im/pkg"
"log" "log"
"os" "os"
"path/filepath" "path/filepath"
"time" "time"
"github.com/openimsdk/open-im-server/v3/tools/url2im/pkg"
) )
/*take.txt /*take.txt

@ -6,11 +6,12 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"io"
"net/http"
"github.com/OpenIMSDK/protocol/auth" "github.com/OpenIMSDK/protocol/auth"
"github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/constant"
"github.com/OpenIMSDK/protocol/third" "github.com/OpenIMSDK/protocol/third"
"io"
"net/http"
) )
type Api struct { type Api struct {

@ -8,7 +8,6 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"github.com/OpenIMSDK/protocol/third"
"io" "io"
"log" "log"
"net/http" "net/http"
@ -20,6 +19,8 @@ import (
"sync" "sync"
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/OpenIMSDK/protocol/third"
) )
type Upload struct { type Upload struct {

@ -2,9 +2,10 @@ package pkg
import ( import (
"bufio" "bufio"
"github.com/kelindar/bitmap"
"os" "os"
"strconv" "strconv"
"github.com/kelindar/bitmap"
) )
func ReadProgress(path string) (*Progress, error) { func ReadProgress(path string) (*Progress, error) {

Loading…
Cancel
Save