版本更新

README.md

@@ -1,3 +1,10 @@
-## 游戏服务更新
-<font sizeToken=common_footnote_text_style__font_size>此成果由<font colorTokenV2=common_blue1_color>@钉三多</font>确认完成</font>
-
+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

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
+}

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'

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" # 需要翻译的列名
+    colunm: "key,en_US,es_LATAM" # 需要翻译的列名
+  - account: "language001"
+    keys: "MergeData,cardName,GuideData,ChapterTip,DialogData,groupName"
+    keysType: "all"
+    colunm: "key,en_US,pt_BR"

controller/alibaba.go

@@ -2,7 +2,7 @@ package controller
 
 import (
 	"backend/Type"
-	"backend/alibaba"
+	"backend/middleware/alibaba"
 	"backend/util"
 	"fmt"
 	"log"

controller/common.go

@@ -2,7 +2,7 @@ package controller
 
 import (
 	"backend/common"
-	"backend/feishu"
+	"backend/middleware/feishu"
 	"fmt"
 
 	"github.com/gin-gonic/gin"

controller/feishu.go

@@ -3,7 +3,7 @@ package controller
 import (
 	"backend/Type"
 	"backend/common"
-	"backend/feishu"
+	"backend/middleware/feishu"
 	"backend/model"
 	"backend/util"
 	"fmt"

controller/scripts.go

@@ -1,7 +1,7 @@
 package controller
 
 import (
-	"backend/alibaba"
+	"backend/middleware/alibaba"
 	"backend/model"
 	"backend/util"
 	"fmt"

controller/server.go

@@ -3,7 +3,7 @@ package controller
 import (
 	"backend/Type"
 	"backend/common"
-	"backend/feishu"
+	"backend/middleware/feishu"
 	"backend/model"
 	"backend/util"
 	"fmt"

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"

middleware/feishu/client/client.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"backend/feishu/data"
+	"backend/middleware/feishu/data"
 	"context"
 	"fmt"
 

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"

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"

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"

monitor/Monitor.go

@@ -2,7 +2,7 @@ package monitor
 
 import (
 	"backend/Type"
-	"backend/alibaba"
+	"backend/middleware/alibaba"
 	"backend/model"
 	"backend/util"
 	"fmt"

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"

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=='

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"

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"

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"