引用统一命名

trunk/.idea/workspace.xml

@@ -5,35 +5,16 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="2037df1b-9ccc-4caa-9145-2d6722712612" name="更改" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/trunk.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/trunk.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/admincenter/internal/admin/admin.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/admincenter/internal/admin/admin.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/center/admincenter/internal/admin/api.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/admincenter/internal/admin/api.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/admincenter/internal/admin/logic.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/admincenter/internal/admin/logic.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/admincenter/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/admincenter/main.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/common/connection/dbHead.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/common/connection/dbHead.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/center/common/httpServer/apiHandler.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/common/httpServer/apiHandler.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/center/common/httpServer/reflect.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/common/httpServer/reflect.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/center/common/httpServer/serverMux.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/common/httpServer/serverMux.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/common/mytime/timefuncs.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/common/mytime/timefuncs.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/common/resultstatus/resultStatusCode.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/common/resultstatus/resultStatusCode.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/common/webserver/apiHandler.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/common/webserver/apiHandler.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/common/webserver/reflect.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/common/webserver/reflect.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/common/webserver/responseObject.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/common/webserver/responseObject.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/common/webserver/serverMux.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/common/webserver/serverMux.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/paycenter/go.mod" beforeDir="false" afterPath="$PROJECT_DIR$/center/paycenter/go.mod" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/paycenter/go.sum" beforeDir="false" afterPath="$PROJECT_DIR$/center/paycenter/go.sum" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/paycenter/internal/alipay.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/paycenter/internal/alipay/alipay.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/paycenter/internal/mesqueue/game_msg.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/paycenter/internal/mesqueue/game_msg.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/paycenter/internal/pay.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/paycenter/internal/wxpay/pay.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/center/common/rabbitmq/config.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/common/rabbitmq/config.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/center/common/webServer/responseObject.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/common/webServer/responseObject.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/center/dbcenter/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/dbcenter/main.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/center/paycenter/internal/pay/api.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/paycenter/internal/pay/api.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/paycenter/internal/pay/check_order.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/paycenter/internal/pay/check_order.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/paycenter/internal/wxpaycofnig/payconfig.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/paycenter/internal/wxpay/config.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/usercenter/internal/wxuser/api.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/usercenter/internal/wxuser/api.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/usercenter/internal/wxuser/logic.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/usercenter/internal/wxuser/logic.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/usercenter/internal/wxuser/user.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/usercenter/internal/wxuser/user.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/usercenter/internal/wxuser/userrecord.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/usercenter/internal/wxuser/userrecord.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/center/usercenter/internal/wxuser/wechatsdkservice.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/usercenter/internal/wxuser/wechatsdkservice.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/center/paycenter/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/paycenter/main.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -53,6 +34,7 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
   </component>
   <component name="HighlightingSettingsPerFile">
