diff --git a/.svn/wc.db b/.svn/wc.db index ec044f0..ef42bc7 100644 Binary files a/.svn/wc.db and b/.svn/wc.db differ diff --git a/trunk/.idea/workspace.xml b/trunk/.idea/workspace.xml index 2bdd48d..3a3d485 100644 --- a/trunk/.idea/workspace.xml +++ b/trunk/.idea/workspace.xml @@ -5,35 +5,16 @@ - - - - - - - - - - - - - - - - + + + - - - - - - - + + { @@ -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" )