合并develop

client.go

@@ -120,7 +120,7 @@ func (c *Client) DelLock(key string) error {
 }
 
 func IsValidAsKeyPath(s string) bool {
-	return strings.IndexByte(s, '/') == -1
+	return strings.IndexAny(s, "/\\") == -1
 }
 
 // etcdTimeoutContext return better error info

conf/conf.go

@@ -11,7 +11,7 @@ import (
 	client "github.com/coreos/etcd/clientv3"
 	"github.com/fsnotify/fsnotify"
 	"github.com/go-gomail/gomail"
-	"github.com/satori/go.uuid"
+	"github.com/gofrs/uuid"
 
 	"github.com/shunfei/cronsun/db"
 	"github.com/shunfei/cronsun/event"

errors.go

@@ -8,8 +8,8 @@ var (
 
 	ErrEmptyJobName        = errors.New("Name of job is empty.")
 	ErrEmptyJobCommand     = errors.New("Command of job is empty.")
-	ErrIllegalJobId        = errors.New("Invalid id that includes illegal characters such as '/'.")
-	ErrIllegalJobGroupName = errors.New("Invalid job group name that includes illegal characters such as '/'.")
+	ErrIllegalJobId        = errors.New("Invalid id that includes illegal characters such as '/' '\\'.")
+	ErrIllegalJobGroupName = errors.New("Invalid job group name that includes illegal characters such as '/' '\\'.")
 
 	ErrEmptyNodeGroupName = errors.New("Name of node group is empty.")
 	ErrIllegalNodeGroupId = errors.New("Invalid node group id that includes illegal characters such as '/'.")

web/ui/index.html

@@ -61,7 +61,7 @@
   <div id="app">
     <div id="initloader"></div>
   </div>
-  <script src="build.js?v=9bb382d"></script>
+  <script src="build.js?v=ed6e655"></script>
 </body>
 
 </html>

web/ui/src/components/JobEditForm.vue

@@ -211,7 +211,7 @@ export default {
             }
           }
         }).
-        onfailed((msg)=> vm.$bus.$emit('error', data)).
+        onfailed((msg)=> vm.$bus.$emit('error', msg)).
         do();
     }