+    <setting file="file://$USER_HOME$/go/pkg/mod/github.com/go-pay/gopay@v1.5.108/alipay/v3/constant.go" root0="SKIP_INSPECTION" />
     <setting file="file://$USER_HOME$/go/pkg/mod/golang.org/toolchain@v0.0.1-go1.23.4.windows-amd64/src/log/log.go" root0="SKIP_INSPECTION" />
   </component>
   <component name="ProjectColorInfo">{
@@ -66,45 +48,45 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;DefaultGoTemplateProperty&quot;: &quot;Go File&quot;,
-    &quot;Docker.admincenter.redis: Compose 部署.executor&quot;: &quot;Run&quot;,
-    &quot;Docker.admincenter/Dockerfile.executor&quot;: &quot;Run&quot;,
-    &quot;Docker.center/admincenter/Dockerfile builder.executor&quot;: &quot;Run&quot;,
-    &quot;Go 构建.go build admincenter.executor&quot;: &quot;Run&quot;,
-    &quot;Go 构建.go build dbcenter.executor&quot;: &quot;Run&quot;,
-    &quot;Go 构建.go build logincenter.executor&quot;: &quot;Debug&quot;,
-    &quot;Go 构建.go build paycenter.executor&quot;: &quot;Run&quot;,
-    &quot;Go 构建.go build usercenter.executor&quot;: &quot;Run&quot;,
-    &quot;Go 测试.common/connection 中的 TestGetDBName.executor&quot;: &quot;Run&quot;,
-    &quot;Go 测试.dbcenter 中的 Test000.executor&quot;: &quot;Debug&quot;,
-    &quot;Go 测试.dbcenter 中的 Test001 (1).executor&quot;: &quot;Debug&quot;,
-    &quot;Go 测试.dbcenter 中的 Test001.executor&quot;: &quot;Run&quot;,
-    &quot;Go 测试.dbcenter 中的 Test002 (1).executor&quot;: &quot;Run&quot;,
-    &quot;Go 测试.dbcenter 中的 Test002.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.go.formatter.settings.were.checked&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.go.migrated.go.modules.settings&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.go.modules.go.list.on.any.changes.was.set&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;go.import.settings.migrated&quot;: &quot;true&quot;,
-    &quot;go.sdk.automatically.set&quot;: &quot;true&quot;,
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/workspace/e2023/goProject/trunk&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;run.configurations.included.in.services&quot;: &quot;true&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "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"
   },
-  &quot;keyToStringList&quot;: {
-    &quot;DatabaseDriversLRU&quot;: [
-      &quot;mysql_aurora&quot;
+  "keyToStringList": {
+    "DatabaseDriversLRU": [
+      "mysql_aurora"
     ]
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\workspace\e2023\goProject\trunk\center\paycenter\internal\cert" />
@@ -125,7 +107,7 @@
       </set>
     </option>
   </component>
-  <component name="RunManager" selected="Go 构建.go build paycenter">
+  <component name="RunManager" selected="Go 构建.go build admincenter">
     <configuration name="go build admincenter" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true">
       <module name="trunk" />
       <working_directory value="$PROJECT_DIR$/center/admincenter" />
@@ -184,10 +166,10 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="Go 构建.go build paycenter" />
         <item itemvalue="Go 构建.go build admincenter" />
-        <item itemvalue="Go 构建.go build dbcenter" />
+        <item itemvalue="Go 构建.go build paycenter" />
         <item itemvalue="Go 构建.go build usercenter" />
+        <item itemvalue="Go 构建.go build dbcenter" />
         <item itemvalue="Docker.admincenter/Dockerfile" />
       </list>
     </recent_temporary>

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

trunk/center/common/httpServer/apiHandler.go

@@ -3,7 +3,7 @@ package httpServer
 import (
 	"net/http"
 
-	"common/resultstatus"
+	"common/resultStatus"
 	"common/webServer"
 )
 

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"

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"

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
 	}
 
 	//循环数据库数量

trunk/center/common/webserver/apiHandler.go

@@ -3,7 +3,7 @@ package webServer
 import (
 	"net/http"
 
-	"common/resultstatus"
+	"common/resultStatus"
 )
 
 // 处理函数

trunk/center/common/webserver/reflect.go

@@ -2,7 +2,7 @@ package webServer
 
 import (
 	config "common/configsYaml"
-	"common/resultstatus"
+	"common/resultStatus"
 	"goutil/logUtilPlus"
 	"reflect"
 	"strconv"

trunk/center/common/webserver/responseObject.go

@@ -1,7 +1,7 @@
 package webServer
 
 import (
-	"common/resultstatus"
+	"common/resultStatus"
 )
 
 // ResponseObject

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"

trunk/center/dbcenter/main.go

@@ -6,7 +6,7 @@ import (
 	"dbcenter/internal"
 	"sync"
 
-	_ "common/resultstatus"
+	_ "common/resultStatus"
 )
 
 var (

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"

trunk/center/paycenter/main.go

@@ -4,7 +4,7 @@ import (
 	"common/connection"
 	"sync"
 
-	_ "common/resultstatus"
+	_ "common/resultStatus"
 	"common/webServer"
 	_ "paycenter/internal"
 )