..

services/base.go

@@ -1,49 +1 @@
 package services
-
-import (
-	"encoding/json"
-	"eta/eta_forum_admin/utils"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-)
-
-// PostEdbLib 调用指标接口
-func PostEdbLib(param map[string]interface{}, method string) (result []byte, err error) {
-	postUrl := utils.EDB_LIB_URL + method
-	postData, err := json.Marshal(param)
-	if err != nil {
-		return
-	}
-	result, err = HttpPost(postUrl, string(postData), "application/json")
-	if err != nil {
-		return
-	}
-	return
-}
-
-func HttpPost(url, postData string, params ...string) ([]byte, error) {
-	fmt.Println("HttpPost Url:" + url)
-	body := ioutil.NopCloser(strings.NewReader(postData))
-	client := &http.Client{}
-	req, err := http.NewRequest("POST", url, body)
-	if err != nil {
-		return nil, err
-	}
-	contentType := "application/x-www-form-urlencoded;charset=utf-8"
-	if len(params) > 0 && params[0] != "" {
-		contentType = params[0]
-	}
-	req.Header.Set("Content-Type", contentType)
-	req.Header.Set("authorization", utils.MD5(utils.APP_EDB_LIB_NAME_EN+utils.EDB_LIB_Md5_KEY))
-	resp, err := client.Do(req)
-	if err != nil {
-		fmt.Println("client.Do err:" + err.Error())
-		return nil, err
-	}
-	defer resp.Body.Close()
-	b, err := ioutil.ReadAll(resp.Body)
-	fmt.Println("HttpPost:" + string(b))
-	return b, err
-}

utils/config.go

@@ -32,16 +32,6 @@ var (
 	CHART_INDEX_NAME string //研究图库索引
 )
 
-// 公共api内部服务调用
-var (
-	// EDB_LIB_URL 公共指标库
-	EDB_LIB_URL         string
-	APP_EDB_LIB_NAME_EN string
-	EDB_LIB_Md5_KEY     string
-	OpUserId            int    // 操作人id
-	OpUserRealName      string // 操作人真实名称
-)
-
 // 弘则
 const (
 	APPID  = "SJCrpOPvagscPxEv"
@@ -61,15 +51,6 @@ var (
 	LogMaxDays  int //日志最大保留天数
 )
 
-var (
-	EtaBridgeUrl       string // 桥接服务地址
-	EtaBridgeAppNameEn string // 桥接服务英文名称-鉴权用
-	EtaBridgeMd5Key    string // 桥接服务Md5密钥-鉴权用
-	EtaBridgeDesKey    string // 桥接服务Des密钥-解密数据用
-	SyncUserPath       string // 桥接服务-用户同步服务地址
-	SyncIndexPath      string // 桥接服务-指标同步服务地址
-)
-
 // 基础配置
 var (
 	DesKey string // 接口返回加密KEY
@@ -85,6 +66,22 @@ func init() {
 	}
 	RunMode = tmpRunMode
 	fmt.Println("RunMode:", RunMode)
+	if RunMode == "" {
+		localIp, err := GetLocalIP()
+		fmt.Println("localIp:", localIp)
+		if localIp == "10.0.0.123" {
+			RunMode = "debug"
+		} else {
+			RunMode = "release"
+		}
+		fmt.Println("RunMode:", RunMode)
+		configPath := `/home/code/config/eta_forum_admin/conf/app.conf`
+		fmt.Println("configPath:", configPath)
+		err = web.LoadAppConfig("ini", configPath)
+		if err != nil {
+			fmt.Println("web.LoadAppConfig Err:" + err.Error())
+		}
+	}
 	config, err := web.AppConfig.GetSection(RunMode)
 	if err != nil {
 		panic("配置文件读取错误 " + err.Error())
@@ -99,21 +96,6 @@ func init() {
 	MYSQL_URL = config["mysql_url"]
 	// mongodb数据库连接配置
 	MgoUrlData = config["mgo_url_data"]
-	// 公共api内部服务调用
-	{
-		// 公共指标库相关
-		EDB_LIB_URL = config["edb_lib_url"]
-		APP_EDB_LIB_NAME_EN = config["app_edb_lib_name_en"]
-		EDB_LIB_Md5_KEY = config["edb_lib_md5_key"]
-		opUserIdStr := config["op_user_id"]
-		if opUserIdStr != `` {
-			OpUserId, err = strconv.Atoi(opUserIdStr)
-			if err != nil {
-				panic("配置文件中操作人配置错误 " + err.Error())
-			}
-		}
-		OpUserRealName = config["op_user_real_name"]
-	}
 	//日志配置
 	{
 		LogPath = config["log_path"]