overflow_backup_2018_0455/overflow_service
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
geek 2017-06-26 14:37:53 +09:00
commit 01192ff31c
12 changed files with 322 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

183
proxy/infra/infra_service.go Normal file
View File

@ -0,0 +1,183 @@
package infra
import (
"encoding/json"
"git.loafle.net/overflow/commons_go/model/timestamp"
"git.loafle.net/overflow/overflow_service/proxy/meta"
"git.loafle.net/overflow/overflow_service/proxy/probe"
"git.loafle.net/overflow/overflow_service/proxy/utils"
)
type InfraService struct {
}
type Infra struct {
Id json.Number `json:"id,Number,omitempty"`
MetaInfraType meta.MetaInfraType `json:"type,omitempty"`
ChildId json.Number `json:"childId,omitempty"`
CreateDate timestamp.Timestamp `json:"createDate,omitempty"`
}
type InfraMachine struct {
Id json.Number `json:"id,Number,omitempty"`
Probe probe.Probe `json:"probe,omitempty"`
Meta string `json:"meta,omitempty"`
CreateDate timestamp.Timestamp `json:"createDate,omitempty"`
}
type InfraHost struct {
Id json.Number `json:"id,Number,omitempty"`
InfraOS InfraOS `json:"os,omitempty"`
Ip json.Number `json:"ip,omitempty"`
Mac json.Number `json:"mac,omitempty"`
CreateDate timestamp.Timestamp `json:"createDate,omitempty"`
}
type InfraOS struct {
Id json.Number `json:"id,Number,omitempty"`
InfraMachine InfraMachine `json:"machine,omitempty"`
Meta string `json:"meta,omitempty"`
CreateDate timestamp.Timestamp `json:"createDate,omitempty"`
MetaInfraVendor meta.MetaInfraVendor `json:"vendor,omitempty"`
}
type InfraOSApplication struct {
Id json.Number `json:"id,Number,omitempty"`
InfraOS InfraOS `json:"os,omitempty"`
Name string `json:"name,omitempty"`
CreateDate timestamp.Timestamp `json:"createDate,omitempty"`
}
type InfraOSDaemon struct {
Id json.Number `json:"id,Number,omitempty"`
InfraOS InfraOS `json:"os,omitempty"`
Name string `json:"name,omitempty"`
CreateDate timestamp.Timestamp `json:"createDate,omitempty"`
}
type InfraOSPort struct {
Id json.Number `json:"id,Number,omitempty"`
InfraOS InfraOS `json:"os,omitempty"`
CreateDate timestamp.Timestamp `json:"createDate,omitempty"`
Port json.Number `json:"port,omitempty"`
PortType string `json:"portType,omitempty"`
MetaInfraVendor meta.MetaInfraVendor `json:"vendor,omitempty"`
TlsType bool `json:"tlsType,omitempty"`
}
type InfraServiceApplication struct {
Id json.Number `json:"id,Number,omitempty"`
InfraHost InfraHost `json:"host,omitempty"`
PortType string `json:"portType,omitempty"`
Port json.Number `json:"port,omitempty"`
MetaInfraVendor meta.MetaInfraVendor `json:"vendor,omitempty"`
CreateDate timestamp.Timestamp `json:"createDate,omitempty"`
TlsType bool `json:"tlsType,omitempty"`
}
func NewInfraService() *InfraService {
return &InfraService{}
}
func(is *InfraService) Save(infra *Infra) (string, error) {
out, err := utils.InvokeDBByModel("infra", "save", infra, "com.loafle.overflow.module.infra.model.Infra")
if err != nil {
return "", err
}
return out, nil;
}
func(is *InfraService) SaveMachine(i *InfraMachine) (string, error) {
out, err := utils.InvokeDBByModel("infraMachine", "save", i, "com.loafle.overflow.module.infra.model.InfraMachine")
if err != nil {
return "", err
}
return out, nil;
}
func(is *InfraService) SaveHost(i *InfraHost) (string, error) {
out, err := utils.InvokeDBByModel("infraHost", "save", i, "com.loafle.overflow.module.infra.model.InfraHost")
if err != nil {
return "", err
}
return out, nil;
}
func(is *InfraService) SaveOS(i *InfraOS) (string, error) {
out, err := utils.InvokeDBByModel("InfraOS", "save", i, "com.loafle.overflow.module.infra.model.InfraOS")
if err != nil {
return "", err
}
return out, nil;
}
func(is *InfraService) SaveOSApplication(i *InfraOSApplication) (string, error) {
out, err := utils.InvokeDBByModel("InfraOSApplication", "save", i, "com.loafle.overflow.module.infra.model.InfraOSApplication")
if err != nil {
return "", err
}
return out, nil;
}
func(is *InfraService) SaveOSDaemon(i *InfraOSDaemon) (string, error) {
out, err := utils.InvokeDBByModel("InfraOSDaemon", "save", i, "com.loafle.overflow.module.infra.model.InfraOSDaemon")
if err != nil {
return "", err
}
return out, nil;
}
func(is *InfraService) SaveOSPort(i *InfraOSPort) (string, error) {
out, err := utils.InvokeDBByModel("InfraOSPort", "save", i, "com.loafle.overflow.module.infra.model.InfraOSPort")
if err != nil {
return "", err
}
return out, nil;
}
func(is *InfraService) SaveService(i *InfraService) (string, error) {
out, err := utils.InvokeDBByModel("InfraService", "save", i, "com.loafle.overflow.module.infra.model.InfraService")
if err != nil {
return "", err
}
return out, nil;
}
func (is *InfraService)Read(id string) (string, error){
out,err :=utils.InvokeDBByModel("infra","findOne",id,"java.lang.Long")
if err != nil {
return "", err
}
return out, nil
}
func (is *InfraService)ReadChild(infraType, id string) (string, error){
out,err :=utils.InvokeDBByModel(infraType,"findOne",id,"java.lang.Long")
if err != nil {
return "", err
}
return out, nil
}

