From c745a4cc47e0197cda820a7ed0752d0cfebfefe7 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期一, 04 九月 2023 18:02:02 +0800
Subject: [PATCH] 删除无关的应用

---
 /dev/null |   78 ---------------------------------------
 Makefile  |    9 ----
 2 files changed, 0 insertions(+), 87 deletions(-)

diff --git a/Makefile b/Makefile
index 68ec2a4..4385d2a 100644
--- a/Makefile
+++ b/Makefile
@@ -17,16 +17,7 @@
 
 ifeq ($(MAKECMDGOALS),base)
 	SUB_DIR := api-gateway \
-	appcenter-service \
-	camera-service \
-	chanmanage-service \
-	compTable-service \
-	gb28181-service \
 	log-service \
-	push-service \
-	realtime-service \
-	scene-service \
-	search-service \
 	sysinfo-service \
 	system-service \
 	version-control
diff --git a/serf-daemon/Makefile b/serf-daemon/Makefile
deleted file mode 100644
index 9d3abe8..0000000
--- a/serf-daemon/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-BUILD_VERSION := 1.1.1
-#APP_NAME      := myversion
-
-include ../module.dep
-
-
-
diff --git a/serf-daemon/main.go b/serf-daemon/main.go
deleted file mode 100644
index 388288f..0000000
--- a/serf-daemon/main.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package main
-
-import (
-	"basic.com/valib/logger.git"
-	_ "basic.com/valib/version.git"
-	"context"
-	"flag"
-	"vamicro/config"
-	"vamicro/serf-daemon/models"
-	"vamicro/serf-daemon/service"
-)
-
-var (
-	procName = "serf-daemon"
-	//proc = &bhomeclient.ProcInfo{
-	//	Name: procName, //杩涚▼鍚嶇О
-	//	ID: procName, //杩涚▼id
-	//	Info: "", //杩涚▼鐨勬弿杩颁俊鎭紝鐢ㄤ簬鍖哄垎鍚屼竴杩涚▼鍚嶇О涓嬪涓繘绋�
-	//}
-	env = flag.String("e", "pro", "")
-)
-
-func init() {
-	flag.Parse()
-	config.Init(*env)
-	// 鏃ュ織鍒濆鍖�
-	var logFile = config.LogConf.Path + "vamicro-"+procName+".log"
-	logger.InitLogger(logFile, config.LogConf.Level, config.LogConf.MaxSize, config.LogConf.MaxBackups, config.LogConf.MaxAge)
-	logger.Info("log init success !")
-}
-
-// serf1杩涚▼锛岄泦缇ゅ唴婕傜Щip鐨勪富鑺傜偣鎵嶄細鍚姩姝よ繘绋�
-// 澶氫釜闆嗙兢涔嬮棿閫氳繃姝よ繘绋嬭繛鎺ュ埌涓�璧风粍鎴愪簩绾ч泦缇�,鍋氭暟鎹粺璁″拰绠＄悊
-// 鍐呴儴鍖呭惈鏈夊悇涓繘绋嬩腑鐨勮澶�-搴旂敤-绠楁硶绛夋暟鎹�
-// 璁惧绠＄悊杩涚▼閫氳繃rpc璋冪敤姝よ繘绋嬭幏鍙栦笟鍔℃暟鎹�
-// 姝よ繘绋嬩篃鍙�氳繃rpc鑾峰彇serf0(system-service)涓殑鏁版嵁
-func main() {
-	flag.Parse()
-	models.Init()
-	defer models.CloseDB()
-
-	ctx := context.Background()
-	if err := service.Start(ctx);err != nil {
-		logger.Debug("err:", err)
-		return
-	}
-	select {
-
-	}
-}
\ No newline at end of file
diff --git a/serf-daemon/models/db.go b/serf-daemon/models/db.go
deleted file mode 100644
index 854b674..0000000
--- a/serf-daemon/models/db.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package models
-
-import (
-	"basic.com/valib/logger.git"
-	"github.com/jinzhu/gorm"
-	"vamicro/config"
-)
-
-var db *gorm.DB
-var err error
-
-// Init creates a connection to mysql database and
-// migrates any new models
-func Init() {
-	db, err = gorm.Open(config.DBconf.Name, "../config/serf-daemon.db")
-	if err != nil {
-		logger.Debug("db open error ", err)
-	}
-	//db.LogMode(true)
-	//db.SetLogger(&DbLogger{})
-	db.AutoMigrate(&Device{}, &DeviceApp{}, &DeviceSdk{})
-}
-
-//GetDB ...
-func GetDB() *gorm.DB {
-	return db
-}
-
-func CloseDB() {
-	db.Close()
-}
diff --git a/serf-daemon/models/device.go b/serf-daemon/models/device.go
deleted file mode 100644
index 29f7dd5..0000000
--- a/serf-daemon/models/device.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package models
-
-import "strconv"
-
-type Device struct {
-	Id 				string 			`gorm:"primary_key;column:id" json:"id"`
-	DevId 			string 			`gorm:"column:devId;unique;not null;" json:"devId"`         //璁惧id
-	DevType 		string 			`gorm:"column:devType" json:"devType"` 						//璁惧绫诲瀷锛屽锛氬瓨鍌ㄣ�佸垎鏋�(鐩掑瓙鎴朼md鏈嶅姟鍣�)銆佸垎鏋愬瓨鍌ㄤ竴浣�
-	DevMode 		string 			`gorm:"column:devMode" json:"devMode"` 						//璁惧鍨嬪彿,濡傦細Bsk-JS1000X
-	DevName 		string 			`gorm:"column:devName" json:"devName"`						//璁惧鍚嶇О
-	MachineCode 	string 			`gorm:"column:machineCode" json:"machineCode"`				//鏈哄櫒鐮�
-	ActivateCode 	string 			`gorm:"column:activateCode" json:"activateCode"`			//婵�娲荤爜
-	ProductId 		string 			`gorm:"column:productId" json:"productId"`					//浜у搧id
-	UserId 			string 			`gorm:"column:userId" json:"userId"`						//鐢ㄦ埛id
-	Address 		string 			`gorm:"column:address" json:"address"`						//鍦板潃
-	DevIp 		 	string 			`gorm:"column:devIp" json:"devIp"`							//ip
-	DevCpu			string 			`gorm:"column:devCpu" json:"devCpu"` 						//cpu
-	DevGpu			string 			`gorm:"column:devGpu" json:"devGpu"`						//gpu
-	Mem 			int 			`gorm:"column:mem" json:"mem"`  							//鍐呭瓨
-	Disk 			string 			`gorm:"column:disk" json:"disk"`  							//纭洏
-	ChannelCount 	int 			`gorm:"column:channelCount;default:16" json:"channelCount"` //绠楀姏鏁伴噺
-	MasterVersion 	string 			`gorm:"column:masterVersion" json:"masterVersion"`   		//涓绘帶鐗堟湰
-	WebVersion 		string 			`gorm:"column:webVersion" json:"webVersion"`   				//web鐗堟湰
-	ServerPort 		string 			`gorm:"column:serverPort" json:"serverPort"`   				//绔彛锛氶粯璁�7003
-	SubMask 		string 			`gorm:"column:subMask" json:"subMask"`		   				//瀛愮綉鎺╃爜
-	Gateway 		string 			`gorm:"column:gateway" json:"gateway"` 		   				//缃戝叧
-	Dns 			string 			`gorm:"column:dns" json:"dns"` 				   				//dns
-	Runtime 		string 			`gorm:"column:runtime" json:"runtime"`         				//杩愯鏃堕暱
-
-	InstallTime 	string 			`gorm:"column:installTime" json:"installTime"`   			//瀹夎鏃堕棿
-	FirstUseTime 	string 			`gorm:"column:firstUseTime" json:"firstUseTime"` 			//棣栨浣跨敤鏃堕棿
-
-	//闆嗙兢鐩稿叧淇℃伅
-	ClusterId 		string 			`gorm:"column:clusterId" json:"clusterId"`       			//闆嗙兢id
-	ClusterName 	string 			`gorm:"column:clusterName" json:"clusterName"`				//闆嗙兢鍚嶇О
-	Status 			int 			`gorm:"column:status;default:0;" json:"status"`             //鐘舵�� -1:绂荤嚎, 1:鍦ㄧ嚎
-
-	CreateTime 		string 			`gorm:"column:createTime" json:"createTime"`                //璁板綍鏃堕棿
-	UpdateTime 		string 			`gorm:"column:updateTime" json:"updateTime"`				//鏇存柊鏃堕棿
-}
-
-const (
-	DevStatus_OnLine = 1   //鍦ㄧ嚎
-	DevStatus_OffLine = -1   //绂荤嚎
-)
-
-func (Device) TableName() string {
-	return "t_device"
-}
-
-func (d *Device) Insert() bool {
-	result := db.Table(d.TableName()).Create(&d)
-	if result.Error !=nil {
-		return false
-	}
-	return result.RowsAffected>0
-}
-
-func (d *Device) Update() bool {
-	result := db.Table(d.TableName()).Update(&d)
-	if result.Error !=nil {
-		return false
-	}
-	return result.RowsAffected>0
-}
-
-func (d *Device) SelectById(id string) (int64, error){
-	result := db.Table(d.TableName()).Where("id=?",id).First(&d)
-	if result.Error != nil || result.RowsAffected == 0 {
-		return 0, err
-	}
-	return result.RowsAffected, nil
-}
-
-func (d *Device) FindByDevId(devId string) (int64,error) {
-	result := db.Table(d.TableName()).Where("devId=?", devId).First(&d)
-	if result.Error != nil || result.RowsAffected == 0 {
-		return 0, result.Error
-	}
-	return result.RowsAffected, nil
-}
-
-func (d *Device) FindAll() (list []Device){
-	if err:=db.Table(d.TableName()).Scan(&list).Error;err !=nil{
-		return nil
-	}
-	return list
-}
-
-type DevClusterGroup struct {
-	ClusterId 		string 		`json:"clusterId"`   //闆嗙兢id
-	ClusterName 	string 		`json:"clusterName"` //闆嗙兢鍚嶇О
-	Count 			int 		`json:"count"`       //鏁伴噺
-}
-func (d *Device) GroupByCluster() (list []DevClusterGroup) {
-	err := db.Raw("select clusterId,clusterName,count(1) as count from "+d.TableName()+" where clusterId!='' group by clusterId,clusterName order by clusterId asc").Scan(&list).Error
-	if err != nil {
-		return nil
-	}
-	return list
-}
-
-func (d *Device) PageAllDev(page int, size int, status int, inputTxt string) (list []Device, err error) {
-	sql := "select * from "+d.TableName()+" where 1=1"
-	from := (page-1)*size
-	if inputTxt != "" {
-		sql += " and devName like '%"+inputTxt+"%'"
-	}
-	if status == DevStatus_OnLine || status == DevStatus_OffLine {
-		sql += " and status="+strconv.Itoa(status)
-	}
-	sql += " order by createTime limit "+strconv.Itoa(from)+","+strconv.Itoa(size)+""
-	err = db.Raw(sql).Scan(&list).Error
-	if err != nil {
-		return nil, err
-	}
-	return
-}
-
-func (d *Device) PageDevByCluster(page int, size int, clusterId string, status int, inputTxt string) (list []Device, err error) {
-	sql := "select * from "+d.TableName()+" where 1=1 and clusterId='"+clusterId+"'"
-	from := (page-1)*size
-	if inputTxt != "" {
-		sql += " and devName like '%"+inputTxt+"%'"
-	}
-	if status == DevStatus_OnLine || status == DevStatus_OffLine {
-		sql += " and status="+strconv.Itoa(status)
-	}
-
-	sql += " order by createTime desc limit "+strconv.Itoa(from)+","+strconv.Itoa(size)+""
-	err = db.Raw(sql).Scan(&list).Error
-	if err != nil {
-		return nil, err
-	}
-	return
-
-}
diff --git a/serf-daemon/models/deviceApp.go b/serf-daemon/models/deviceApp.go
deleted file mode 100644
index f00aa48..0000000
--- a/serf-daemon/models/deviceApp.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package models
-
-type DeviceApp struct {
-	Id 				string 		`gorm:"column:id;primary_key;type:varchar(50);unique;not null;" json:"id"`
-	DevId 			string 		`gorm:"column:devId" json:"devId"`
-	MachineCode 	string 		`gorm:"column:machineCode" json:"machineCode"`
-	ActivateCode 	string 		`gorm:"column:activateCode" json:"activateCode"`
-	AppId 			string 		`gorm:"column:appId" json:"appId"`
-	ExpireTime 		string 		`gorm:"column:expireTime" json:"expireTime"` 	 //婵�娲绘椂闂�
-	InstallTime 	string 		`gorm:"column:installTime" json:"installTime"`   //瀹夎鏃堕棿
-}
-
-func (DeviceApp) TableName() string {
-	return "t_device_app"
-}
-
-func (da *DeviceApp) Insert() bool {
-	result := db.Table(da.TableName()).Create(&da)
-	if result.Error == nil && result.RowsAffected > 0 {
-		return true
-	}
-	return false
-}
-
-func (da *DeviceApp) Update() bool {
-	result := db.Table(da.TableName()).Where("id=?", da.Id).Update(&da)
-	if result.Error ==nil && result.RowsAffected > 0 {
-		return true
-	}
-	return false
-}
-
-func (da *DeviceApp) DeleteById(id string) bool {
-	result := db.Exec("delete from "+da.TableName()+" where id='"+id+"'")
-	if result.Error == nil && result.RowsAffected > 0 {
-		return true
-	}
-	return false
-}
-
-func (da *DeviceApp) FindByActivateCode(activateCode string) (list []DeviceApp, err error) {
-	result := db.Table(da.TableName()).Where("activateCode=?", activateCode).Find(&list)
-	if result.Error != nil {
-		return []DeviceApp{},result.Error
-	}
-	return list, nil
-}
-
-func (da *DeviceApp) FindByMachineCode(machineCode string, serverId string) (list []DeviceApp, err error) {
-	result := db.Table(da.TableName()).Where("machineCode=? or devId=?", machineCode, serverId).Order("installTime desc").Find(&list)
-	if result.Error != nil {
-		return []DeviceApp{},result.Error
-	}
-	return list, nil
-}
\ No newline at end of file
diff --git a/serf-daemon/models/deviceSdk.go b/serf-daemon/models/deviceSdk.go
deleted file mode 100644
index 27f3926..0000000
--- a/serf-daemon/models/deviceSdk.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package models
-
-type DeviceSdk struct {
-	Id 				string 		`gorm:"column:id;primary_key;type:varchar(50);unique;not null;" json:"id"`
-	DevId 			string 		`gorm:"column:devId" json:"devId"`
-	MachineCode 	string 		`gorm:"column:machineCode" json:"machineCode"`
-	ActivateCode 	string 		`gorm:"column:activateCode" json:"activateCode"`
-	SdkId 			string 		`gorm:"column:sdkId" json:"sdkId"`
-	ExpireTime 		string 		`gorm:"column:expireTime" json:"expireTime"`
-	InstallTime 	string 		`gorm:"column:installTime" json:"installTime"`   //瀹夎鏃堕棿
-
-}
-
-func (DeviceSdk) TableName() string {
-	return "t_device_sdk"
-}
-
-func (ds *DeviceSdk) Insert() bool {
-	result := db.Table(ds.TableName()).Create(&ds)
-	if result.Error == nil && result.RowsAffected > 0 {
-		return true
-	}
-	return false
-}
-
-func (ds *DeviceSdk) Update() bool {
-	result := db.Table(ds.TableName()).Where("id=?", ds.Id).Update(&ds)
-	if result.Error ==nil && result.RowsAffected > 0 {
-		return true
-	}
-	return false
-}
-
-func (ds *DeviceSdk) DeleteById(id string) bool {
-	result := db.Exec("delete from "+ds.TableName()+" where id='"+id+"'")
-	if result.Error == nil && result.RowsAffected > 0 {
-		return true
-	}
-	return false
-}
-
-func (ds *DeviceSdk) FindByActivateCode(activateCode string) (list []DeviceSdk, err error) {
-	result := db.Table(ds.TableName()).Where("activateCode=?", activateCode).Find(&list)
-	if result.Error != nil {
-		return []DeviceSdk{},result.Error
-	}
-	return list, nil
-}
-
-func (ds *DeviceSdk) FindByMachineCode(machineCode string, serverId string) (list []DeviceSdk, err error) {
-	result := db.Table(ds.TableName()).Where("machineCode=? or devId=?", machineCode, serverId).Order("installTime desc").Find(&list)
-	if result.Error != nil {
-		return []DeviceSdk{},result.Error
-	}
-	return list, nil
-}
-
-func (ds *DeviceSdk) FindByMacAndSdk(macCode, serverId, sdkId string) (list []DeviceSdk, err error) {
-	result := db.Table(ds.TableName()).Where("(machineCode=? or devId=?) and sdkId=?", macCode, serverId, sdkId).Find(&list)
-	if result.Error != nil {
-		return []DeviceSdk{},result.Error
-	}
-	return list, nil
-}
-
-//鎸夎澶噄d缁熻绠楁硶鏁伴噺
-func (ds *DeviceSdk) CountByDevId(devId string) (int,error) {
-	var count int
-	if err := db.Raw("select count(1) as count from "+ds.TableName()+" where devId=?",devId).Count(&count).Error; err != nil {
-		return 0, err
-	}
-	return count, nil
-}
\ No newline at end of file
diff --git a/serf-daemon/service/event.go b/serf-daemon/service/event.go
deleted file mode 100644
index 860e8f8..0000000
--- a/serf-daemon/service/event.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package service
-
-import (
-	"basic.com/valib/logger.git"
-	"basic.com/valib/serf.git/serf"
-)
-
-const (
-	UpdateLocalDevData = "UpdateLocalDevData"
-)
-func HandleSerfEvent(event serf.Event) {
-	switch ev := event.(type) {
-	case serf.UserEvent:
-
-	case *serf.Query:
-		if ev.Name == UpdateLocalDevData {
-
-		}
-	case serf.MemberEvent:
-
-	default:
-		logger.Debug("unknown event name:", ev.String())
-	}
-}
-
diff --git a/serf-daemon/service/serf.go b/serf-daemon/service/serf.go
deleted file mode 100644
index 70440dc..0000000
--- a/serf-daemon/service/serf.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package service
-
-import (
-	"basic.com/syncdb.git"
-	"basic.com/valib/logger.git"
-	"basic.com/valib/serf.git/client"
-	"basic.com/valib/serf.git/cmd/serf/command/agent"
-	"context"
-	"github.com/mitchellh/cli"
-	"vamicro/config"
-	"vamicro/extend/util"
-)
-
-//serf daemon杩涚▼锛岄泦缇や腑鍙湁涓昏妭鐐规墠浼氬惎鍔紝闈炰富鑺傜偣澶勪簬鍋滄鐘舵�併��
-func Start(ctx context.Context) error {
-	clusterId := ""
-	password := config.ClusterSet.PwdPre+"123456"
-	var addrs []string
-
-	conf := syncdb.DefaultConfig()
-	conf.RPCAddr = "0.0.0.0"
-	conf.RPCPort = 7474
-	conf.BindAddr = "0.0.0.0:30290"
-	conf.Ctx = ctx
-	agent, err := syncdb.Init(clusterId, password, config.Server.AnalyServerId, addrs, "./serf-daemon.json", conf)
-	if err != nil {
-		return err
-	}
-	agent.RegisterHandleEventFunc(HandleSerfEvent)
-	logger.Debug("agent:", agent, "err:", err)
-	return nil
-}
-
-func TestSerfRPC() {
-	shutdownCh := make(chan struct{})
-	doneCh := make(chan struct{})
-	defer func() {
-		close(shutdownCh)
-		<-doneCh
-	}()
-
-	ui := new(cli.MockUi)
-	c := &agent.Command{
-		ShutdownCh: shutdownCh,
-		Ui: ui,
-	}
-
-	ip, _, _ := util.GetLocalIP(config.Server.NetworkAdapter)
-	rpcAddr := ip + ":7373"
-	args := []string {
-		"-bind", ip,
-		"-rpc-addr", rpcAddr,
-	}
-
-	go func() {
-		code := c.Run(args)
-		if code != 0 {
-			logger.Debug("run serf Command code:", code)
-		}
-		close(doneCh)
-	}()
-	rpcClient, err := client.NewRPCClient(rpcAddr)
-	if err != nil {
-		logger.Debug("client.NewRPCClient err:", err)
-		return
-	}
-	members, err := rpcClient.Members()
-	if err != nil {
-		logger.Debug("rpc members err:", err)
-	}
-	logger.Debug("len(members):", len(members))
-	param := client.QueryParam{
-		FilterNodes: []string{},
-		Name: "",
-		Payload: []byte(""),
-	}
-	rpcClient.Query(&param)
-}
\ No newline at end of file

--
Gitblit v1.8.0