From 1a50abf5c447ba223e2aaf9375c28e89083d062c Mon Sep 17 00:00:00 2001 From: tangping <303397035@qq.com> Date: Thu, 20 Feb 2025 17:46:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E7=94=A8=E7=BB=9F=E4=B8=80=E5=91=BD?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .svn/wc.db | Bin 593920 -> 614400 bytes trunk/.idea/workspace.xml | 106 ++++++++---------- .../center/admincenter/internal/admin/api.go | 4 +- trunk/center/common/httpServer/apiHandler.go | 2 +- trunk/center/common/httpServer/reflect.go | 2 +- trunk/center/common/httpServer/serverMux.go | 2 +- trunk/center/common/rabbitmq/config.go | 2 + trunk/center/common/webserver/apiHandler.go | 2 +- trunk/center/common/webserver/reflect.go | 2 +- .../center/common/webserver/responseObject.go | 2 +- trunk/center/common/webserver/serverMux.go | 2 +- trunk/center/dbcenter/main.go | 2 +- trunk/center/paycenter/internal/pay/api.go | 2 +- trunk/center/paycenter/main.go | 2 +- 14 files changed, 58 insertions(+), 74 deletions(-) diff --git a/.svn/wc.db b/.svn/wc.db index ec044f0ac52a8ef8748a4092bad96c46314c483c..ef42bc7615449a503d6654fa69b536364c6033a4 100644 GIT binary patch delta 36088 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 delta 19974 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 - - - - - - - - - - - - - - - - + + + - - - - - - - + + { @@ -66,45 +48,45 @@ - { - "keyToString": { - "DefaultGoTemplateProperty": "Go File", - "Docker.admincenter.redis: Compose 部署.executor": "Run", - "Docker.admincenter/Dockerfile.executor": "Run", - "Docker.center/admincenter/Dockerfile builder.executor": "Run", - "Go 构建.go build admincenter.executor": "Run", - "Go 构建.go build dbcenter.executor": "Run", - "Go 构建.go build logincenter.executor": "Debug", - "Go 构建.go build paycenter.executor": "Run", - "Go 构建.go build usercenter.executor": "Run", - "Go 测试.common/connection 中的 TestGetDBName.executor": "Run", - "Go 测试.dbcenter 中的 Test000.executor": "Debug", - "Go 测试.dbcenter 中的 Test001 (1).executor": "Debug", - "Go 测试.dbcenter 中的 Test001.executor": "Run", - "Go 测试.dbcenter 中的 Test002 (1).executor": "Run", - "Go 测试.dbcenter 中的 Test002.executor": "Run", - "RunOnceActivity.ShowReadmeOnStart": "true", - "RunOnceActivity.git.unshallow": "true", - "RunOnceActivity.go.formatter.settings.were.checked": "true", - "RunOnceActivity.go.migrated.go.modules.settings": "true", - "RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true", - "git-widget-placeholder": "master", - "go.import.settings.migrated": "true", - "go.sdk.automatically.set": "true", - "ignore.virus.scanning.warn.message": "true", - "last_opened_file_path": "D:/workspace/e2023/goProject/trunk", - "node.js.detected.package.eslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "run.configurations.included.in.services": "true", - "settings.editor.selected.configurable": "preferences.pluginManager" + +}]]> @@ -125,7 +107,7 @@ - + @@ -184,10 +166,10 @@ - - + + diff --git a/trunk/center/admincenter/internal/admin/api.go b/trunk/center/admincenter/internal/admin/api.go index 87ace60..eac1ff4 100644 --- a/trunk/center/admincenter/internal/admin/api.go +++ b/trunk/center/admincenter/internal/admin/api.go @@ -243,7 +243,7 @@ func (a *AdminApi) GetAveragePlaytimes(startTime, endTime int64) (responseObj *w if endZero > nowZero { endZero = nowZero } - GetAveragePlaytimes() + //GetAveragePlaytimes() totalMap := make(map[int32]map[int64]int64) userSeverList, _ := GetUserSeverList() date := startZero @@ -333,7 +333,7 @@ func (a *AdminApi) GetAverageWatchADNum(startTime, endTime int64) (responseObj * if endZero > nowZero { endZero = nowZero } - GetAveragePlaytimes() + //GetAveragePlaytimes() totalMap := make(map[int32]map[int64]float32) userSeverList, _ := GetUserSeverList() date := startZero diff --git a/trunk/center/common/httpServer/apiHandler.go b/trunk/center/common/httpServer/apiHandler.go index be46147..4bb1f4d 100644 --- a/trunk/center/common/httpServer/apiHandler.go +++ b/trunk/center/common/httpServer/apiHandler.go @@ -3,7 +3,7 @@ package httpServer import ( "net/http" - "common/resultstatus" + "common/resultStatus" "common/webServer" ) diff --git a/trunk/center/common/httpServer/reflect.go b/trunk/center/common/httpServer/reflect.go index f0a6e8e..e01a089 100644 --- a/trunk/center/common/httpServer/reflect.go +++ b/trunk/center/common/httpServer/reflect.go @@ -2,7 +2,7 @@ package httpServer import ( config "common/configsYaml" - "common/resultstatus" + "common/resultStatus" "common/webServer" "goutil/logUtilPlus" "reflect" diff --git a/trunk/center/common/httpServer/serverMux.go b/trunk/center/common/httpServer/serverMux.go index 13cb013..d188666 100644 --- a/trunk/center/common/httpServer/serverMux.go +++ b/trunk/center/common/httpServer/serverMux.go @@ -2,7 +2,7 @@ package httpServer import ( config "common/configsYaml" - "common/resultstatus" + "common/resultStatus" "common/utils" "common/webServer" "encoding/json" diff --git a/trunk/center/common/rabbitmq/config.go b/trunk/center/common/rabbitmq/config.go index fb99526..714edab 100644 --- a/trunk/center/common/rabbitmq/config.go +++ b/trunk/center/common/rabbitmq/config.go @@ -28,6 +28,7 @@ func init() { //抛出一个异常 logUtil.FatalLog("Failed to connect to RabbitMQ: %s,err:%s", rabbitMQAddress, err.Error()) + return } // 打开一个通道 @@ -36,6 +37,7 @@ func init() { //抛出一个异常 logUtil.FatalLog("Failed to open a channel,err:%s", err.Error()) + return } //循环数据库数量 diff --git a/trunk/center/common/webserver/apiHandler.go b/trunk/center/common/webserver/apiHandler.go index c79948a..b2f020f 100644 --- a/trunk/center/common/webserver/apiHandler.go +++ b/trunk/center/common/webserver/apiHandler.go @@ -3,7 +3,7 @@ package webServer import ( "net/http" - "common/resultstatus" + "common/resultStatus" ) // 处理函数 diff --git a/trunk/center/common/webserver/reflect.go b/trunk/center/common/webserver/reflect.go index 3805faa..854230a 100644 --- a/trunk/center/common/webserver/reflect.go +++ b/trunk/center/common/webserver/reflect.go @@ -2,7 +2,7 @@ package webServer import ( config "common/configsYaml" - "common/resultstatus" + "common/resultStatus" "goutil/logUtilPlus" "reflect" "strconv" diff --git a/trunk/center/common/webserver/responseObject.go b/trunk/center/common/webserver/responseObject.go index 4614a9c..0b79498 100644 --- a/trunk/center/common/webserver/responseObject.go +++ b/trunk/center/common/webserver/responseObject.go @@ -1,7 +1,7 @@ package webServer import ( - "common/resultstatus" + "common/resultStatus" ) // ResponseObject diff --git a/trunk/center/common/webserver/serverMux.go b/trunk/center/common/webserver/serverMux.go index 7079f3a..bcff6df 100644 --- a/trunk/center/common/webserver/serverMux.go +++ b/trunk/center/common/webserver/serverMux.go @@ -2,7 +2,7 @@ package webServer import ( config "common/configsYaml" - "common/resultstatus" + "common/resultStatus" "common/utils" "encoding/json" "fmt" diff --git a/trunk/center/dbcenter/main.go b/trunk/center/dbcenter/main.go index 8e1ddbb..d825d48 100644 --- a/trunk/center/dbcenter/main.go +++ b/trunk/center/dbcenter/main.go @@ -6,7 +6,7 @@ import ( "dbcenter/internal" "sync" - _ "common/resultstatus" + _ "common/resultStatus" ) var ( diff --git a/trunk/center/paycenter/internal/pay/api.go b/trunk/center/paycenter/internal/pay/api.go index 00d604a..6061447 100644 --- a/trunk/center/paycenter/internal/pay/api.go +++ b/trunk/center/paycenter/internal/pay/api.go @@ -2,7 +2,7 @@ package pay import ( "common/remark" - "common/resultstatus" + "common/resultStatus" "common/webServer" "goutil/logUtilPlus" "goutil/webUtil" diff --git a/trunk/center/paycenter/main.go b/trunk/center/paycenter/main.go index 23eb51c..ba61fb3 100644 --- a/trunk/center/paycenter/main.go +++ b/trunk/center/paycenter/main.go @@ -4,7 +4,7 @@ import ( "common/connection" "sync" - _ "common/resultstatus" + _ "common/resultStatus" "common/webServer" _ "paycenter/internal" )