浏览代码

path config seperated to stand alone file.

master
Patrick Peng Sun 8 年前
父节点
当前提交
d48611054e
共有 5 个文件被更改,包括 56 次插入14 次删除
  1. +1
    -1
      common_test.go
  2. +3
    -0
      config.go
  3. +41
    -0
      configPath.go
  4. +6
    -13
      main.go
  5. +5
    -0
      path_config.json

+ 1
- 1
common_test.go 查看文件

@@ -35,7 +35,7 @@ func SetupConfig() {
IntraAPIConfig = ConfigIntraAPI{
"cAT/ckkfjajvczxiaufodqdfakpozcczfas341fda.vfasdk/8934125",
}
GlobalPath = PathsConfig{"/tmp", "spa/"}
GlobalPath = PathsConfig{"/tmp", "spa/", "http://192.168.1.39:65500/"}
KFUsers.kfRenewList()
}


+ 3
- 0
config.go 查看文件

@@ -66,3 +66,6 @@ func getAesEncryptKey() [32]byte {
copy(k[:], key)
return k
}




+ 41
- 0
configPath.go 查看文件

@@ -0,0 +1,41 @@
package main

import (
"encoding/json"
"errors"
"io/ioutil"
"log"
)

//PathsConfig all system available pathes
type PathsConfig struct {
Angular2App string `json:"angular2_app"`
SinglePageEdit string `json:"singlePageEdit"`
ThisSiteURL string `json:"thisSiteURL"`
}

//GlobalPath all global pathes configurations
var GlobalPath = PathsConfig{}

func (m *PathsConfig) readConfig() error {
log.Printf("read Path config from %s\r\n", "path_config.json")
body, err := ioutil.ReadFile("path_config.json")
if err != nil {
log.Fatal("Cannot read config from path_config.json")
return err
}
err = json.Unmarshal(body, m)
if m.SinglePageEdit == "" {
return errors.New("Single Page Edit Resources not available")
}

if m.Angular2App == "" {
return errors.New("Angular2APP path not available")
}

if m.ThisSiteURL == "" {
return errors.New("site url not available")
}

return err
}

+ 6
- 13
main.go 查看文件

@@ -13,19 +13,6 @@ import (
"time"
)

//PathsConfig all system available pathes
type PathsConfig struct {
Angular2App string `json:"angular2_app"`
SinglePageEdit string `json:"singlePageEdit"`
}

//GlobalPath all global pathes configurations
// TODO: setup GlobalPath Config, from reading file
var GlobalPath = PathsConfig{
"dist/",
"spa/",
}

//KFUsers info cache about current customer service
var KFUsers kfCache

@@ -49,6 +36,12 @@ func main() {
log.Fatal("unable to read intra-api-config, program quit")
}

err = GlobalPath.readConfig()
if err != nil {
log.Println(err)
log.Fatal("unable to read globalPath, program quit")
}

initAllProc()
setupRootFileServer()
startSessionManager(2048)

+ 5
- 0
path_config.json 查看文件

@@ -0,0 +1,5 @@
{
"angular2_app" : "dist/",
"singlePageEdit" : "spa/",
"thisSiteURL" :"http://192.168.1.39:65500/"
}

正在加载...
取消
保存