7
proxy/keystore/keystore_service.go
View File

@ -2,6 +2,7 @@ package keystore
import (
"github.com/google/uuid"
"strings"
)
type KeyStoreService struct {
@ -14,11 +15,13 @@ func NewKeyStoreSerivce() *KeyStoreService {
}
func(k *KeyStoreService)CreateKey() (string,error) {
uu, err := uuid.NewUUID();
uu, err := uuid.NewUUID()
if err != nil {
return "", err
}
return uu.String(), nil
ss := strings.Replace(uu.String(), "-", "", -1)
return ss, nil
}

7
proxy/keystore/keystore_service_test.go
View File

@ -2,7 +2,7 @@ package keystore
import (
"testing"
"strings"
)
func TestGetKey(t *testing.T) {
@ -14,10 +14,5 @@ func TestGetKey(t *testing.T) {
t.Log(str)
t.Log(len(str))
ss := strings.Replace(str, "-", "", -1)
t.Log(ss);
t.Log(len(ss))
}

12
proxy/meta/meta_infra_type.go Normal file
View File

@ -0,0 +1,12 @@
package meta
import (
"encoding/json"
"git.loafle.net/overflow/commons_go/model/timestamp"
)
type MetaInfraType struct {
Id json.Number `json:"id,Number,omitempty"`
Name string `json:"name,omitempty"`
CreateDate timestamp.Timestamp `json:"createDate,omitempty"`
}

13
proxy/meta/meta_infra_vendor.go Normal file
View File

@ -0,0 +1,13 @@
package meta
import (
"encoding/json"
"git.loafle.net/overflow/commons_go/model/timestamp"
)
type MetaInfraVendor struct {
Id json.Number `json:"id,Number,omitempty"`
Name string `json:"name,omitempty"`
CreateDate timestamp.Timestamp `json:"createDate,omitempty"`
MetaInfraType MetaInfraType `json:"metaInfraType,omitempty"`
}

31
proxy/meta/meta_noauth_probe_status.go
View File

@ -1,8 +1,37 @@
package meta
import "encoding/json"
import (
"encoding/json"
"strconv"
)
const (
PROBE_STATUS_ACCEPT = 1
PROBE_STATUS_DENY = 2
PROBE_STATUS_PROCESS = 3
)
var metaNoauthProbeStatusMap = map[int]string{
1: "ACCEPT",
2: "DENY",
3: "PROCESS",
}
type MetaNoAuthProbeStatus struct {
Id json.Number `json:"id,Number,omitempty"`
Name string `json:"name,omitempty"`
}
func NewMetaNoAuthProbeStatus(types int) *MetaNoAuthProbeStatus {
str := metaNoauthProbeStatusMap[types]
if len(str) <= 0 {
return nil
}
return &MetaNoAuthProbeStatus{
Id:json.Number(strconv.Itoa(types)),
Name:str,
}
}

15
proxy/meta/meta_probe_status.go Normal file
View File

@ -0,0 +1,15 @@
package meta
import "encoding/json"
const (
INITIAL = 1
NORMAL = 2
)
type MetaProbeStatus struct {
Id json.Number `json:"id,Number,omitempty"`
Name string `json:"name,omitempty"`
}

12
proxy/noauthprobe/noauth_probe_service.go
View File

@ -5,7 +5,7 @@ import (
"git.loafle.net/overflow/commons_go/model/timestamp"
"encoding/json"
"git.loafle.net/overflow/overflow_service/proxy/member"
"git.loafle.net/overflow/overflow_service/proxy/probe"
"git.loafle.net/overflow/overflow_service/proxy/domain"
"errors"
@ -111,7 +111,7 @@ func(as *NoAuthProbeService)GetList(d *domain.Domain) (string,error) {
func (as *NoAuthProbeService)RequestAuth(np *NoAuthProbe, memberId int, desc string) (string, error) {
func (as *NoAuthProbeService)RequestAuth(np *NoAuthProbe, domainId int, desc string) (string, error) {
//paramMap := make(map[string]string)
//noauthAgt.Status = "A"
//
@ -141,10 +141,10 @@ func (as *NoAuthProbeService)RequestAuth(np *NoAuthProbe, memberId int, desc str
//FIXME:: probe
m := member.Member{}
m.Id = json.Number(memberId)
newAgent := probe.NewAgent(desc, m)
newone, err := probe.NewProbeService().SaveAgent(newAgent)
d := domain.Domain{}
d.Id = json.Number(domainId)
newAgent := probe.NewProbe("", "")
newone, err := probe.NewProbeService().Save(newAgent)
if err!= nil {
return "", err
}

2
proxy/noauthprobe/noauth_probe_service_test.go
View File

@ -128,4 +128,4 @@ func TestRead(t *testing.T) {
t.Log(out)
}
}

60
proxy/probe/probe_service.go
View File

@ -4,9 +4,12 @@ import (
"encoding/json"
//"fmt"
//"git.loafle.net/overflow/overflow_service/proxy"
"git.loafle.net/overflow/overflow_service/proxy/member"
"git.loafle.net/overflow/overflow_service/proxy/utils"
"time"
"git.loafle.net/overflow/overflow_service/proxy/meta"
"git.loafle.net/overflow/commons_go/model/timestamp"
"git.loafle.net/overflow/overflow_service/proxy/domain"
)
type ProbeService struct {
@ -14,40 +17,34 @@ type ProbeService struct {
type Probe struct {
Id json.Number `json:"id,Number,omitempty"`
AuthorizedDate int64 `json:"authorizedDate,Number,omitempty"`
Description string `json:"description,omitempty"`
Member member.Member `json:"member,omitempty"`
LastPollingDate int64 `json:"lastPollingDate,omitempty"`
Status string `json:"status,omitempty"`
Status *meta.MetaNoAuthProbeStatus `json:"status,omitempty"`
CreateDate timestamp.Timestamp `json:"createDate,omitempty"`
LastPollingDate timestamp.Timestamp `json:"lastPollingDate,omitempty"`
NextPollingDate timestamp.Timestamp `json:"nextPollingDate,omitempty"`
Domain *domain.Domain `json:"domain,omitempty"`
ProbeKey string `json:"probeKey,omitempty"`
EncryptionKey string `json:"encryptionKey,omitempty"`
}
func NewProbeService() *ProbeService {
return &ProbeService{}
}
func NewAgent(desc string, member member.Member) *Probe {
func NewProbe(probeKey string, encryptionKey string) *Probe {
na := &Probe{
AuthorizedDate: time.Now().Unix(),
Description: desc,
Member: member,
Status:meta.NewMetaNoAuthProbeStatus(meta.PROBE_STATUS_PROCESS),
ProbeKey:probeKey,
EncryptionKey:encryptionKey,
}
return na
}
func (as *ProbeService) SaveAgent(agent *Probe) (string, error) {
//bytes, err := json.Marshal(probe)
//if err != nil {
// return "", err
//}
//fmt.Println(probe.Member.Id)
//fmt.Println(string(bytes))
//paramMap := make(map[string]string)
//paramMap["com.loafle.overflow.probe.model.Probe"] = string(bytes)
//
//out, err := proxy.InvokeDB("probe", "create", paramMap)
func (as *ProbeService) Save(p *Probe) (string, error) {
out, err := utils.InvokeDB("probe", "create", agent)
out, err := utils.InvokeDBByModel("probe", "save", p, "com.loafle.overflow.module.probe.model.Probe")
if err != nil {
return "", err
@ -56,22 +53,9 @@ func (as *ProbeService) SaveAgent(agent *Probe) (string, error) {
return out, nil
}
func (as *ProbeService) GetAgentList(mem *member.Member) (string, error) {
//paramMap := make(map[string]string)
//
//mem := member.NewMember()
//mem.Id = json.Number(memberId)
//
//bytes, err := json.Marshal(mem)
//if err != nil {
// return "", err
//}
//
//paramMap["com.loafle.overflow.member.model.Member"] = string(bytes)
//
//out, err := proxy.InvokeDB("probe", "findAgentListByMemberId", paramMap)
func (as *ProbeService) GetList(d *domain.Domain) (string, error) {
out, err := utils.InvokeDBByModel("probe", "findAgentListByMemberId", mem, "com.loafle.overflow.member.model.Member")
out, err := utils.InvokeDBByModel("probe", "findAgentListByMemberId", d, "com.loafle.overflow.module.domain.model.Domain")
if err != nil {
return "", err

48
proxy/probe/probe_service_test.go
View File

@ -6,28 +6,28 @@ import (
"git.loafle.net/overflow/overflow_service/proxy/member"
)
func TestSaveAgent(t *testing.T) {
m := member.Member{}
m.Id = json.Number("1")
//func TestSaveAgent(t *testing.T) {
// m := member.Member{}
// m.Id = json.Number("1")
//
// agt := NewAgent("test agent424", m)
// as := NewProbeService()
//
// res, err := as.SaveAgent(agt)
// if err != nil {
// t.Log(res)
// }
//}
agt := NewAgent("test agent424", m)
as := NewProbeService()
res, err := as.SaveAgent(agt)
if err != nil {
t.Log(res)
}
}
func TestListAgent(t *testing.T) {
as := NewProbeService()
m := member.Member{}
m.Id = "1"
if res, err := as.getAgentList(&m); err != nil {
t.Fatal(err)
}else {
t.Log(res)
}
}
//
//func TestListAgent(t *testing.T) {
// as := NewProbeService()
// m := member.Member{}
// m.Id = "1"
// if res, err := as.GetAgentList(&m); err != nil {
// t.Fatal(err)
// }else {
// t.Log(res)
// }
//
//}

10
proxy/utils/model_mapping.go Normal file
View File

@ -0,0 +1,10 @@
package utils
const (
MODEL_DOMAIN = "com.loafle.overflow.module.domain.model.Domain"
MODEL_NOAUTHPROBE = "com.loafle.overflow.module.noauthprobe.model.NoAuthProbe"
MODEL_PROBE = "com.loafle.overflow.module.probe.model.Probe"
MODEL_STRING = "java.lang.String"
MODEL_LONG = "java.lang.Long"
)