Merge branch 'master' of http://43.226.57.217:3000/leitao/RoConfig

jenkins/open_server_hw.sh

@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# open_server_hw.sh
+# Call the gmweb /v1/pay/openServer endpoint for overseas (HW) open-server notification.
+# Usage:
+#   ./open_server_hw.sh sid name time gameid signkey
+#   ./open_server_hw.sh <base_url> sid name time gameid signkey
+# Examples:
+#   ./open_server_hw.sh 1 "Server One" "2026-02-01 10:00:00" mygamekey mysignkey
+#   ./open_server_hw.sh http://127.0.0.1:8080/v1/pay/openServer 1 "Server One" "2026-02-01 10:00:00" mygamekey mysignkey
+# Notes:
+#  - If you provide 5 args (or 6 with base URL), the script will work as before.
+#  - If `time` is passed without quotes (split into multiple tokens like 2025-11-20 12:00:00),
+#    the script will rejoin the middle tokens into the time string automatically.
+#  - Values that include spaces are still best passed quoted; this just provides convenience for the
+#    common date-time case where users forget to quote the string.
+#  - The script uses curl --get --data-urlencode so values are URL-encoded safely.
+
+usage() {
+    echo "Usage: $0 sid name time gameid signkey"
+    echo "   or: $0 <base_url> sid name time gameid signkey"
+    exit 1
+}
+
+DEFAULT_URL="http://127.0.0.1:8086/v1/pay/openServer"
+
+if [ $# -lt 5 ]; then
+    usage
+fi
+
+# detect optional base URL (starts with http:// or https://)
+case "$1" in
+    http://*|https://*)
+        BASE_URL="$1"
+        shift
+        ;;
+    *)
+        BASE_URL="$DEFAULT_URL"
+        ;;
+esac
+
+# Now we expect at least 5 positional parts: sid name time... gameid signkey
+if [ $# -lt 5 ]; then
+    usage
+fi
+
+sid="$1"
+name="$2"
+
+# We treat the last two tokens as gameid and signkey, and everything between name and gameid as the time
+# Count remaining args
+N=$#
+# get signkey (last arg)
+signkey=$(eval "echo \${$N}")
+# get gameid (arg N-1)
+idx=`expr $N - 1`
+gameid=$(eval "echo \${$idx}")
+
+# build time from args 3 .. N-2
+time=""
+start=3
+end=`expr $N - 2`
+idx=$start
+while [ $idx -le $end ]; do
+    part=$(eval "echo \${$idx}")
+    if [ -z "$time" ]; then
+        time="$part"
+    else
+        time="$time $part"
+    fi
+    idx=`expr $idx + 1`
+done
+
+if ! command -v curl >/dev/null 2>&1; then
+    echo "curl not found. Please install curl."
+    exit 1
+fi
+
+echo "Calling ${BASE_URL} with:" \
+     "sid=${sid}" "name=${name}" "time=${time}" "gameid=${gameid}"
+
+# Use curl --get --data-urlencode for safe encoding of parameters (handles spaces and special chars)
+curl -S -G "$BASE_URL" \
+    --data-urlencode "sid=${sid}" \
+    --data-urlencode "name=${name}" \
+    --data-urlencode "time=${time}" \
+    --data-urlencode "gameid=${gameid}" \
+    --data-urlencode "signkey=${signkey}"
+
+echo
+
+echo "-----done-----"

jenkins/select_pay_user.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# MySQL 连接配置
+MYSQL_USER="root"      # 替换为你的数据库用户名
+MYSQL_PASSWORD="123456"   # 替换为你的数据库密码
+MYSQL_HOST="127.0.0.1"            # 替换为数据库地址，如 127.0.0.1
+
+# 获取所有以 'ro' 开头的数据库
+DATABASES=$(mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -h$MYSQL_HOST -e "SHOW DATABASES LIKE 'ro%';" -s -N)
+
+TOTAL_RMB=0
+TOTAL_ROLE=0
+
+echo "开始查询所有 ro* 数据库的统计信息..."
+
+# 遍历每个数据库
+for DB in $DATABASES; do
+    echo "数据库: $DB"
+
+    # 查询1: 当日 RMB 总和（优化版，使用索引）
+    SQL1="SELECT COALESCE(SUM(rmb), 0) FROM role_order_list WHERE order_date >= CURDATE() AND order_date < CURDATE() + INTERVAL 1 DAY;"
+    SUM_RMB=$(mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -h$MYSQL_HOST -D $DB -e "$SQL1" -s -N 2>/dev/null)
+
+    # 查询2: 当日创建的角色数量（优化版，使用索引）
+    SQL2="SELECT COALESCE(COUNT(*), 0) FROM role WHERE create_date >= CURDATE() AND create_date < CURDATE() + INTERVAL 1 DAY;"
+    COUNT_ROLE=$(mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -h$MYSQL_HOST -D $DB -e "$SQL2" -s -N 2>/dev/null)
+
+    # 显示当前数据库的两个统计值
+    echo "  - 当日充值金额(rmb): $SUM_RMB"
+    echo "  - 当日新角色数量: $COUNT_ROLE"
+    echo ""
+
+    # 分别累加到对应的总和
+    TOTAL_RMB=$((TOTAL_RMB + SUM_RMB))
+    TOTAL_ROLE=$((TOTAL_ROLE + COUNT_ROLE))
+done
+
+echo "========================================"
+echo "汇总结果:"
+echo "所有 ro* 数据库的当日充值总金额(rmb): $TOTAL_RMB"
+echo "所有 ro* 数据库的当日新角色总数: $TOTAL_ROLE"

开服流程/yamlrel/gmweb_config.yaml

@@ -14,7 +14,7 @@ server:
     id: 1
     zone: 2
     logfile: ./log
-    loglevel: 3
+    loglevel: 2
     etcdaddr: 127.0.0.1:2379
     concern: [social]
     config: ./config
@@ -38,5 +38,6 @@ server:
   db:
     redisaddr: [127.0.0.1:6379]
     dbindex: 0
+    dbindex3: 120
     mysqladdr: root:123456@(127.0.0.1:3306)/ro?charset=utf8&loc=Asia%2FShanghai&parseTime=true
-    mysqladdrall: [root:123456@(127.0.0.1:3306)/ro?charset=utf8&loc=Asia%2FShanghai&parseTime=true,root:123456@(127.0.0.1:3306)/ro2?charset=utf8&loc=Asia%2FShanghai&parseTime=true]
+    #mysqladdrall: [root:123456@(127.0.0.1:3306)/ro?charset=utf8&loc=Asia%2FShanghai&parseTime=true,root:123456@(127.0.0.1:3306)/ro2?charset=utf8&loc=Asia%2FShanghai&parseTime=true]

开服流程/白名单用户.txt

@@ -29,6 +29,7 @@ Ch0KCDI2NzMwMjYzGMGAwICg6KW2ZyjKubuBwDIwAg==
 
 1234567双平台测试服
 7441807963113652641
+东南亚测试白名单：ssum22snezy871241
 
 cp -r /data/server/{auth,battleboss,battlerecord,crossrank,crossrouter,crossserver,db,game,gate,gmweb,guild,rank,social,cleanpid.sh,config} /data/server9/