Merge branch 'feature/tmr-group' of baishaojie/tmrgo into develop

.drone.yml

@@ -0,0 +1,42 @@
+kind: pipeline
+type: docker
+name: kpt-tmr
+
+steps:
+  - name: build
+    image: plugins/docker
+    volumes:
+      - name: hosts
+        path: /etc/hosts
+      - name: docker-ca
+        path: /etc/docker
+      - name: docker-sock
+        path: /var/run/docker.sock
+    settings:
+      dockerfile: /drone/src/Dockerfile
+      username:
+        from_secret: aliyun_name
+      password:
+        from_secret: aliyun_password
+      repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/kpt-tmr
+      registry: registry.cn-hangzhou.aliyuncs.com
+      tags: [ 1.0.0,latest ]
+
+trigger:
+  branch:
+    include:
+      - develop
+  event:
+    include:
+      - push
+
+volumes:
+  - name: host
+    host:
+      path: /etc/host
+  - name: docker-ca
+    host:
+      path: /ect/docker
+  - name: docker-sock
+    host:
+      path: /var/run/docker.sock

.gitignore

@@ -17,4 +17,6 @@ runtime/*
 */vendor
 logs/*
 go-admin*
-go-admin.exe
+go-admin.exe
+
+.vscode

.vscode/launch.json

@@ -1,7 +0,0 @@
-{
-    // 使用 IntelliSense 了解相关属性。 
-    // 悬停以查看现有属性的描述。
-    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": []
-}

Dockerfile

@@ -0,0 +1,15 @@
+FROM alpine:latest
+
+LABEL name="kpt-tmr" \
+description="pt service" \
+owner="yiping.xu"
+
+WORKDIR /bin
+
+ADD ./bin/kptTmr /bin/kptTmr
+COPY config/ /bin/config/
+
+EXPOSE 8081
+VOLUME /bin/logger
+
+CMD ["/bin/kptTmr"]

comm/comm.go

@@ -1,19 +1,20 @@
 package comm
 
 import (
-	"../pkg/app"
-	"../pkg/e"
-	"../pkg/setting"
-	"../routers/restful"
 	"encoding/hex"
 	"fmt"
-	"github.com/gin-gonic/gin"
-	"github.com/jacobsa/go-serial/serial"
 	"log"
 	"net/http"
 	"reflect"
 	"time"
+	"tmr-watch/conf/setting"
+	"tmr-watch/http/handle/restful"
+	"tmr-watch/pkg/app"
+	"tmr-watch/pkg/e"
 	"unsafe"
+
+	"github.com/gin-gonic/gin"
+	"github.com/jacobsa/go-serial/serial"
 )
 
 //一个已经被关闭的channel不会阻塞，已经被关闭的channel会实时返回

conf/app.ini

@@ -47,7 +47,7 @@ Type = mysql
 User = root
 #Password = root
 #Host = 192.168.1.93:3326
-Host = 127.0.0.1:3316
+Host = 127.0.0.1:3306
 #Name = haiyuan
 #Password = root
 #Password = root
@@ -57,7 +57,7 @@ Host = 127.0.0.1:3316
 #Password = keep
 
 #Password = kptzhu@163.com
-Password = root
+Password = 123456
 #Password = kepaiteng!QAZ
 #Host = 47.92.52.73:3306
 #Host = 127.0.0.1:3306

pkg/setting/setting.go → conf/setting/setting.go

@@ -12,7 +12,18 @@ import (
 
 	"github.com/go-ini/ini"
 	"github.com/jacobsa/go-serial/serial"
-	"github.com/kptyun/KPTCOMM/pkg/util"
+)
+
+var (
+	AppSetting       = &App{}
+	ServerSetting    = &Server{}
+	CommSetting      = &serial.OpenOptions{}
+	SnowIds          *IdWorker
+	DatabaseSetting  = &Database{}
+	SQlserverSetting = &SQlserver{}
+	YynserverSetting = &Yyn{}
+	cfg              *ini.File
+	CurrentPath      string
 )
 
 type App struct {
@@ -44,8 +55,6 @@ type App struct {
 	TimeFormat  string
 }
 
-var AppSetting = &App{}
-
 type Server struct {
 	RunMode          string
 	HttpPort         int
@@ -65,11 +74,6 @@ type Server struct {
 	GRFDURL          string
 }
 
-var ServerSetting = &Server{}
-
-var CommSetting = &serial.OpenOptions{}
-var SnowIds *util.IdWorker
-
 type Database struct {
 	Type          string
 	User          string
@@ -97,37 +101,6 @@ type Yyn struct {
 	HeartBeat    string
 }
 
-var DatabaseSetting = &Database{}
-
-var SQlserverSetting = &SQlserver{}
-
-var YynserverSetting = &Yyn{}
-
-var cfg *ini.File
-
-var CurrentPath string
-
-func GetCurrentPath() (string, error) {
-	file, err := exec.LookPath(os.Args[0])
-	if err != nil {
-		return "", err
-	}
-	path, err := filepath.Abs(file)
-	if err != nil {
-		return "", err
-	}
-	//fmt.Println("path111:", path)
-	if runtime.GOOS == "windows" {
-		path = strings.Replace(path, "\\", "/", -1)
-	}
-	//fmt.Println("path222:", path)
-	i := strings.LastIndex(path, "/")
-	if i < 0 {
-		return "", errors.New(`Can't find "/" or "\".`)
-	}
-	//fmt.Println("path333:", path)
-	return string(path[0 : i+1]), nil
-}
 func Setup(dir string) {
 	var err error
 	if strings.Trim(dir, " ") == "" {
@@ -140,7 +113,7 @@ func Setup(dir string) {
 		log.Fatalf("setting.Setup, fail to parse 'conf/app.ini': %v", err)
 	}
 
-	SnowIds, err = util.NewIdWorker(1)
+	SnowIds, err = NewIdWorker(1)
 	if err != nil {
 		log.Fatalf("setting.Setup, fail to create SnowIds: %v", err)
 	}
@@ -163,6 +136,25 @@ func Setup(dir string) {
 
 }
 
+func GetCurrentPath() (string, error) {
+	file, err := exec.LookPath(os.Args[0])
+	if err != nil {
+		return "", err
+	}
+	path, err := filepath.Abs(file)
+	if err != nil {
+		return "", err
+	}
+	if runtime.GOOS == "windows" {
+		path = strings.Replace(path, "\\", "/", -1)
+	}
+	i := strings.LastIndex(path, "/")
+	if i < 0 {
+		return "", errors.New(`Can't find "/" or "\".`)
+	}
+	return path[0 : i+1], nil
+}
+
 func mapTo(section string, v interface{}) {
 	err := cfg.Section(section).MapTo(v)
 	if err != nil {

conf/setting/snowflake.go

@@ -0,0 +1,120 @@
+package setting
+
+import (
+	"errors"
+	"fmt"
+	"sync"
+	"time"
+)
+
+const (
+	twepoch        = int64(1417937700000) // 默认起始的时间戳 1449473700000 。计算时，减去这个值
+	DistrictIdBits = uint(5)              //区域 所占用位置
+	NodeIdBits     = uint(9)              //节点 所占位置
+	sequenceBits   = uint(10)             //自增ID 所占用位置
+
+	/*
+	 * 1 符号位  |  39 时间戳                                     | 5 区域  |  9 节点       | 10 （毫秒内）自增ID
+	 * 0        |  0000000 00000000 00000000 00000000 00000000  | 00000  | 000000 000   |  000000 0000
+	 *
+	 */
+	maxNodeId     = -1 ^ (-1 << NodeIdBits)     //节点 ID 最大范围
+	maxDistrictId = -1 ^ (-1 << DistrictIdBits) //最大区域范围
+
+	nodeIdShift        = sequenceBits //左移次数
+	DistrictIdShift    = sequenceBits + NodeIdBits
+	timestampLeftShift = sequenceBits + NodeIdBits + DistrictIdBits
+	sequenceMask       = -1 ^ (-1 << sequenceBits)
+	maxNextIdsNum      = 100 //单次获取ID的最大数量
+)
+
+type IdWorker struct {
+	sequence      int64 //序号
+	lastTimestamp int64 //最后时间戳
+	nodeId        int64 //节点ID
+	twepoch       int64
+	districtId    int64
+	mutex         sync.Mutex
+}
+
+// NewIdWorker new a snowflake id generator object.
+func NewIdWorker(NodeId int64) (*IdWorker, error) {
+	var districtId int64
+	districtId = 1 //暂时默认给1 ，方便以后扩展
+	idWorker := &IdWorker{}
+	if NodeId > maxNodeId || NodeId < 0 {
+		fmt.Sprintf("NodeId Id can't be greater than %d or less than 0", maxNodeId)
+		return nil, errors.New(fmt.Sprintf("NodeId Id: %d error", NodeId))
+	}
+	if districtId > maxDistrictId || districtId < 0 {
+		fmt.Sprintf("District Id can't be greater than %d or less than 0", maxDistrictId)
+		return nil, errors.New(fmt.Sprintf("District Id: %d error", districtId))
+	}
+	idWorker.nodeId = NodeId
+	idWorker.districtId = districtId
+	idWorker.lastTimestamp = -1
+	idWorker.sequence = 0
+	idWorker.twepoch = twepoch
+	idWorker.mutex = sync.Mutex{}
+	fmt.Sprintf("worker starting. timestamp left shift %d, District id bits %d, worker id bits %d, sequence bits %d, workerid %d", timestampLeftShift, DistrictIdBits, NodeIdBits, sequenceBits, NodeId)
+	return idWorker, nil
+}
+
+// timeGen generate a unix millisecond.
+func timeGen() int64 {
+	return time.Now().UnixNano() / int64(time.Millisecond)
+}
+
+// tilNextMillis spin wait till next millisecond.
+func tilNextMillis(lastTimestamp int64) int64 {
+	timestamp := timeGen()
+	for timestamp <= lastTimestamp {
+		timestamp = timeGen()
+	}
+	return timestamp
+}
+
+// NextId get a snowflake id.
+func (id *IdWorker) NextId() (int64, error) {
+	id.mutex.Lock()
+	defer id.mutex.Unlock()
+	return id.nextid()
+}
+
+// NextIds get snowflake ids.
+func (id *IdWorker) NextIds(num int) ([]int64, error) {
+	if num > maxNextIdsNum || num < 0 {
+		fmt.Sprintf("NextIds num can't be greater than %d or less than 0", maxNextIdsNum)
+		return nil, errors.New(fmt.Sprintf("NextIds num: %d error", num))
+	}
+	ids := make([]int64, num)
+	id.mutex.Lock()
+	defer id.mutex.Unlock()
+	for i := 0; i < num; i++ {
+		ids[i], _ = id.nextid()
+	}
+	return ids, nil
+}
+
+func (id *IdWorker) nextid() (int64, error) {
+	//取毫秒时间戳
+	timestamp := timeGen()
+	//id.lastTimestamp 最后的时间戳
+	if timestamp < id.lastTimestamp {
+		//    fmt.Sprintf("clock is moving backwards.  Rejecting requests until %d.", id.lastTimestamp)
+		return 0, errors.New(fmt.Sprintf("Clock moved backwards.  Refusing to generate id for %d milliseconds", id.lastTimestamp-timestamp))
+	}
+
+	// 最后时间戳 = 当前时间戳
+	if id.lastTimestamp == timestamp {
+		// sequence 序号
+		id.sequence = (id.sequence + 1) & sequenceMask
+		if id.sequence == 0 {
+			timestamp = tilNextMillis(id.lastTimestamp)
+		}
+	} else {
+		id.sequence = 0
+	}
+	id.lastTimestamp = timestamp
+	return ((timestamp - id.twepoch) << timestampLeftShift) | (id.districtId << DistrictIdShift) | (id.nodeId << nodeIdShift) | id.sequence, nil
+}