added setting

proxy/keystore/keystore_service.go

@@ -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
 }

proxy/keystore/keystore_service_test.go

@@ -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))
 
 }

proxy/meta/meta_noauth_probe_status.go

@@ -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,
+	}
 }

proxy/meta/meta_probe_status.go

@@ -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"`
+}
+
+

proxy/noauthprobe/noauth_probe_service.go

@@ -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{}
+	d := domain.Domain{}
-	m.Id = json.Number(memberId)
+	d.Id = json.Number(domainId)
-	newAgent := probe.NewAgent(desc, m)
+	newAgent := probe.NewProbe("", "")
-	newone, err := probe.NewProbeService().SaveAgent(newAgent)
+	newone, err := probe.NewProbeService().Save(newAgent)
 	if err!= nil {
 		return "", err
 	}

proxy/noauthprobe/noauth_probe_service_test.go

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

proxy/probe/probe_service.go

@@ -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"`
+	Status	*meta.MetaNoAuthProbeStatus	`json:"status,omitempty"`
-	Description     string        `json:"description,omitempty"`
+	CreateDate	timestamp.Timestamp	`json:"createDate,omitempty"`
-	Member          member.Member `json:"member,omitempty"`
+	LastPollingDate	timestamp.Timestamp	`json:"lastPollingDate,omitempty"`
-	LastPollingDate int64         `json:"lastPollingDate,omitempty"`
+	NextPollingDate	timestamp.Timestamp	`json:"nextPollingDate,omitempty"`
-	Status          string        `json:"status,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(),
+		Status:meta.NewMetaNoAuthProbeStatus(meta.PROBE_STATUS_PROCESS),
-		Description:    desc,
+		ProbeKey:probeKey,
-		Member:         member,
+		EncryptionKey:encryptionKey,
+
 	}
 	return na
 }
 
-func (as *ProbeService) SaveAgent(agent *Probe) (string, error) {
+func (as *ProbeService) Save(p *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)
 
-	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) {
+func (as *ProbeService) GetList(d *domain.Domain) (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)
 
-	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

proxy/probe/probe_service_test.go

@@ -6,28 +6,28 @@ import (
 	"git.loafle.net/overflow/overflow_service/proxy/member"
 )
 
-func TestSaveAgent(t *testing.T) {
+//func TestSaveAgent(t *testing.T) {
-	m := member.Member{}
+//	m := member.Member{}
-	m.Id = json.Number("1")
+//	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()
+//func TestListAgent(t *testing.T) {
-
+//	as := NewProbeService()
-	res, err := as.SaveAgent(agt)
+//	m := member.Member{}
-	if err != nil {
+//	m.Id = "1"
-		t.Log(res)
+//	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)
-	}
-
-}

proxy/utils/model_mapping.go

@@ -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"
+)