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

fixed

Browse Source 
noauthprobe
This commit is contained in:
snoop
2017-06-23 20:30:49 +09:00
parent 74beb66775
commit 34d7a81ae8
2 changed files with 158 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
proxy/noauthprobe/noauth_probe_service.go
View File

@@ -3,11 +3,13 @@ package noauthprobe
import (
"git.loafle.net/overflow/commons_go/model/timestamp"
"git.loafle.net/overflow/overflow_service/proxy"
"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"
"git.loafle.net/overflow/overflow_service/proxy/utils"
)
type NoAuthProbeService struct {
@@ -20,22 +22,32 @@ func NewNoAuthProbeService() *NoAuthProbeService {
type NoAuthProbe struct {
Id json.Number `json:"id,Number,omitempty"`
TempKey string `json:"tempKey,omitempty"`
Date timestamp.Timestamp`json:"date,omitempty"`
ApiKey string `json:"apiKey,omitempty"`
AuthStatus string `json:"authStatus,omitempty"`
LocalIP int64 `json:"localIP,omitempty"`
HostName string `json:"hostName,omitempty"`
MacAddress int64 `json:"macAddress,omitempty"`
IpAddress int64 `json:"ipAddress,omitempty"`
// P rocess, A ccept, D eny
Status string `json:"status,omitempty"`
TempProbeKey string `json:"tempProbeKey,omitempty"`
CreateDate timestamp.Timestamp`json:"createDate,omitempty"`
ApiKey string `json:"apiKey,omitempty"`
Domain domain.Domain `json:"domain,omitempty"`
Probe probe.Probe `json:"probe,omitempty"`
}
func NewNoAuthProbe(apikey string, localIp int64, hostName string) *NoAuthProbe {
func NewNoAuthProbe(apikey string, ipAddress int64, hostName string, md int64) *NoAuthProbe {
na := &NoAuthProbe{
Date:timestamp.Now(),
CreateDate:timestamp.Now(),
ApiKey:apikey,
LocalIP:localIp,
IpAddress:ipAddress,
HostName:hostName,
MacAddress:md,
}
return na
}
@@ -44,15 +56,17 @@ func NewNoAuthProbe(apikey string, localIp int64, hostName string) *NoAuthProbe
func(as *NoAuthProbeService)Save(na *NoAuthProbe) (string, error) {
bytes, err := json.Marshal(na)
if err != nil {
return "",err
}
//bytes, err := json.Marshal(na)
//if err != nil {
// return "",err
//}
//
//memMap := make(map[string]string)
//memMap["com.loafle.overflow.module.noauthprobe.model.NoAuthProbe"] = string(bytes);
//
//out, err := proxy.InvokeDB("noauthProbe", "save", memMap);
memMap := make(map[string]string)
memMap["com.loafle.overflow.noauthprobe.model.NoAuthProbe"] = string(bytes);
out, err := proxy.InvokeDB("noauthProbe", "create", memMap);
out, err := utils.InvokeDBByModel("noauthProbe", "save", na, "com.loafle.overflow.module.noauthprobe.model.NoAuthProbe")
if err != nil {
return "", err
@@ -63,19 +77,21 @@ func(as *NoAuthProbeService)Save(na *NoAuthProbe) (string, error) {
func(as *NoAuthProbeService)CheckAuth(tempKey string) (string,error) {
memMap := make(map[string]string)
//memMap := make(map[string]string)
//
//na := NewNoAuthProbe("", 0, "", 0)
//na.TempProbeKey = tempKey
//
//bytes, err := json.Marshal(na)
//if err != nil {
// return "", err;
//}
//
//memMap["com.loafle.overflow.noauthprobe.model.NoAuthProbe"] = string(bytes);
//
//out, err := proxy.InvokeDB("noauthProbe", "findByTempKey", memMap);
na := NewNoAuthProbe("", 0, "")
na.TempKey = tempKey
bytes, err := json.Marshal(na)
if err != nil {
return "", err;
}
memMap["com.loafle.overflow.noauthprobe.model.NoAuthProbe"] = string(bytes);
out, err := proxy.InvokeDB("noauthProbe", "findByTempKey", memMap);
out, err:= utils.InvokeDBByModel("noauthProbe","findByTempProbeKey",tempKey, "java.lang.String")
if err != nil {
return "", err
@@ -92,50 +108,63 @@ func(as *NoAuthProbeService)CheckAuth(tempKey string) (string,error) {
}
func(as *NoAuthProbeService)GetList(excludeStatus string) (string,error) {
func(as *NoAuthProbeService)GetList(d *domain.Domain) (string,error) {
memMap := make(map[string]string)
//memMap := make(map[string]string)
//
//na := NewNoAuthProbe("", 0, "", 0)
//na.Status = excludeStatus
//
//bytes, err := json.Marshal(na)
//if err != nil {
// return "", err;
//}
//
//memMap["com.loafle.overflow.noauthprobe.model.NoAuthProbe"] = string(bytes);
//
//out, err := proxy.InvokeDB("noauthProbe", "findAllByNoAuth", memMap);
na := NewNoAuthProbe("", 0, "")
na.AuthStatus = excludeStatus
bytes, err := json.Marshal(na)
if err != nil {
return "", err;
}
memMap["com.loafle.overflow.noauthprobe.model.NoAuthProbe"] = string(bytes);
out, err := proxy.InvokeDB("noauthProbe", "findAllByNoAuth", memMap);
out, err := utils.InvokeDBByModel("noauthProbe","findAllByDomain", d, "com.loafle.overflow.module.domain.model.Domain");
if err != nil {
return "", err
}
return out,nil;
}
func (as *NoAuthProbeService)RequestAuth(noauthAgt NoAuthProbe, memberId, desc string) (string, error) {
paramMap := make(map[string]string)
noauthAgt.AuthStatus = "ACCEPT"
func (as *NoAuthProbeService)RequestAuth(np *NoAuthProbe, memberId int, desc string) (string, error) {
//paramMap := make(map[string]string)
//noauthAgt.Status = "A"
//
//bytes, err := json.Marshal(noauthAgt)
//if err != nil {
// return "", err;
//}
//paramMap["com.loafle.overflow.noauthprobe.model.NoAuthProbe"] = string(bytes)
//out, err := proxy.InvokeDB("noauthProbe", "update", paramMap)
bytes, err := json.Marshal(noauthAgt)
if err != nil {
return "", err;
}
paramMap["com.loafle.overflow.noauthprobe.model.NoAuthProbe"] = string(bytes)
out, err := proxy.InvokeDB("noauthProbe", "update", paramMap)
out ,err := utils.InvokeDBByModel("noauthProbe","findByTempProbeKey", np.TempProbeKey, "java.lang.String");
if err != nil {
return "", err
}
if len(out) == 0 {
return "", errors.New("Cannot update Probe. ")
}
dbnp := NoAuthProbe{}
err = json.Unmarshal([]byte(out), &dbnp);
if err != nil {
return "", err
}
dbnp.Status = np.Status;
//FIXME:: probe
m := member.Member{}
m.Id = json.Number(memberId)
newAgent := probe.NewAgent(desc, m)
@@ -148,9 +177,11 @@ func (as *NoAuthProbeService)RequestAuth(noauthAgt NoAuthProbe, memberId, desc s
}
func (as *NoAuthProbeService)Read(id string) (string, error){
mm := make(map[string]string)
mm["id"] = id
out, err := proxy.InvokeDB("noauthProbe", "find", mm)
//mm := make(map[string]string)
//mm["id"] = id
//out, err := proxy.InvokeDB("noauthProbe", "findOne", id, "java.lang.Long")
out,err :=utils.InvokeDBByModel("noauthProbe","findOne",id,"java.lang.Long")
if err != nil {
return "", err