Browse Source

配置项修改

WH01243 10 tháng trước cách đây
mục cha
commit
e359956375

+ 1 - 1
api/common/initconfig.go

@@ -122,7 +122,7 @@ func InitConf() {
 	redis.InitRedis(DB.Redis)
 	redis.InitRedis(DB.Redis)
 
 
 	ConnectClickhouse(DB.Clickhouse)
 	ConnectClickhouse(DB.Clickhouse)
-	Middleground = middleground.NewMiddleground(C.CodeServiceConf.Etcd.Hosts).
+	Middleground = middleground.NewMiddleground(C.Hosts).
 		RegUserCenter(C.UserCenterKey).
 		RegUserCenter(C.UserCenterKey).
 		RegPowerCheckCenter(C.PowerCheckCenterKey).
 		RegPowerCheckCenter(C.PowerCheckCenterKey).
 		RegEntManageApplication(C.EntManageApplication)
 		RegEntManageApplication(C.EntManageApplication)

+ 5 - 8
api/etc/networkmanage.yaml

@@ -8,13 +8,10 @@ Gateway:
     - 192.168.3.207:2379
     - 192.168.3.207:2379
     - 192.168.3.165:2379
     - 192.168.3.165:2379
     - 192.168.3.204:2379
     - 192.168.3.204:2379
-CodeServiceConf:
-  Etcd:
-    Hosts:
-      - 192.168.3.207:2379
-      - 192.168.3.165:2379
-      - 192.168.3.204:2379
-    Key: codeservice.rpc
+Hosts:
+  - 192.168.3.207:2379
+  - 192.168.3.165:2379
+  - 192.168.3.204:2379
 UserCenterKey: "usercenter.rpc" #用户中台rpc
 UserCenterKey: "usercenter.rpc" #用户中台rpc
 PowerCheckCenterKey: "powercheck.rpc" #权益校验中台
 PowerCheckCenterKey: "powercheck.rpc" #权益校验中台
-EntManageApplication: "entmanageapplication.rpc" #企业管理中台    -
+EntManageApplication: "entmanageapplication.rpc" #企业管理中台

+ 1 - 2
api/internal/config/config.go

@@ -3,7 +3,6 @@ package config
 import (
 import (
 	"bp.jydev.jianyu360.cn/CRM/networkManage/entity"
 	"bp.jydev.jianyu360.cn/CRM/networkManage/entity"
 	"github.com/zeromicro/go-zero/rest"
 	"github.com/zeromicro/go-zero/rest"
-	"github.com/zeromicro/go-zero/zrpc"
 )
 )
 
 
 type Config struct {
 type Config struct {
@@ -15,7 +14,7 @@ type Config struct {
 	UserCenterKey        string
 	UserCenterKey        string
 	PowerCheckCenterKey  string
 	PowerCheckCenterKey  string
 	EntManageApplication string
 	EntManageApplication string
-	CodeServiceConf      zrpc.RpcClientConf
+	Hosts                []string
 }
 }
 
 
 type Db struct {
 type Db struct {