tangping/goProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

引用统一命名

Browse Source
This commit is contained in:
tangping 2025-02-20 17:46:57 +08:00
parent cbdce12462
commit 1a50abf5c4
14 changed files with 58 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.svn/wc.db
View File

Binary file not shown.

106
trunk/.idea/workspace.xml
View File

@ -5,35 +5,16 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="2037df1b-9ccc-4caa-9145-2d6722712612" name="更改" comment=""> <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$/.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/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/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/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/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/rabbitmq/config.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/common/rabbitmq/config.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/responseObject.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/common/webServer/responseObject.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/dbcenter/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/dbcenter/main.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/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/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/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/center/paycenter/main.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" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -53,6 +34,7 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component> </component>
<component name="HighlightingSettingsPerFile"> <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" /> <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>
<component name="ProjectColorInfo">{ <component name="ProjectColorInfo">{
@ -66,45 +48,45 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent">{ <component name="PropertiesComponent"><![CDATA[{
&quot;keyToString&quot;: { "keyToString": {
&quot;DefaultGoTemplateProperty&quot;: &quot;Go File&quot;, "DefaultGoTemplateProperty": "Go File",
&quot;Docker.admincenter.redis: Compose 部署.executor&quot;: &quot;Run&quot;, "Docker.admincenter.redis: Compose 部署.executor": "Run",
&quot;Docker.admincenter/Dockerfile.executor&quot;: &quot;Run&quot;, "Docker.admincenter/Dockerfile.executor": "Run",
&quot;Docker.center/admincenter/Dockerfile builder.executor&quot;: &quot;Run&quot;, "Docker.center/admincenter/Dockerfile builder.executor": "Run",
&quot;Go 构建.go build admincenter.executor&quot;: &quot;Run&quot;, "Go 构建.go build admincenter.executor": "Run",
&quot;Go 构建.go build dbcenter.executor&quot;: &quot;Run&quot;, "Go 构建.go build dbcenter.executor": "Run",
&quot;Go 构建.go build logincenter.executor&quot;: &quot;Debug&quot;, "Go 构建.go build logincenter.executor": "Debug",
&quot;Go 构建.go build paycenter.executor&quot;: &quot;Run&quot;, "Go 构建.go build paycenter.executor": "Run",
&quot;Go 构建.go build usercenter.executor&quot;: &quot;Run&quot;, "Go 构建.go build usercenter.executor": "Run",
&quot;Go 测试.common/connection 中的 TestGetDBName.executor&quot;: &quot;Run&quot;, "Go 测试.common/connection 中的 TestGetDBName.executor": "Run",
&quot;Go 测试.dbcenter 中的 Test000.executor&quot;: &quot;Debug&quot;, "Go 测试.dbcenter 中的 Test000.executor": "Debug",
&quot;Go 测试.dbcenter 中的 Test001 (1).executor&quot;: &quot;Debug&quot;, "Go 测试.dbcenter 中的 Test001 (1).executor": "Debug",
&quot;Go 测试.dbcenter 中的 Test001.executor&quot;: &quot;Run&quot;, "Go 测试.dbcenter 中的 Test001.executor": "Run",
&quot;Go 测试.dbcenter 中的 Test002 (1).executor&quot;: &quot;Run&quot;, "Go 测试.dbcenter 中的 Test002 (1).executor": "Run",
&quot;Go 测试.dbcenter 中的 Test002.executor&quot;: &quot;Run&quot;, "Go 测试.dbcenter 中的 Test002.executor": "Run",
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;, "RunOnceActivity.ShowReadmeOnStart": "true",
&quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;, "RunOnceActivity.git.unshallow": "true",
&quot;RunOnceActivity.go.formatter.settings.were.checked&quot;: &quot;true&quot;, "RunOnceActivity.go.formatter.settings.were.checked": "true",
&quot;RunOnceActivity.go.migrated.go.modules.settings&quot;: &quot;true&quot;, "RunOnceActivity.go.migrated.go.modules.settings": "true",
&quot;RunOnceActivity.go.modules.go.list.on.any.changes.was.set&quot;: &quot;true&quot;, "RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true",
&quot;git-widget-placeholder&quot;: &quot;master&quot;, "git-widget-placeholder": "master",
&quot;go.import.settings.migrated&quot;: &quot;true&quot;, "go.import.settings.migrated": "true",
&quot;go.sdk.automatically.set&quot;: &quot;true&quot;, "go.sdk.automatically.set": "true",
&quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;, "ignore.virus.scanning.warn.message": "true",
&quot;last_opened_file_path&quot;: &quot;D:/workspace/e2023/goProject/trunk&quot;, "last_opened_file_path": "D:/workspace/e2023/goProject/trunk",
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;, "node.js.detected.package.eslint": "true",
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;, "node.js.selected.package.eslint": "(autodetect)",
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;, "nodejs_package_manager_path": "npm",
&quot;run.configurations.included.in.services&quot;: &quot;true&quot;, "run.configurations.included.in.services": "true",
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot; "settings.editor.selected.configurable": "preferences.pluginManager"
}, },
&quot;keyToStringList&quot;: { "keyToStringList": {
&quot;DatabaseDriversLRU&quot;: [ "DatabaseDriversLRU": [
&quot;mysql_aurora&quot; "mysql_aurora"
] ]
} }
}</component> }]]></component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="D:\workspace\e2023\goProject\trunk\center\paycenter\internal\cert" /> <recent name="D:\workspace\e2023\goProject\trunk\center\paycenter\internal\cert" />
@ -125,7 +107,7 @@
</set> </set>
</option> </option>
</component> </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"> <configuration name="go build admincenter" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true">
<module name="trunk" /> <module name="trunk" />
<working_directory value="$PROJECT_DIR$/center/admincenter" /> <working_directory value="$PROJECT_DIR$/center/admincenter" />
@ -184,10 +166,10 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Go 构建.go build paycenter" />
<item itemvalue="Go 构建.go build admincenter" /> <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 usercenter" />
<item itemvalue="Go 构建.go build dbcenter" />
<item itemvalue="Docker.admincenter/Dockerfile" /> <item itemvalue="Docker.admincenter/Dockerfile" />
</list> </list>
</recent_temporary> </recent_temporary>

