From c514f25ed39ff47e96096376e6006a95b806e6d5 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 03 六月 2020 11:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/webserver
---
service/SdkInstall.go | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/service/SdkInstall.go b/service/SdkInstall.go
index d397ee7..c0d784b 100644
--- a/service/SdkInstall.go
+++ b/service/SdkInstall.go
@@ -1,6 +1,7 @@
package service
import (
+ "basic.com/dbapi.git"
//"basic.com/dbapi.git"
"basic.com/valib/logger.git"
"encoding/json"
@@ -109,7 +110,7 @@
var skDefArr []SdkDef
if err = json.Unmarshal(defB, &skDefArr);err == nil {
//娉ㄥ唽绠楁硶淇℃伅鍜岀畻娉曞弬鏁板埌dbserver
- //var sdkApi dbapi.SdkApi
+ var sdkApi dbapi.SdkApi
for _,skd := range skDefArr {
if _,ok := soM[skd.Def.SdkType];!ok {
soM[skd.Def.SdkType] = skd
@@ -141,10 +142,10 @@
}
paramBody := util.Struct2Map(srv)
logger.Debug("sdkApi.Register paramBody:", paramBody)
- //sdkApi.Register(paramBody) //灏嗙畻娉曟敞鍐屽埌鏁版嵁搴撲腑
+ sdkApi.Register(paramBody) //灏嗙畻娉曟敞鍐屽埌鏁版嵁搴撲腑
}
- zconfPath := "/opt/vasystem/bin/zconft/"
- libPath := "/opt/vasystem/libst/"
+ zconfPath := "/opt/vasystem/bin/zconf/"
+ libPath := "/opt/vasystem/libs/"
if !util.DirExists(zconfPath) {
os.MkdirAll(zconfPath, 0777)
}
@@ -156,15 +157,15 @@
if unTarGzE := util.UnTarGz(unPackPath+sdkType+".tar.gz", unPackPath);unTarGzE == nil {
//澶嶅埗json鍚姩鏂囦欢
if util.Exists(unPackPath+sdkType+"/zconf/"+sdkType+".json") {
- util.CopyFile(unPackPath+sdkType+"/zconf/"+sdkType+".json", zconfPath)
+ util.CopyFile(unPackPath+sdkType+"/zconf/"+sdkType+".json", zconfPath+sdkType+".json")
}
- if util.DirExists(unPackPath+sdkType+"/"+sdkType) {
- if _,cE := util.CopyDirByCmd(unPackPath+sdkType+"/"+sdkType, libPath);cE != nil {
+ if util.DirExists(unPackPath+sdkType) {
+ if _,cE := util.CopyDirByCmd(unPackPath+sdkType, libPath);cE != nil {
return false, cE
}
}
if util.DirExists(unPackPath+sdkType+"/models") {
- if _,cE := util.CopyDirByCmd(unPackPath+sdkType+"/models", "/opt/vasystem/bin/zconft"); cE != nil {
+ if _,cE := util.CopyDirByCmd(unPackPath+sdkType+"/models", "/opt/vasystem/bin/zconf"); cE != nil {
return false, cE
}
}
--
Gitblit v1.8.0