TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-05 01:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

“集群设置 -- 网站设置”增加“允许记录访问日志”选项

Browse Source
This commit is contained in:
GoEdgeLab
2023-07-05 15:29:11 +08:00
parent 0c81fd5090
commit 1b70824e0d
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/db/models/node_cluster_dao.go
View File

@@ -176,7 +176,7 @@ func (this *NodeClusterDAO) CreateCluster(tx *dbs.Tx, adminId int64, name string
// 全局服务配置 // 全局服务配置
if globalServerConfig == nil { if globalServerConfig == nil {
globalServerConfig = serverconfigs.DefaultGlobalServerConfig() globalServerConfig = serverconfigs.NewGlobalServerConfig()
} }
globalServerConfigJSON, err := json.Marshal(globalServerConfig) globalServerConfigJSON, err := json.Marshal(globalServerConfig)
if err != nil { if err != nil {
@@ -1396,7 +1396,7 @@ func (this *NodeClusterDAO) FindClusterGlobalServerConfig(tx *dbs.Tx, clusterId
return nil, err return nil, err
} }
var config = serverconfigs.DefaultGlobalServerConfig() var config = serverconfigs.NewGlobalServerConfig()
if IsNull(configJSON) { if IsNull(configJSON) {
return config, nil return config, nil
} }
@@ -1412,7 +1412,7 @@ func (this *NodeClusterDAO) FindClusterGlobalServerConfig(tx *dbs.Tx, clusterId
// UpdateClusterGlobalServerConfig 修改全局服务配置 // UpdateClusterGlobalServerConfig 修改全局服务配置
func (this *NodeClusterDAO) UpdateClusterGlobalServerConfig(tx *dbs.Tx, clusterId int64, config *serverconfigs.GlobalServerConfig) error { func (this *NodeClusterDAO) UpdateClusterGlobalServerConfig(tx *dbs.Tx, clusterId int64, config *serverconfigs.GlobalServerConfig) error {
if config == nil { if config == nil {
config = serverconfigs.DefaultGlobalServerConfig() config = serverconfigs.NewGlobalServerConfig()
} }
configJSON, err := json.Marshal(config) configJSON, err := json.Marshal(config)
if err != nil { if err != nil {

2
internal/db/models/node_cluster_model_ext.go
View File

@@ -60,7 +60,7 @@ func (this *NodeCluster) DecodeClock() *nodeconfigs.ClockConfig {
// DecodeGlobalServerConfig 解析全局服务配置 // DecodeGlobalServerConfig 解析全局服务配置
func (this *NodeCluster) DecodeGlobalServerConfig() *serverconfigs.GlobalServerConfig { func (this *NodeCluster) DecodeGlobalServerConfig() *serverconfigs.GlobalServerConfig {
var config = serverconfigs.DefaultGlobalServerConfig() var config = serverconfigs.NewGlobalServerConfig()
if IsNotNull(this.GlobalServerConfig) { if IsNotNull(this.GlobalServerConfig) {
err := json.Unmarshal(this.GlobalServerConfig, config) err := json.Unmarshal(this.GlobalServerConfig, config)
if err != nil { if err != nil {

2
internal/rpc/services/service_node.go
View File

@@ -2016,7 +2016,7 @@ func (this *NodeService) FindNodeGlobalServerConfig(ctx context.Context, req *pb
} }
} }
if config == nil { if config == nil {
config = serverconfigs.DefaultGlobalServerConfig() config = serverconfigs.NewGlobalServerConfig()
} }
configJSON, err := json.Marshal(config) configJSON, err := json.Marshal(config)

4
internal/rpc/services/service_node_cluster.go
View File

@@ -34,7 +34,7 @@ func (this *NodeClusterService) CreateNodeCluster(ctx context.Context, req *pb.C
} }
// 全局服务配置 // 全局服务配置
var serverGlobalConfig = serverconfigs.DefaultGlobalServerConfig() var serverGlobalConfig = serverconfigs.NewGlobalServerConfig()
if len(req.GlobalServerConfigJSON) > 0 { if len(req.GlobalServerConfigJSON) > 0 {
err = json.Unmarshal(req.GlobalServerConfigJSON, serverGlobalConfig) err = json.Unmarshal(req.GlobalServerConfigJSON, serverGlobalConfig)
if err != nil { if err != nil {
@@ -1444,7 +1444,7 @@ func (this *NodeClusterService) UpdateNodeClusterGlobalServerConfig(ctx context.
return nil, err return nil, err
} }
var config = serverconfigs.DefaultGlobalServerConfig() var config = serverconfigs.NewGlobalServerConfig()
err = json.Unmarshal(req.GlobalServerConfigJSON, config) err = json.Unmarshal(req.GlobalServerConfigJSON, config)
if err != nil { if err != nil {
return nil, err return nil, err