4
trunk/center/admincenter/internal/admin/api.go
View File

@ -243,7 +243,7 @@ func (a *AdminApi) GetAveragePlaytimes(startTime, endTime int64) (responseObj *w
if endZero > nowZero { if endZero > nowZero {
endZero = nowZero endZero = nowZero
} }
GetAveragePlaytimes() //GetAveragePlaytimes()
totalMap := make(map[int32]map[int64]int64) totalMap := make(map[int32]map[int64]int64)
userSeverList, _ := GetUserSeverList() userSeverList, _ := GetUserSeverList()
date := startZero date := startZero
@ -333,7 +333,7 @@ func (a *AdminApi) GetAverageWatchADNum(startTime, endTime int64) (responseObj *
if endZero > nowZero { if endZero > nowZero {
endZero = nowZero endZero = nowZero
} }
GetAveragePlaytimes() //GetAveragePlaytimes()
totalMap := make(map[int32]map[int64]float32) totalMap := make(map[int32]map[int64]float32)
userSeverList, _ := GetUserSeverList() userSeverList, _ := GetUserSeverList()
date := startZero date := startZero

2
trunk/center/common/httpServer/apiHandler.go
View File

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

2
trunk/center/common/httpServer/reflect.go
View File

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

2
trunk/center/common/httpServer/serverMux.go
View File

@ -2,7 +2,7 @@ package httpServer
import ( import (
config "common/configsYaml" config "common/configsYaml"
"common/resultstatus" "common/resultStatus"
"common/utils" "common/utils"
"common/webServer" "common/webServer"
"encoding/json" "encoding/json"

2
trunk/center/common/rabbitmq/config.go
View File

@ -28,6 +28,7 @@ func init() {
//抛出一个异常 //抛出一个异常
logUtil.FatalLog("Failed to connect to RabbitMQ: %s，err:%s", rabbitMQAddress, err.Error()) 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()) logUtil.FatalLog("Failed to open a channel，err:%s", err.Error())
return
} }
//循环数据库数量 //循环数据库数量

2
trunk/center/common/webserver/apiHandler.go
View File

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

2
trunk/center/common/webserver/reflect.go
View File

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

2
trunk/center/common/webserver/responseObject.go
View File

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

2
trunk/center/common/webserver/serverMux.go
View File

@ -2,7 +2,7 @@ package webServer
import ( import (
config "common/configsYaml" config "common/configsYaml"
"common/resultstatus" "common/resultStatus"
"common/utils" "common/utils"
"encoding/json" "encoding/json"
"fmt" "fmt"

2
trunk/center/dbcenter/main.go
View File

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

2
trunk/center/paycenter/internal/pay/api.go
View File

@ -2,7 +2,7 @@ package pay
import ( import (
"common/remark" "common/remark"
"common/resultstatus" "common/resultStatus"
"common/webServer" "common/webServer"
"goutil/logUtilPlus" "goutil/logUtilPlus"
"goutil/webUtil" "goutil/webUtil"

2
trunk/center/paycenter/main.go
View File

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