Merge fc6bb8cf34 into 3a05281a9f

allow admin/staff unbind a user and better subscription domain names

app/Console/Commands/MigrateFromV2b.php

@@ -51,15 +51,16 @@ class MigrateFromV2b extends Command
             ],
             '1.7.3' => [
                 'ALTER TABLE `v2_stat_order` RENAME TO `v2_stat`;',
-                "ALTER TABLE `v2_stat` CHANGE COLUMN order_amount order_total INT COMMENT '订单合计';",
+                "ALTER TABLE `v2_stat` CHANGE COLUMN order_amount paid_total INT COMMENT '订单合计';",
+                "ALTER TABLE `v2_stat` CHANGE COLUMN order_count paid_count INT COMMENT '邀请佣金';",
                 "ALTER TABLE `v2_stat` CHANGE COLUMN commission_amount commission_total INT COMMENT '佣金合计';",
                 "ALTER TABLE `v2_stat`
-                    ADD COLUMN paid_count INT NULL,
+                    ADD COLUMN order_count INT NULL,
-                    ADD COLUMN paid_total INT NULL,
+                    ADD COLUMN order_total INT NULL,
                     ADD COLUMN register_count INT NULL,
                     ADD COLUMN invite_count INT NULL,
                     ADD COLUMN transfer_used_total VARCHAR(32) NULL;
-                ",  
+                ", 
                 "CREATE TABLE `v2_log` (
                     `id` INT AUTO_INCREMENT PRIMARY KEY,
                     `title` TEXT NOT NULL,

app/Plugins/Telegram/Commands/UnBind.php

@@ -12,11 +12,17 @@ class UnBind extends Telegram {
 
     public function handle($message, $match = []) {
         if (!$message->is_private) return;
-        $user = User::where('telegram_id', $message->chat_id)->first();
+        if (!isset($message->args[0])) {
-        $telegramService = $this->telegramService;
+            $user = User::where('telegram_id', $message->chat_id)->first();
-        if (!$user) {
+        } else {
-            $telegramService->sendMessage($message->chat_id, '没有查询到您的用户信息，请先绑定账号', 'markdown');
+            $chat = User::where('telegram_id', $message->chat_id)->first();
-            return;
+            if (!$chat) return;
+            if (!($chat->is_admin || $chat->is_staff)) return;
+            if (strpos($message->args[0], '@') !== true) {
+                $user = User::where('email', $message->args[0])->first();
+            } else {
+                $user = User::where('telegram_id', $message->args[0])->first();
+            }
         }
         $user->telegram_id = NULL;
         if (!$user->save()) {

app/Utils/Helper.php

@@ -110,11 +110,20 @@ class Helper
 
     public static function getSubscribeUrl(string $token, $subscribeUrl = null)
     {
+        $strs = 'QWERTYUIOPASDFGHJKLZXCVBNM1234567890qwertyuiopasdfghjklzxcvbnm';
+        $randstr = substr(str_shuffle($strs), 0, rand(4,8));
+        
         $path = route('client.subscribe', ['token' => $token], false);
         if(!$subscribeUrl){
             $subscribeUrls = explode(',', admin_setting('subscribe_url'));
             $subscribeUrl = \Arr::random($subscribeUrls);
             $subscribeUrl = self::replaceByPattern($subscribeUrl);
+            if (strpos($subscribeUrl, "*") !== false) {
+                $subscribeUrl = str_replace("*", $randstr, $subscribeUrl);
+            } elseif (strpos($subscribeUrl, '{uuid}') !== false) {
+                $user = User::where('token', $token)->first();
+                $subscribeUrl = str_replace('{uuid}', $user->uuid, $subscribeUrl);
+            }
         }
         return $subscribeUrl ? rtrim($subscribeUrl, '/') . $path : url($path);
     }

update.sh

@@ -11,7 +11,7 @@ if ! command -v git &> /dev/null; then
 fi
 
 git config --global --add safe.directory $(pwd)
-git fetch --all && git reset --hard origin/dev && git pull origin dev
+git fetch --all && git reset --hard origin/legacy && git pull origin legacy
 rm -rf composer.lock composer.phar
 wget https://github.com/composer/composer/releases/latest/download/composer.phar -O composer.phar
 php composer.phar update -vvv