From 20dbb48221932b3e2ad626ee3f236786f7c99354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=85=B5=E5=85=B5?= <liubingbing@qimai.cn>
Date: Wed, 28 Nov 2018 13:22:21 +0800
Subject: [PATCH 1/4] github.com/coreos/etcd/clientv3 =>
 go.etcd.io/etcd/clientv3

---
 bin/csctl/cmd/backup.go  | 2 +-
 bin/csctl/cmd/upgrade.go | 2 +-
 client.go                | 2 +-
 conf/conf.go             | 2 +-
 csctl.go                 | 2 +-
 group.go                 | 2 +-
 job.go                   | 2 +-
 node.go                  | 2 +-
 node/node.go             | 2 +-
 noticer.go               | 2 +-
 once.go                  | 2 +-
 proc.go                  | 2 +-
 web/info.go              | 2 +-
 web/job.go               | 2 +-
 web/node.go              | 2 +-
 web/session/session.go   | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/bin/csctl/cmd/backup.go b/bin/csctl/cmd/backup.go
index 42ecfbc..a8afc78 100644
--- a/bin/csctl/cmd/backup.go
+++ b/bin/csctl/cmd/backup.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3"
 	"github.com/spf13/cobra"
 
 	"github.com/shunfei/cronsun"
diff --git a/bin/csctl/cmd/upgrade.go b/bin/csctl/cmd/upgrade.go
index 32e8893..b7e6afe 100644
--- a/bin/csctl/cmd/upgrade.go
+++ b/bin/csctl/cmd/upgrade.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/coreos/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3"
 	"github.com/spf13/cobra"
 	mgo "gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
diff --git a/client.go b/client.go
index d1fb1cd..1a95240 100644
--- a/client.go
+++ b/client.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	client "github.com/coreos/etcd/clientv3"
+	client "go.etcd.io/etcd/clientv3"
 
 	"github.com/shunfei/cronsun/conf"
 )
diff --git a/conf/conf.go b/conf/conf.go
index 79ac912..65d329b 100644
--- a/conf/conf.go
+++ b/conf/conf.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	client "github.com/coreos/etcd/clientv3"
+	client "go.etcd.io/etcd/clientv3"
 	"github.com/fsnotify/fsnotify"
 	"github.com/go-gomail/gomail"
 	"github.com/gofrs/uuid"
diff --git a/csctl.go b/csctl.go
index 55f62fb..9d9ae04 100644
--- a/csctl.go
+++ b/csctl.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 
-	client "github.com/coreos/etcd/clientv3"
+	client "go.etcd.io/etcd/clientv3"
 
 	"github.com/shunfei/cronsun/conf"
 )
diff --git a/group.go b/group.go
index a2ffeea..dd32fdf 100644
--- a/group.go
+++ b/group.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	client "github.com/coreos/etcd/clientv3"
+	client "go.etcd.io/etcd/clientv3"
 
 	"github.com/shunfei/cronsun/conf"
 	"github.com/shunfei/cronsun/log"
