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:
snoop 2017-06-26 14:51:01 +09:00
commit ae2569e9b8
4 changed files with 87 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
proxy/infra/infra_service.go
View File

@ -86,10 +86,9 @@ func(is *InfraService) Save(infra *Infra) (string, error) {
return "", err
}
return out, nil;
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")
@ -97,7 +96,7 @@ func(is *InfraService) SaveMachine(i *InfraMachine) (string, error) {
return "", err
}
return out, nil;
return out, nil
}
func (is *InfraService) SaveHost(i *InfraHost) (string, error) {
@ -107,7 +106,7 @@ func(is *InfraService) SaveHost(i *InfraHost) (string, error) {
return "", err
}
return out, nil;
return out, nil
}
func (is *InfraService) SaveOS(i *InfraOS) (string, error) {
@ -117,7 +116,7 @@ func(is *InfraService) SaveOS(i *InfraOS) (string, error) {
return "", err
}
return out, nil;
return out, nil
}
func (is *InfraService) SaveOSApplication(i *InfraOSApplication) (string, error) {
@ -127,7 +126,7 @@ func(is *InfraService) SaveOSApplication(i *InfraOSApplication) (string, error)
return "", err
}
return out, nil;
return out, nil
}
func (is *InfraService) SaveOSDaemon(i *InfraOSDaemon) (string, error) {
@ -137,7 +136,7 @@ func(is *InfraService) SaveOSDaemon(i *InfraOSDaemon) (string, error) {
return "", err
}
return out, nil;
return out, nil
}
func (is *InfraService) SaveOSPort(i *InfraOSPort) (string, error) {
@ -147,7 +146,7 @@ func(is *InfraService) SaveOSPort(i *InfraOSPort) (string, error) {
return "", err
}
return out, nil;
return out, nil
}
func (is *InfraService) SaveService(i *InfraService) (string, error) {
@ -157,7 +156,7 @@ func(is *InfraService) SaveService(i *InfraService) (string, error) {
return "", err
}
return out, nil;
return out, nil
}
func (is *InfraService) Read(id string) (string, error) {

41
proxy/member/member_service.go
View File

@ -8,6 +8,7 @@ import (
"git.loafle.net/overflow/overflow_service/proxy/apikey"
"git.loafle.net/overflow/overflow_service/proxy/keystore"
"log"
"git.loafle.net/overflow/overflow_service/proxy/utils"
)
type Member struct {
@ -80,14 +81,14 @@ func (m *MemberService) Login(mem *Member) (string, error) {
func (m *MemberService) Regist(mem *Member) (string, error) {
log.Println("Call Regist", mem.Email, mem.PwSalt)
pwSalt, digest, err := encryption.Encrypt(mem.PwSalt)
if err != nil {
//log.Fatal("encryption Encrypt Error: ", err)
return "", err
}
//pwSalt, digest, err := encryption.Encrypt(mem.PwSalt)
//if err != nil {
// //log.Fatal("encryption Encrypt Error: ", err)
// return "", err
//}
mem.PwSalt = pwSalt
mem.Pw = digest
//mem.PwSalt = pwSalt
//mem.Pw = digest
memMap := m.getMemberMap(mem)
re, err := proxy.InvokeDB(TARGET_DAO, "save", memMap)
@ -111,14 +112,8 @@ func (m *MemberService) ReadByEmail(mem *Member) (string, error) {
}
func (m *MemberService) Read(mem *Member) (string, error) {
log.Println("Call Read", mem.Email)
// Todo Call DB Gateway
mem.Pw = "qwer5795"
//memMap := m.getMemberMap()
mm := make(map[string]string)
mm["id"] = string(mem.Id)
log.Println("Read Member", m)
re, err := proxy.InvokeDB(TARGET_DAO, "find", mm)
re, err := utils.InvokeDBByModel("member","findOne",mem.Id,"java.lang.Long")
if err != nil {
return "", err
@ -128,12 +123,14 @@ func (m *MemberService) Read(mem *Member) (string, error) {
}
func (m *MemberService) Modify(mem *Member) (string, error) {
log.Println("Call Modify", mem.Email, "::", mem.PwSalt)
// Todo Call DB Gateway
mem.Pw = "read"
if mem.Id == "" {
log.Fatal("Id nil")
}
memMap := m.getMemberMap(mem)
re, err := proxy.InvokeDB(TARGET_DAO, "update", memMap)
re, err := proxy.InvokeDB(TARGET_DAO, "save", memMap)
if err != nil {
return "", err
@ -143,12 +140,8 @@ func (m *MemberService) Modify(mem *Member) (string, error) {
}
func (m *MemberService) Remove(mem *Member) (string, error) {
log.Println("Call Remove", mem.Email)
// Todo Call DB Gateway
//m.Digest = "read"
memMap := m.getMemberMap(mem)
re, err := proxy.InvokeDB(TARGET_DAO, "delete", memMap)
re, err := utils.InvokeDBByModel("member","delete",mem.Id,"java.lang.Long")
if err != nil {
return "", err

50
proxy/member/member_service_test.go
View File

@ -5,9 +5,6 @@ import (
"encoding/json"
"github.com/golang/glog"
"fmt"
"log"
"git.loafle.net/overflow/overflow_service/proxy"
)
func TestMemberService_Login(t *testing.T) {
@ -58,33 +55,54 @@ func TestMemberLogin(t *testing.T) {
}
func TestMemberService_Read(t *testing.T) {
mm := make(map[string] string)
mm["id"] = "12"
rr, _ := proxy.InvokeDB(TARGET_DAO, "find", mm)
mm := &Member{
Id:"1",
}
log.Println(rr)
ms := NewMemberService()
rr, err := ms.Read(mm)
if err != nil {
t.Error(err)
}
t.Log(rr)
}
func TestMemberService_ReadByEmail(t *testing.T) {
ms := NewMemberService()
m := &Member{
Email:"geek@loafle.com",
Email:"overflow@loafle.com",
}
mm := ms.getMemberMap(m)
rr, _ := proxy.InvokeDB(TARGET_DAO, "findByEmail", mm)
log.Println(rr)
rr, err := ms.ReadByEmail(m)
if err != nil {
t.Error(err)
}
t.Log(rr)
}
func TestMemberUpdate(t *testing.T) {
ms := NewMemberService()
m := &Member{
Id: "11",
Email:"keeg@loafle.com",
Id:"1",
}
mm := ms.getMemberMap(m)
rr, _ := proxy.InvokeDB(TARGET_DAO, "update", mm)
log.Println(rr)
rm, _ := ms.Read(m)
json.Unmarshal([]byte(rm), m)
m.Phone = "010-4055-6699"
m.Status.Id = "1"
m.Name = "Park"
rr, err := ms.Modify(m)
if err != nil {
t.Error(err)
}
t.Log(rr)
}
func TestComvertJson(t *testing.T) {

11
proxy/utils/model_mapping.go
View File

@ -1,10 +1,19 @@
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_INFRA = "com.loafle.overflow.module.infra.model.Infra"
MODEL_INFRA_MACHINE = "com.loafle.overflow.module.infra.model.InfraMachine"
MODEL_INFRA_HOST = "com.loafle.overflow.module.infra.model.InfraHost"
MODEL_INFRA_OS = "com.loafle.overflow.module.infra.model.InfraOS"
MODEL_INFRA_OS_APPLICATION = "com.loafle.overflow.module.infra.model.InfraOSApplication"
MODEL_INFRA_OS_DAEMON = "com.loafle.overflow.module.infra.model.InfraOSDaemon"
MODEL_INFRA_OS_PORT = "com.loafle.overflow.module.infra.model.InfraOSPort"
MODEL_INFRA_SERVICE = "com.loafle.overflow.module.infra.model.InfraService"
MODEL_TARGET = "com.loafle.overflow.module.target.model.Target"
MODEL_STRING = "java.lang.String"
MODEL_LONG = "java.lang.Long"
)