From 481494a885303708d781b8f6e3c9ba7cc25450e1 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sat, 21 Apr 2018 13:06:10 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EB=A9=94=EC=8B=9C?= =?UTF-8?q?=EC=A7=80=20=EC=95=88=20=EB=B3=B4=EB=82=B4=EC=A7=80=EB=8D=98=20?= =?UTF-8?q?=EA=B2=83=20=EC=88=98=EC=A0=95=2010=EC=B4=88=EB=A7=88=EB=8B=A4?= =?UTF-8?q?=20=EB=A9=94=EC=8B=9C=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/_admin2_submit.php | 26 +++++++++++++------------- hwe/index.php | 2 +- hwe/sql/schema.sql | 2 +- tmp_msg/msg.js | 3 --- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/hwe/_admin2_submit.php b/hwe/_admin2_submit.php index c36380c2..9d60588f 100644 --- a/hwe/_admin2_submit.php +++ b/hwe/_admin2_submit.php @@ -101,7 +101,7 @@ switch($btn) { $text = "특기 부여!"; foreach($db->query("SELECT `no`,leader,power,intel,dex0,dex10,dex20,dex30,dex40 FROM general WHERE `no` IN %li", $genlist) as $general){ - $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($general['no']), $text, new DateTime(), new DateTime('9999-12-31'), []); + $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($general['no']), $text, new \DateTime(), new \DateTime('9999-12-31'), []); $msg->send(true); $specialWar = SpecialityConst::pickSpecialWar($general); @@ -119,7 +119,7 @@ switch($btn) { $src = MessageTarget::buildQuick($session->generalID); $text = $btn." 지급!"; foreach($genlist as $generalID){ - $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []); + $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []); $msg->send(true); } $db->update('general',[ @@ -131,7 +131,7 @@ switch($btn) { $src = MessageTarget::buildQuick($session->generalID); $text = $btn." 지급!"; foreach($genlist as $generalID){ - $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []); + $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []); $msg->send(true); } $db->update('general',[ @@ -143,7 +143,7 @@ switch($btn) { $src = MessageTarget::buildQuick($session->generalID); $text = "보병숙련도+10000 지급!"; foreach($genlist as $generalID){ - $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []); + $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []); $msg->send(true); } $db->update('general',[ @@ -154,7 +154,7 @@ switch($btn) { $src = MessageTarget::buildQuick($session->generalID); $text = "궁병숙련도+10000 지급!"; foreach($genlist as $generalID){ - $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []); + $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []); $msg->send(true); } $db->update('general',[ @@ -165,7 +165,7 @@ switch($btn) { $src = MessageTarget::buildQuick($session->generalID); $text = "기병숙련도+10000 지급!"; foreach($genlist as $generalID){ - $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []); + $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []); $msg->send(true); } $db->update('general',[ @@ -176,7 +176,7 @@ switch($btn) { $src = MessageTarget::buildQuick($session->generalID); $text = "귀병숙련도+10000 지급!"; foreach($genlist as $generalID){ - $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []); + $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []); $msg->send(true); } $db->update('general',[ @@ -187,7 +187,7 @@ switch($btn) { $src = MessageTarget::buildQuick($session->generalID); $text = "차병숙련도+10000 지급!"; foreach($genlist as $generalID){ - $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []); + $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []); $msg->send(true); } $db->update('general',[ @@ -207,7 +207,7 @@ switch($btn) { case "메세지 전달": $text = $msg; foreach($genlist as $generalID){ - $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []); + $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []); $msg->send(true); } break; @@ -221,7 +221,7 @@ switch($btn) { } foreach($genlist as $generalID){ - $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []); + $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []); $msg->send(true); } @@ -245,7 +245,7 @@ switch($btn) { } foreach($genlist as $generalID){ - $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []); + $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []); $msg->send(true); } @@ -269,7 +269,7 @@ switch($btn) { } foreach($genlist as $generalID){ - $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []); + $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []); $msg->send(true); } @@ -293,7 +293,7 @@ switch($btn) { } foreach($genlist as $generalID){ - $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []); + $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []); $msg->send(true); } diff --git a/hwe/index.php b/hwe/index.php index fd49d6a0..ee0752c7 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -77,7 +77,7 @@ $(function(){ setInterval(function(){ refreshMsg(); - }, 30000); + }, 10000); }); diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql index 2b81ca2b..afe1c197 100644 --- a/hwe/sql/schema.sql +++ b/hwe/sql/schema.sql @@ -419,7 +419,7 @@ CREATE TABLE `message` ( `valid_until` DATETIME NOT NULL DEFAULT '9999-12-31 23:59:59', `message` TEXT NOT NULL COMMENT 'json', PRIMARY KEY (`id`), - INDEX `by_mailbox` (`mailbox`, `type`, `time`) + INDEX `by_mailbox` (`mailbox`, `type`, `id`) ) DEFAULT CHARSET=utf8mb4 ENGINE=InnoDB; diff --git a/tmp_msg/msg.js b/tmp_msg/msg.js index 9cea74b8..6edb5e9d 100644 --- a/tmp_msg/msg.js +++ b/tmp_msg/msg.js @@ -59,9 +59,6 @@ function fetchMsg(){ } function redrawMsg(deferred){ - - console.log(deferred); - function registerSequence(obj){ if(!obj.result){ deferred.reject();