diff --git a/README.md b/README.md index 1664863..fd5e2e0 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,10 @@ -## 游戏服务更新 -此成果由@钉三多确认完成 - +docker run --name nacos-standalone-derby --restart=always \ + -e MODE=standalone \ + -e NACOS_AUTH_TOKEN=MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY= \ + -e NACOS_AUTH_IDENTITY_KEY=nacos-server-key \ + -e NACOS_AUTH_IDENTITY_VALUE=nacos-server-value-2026 \ + -p 8080:8080 \ + -p 8848:8848 \ + -p 9848:9848 \ + -v /data/nacos:/home/nacos/data \ + -d nacos/nacos-server:latest \ No newline at end of file diff --git a/conf/server.json b/conf/server.json new file mode 100644 index 0000000..ff105c9 --- /dev/null +++ b/conf/server.json @@ -0,0 +1,48 @@ +{ + "AppID": 0, + "LogLevel": "debug", + "LogPath": "./log", + "TCPAddr": ":3602", + "WSAddr": ":3567", + "MySqlAddr": "127.0.0.1", + "MySqlPort": "3306", + "MySqlUsr": "root", + "MySqlPwd": "IOagNEq3C84c-20CmHEin5iODVc=", + "MaxConnNum": 20000, + "DbName": "merge_pet_1", + "HttpPort": ":8081", + "AppPath": "./app", + "TELOGDIR" : "./teLog/", + + "GameName": "pet_home_local", + + "ServerType":"node", + + "ServerID": 1, + "ServerOpenTime": "2018-01-01 00:00:00", + "ServerName": "Merge_Pet", + "ServerStatus" : 1, + "ServerCenter" : 0, + "GameConfPath": "D:/Github/pet_home_server/src/server/gamedata/config/", + + "ListenAddr":":9002", + "CenterAddr": "127.0.0.1:7000", + "RemoteAddr":"127.0.0.1:9002", + + "RedisAddr":"127.0.0.1", + "RedisPort" :"6379", + "RedisPwd" :"", + + "RedisWriteAddr":"127.0.0.1:6379", + "RedisReadAddrs":"127.0.0.1:6379", + "RedisMasterName":"mymaster", + "RedisConnType":"Direct", + + "GoogleVerify":false, + "Partition":3, + "KafkaHost":"kafka-server", + "CountryCode":"004", + "KafkaPort":"9092", + "Version":"1.0.0", + "IdVerify":false +} diff --git a/conf/server.yml b/conf/server.yml index 426fe28..a20fc59 100644 --- a/conf/server.yml +++ b/conf/server.yml @@ -8,6 +8,8 @@ system: us_operation_chat_id: 'oc_a3d1268f63573563fdaea3dedb3bf78d' client_chat_id: 'oc_f6e10a55f28f31e2a5677bdcb6aed599' ssh: true + env: 'dev' + rpc_switch: true mysqls: - host: '127.0.0.1' name: 'merge_pet_test' @@ -37,7 +39,7 @@ mysqls: password: 'GWFj1cHaqjpzvcsHBWTFtLWtm8MUZKROx_wvbV6jPg==' database: 'merge_pet_london_%d' idleTimeout: Infinity - - host: 'rm-rj9my01442p7kpe36.mysql.rds-aliyun-america.rds.aliyuncs.com' + - host: 'ga-bp1s4q4jo935fmnxs474f.aliyunga0018.com' name: 'merge_pet_online' port: 3306 user: 'root' diff --git a/conf/translater.yml b/conf/translater.yml index ae43ed1..7f109e0 100644 --- a/conf/translater.yml +++ b/conf/translater.yml @@ -9,10 +9,10 @@ user: - account: "Catarina Pereira" # 账号名 keys: "MergeData, cardName, DialogData, ChapterTip, chapter_title" # 需要的键值列表，逗号分隔 colunm: "key,en_US,pt_BR" # 需要翻译的列名 - - account: "Príamo Jiménez" # 账号名 - keys: "DialogData" # 需要的键值列表，逗号分隔 - keysType: "no_include" # keysType 不包含 - colunm: "key,en_US,es_LATAM" # 需要翻译的列名 - account: "Gabriela Mantellini" # 账号名 keys: "DialogData" # 需要的键值列表，逗号分隔 - colunm: "key,en_US,es_LATAM" # 需要翻译的列名 \ No newline at end of file + colunm: "key,en_US,es_LATAM" # 需要翻译的列名 + - account: "language001" + keys: "MergeData,cardName,GuideData,ChapterTip,DialogData,groupName" + keysType: "all" + colunm: "key,en_US,pt_BR" \ No newline at end of file diff --git a/controller/alibaba.go b/controller/alibaba.go index ee98dac..8e29a0f 100644 --- a/controller/alibaba.go +++ b/controller/alibaba.go @@ -2,7 +2,7 @@ package controller import ( "backend/Type" - "backend/alibaba" + "backend/middleware/alibaba" "backend/util" "fmt" "log" diff --git a/controller/common.go b/controller/common.go index 9a6f43c..8788175 100644 --- a/controller/common.go +++ b/controller/common.go @@ -2,7 +2,7 @@ package controller import ( "backend/common" - "backend/feishu" + "backend/middleware/feishu" "fmt" "github.com/gin-gonic/gin" diff --git a/controller/feishu.go b/controller/feishu.go index 5b80d9e..e34f8f5 100644 --- a/controller/feishu.go +++ b/controller/feishu.go @@ -3,7 +3,7 @@ package controller import ( "backend/Type" "backend/common" - "backend/feishu" + "backend/middleware/feishu" "backend/model" "backend/util" "fmt" diff --git a/controller/scripts.go b/controller/scripts.go index 38b8e4b..9eb70c5 100644 --- a/controller/scripts.go +++ b/controller/scripts.go @@ -1,7 +1,7 @@ package controller import ( - "backend/alibaba" + "backend/middleware/alibaba" "backend/model" "backend/util" "fmt" diff --git a/controller/server.go b/controller/server.go index 1eaac63..162ceb3 100644 --- a/controller/server.go +++ b/controller/server.go @@ -3,7 +3,7 @@ package controller import ( "backend/Type" "backend/common" - "backend/feishu" + "backend/middleware/feishu" "backend/model" "backend/util" "fmt" diff --git a/main.go b/main.go index 0c8f5b2..0b4d1bb 100644 --- a/main.go +++ b/main.go @@ -3,9 +3,9 @@ package main import ( "backend/common" "backend/controller" - "backend/feishu/server" config "backend/global" "backend/middleware" + "backend/middleware/feishu/server" "backend/model" "backend/monitor" "backend/util" diff --git a/alibaba/card.go b/middleware/alibaba/card.go similarity index 100% rename from alibaba/card.go rename to middleware/alibaba/card.go diff --git a/alibaba/card_example.go b/middleware/alibaba/card_example.go similarity index 100% rename from alibaba/card_example.go rename to middleware/alibaba/card_example.go diff --git a/alibaba/client.go b/middleware/alibaba/client.go similarity index 100% rename from alibaba/client.go rename to middleware/alibaba/client.go diff --git a/alibaba/robot.go b/middleware/alibaba/robot.go similarity index 100% rename from alibaba/robot.go rename to middleware/alibaba/robot.go diff --git a/alibaba/space.go b/middleware/alibaba/space.go similarity index 100% rename from alibaba/space.go rename to middleware/alibaba/space.go diff --git a/feishu/client/client.go b/middleware/feishu/client/client.go similarity index 98% rename from feishu/client/client.go rename to middleware/feishu/client/client.go index 849335b..b6d0ff6 100644 --- a/feishu/client/client.go +++ b/middleware/feishu/client/client.go @@ -1,7 +1,7 @@ package client import ( - "backend/feishu/data" + "backend/middleware/feishu/data" "context" "fmt" diff --git a/feishu/data/d.go b/middleware/feishu/data/d.go similarity index 100% rename from feishu/data/d.go rename to middleware/feishu/data/d.go diff --git a/feishu/feishu.go b/middleware/feishu/feishu.go similarity index 99% rename from feishu/feishu.go rename to middleware/feishu/feishu.go index 38cdb6f..72e9309 100644 --- a/feishu/feishu.go +++ b/middleware/feishu/feishu.go @@ -3,7 +3,7 @@ package feishu import ( "backend/Type" "backend/common" - "backend/feishu/client" + "backend/middleware/feishu/client" "backend/util" "bytes" "encoding/json" diff --git a/feishu/handle/card.go b/middleware/feishu/handle/card.go similarity index 100% rename from feishu/handle/card.go rename to middleware/feishu/handle/card.go diff --git a/feishu/server/server.go b/middleware/feishu/server/server.go similarity index 94% rename from feishu/server/server.go rename to middleware/feishu/server/server.go index a7838b3..e87419e 100644 --- a/feishu/server/server.go +++ b/middleware/feishu/server/server.go @@ -2,9 +2,9 @@ package server import ( "backend/common" - "backend/feishu/client" - "backend/feishu/data" - "backend/feishu/handle" + "backend/middleware/feishu/client" + "backend/middleware/feishu/data" + "backend/middleware/feishu/handle" "context" "fmt" "log" diff --git a/model/server.go b/model/server.go index 814d760..7f0fa41 100644 --- a/model/server.go +++ b/model/server.go @@ -2,8 +2,8 @@ package model import ( "backend/Type" - "backend/alibaba" - "backend/feishu" + "backend/middleware/alibaba" + "backend/middleware/feishu" "backend/msg" util "backend/util" "fmt" diff --git a/monitor/Monitor.go b/monitor/Monitor.go index f00b2c2..7a0ff3d 100644 --- a/monitor/Monitor.go +++ b/monitor/Monitor.go @@ -2,7 +2,7 @@ package monitor import ( "backend/Type" - "backend/alibaba" + "backend/middleware/alibaba" "backend/model" "backend/util" "fmt" diff --git a/sdk/login/model/tuyou/tuyou.go b/sdk/login/model/tuyou/tuyou.go index 4105f2f..1b04024 100644 --- a/sdk/login/model/tuyou/tuyou.go +++ b/sdk/login/model/tuyou/tuyou.go @@ -2,7 +2,7 @@ package tuyou import ( "backend/Type" - "backend/feishu" + "backend/middleware/feishu" "backend/sdk/login/model/base" "backend/util" "crypto/tls" diff --git a/sdk/ship/conf/server.yml b/sdk/ship/conf/server.yml index b1c332c..7a6ae3c 100644 --- a/sdk/ship/conf/server.yml +++ b/sdk/ship/conf/server.yml @@ -53,7 +53,7 @@ mysqls: servers: - name: 'server1' - host: '1.15.182.107' + host: '112.124.54.243' port: 22 username: 'root' password: 'r_vcLRGHPm1bEZDKU1L5TTr_-u_expNKgsCBuXNHmA==' diff --git a/sdk/ship/model/test/test.go b/sdk/ship/model/test/test.go index 766b98d..a8916b0 100644 --- a/sdk/ship/model/test/test.go +++ b/sdk/ship/model/test/test.go @@ -4,7 +4,7 @@ import ( "backend/Type" "backend/client" "backend/common" - "backend/feishu" + "backend/middleware/feishu" "backend/msg" "backend/sdk/ship/model/base" "backend/util" diff --git a/sdk/ship/model/tuyou/tuyou.go b/sdk/ship/model/tuyou/tuyou.go index 1a1895d..3ade8c4 100644 --- a/sdk/ship/model/tuyou/tuyou.go +++ b/sdk/ship/model/tuyou/tuyou.go @@ -2,10 +2,10 @@ package tuyou import ( "backend/Type" - "backend/alibaba" "backend/client" "backend/common" - "backend/feishu" + "backend/middleware/alibaba" + "backend/middleware/feishu" "backend/msg" "backend/sdk/ship/model/base" "backend/util" diff --git a/unit_test.go b/unit_test.go index 46a26c3..e194a1c 100644 --- a/unit_test.go +++ b/unit_test.go @@ -2,8 +2,8 @@ package main import ( "backend/Type" - "backend/alibaba" - "backend/feishu" + "backend/middleware/alibaba" + "backend/middleware/feishu" "backend/model" "backend/sdk/ship/model/tuyou" "backend/util"