From 2ed9efc77cc81183d7f26d206b8adaa21aaff6e6 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 9 Nov 2020 20:22:39 +0800
Subject: [PATCH] 1

---
 sql/paydb.sql                                  |  2 +-
 webapp/bootstrap/config_loader.php             | 13 ++++++++++---
 webapp/controller/UnitTestController.class.php | 18 +++++++++++++++++-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/sql/paydb.sql b/sql/paydb.sql
index 3654aa2..7bfdab1 100644
--- a/sql/paydb.sql
+++ b/sql/paydb.sql
@@ -48,7 +48,7 @@ CREATE TABLE `orderinfo` (
   `try_count` int(11) NOT NULL DEFAULT '0' COMMENT '补单次数',
   `price` int(11) NOT NULL DEFAULT '0' COMMENT 'price',
   `ipv4` varchar(50) NOT NULL DEFAULT '' COMMENT 'ipv4地址',
-  `status` int(11) NOT NULL DEFAULT '0' COMMENT '0: 新添加订单 1:已经完成订单 2:发货成功',
+  `status` int(11) NOT NULL DEFAULT '0' COMMENT '0: 新添加订单 1:已经完成订单',
   `confirmtime` int(11) NOT NULL DEFAULT '0' COMMENT 'GameServer订单确认时间',
   `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
 
diff --git a/webapp/bootstrap/config_loader.php b/webapp/bootstrap/config_loader.php
index 792d431..8d453f7 100644
--- a/webapp/bootstrap/config_loader.php
+++ b/webapp/bootstrap/config_loader.php
@@ -1,7 +1,8 @@
 <?php
 
 $g_conf_mysql_cluster = require('../config/pay.mysql.cluster.php');
-$g_conf_redis_cluster = require('../config/pay.redis.cluster.php');
+//$g_conf_redis_cluster = require('../config/pay.redis.cluster.php');
+$g_conf_global_redis = require('../config/pay.global.redis.php');
 
 function checkMysqlConfig()
 {
@@ -40,7 +41,7 @@ function getMysqlConfig($hash_value)
     return $g_conf_mysql_cluster[$idx];
 }
 
-function getRedisConfig($hash_value)
+/*function getRedisConfig($hash_value)
 {
     if ($hash_value < 0) {
         die('hash_value < 0 ' . $hash_value);
@@ -48,7 +49,13 @@ function getRedisConfig($hash_value)
     global $g_conf_redis_cluster;
     $idx = $hash_value % count($g_conf_redis_cluster);
     return $g_conf_redis_cluster[$idx];
+    }*/
+
+function getGlobalRedisConfig()
+{
+    global $g_conf_global_redis;
+    return $g_conf_global_redis;
 }
 
 checkMysqlConfig();
-checkRedisConfig();
+//checkRedisConfig();
diff --git a/webapp/controller/UnitTestController.class.php b/webapp/controller/UnitTestController.class.php
index 96dbe5a..e041262 100644
--- a/webapp/controller/UnitTestController.class.php
+++ b/webapp/controller/UnitTestController.class.php
@@ -1,12 +1,28 @@
 <?php
 
+require 'classes/OrderCtrl.php';
+
+use classes;
+
 class UnitTestController {
 
-    public function __construct() {
+    public function __construct()
+    {
         if (SERVER_ENV == _ONLINE) {
             die("can't create UnitTestController");
             return;
         }
     }
 
+    public function genOrderId()
+    {
+        $order_ctrl = new classes\OrderCtrl();
+        echo json_encode(array(
+            'errcode' => 0,
+            'errmsg' => '',
+            'orderid' => $order_ctrl->genOrder($_REQUEST['account_id']
+            ))
+        );
+    }
+
 }