diff --git a/job.go b/job.go
index 398079a..b01d8a0 100644
--- a/job.go
+++ b/job.go
@@ -15,7 +15,7 @@ import (
 	"syscall"
 	"time"
 
-	client "github.com/coreos/etcd/clientv3"
+	client "go.etcd.io/etcd/clientv3"
 
 	"github.com/shunfei/cronsun/conf"
 	"github.com/shunfei/cronsun/log"
diff --git a/node.go b/node.go
index 64e63bc..9e8bacf 100644
--- a/node.go
+++ b/node.go
@@ -8,7 +8,7 @@ import (
 	"syscall"
 	"time"
 
-	client "github.com/coreos/etcd/clientv3"
+	client "go.etcd.io/etcd/clientv3"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
 
diff --git a/node/node.go b/node/node.go
index f09c8fd..3bab2ae 100644
--- a/node/node.go
+++ b/node/node.go
@@ -11,7 +11,7 @@ import (
 	"syscall"
 	"time"
 
-	client "github.com/coreos/etcd/clientv3"
+	client "go.etcd.io/etcd/clientv3"
 	"github.com/shunfei/cronsun"
 	"github.com/shunfei/cronsun/conf"
 	"github.com/shunfei/cronsun/log"
diff --git a/noticer.go b/noticer.go
index 575e47c..050889c 100644
--- a/noticer.go
+++ b/noticer.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"time"
 
-	client "github.com/coreos/etcd/clientv3"
+	client "go.etcd.io/etcd/clientv3"
 	"github.com/go-gomail/gomail"
 
 	"github.com/shunfei/cronsun/conf"
diff --git a/once.go b/once.go
index 174c7d3..3de4482 100644
--- a/once.go
+++ b/once.go
@@ -1,7 +1,7 @@
 package cronsun
 
 import (
-	client "github.com/coreos/etcd/clientv3"
+	client "go.etcd.io/etcd/clientv3"
 
 	"github.com/shunfei/cronsun/conf"
 )
diff --git a/proc.go b/proc.go
index 9c6c52b..36632cf 100644
--- a/proc.go
+++ b/proc.go
@@ -8,7 +8,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	client "github.com/coreos/etcd/clientv3"
+	client "go.etcd.io/etcd/clientv3"
 
 	"github.com/shunfei/cronsun/conf"
 	"github.com/shunfei/cronsun/log"
diff --git a/web/info.go b/web/info.go
index b6abf13..8b896a4 100644
--- a/web/info.go
+++ b/web/info.go
@@ -3,7 +3,7 @@ package web
 import (
 	"time"
 
-	v3 "github.com/coreos/etcd/clientv3"
+	v3 "go.etcd.io/etcd/clientv3"
 
 	"github.com/shunfei/cronsun"
 	"github.com/shunfei/cronsun/conf"
diff --git a/web/job.go b/web/job.go
index 643d3fb..3f397b5 100644
--- a/web/job.go
+++ b/web/job.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/coreos/etcd/clientv3"
+	"go.etcd.io/etcd/clientv3"
 	"github.com/gorilla/mux"
 
 	"github.com/shunfei/cronsun"
diff --git a/web/node.go b/web/node.go
index 1ce2643..ff38af2 100644
--- a/web/node.go
+++ b/web/node.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	v3 "github.com/coreos/etcd/clientv3"
+	v3 "go.etcd.io/etcd/clientv3"
 	"github.com/gorilla/mux"
 	"gopkg.in/mgo.v2/bson"
 
diff --git a/web/session/session.go b/web/session/session.go
index b258ce3..626a925 100644
--- a/web/session/session.go
+++ b/web/session/session.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"net/http"
 
-	client "github.com/coreos/etcd/clientv3"
+	client "go.etcd.io/etcd/clientv3"
 	"github.com/shunfei/cronsun"
 	"github.com/shunfei/cronsun/conf"
 	"github.com/shunfei/cronsun/log"

From 6535dd9e4c408f5c5ea5094fc2a96aee4b61a50c Mon Sep 17 00:00:00 2001
From: lbbniu <lbbniu@qq.com>
Date: Wed, 28 Nov 2018 13:30:44 +0800
Subject: [PATCH 2/4] Revert "github.com/coreos/etcd/clientv3 =>
 go.etcd.io/etcd/clientv3"

---
 bin/csctl/cmd/backup.go  | 2 +-
 bin/csctl/cmd/upgrade.go | 2 +-
 client.go                | 2 +-
 conf/conf.go             | 2 +-
 csctl.go                 | 2 +-
 group.go                 | 2 +-
 job.go                   | 2 +-
 node.go                  | 2 +-
 node/node.go             | 2 +-
 noticer.go               | 2 +-
 once.go                  | 2 +-
 proc.go                  | 2 +-
 web/info.go              | 2 +-
 web/job.go               | 2 +-
 web/node.go              | 2 +-
 web/session/session.go   | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/bin/csctl/cmd/backup.go b/bin/csctl/cmd/backup.go
index a8afc78..42ecfbc 100644
--- a/bin/csctl/cmd/backup.go
+++ b/bin/csctl/cmd/backup.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/clientv3"
+	"github.com/coreos/etcd/clientv3"
 	"github.com/spf13/cobra"
 
 	"github.com/shunfei/cronsun"
diff --git a/bin/csctl/cmd/upgrade.go b/bin/csctl/cmd/upgrade.go
index b7e6afe..32e8893 100644
--- a/bin/csctl/cmd/upgrade.go
+++ b/bin/csctl/cmd/upgrade.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"go.etcd.io/etcd/clientv3"
+	"github.com/coreos/etcd/clientv3"
 	"github.com/spf13/cobra"
 	mgo "gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
diff --git a/client.go b/client.go
index 1a95240..d1fb1cd 100644
--- a/client.go
+++ b/client.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	client "go.etcd.io/etcd/clientv3"
+	client "github.com/coreos/etcd/clientv3"
 
 	"github.com/shunfei/cronsun/conf"
 )
diff --git a/conf/conf.go b/conf/conf.go
index 65d329b..79ac912 100644
--- a/conf/conf.go
+++ b/conf/conf.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	client "go.etcd.io/etcd/clientv3"
+	client "github.com/coreos/etcd/clientv3"
 	"github.com/fsnotify/fsnotify"
 	"github.com/go-gomail/gomail"
 	"github.com/gofrs/uuid"
diff --git a/csctl.go b/csctl.go
index 9d9ae04..55f62fb 100644
--- a/csctl.go
+++ b/csctl.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 
-	client "go.etcd.io/etcd/clientv3"
+	client "github.com/coreos/etcd/clientv3"
 
 	"github.com/shunfei/cronsun/conf"
 )
diff --git a/group.go b/group.go
index dd32fdf..a2ffeea 100644
--- a/group.go
+++ b/group.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	client "go.etcd.io/etcd/clientv3"
+	client "github.com/coreos/etcd/clientv3"
 
 	"github.com/shunfei/cronsun/conf"
 	"github.com/shunfei/cronsun/log"
diff --git a/job.go b/job.go
index b01d8a0..398079a 100644
--- a/job.go
+++ b/job.go
@@ -15,7 +15,7 @@ import (
 	"syscall"
 	"time"
 
-	client "go.etcd.io/etcd/clientv3"
+	client "github.com/coreos/etcd/clientv3"
 
 	"github.com/shunfei/cronsun/conf"
 	"github.com/shunfei/cronsun/log"
diff --git a/node.go b/node.go
index 9e8bacf..64e63bc 100644
--- a/node.go
+++ b/node.go
@@ -8,7 +8,7 @@ import (
 	"syscall"
 	"time"
 
-	client "go.etcd.io/etcd/clientv3"
+	client "github.com/coreos/etcd/clientv3"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
 
diff --git a/node/node.go b/node/node.go
index 3bab2ae..f09c8fd 100644
--- a/node/node.go
+++ b/node/node.go
@@ -11,7 +11,7 @@ import (
 	"syscall"
 	"time"
 
-	client "go.etcd.io/etcd/clientv3"
+	client "github.com/coreos/etcd/clientv3"
 	"github.com/shunfei/cronsun"
 	"github.com/shunfei/cronsun/conf"
 	"github.com/shunfei/cronsun/log"
diff --git a/noticer.go b/noticer.go
index 050889c..575e47c 100644
--- a/noticer.go
+++ b/noticer.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"time"
 
-	client "go.etcd.io/etcd/clientv3"
+	client "github.com/coreos/etcd/clientv3"
 	"github.com/go-gomail/gomail"
 
 	"github.com/shunfei/cronsun/conf"
diff --git a/once.go b/once.go
index 3de4482..174c7d3 100644
--- a/once.go
+++ b/once.go
@@ -1,7 +1,7 @@
 package cronsun
 
 import (
-	client "go.etcd.io/etcd/clientv3"
+	client "github.com/coreos/etcd/clientv3"
 
 	"github.com/shunfei/cronsun/conf"
 )
diff --git a/proc.go b/proc.go
index 36632cf..9c6c52b 100644
--- a/proc.go
+++ b/proc.go
@@ -8,7 +8,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	client "go.etcd.io/etcd/clientv3"
+	client "github.com/coreos/etcd/clientv3"
 
 	"github.com/shunfei/cronsun/conf"
 	"github.com/shunfei/cronsun/log"
diff --git a/web/info.go b/web/info.go
index 8b896a4..b6abf13 100644
--- a/web/info.go
+++ b/web/info.go
@@ -3,7 +3,7 @@ package web
 import (
 	"time"
 
-	v3 "go.etcd.io/etcd/clientv3"
+	v3 "github.com/coreos/etcd/clientv3"
 
 	"github.com/shunfei/cronsun"
 	"github.com/shunfei/cronsun/conf"
diff --git a/web/job.go b/web/job.go
index 3f397b5..643d3fb 100644
--- a/web/job.go
+++ b/web/job.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strings"
 
-	"go.etcd.io/etcd/clientv3"
+	"github.com/coreos/etcd/clientv3"
 	"github.com/gorilla/mux"
 
 	"github.com/shunfei/cronsun"
diff --git a/web/node.go b/web/node.go
index ff38af2..1ce2643 100644
--- a/web/node.go
+++ b/web/node.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	v3 "go.etcd.io/etcd/clientv3"
+	v3 "github.com/coreos/etcd/clientv3"
 	"github.com/gorilla/mux"
 	"gopkg.in/mgo.v2/bson"
 
diff --git a/web/session/session.go b/web/session/session.go
index 626a925..b258ce3 100644
--- a/web/session/session.go
+++ b/web/session/session.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"net/http"
 
-	client "go.etcd.io/etcd/clientv3"
+	client "github.com/coreos/etcd/clientv3"
 	"github.com/shunfei/cronsun"
 	"github.com/shunfei/cronsun/conf"
 	"github.com/shunfei/cronsun/log"

From e22ecda83843633e95808ec9c02331a3291592e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=85=B5=E5=85=B5?= <liubingbing@qimai.com>
Date: Thu, 16 May 2019 17:53:33 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=91=BD=E4=BB=A4=E6=98=BE=E7=A4=BA=E5=92=8C?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E8=A7=84=E5=88=99=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/ui/src/App.vue            |  2 +-
 web/ui/src/components/Job.vue | 81 ++++++++++++++++++++---------------
 2 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/web/ui/src/App.vue b/web/ui/src/App.vue
index af01c05..ced6930 100644
--- a/web/ui/src/App.vue
+++ b/web/ui/src/App.vue
@@ -66,7 +66,7 @@ export default {
 
   created: function() {
     this.locale = window.$.cookie('locale');
-    this.$store.commit('setShowWithHostname', window.$.cookie('hostshows') === 'hostname');
+    this.$store.commit('setShowWithHostname', !(window.$.cookie('hostshows') === 'ip'));
   },
 
   computed: {
diff --git a/web/ui/src/components/Job.vue b/web/ui/src/components/Job.vue
index 1966298..70c6bbd 100644
--- a/web/ui/src/components/Job.vue
+++ b/web/ui/src/components/Job.vue
@@ -1,6 +1,8 @@
 <style scope>
   .clearfix:after {content:""; clear:both; display:table;}
   .ui.fitted.checkbox {min-height: 15px;}
+  .table tbody .cmd-box td {padding: 0.2em 0 0.2em 1em !important ;background:black;color:#06f902;}
+  .table tbody .cmd-box{padding: 0.2em 0 0.2em 1em !important ;background:black;color:#06f902;}
 </style>
 <template>
   <div>
@@ -43,39 +45,42 @@
         </tr>
       </thead>
       <tbody>
-        <tr v-for="(job, index) in jobs">
-          <td class="center aligned">
-            <div class="ui icon dropdown" v-show="!batched">
-              <i class="content icon"></i>
-              <div class="menu">
-                <div class="item" v-on:click="editJob(job.group, job.id)">{{$L('edit')}}</div>
-                <div class="item" v-if="job.pause" v-on:click="changeStatus(job.group, job.id, index, !job.pause)">{{$L('open')}}</div>
-                <div class="item" v-if="!job.pause" v-on:click="changeStatus(job.group, job.id, index, !job.pause)">{{$L('pause')}}</div>
-                <div class="divider"></div>
-                <div class="item" style="color:red;" v-on:click="removeJob(job.group, job.id, index)">{{$L('delete')}}</div>
+        <template v-for="(job, index) in jobs">
+          <tr>
+            <td class="center aligned">
+              <div class="ui icon dropdown" v-show="!batched">
+                <i class="content icon"></i>
+                <div class="menu">
+                  <div class="item" v-on:click="editJob(job.group, job.id)">{{$L('edit')}}</div>
+                  <div class="item" v-if="job.pause" v-on:click="changeStatus(job.group, job.id, index, !job.pause)">{{$L('open')}}</div>
+                  <div class="item" v-if="!job.pause" v-on:click="changeStatus(job.group, job.id, index, !job.pause)">{{$L('pause')}}</div>
+                  <div class="divider"></div>
+                  <div class="item" style="color:red;" v-on:click="removeJob(job.group, job.id, index)">{{$L('delete')}}</div>
+                </div>
               </div>
-            </div>
-            <div class="ui fitted checkbox" v-show="batched">
-              <input type="checkbox" :value="job.group+'/'+job.id" v-model="batchIds"><label></label>
-            </div>
-          </td>
-          <td class="center aligned"><i class="icon" v-bind:class="{pause: job.pause, play: !job.pause, green: !job.pause}"></i></td>
-          <td>{{job.group}}</td>
-          <td>{{job.user && job.user.length > 0 ? job.user : '-'}}</td>
-          <td><router-link :to="buildEditJobURL(job.group, job.id)">{{job.name}}</router-link></td>
-          <td>
-            <span v-if="!job.latestStatus">-</span>
-            <span v-else>{{formatLatest(job.latestStatus)}}</span>
-            <br/>
-            <span>{{formatNextRunTime(job.nextRunTime)}}</span>
-          </td>
-          <td :class="{error: job.latestStatus && !job.latestStatus.success}">
-            <span v-if="!job.latestStatus">-</span>
-            <router-link v-else :to="'/log/'+job.latestStatus.refLogId">{{$L(job.latestStatus.success ? 'successed' : 'failed')}}</router-link> |
-            <router-link :to="{path: 'log', query: {latest:true, ids: job.id}}">latest</router-link> |
-            <a href="#" :title="$L('click to select a node and re-execute job')" v-on:click.prevent="showExecuteJobModal(job.name, job.group, job.id)"><i class="icon repeat"></i></a>
-          </td>
-        </tr>
+              <div class="ui fitted checkbox" v-show="batched">
+                <input type="checkbox" :value="job.group+'/'+job.id" v-model="batchIds"><label></label>
+              </div>
+            </td>
+            <td class="center aligned"><i ref="ruletip" :data-html="showTimer(job.rules)" class="icon" v-bind:class="{pause: job.pause, play: !job.pause, green: !job.pause}"></i></td>
+            <td>{{job.group}}</td>
+            <td>{{job.user && job.user.length > 0 ? job.user : '-'}}</td>
+            <td><router-link :to="buildEditJobURL(job.group, job.id)">{{job.name}}</router-link></td>
+            <td>
+              <span v-if="!job.latestStatus">-</span>
+              <span v-else>{{formatLatest(job.latestStatus)}}</span>
+              <br/>
+              <span>{{formatNextRunTime(job.nextRunTime)}}</span>
+            </td>
+            <td :class="{error: job.latestStatus && !job.latestStatus.success}">
+              <span v-if="!job.latestStatus">-</span>
+              <router-link v-else :to="'/log/'+job.latestStatus.refLogId">{{$L(job.latestStatus.success ? 'successed' : 'failed')}}</router-link> |
+              <router-link :to="{path: 'log', query: {latest:true, ids: job.id}}">latest</router-link> |
+              <a href="#" :title="$L('click to select a node and re-execute job')" v-on:click.prevent="showExecuteJobModal(job.name, job.group, job.id)"><i class="icon repeat"></i></a>
+            </td>
+          </tr>
+          <tr class="cmd-box" ><td colspan="7">{{job.cmd}}</td></tr>
+        </template>
       </tbody>
     </table>
     <ExecuteJob ref="executeJobModal"/>
@@ -100,7 +105,7 @@ export default {
       jobs: []
     }
   },
-  
+
   mounted: function(){
     this.fillParams();
     var vm = this;
@@ -157,6 +162,7 @@ export default {
         vm.jobs = resp;
         vm.$nextTick(()=>{
           $(vm.$el).find('table .ui.dropdown').dropdown();
+          $(vm.$refs.ruletip).popup();
         });
       }).do();
     },
@@ -194,7 +200,7 @@ export default {
 
     formatExecResult: function(st){
       if (!st) return '-';
-      return 
+      return
     },
 
     formatLatest: function(latest){
@@ -209,6 +215,13 @@ export default {
       this.$refs.executeJobModal.show(jobName, jobGroup, jobId);
     },
 
+    showTimer: function(rules){
+      var timers = rules.map(function (rule) {
+        return rule.timer;
+      });
+      return timers.join("\n");
+    },
+
     batch: function(op){
       switch(op) {
         case 'start': break;

From b326093d654f93dd657a9c1b8016c4fdb2e84101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=85=B5=E5=85=B5?= <liubingbing@qimai.com>
Date: Thu, 27 Aug 2020 13:31:04 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=BF=87=E5=A4=9A=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/csctl/cmd/restore.go | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/bin/csctl/cmd/restore.go b/bin/csctl/cmd/restore.go
index 3218994..570e80a 100644
--- a/bin/csctl/cmd/restore.go
+++ b/bin/csctl/cmd/restore.go
@@ -71,10 +71,23 @@ var (
 	valBuf    = make([]byte, 1024)
 )
 
+func fixRead(r io.Reader, p []byte) (int, error)  {
+	valLen, readLen := len(p), 0
+	for readLen != valLen {
+		n, err := r.Read(p[readLen:])
+		readLen += n
+		if err != nil {
+			return readLen, err
+		}
+	}
+	return readLen, nil
+}
+
+
 func restoreKvs(r io.Reader, keyPrefix string, storeChan chan *kv, wg *sync.WaitGroup) error {
 	for {
 		// read length of key
-		n, err := r.Read(keyLenBuf)
+		n, err := fixRead(r, keyLenBuf)
 		if err == io.EOF && n != 0 {
 			return fmt.Errorf("unexcepted data, the file may broken")
 		} else if err == io.EOF && n == 0 {
@@ -82,28 +95,28 @@ func restoreKvs(r io.Reader, keyPrefix string, storeChan chan *kv, wg *sync.Wait
 		} else if err != nil {
 			return err
 		}
-		keylen := binary.LittleEndian.Uint16(keyLenBuf)
+		keyLen := binary.LittleEndian.Uint16(keyLenBuf)
 
 		// read key
-		if n, err = r.Read(keyBuf[:keylen]); err != nil {
+		if n, err = fixRead(r, keyBuf[:keyLen]); err != nil {
 			return err
 		}
-		key := keyBuf[:keylen]
+		key := keyBuf[:keyLen]
 
 		// read length of value
-		if n, err = r.Read(valLenBuf); err != nil {
+		if n, err = fixRead(r, valLenBuf); err != nil {
 			return err
 		}
-		vallen := binary.LittleEndian.Uint32(valLenBuf)
+		valLen := binary.LittleEndian.Uint32(valLenBuf)
 
 		// read value
-		if len(valBuf) < int(vallen) {
-			valBuf = make([]byte, vallen*2)
+		if len(valBuf) < int(valLen) {
+			valBuf = make([]byte, valLen*2)
 		}
-		if n, err = r.Read(valBuf[:vallen]); err != nil && err != io.EOF {
+		if n, err = fixRead(r, valBuf[:valLen]); err != nil && err != io.EOF {
 			return err
 		}
-		value := valBuf[:vallen]
+		value := valBuf[:valLen]
 
 		wg.Add(1)
 		storeChan <- &kv{