From cd0e3e77b769396ba634429b25ae6c8a448a73f6 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 21 五月 2019 17:49:12 +0800
Subject: [PATCH] update submodule url
---
protomsg | 2 +-
entites.go | 37 ++++++++-----------------------------
2 files changed, 9 insertions(+), 30 deletions(-)
diff --git a/entites.go b/entites.go
index 9724f6a..c6b599d 100644
--- a/entites.go
+++ b/entites.go
@@ -74,7 +74,6 @@
Enable bool
IsAlarm bool
DelFlag bool
- Isfull bool
}
//鎽勫儚鏈轰换鍔�
@@ -91,9 +90,8 @@
type TasksRes struct {
Task Task `json:"task"` //浠诲姟缁撴瀯浣�
Sdks []Sdk `json:"sdks"` //浠诲姟瀵瑰簲鐨勭畻娉曚俊鎭拰鍙傛暟
- CtlTime TimeCtl `json:"ctlTime"`
LinkType string `json:"linkType"`
- SdkFrames Frame `json:"sdkFrames"` //鐢绘鐨勭粨鏋�
+
}
//浠诲姟鍜岀畻娉曞叧鑱�
@@ -107,7 +105,7 @@
//绠楁硶缁撴瀯浣�
type Sdk struct {
BaseEntity
- SdkName string `json:"sdkName"` //绠楁硶鍚嶇О
+ SdkName string `json:"sdk_name"` //绠楁硶鍚嶇О
Args string `json:"args"` //绠楁硶鍙傛暟
Icon string `json:"icon"` //绠楁硶鍥炬爣
Url string `json:"url"` //绠楁硶涓嬭浇鍦板潃
@@ -115,8 +113,7 @@
//绠楁硶鍙傛暟瀹氫箟
type SdkArg struct {
- Id string `json:"id"` //鍙傛暟id
- Key string `json:"key"` //鍙傛暟鐨刱ey
+ Alias string `json:"alias"` //鍙傛暟鐨勫埆鍚�
Name string `json:"name"` //鍙傛暟鍚嶇О
Type string `json:"type"` //鍙傛暟绫诲瀷(鏁存暟锛屽瓧绗︿覆鎴栨暟缁�)
Must bool `json:"must"` //鏄惁蹇呭～
@@ -125,31 +122,13 @@
}
//鏃堕棿鍙傛暟,浠庡懆涓�鍒板懆鏃ユ煇澶╃殑寮�濮嬫椂闂村拰缁撴潫鏃堕棿,controller鐢�
-type TimeCtl struct {
- MondayStart string `json:"mondayStart"`
- MondayEnd string `json:"mondayEnd"`
- TuesdayStart string `json:"tuesdayStart"`
- TuesdayEnd string `json:"tuesdayEnd"`
- WednesdayStart string `json:"wednesdayStart"`
- WednesdayEnd string `json:"wednesdayEnd"`
- ThursdayStart string `json:"thursdayStart"`
- ThursdayEnd string `json:"thursdayEnd"`
- FridayStart string `json:"fridayStart"`
- FridayEnd string `json:"fridayEnd"`
- SaturdayStart string `json:"saturdayStart"`
- SaturdayEnd string `json:"saturdayEnd"`
- SundayStart string `json:"sundayStart"`
- SundayEnd string `json:"sundayEnd"`
-}
-
-//鐢绘鐨勭粨鏋勪綋
-type Frame struct {
- Area [][]Point `json:"area"`
- Arrow []Point `json:"arrow"`
+type TimeRange struct {
+ Start string
+ End string
}
//澶氳竟褰㈢粨鏋勪綋
type Point struct {
- X string `json:"x"`
- Y string `json:"y"`
+ X int32 `json:"x"`
+ Y int32 `json:"y"`
}
diff --git a/protomsg b/protomsg
index dd1ef99..fc2d2bc 160000
--- a/protomsg
+++ b/protomsg
@@ -1 +1 @@
-Subproject commit dd1ef998554df4189cf6c2115548689e5825d299
+Subproject commit fc2d2bcbdea4e392cfb0a81d8b1365854faaed60
--
Gitblit v1.8.0