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

41
proxy/infra/infra_service.go
View File

@ -79,90 +79,89 @@ func NewInfraService() *InfraService {
return &InfraService{} return &InfraService{}
} }
func(is *InfraService) Save(infra *Infra) (string, error) { func (is *InfraService) Save(infra *Infra) (string, error) {
out, err := utils.InvokeDBByModel("infra", "save", infra, "com.loafle.overflow.module.infra.model.Infra") out, err := utils.InvokeDBByModel("infra", "save", infra, "com.loafle.overflow.module.infra.model.Infra")
if err != nil { if err != nil {
return "", err return "", err
} }
return out, nil; return out, nil
} }
func (is *InfraService) SaveMachine(i *InfraMachine) (string, error) {
func(is *InfraService) SaveMachine(i *InfraMachine) (string, error) {
out, err := utils.InvokeDBByModel("infraMachine", "save", i, "com.loafle.overflow.module.infra.model.InfraMachine") out, err := utils.InvokeDBByModel("infraMachine", "save", i, "com.loafle.overflow.module.infra.model.InfraMachine")
if err != nil { if err != nil {
return "", err return "", err
} }
return out, nil; return out, nil
} }
func(is *InfraService) SaveHost(i *InfraHost) (string, error) { func (is *InfraService) SaveHost(i *InfraHost) (string, error) {
out, err := utils.InvokeDBByModel("infraHost", "save", i, "com.loafle.overflow.module.infra.model.InfraHost") out, err := utils.InvokeDBByModel("infraHost", "save", i, "com.loafle.overflow.module.infra.model.InfraHost")
if err != nil { if err != nil {
return "", err return "", err
} }
return out, nil; return out, nil
} }
func(is *InfraService) SaveOS(i *InfraOS) (string, error) { func (is *InfraService) SaveOS(i *InfraOS) (string, error) {
out, err := utils.InvokeDBByModel("InfraOS", "save", i, "com.loafle.overflow.module.infra.model.InfraOS") out, err := utils.InvokeDBByModel("InfraOS", "save", i, "com.loafle.overflow.module.infra.model.InfraOS")
if err != nil { if err != nil {
return "", err return "", err
} }
return out, nil; return out, nil
} }
func(is *InfraService) SaveOSApplication(i *InfraOSApplication) (string, error) { func (is *InfraService) SaveOSApplication(i *InfraOSApplication) (string, error) {
out, err := utils.InvokeDBByModel("InfraOSApplication", "save", i, "com.loafle.overflow.module.infra.model.InfraOSApplication") out, err := utils.InvokeDBByModel("InfraOSApplication", "save", i, "com.loafle.overflow.module.infra.model.InfraOSApplication")
if err != nil { if err != nil {
return "", err return "", err
} }
return out, nil; return out, nil
} }
func(is *InfraService) SaveOSDaemon(i *InfraOSDaemon) (string, error) { func (is *InfraService) SaveOSDaemon(i *InfraOSDaemon) (string, error) {
out, err := utils.InvokeDBByModel("InfraOSDaemon", "save", i, "com.loafle.overflow.module.infra.model.InfraOSDaemon") out, err := utils.InvokeDBByModel("InfraOSDaemon", "save", i, "com.loafle.overflow.module.infra.model.InfraOSDaemon")
if err != nil { if err != nil {
return "", err return "", err
} }
return out, nil; return out, nil
} }
func(is *InfraService) SaveOSPort(i *InfraOSPort) (string, error) { func (is *InfraService) SaveOSPort(i *InfraOSPort) (string, error) {
out, err := utils.InvokeDBByModel("InfraOSPort", "save", i, "com.loafle.overflow.module.infra.model.InfraOSPort") out, err := utils.InvokeDBByModel("InfraOSPort", "save", i, "com.loafle.overflow.module.infra.model.InfraOSPort")
if err != nil { if err != nil {
return "", err return "", err
} }
return out, nil; return out, nil
} }
func(is *InfraService) SaveService(i *InfraService) (string, error) { func (is *InfraService) SaveService(i *InfraService) (string, error) {
out, err := utils.InvokeDBByModel("InfraService", "save", i, "com.loafle.overflow.module.infra.model.InfraService") out, err := utils.InvokeDBByModel("InfraService", "save", i, "com.loafle.overflow.module.infra.model.InfraService")
if err != nil { if err != nil {
return "", err return "", err
} }
return out, nil; return out, nil
} }
func (is *InfraService)Read(id string) (string, error){ func (is *InfraService) Read(id string) (string, error) {
out,err :=utils.InvokeDBByModel("infra","findOne",id,"java.lang.Long") out, err := utils.InvokeDBByModel("infra", "findOne", id, "java.lang.Long")
if err != nil { if err != nil {
return "", err return "", err
@ -171,9 +170,9 @@ func (is *InfraService)Read(id string) (string, error){
return out, nil return out, nil
} }
func (is *InfraService)ReadChild(infraType, id string) (string, error){ func (is *InfraService) ReadChild(infraType, id string) (string, error) {
out,err :=utils.InvokeDBByModel(infraType,"findOne",id,"java.lang.Long") out, err := utils.InvokeDBByModel(infraType, "findOne", id, "java.lang.Long")
if err != nil { if err != nil {
return "", err return "", err

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/apikey"
"git.loafle.net/overflow/overflow_service/proxy/keystore" "git.loafle.net/overflow/overflow_service/proxy/keystore"
"log" "log"
"git.loafle.net/overflow/overflow_service/proxy/utils"
) )
type Member struct { type Member struct {
@ -80,14 +81,14 @@ func (m *MemberService) Login(mem *Member) (string, error) {
func (m *MemberService) Regist(mem *Member) (string, error) { func (m *MemberService) Regist(mem *Member) (string, error) {
log.Println("Call Regist", mem.Email, mem.PwSalt) log.Println("Call Regist", mem.Email, mem.PwSalt)
pwSalt, digest, err := encryption.Encrypt(mem.PwSalt) //pwSalt, digest, err := encryption.Encrypt(mem.PwSalt)
if err != nil { //if err != nil {
//log.Fatal("encryption Encrypt Error: ", err) // //log.Fatal("encryption Encrypt Error: ", err)
return "", err // return "", err
} //}
mem.PwSalt = pwSalt //mem.PwSalt = pwSalt
mem.Pw = digest //mem.Pw = digest
memMap := m.getMemberMap(mem) memMap := m.getMemberMap(mem)
re, err := proxy.InvokeDB(TARGET_DAO, "save", memMap) 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) { func (m *MemberService) Read(mem *Member) (string, error) {
log.Println("Call Read", mem.Email)
// Todo Call DB Gateway re, err := utils.InvokeDBByModel("member","findOne",mem.Id,"java.lang.Long")
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)
if err != nil { if err != nil {
return "", err return "", err
@ -128,12 +123,14 @@ func (m *MemberService) Read(mem *Member) (string, error) {
} }
func (m *MemberService) Modify(mem *Member) (string, error) { func (m *MemberService) Modify(mem *Member) (string, error) {
log.Println("Call Modify", mem.Email, "::", mem.PwSalt)
// Todo Call DB Gateway if mem.Id == "" {
mem.Pw = "read" log.Fatal("Id nil")
}
memMap := m.getMemberMap(mem) memMap := m.getMemberMap(mem)
re, err := proxy.InvokeDB(TARGET_DAO, "update", memMap) re, err := proxy.InvokeDB(TARGET_DAO, "save", memMap)
if err != nil { if err != nil {
return "", err return "", err
@ -143,12 +140,8 @@ func (m *MemberService) Modify(mem *Member) (string, error) {
} }
func (m *MemberService) Remove(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 { if err != nil {
return "", err return "", err

50
proxy/member/member_service_test.go
View File

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

19
proxy/utils/model_mapping.go
View File

@ -1,10 +1,19 @@
package utils package utils
const ( const (
MODEL_DOMAIN = "com.loafle.overflow.module.domain.model.Domain" MODEL_DOMAIN = "com.loafle.overflow.module.domain.model.Domain"
MODEL_NOAUTHPROBE = "com.loafle.overflow.module.noauthprobe.model.NoAuthProbe" MODEL_NOAUTHPROBE = "com.loafle.overflow.module.noauthprobe.model.NoAuthProbe"
MODEL_PROBE = "com.loafle.overflow.module.probe.model.Probe" 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_STRING = "java.lang.String"
MODEL_LONG = "java.lang.Long" MODEL_LONG = "java.lang.Long"
) )