Compare commits
2
Commits
e15debc962
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
15c26f1939 | ||
|
|
1a95653894 |
@@ -34,7 +34,8 @@ const (
|
|||||||
func InitConfig() {
|
func InitConfig() {
|
||||||
// 设置默认配置
|
// 设置默认配置
|
||||||
defaultConfig := Config{
|
defaultConfig := Config{
|
||||||
Url: "http://127.0.0.1:8080",
|
//Url: "http://127.0.0.1:8080",
|
||||||
|
Url: "http://112.124.71.39:8080",
|
||||||
Token: "",
|
Token: "",
|
||||||
ThreadCount: 10,
|
ThreadCount: 10,
|
||||||
HandleFileCount: 25,
|
HandleFileCount: 25,
|
||||||
|
|||||||
@@ -334,7 +334,7 @@ func processFile(ctx context.Context, logChan *chan string, filePath string, fil
|
|||||||
lines := make(chan string, 200)
|
lines := make(chan string, 200)
|
||||||
var countLine int32 = 0
|
var countLine int32 = 0
|
||||||
// 创建指定个worker同时处理文件上传
|
// 创建指定个worker同时处理文件上传
|
||||||
for i := 0; i < config.APPConfig.ThreadCount; i++ {
|
for i := range config.APPConfig.ThreadCount {
|
||||||
select {
|
select {
|
||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
close(lines)
|
close(lines)
|
||||||
@@ -342,6 +342,7 @@ func processFile(ctx context.Context, logChan *chan string, filePath string, fil
|
|||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//创建处理进程
|
||||||
go func() {
|
go func() {
|
||||||
processLines(ctx, logChan, &lines, i, filePath, &countLine)
|
processLines(ctx, logChan, &lines, i, filePath, &countLine)
|
||||||
}()
|
}()
|
||||||
@@ -356,6 +357,7 @@ func processFile(ctx context.Context, logChan *chan string, filePath string, fil
|
|||||||
fmt.Println("panic:", f+":"+strconv.Itoa(l), r)
|
fmt.Println("panic:", f+":"+strconv.Itoa(l), r)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
for scanner.Scan() {
|
for scanner.Scan() {
|
||||||
select {
|
select {
|
||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
@@ -384,6 +386,7 @@ func processFile(ctx context.Context, logChan *chan string, filePath string, fil
|
|||||||
Percentage: int(float64(countLine) / float64(fileLines) * 100),
|
Percentage: int(float64(countLine) / float64(fileLines) * 100),
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
time.Sleep(50 * time.Millisecond)
|
||||||
}
|
}
|
||||||
//上传完成,进度设为100
|
//上传完成,进度设为100
|
||||||
progress.Store(filepath.Base(filePath),
|
progress.Store(filepath.Base(filePath),
|
||||||
@@ -415,6 +418,7 @@ func processLines(ctx context.Context, logChan *chan string, lines *chan string,
|
|||||||
|
|
||||||
// 跳过空行
|
// 跳过空行
|
||||||
if strings.TrimSpace(line) == "" {
|
if strings.TrimSpace(line) == "" {
|
||||||
|
atomic.AddInt32(countLine, 1)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
// 上传数据
|
// 上传数据
|
||||||
|
|||||||
Reference in New Issue
Block a user