发布测试版 2.5.0

app/Support/Totp.php

@@ -97,18 +97,6 @@ class Totp
         return $val2[1];
     }
 
-    /**
-     * @param string $user
-     * @param string $hostname
-     * @param string $secret
-     * @return string
-     */
-    public function getURL($user, $hostname, $secret)
-    {
-        $encoderURL = sprintf("otpauth://totp/%s@%s%%3Fsecret%%3D%s", $user, $hostname, $secret);
-        return $encoderURL;
-    }
-
     /**
      * @return string
      */
@@ -123,6 +111,19 @@ class Totp
         }
         return Base32::encode($secret);
     }
+
+    /**
+     * @param string $user
+     * @param string $host
+     * @param string $secret
+     * @param string $issuer
+     * @return string
+     */
+    public static function getURL($user, $host, $secret, $issuer)
+    {
+        $encoderURL = sprintf("otpauth://totp/%s@%s%%3Fsecret%%3D%s%%3Fissuer%%3D%s", $user, $host, $secret, urlencode($issuer));
+        return $encoderURL;
+    }
 }
 
 /*

app/Support/helpers.php

@@ -890,14 +890,6 @@ function array_find($data, $key)
     return false;
 }
 
-/**
- * 获取自定义变量
- */
-function get_gdoo_var()
-{
-    return json_decode(App\Support\AES::decrypt('WyJxdThDblJqd2hCWXF0Y2ZCT0JveTNBPT0iLCJGdUlcLzVUMTRYK1dCTnFtZGoxYWZucUk3MVhNanYzTEpkV094QVQ3K0c1S2wrTnZyQ3ppN0pFZTNIWEs3VzdGekhDblJQXC9PUDN3bmtMRWJKVVNwWVd5RE5EaFllazh0bHdUOWxBNXdyTXVPTk1qazljd2xtaUxqXC9MZTU0QXdwSm1ZYkhaOU01bWFSUFRnMVphcmN5UU43Zm9PR0xJdHNvUnUyc1YwSEJnaTR5a0Mzc1RUdHAxSzdwMHpjRzF6TlQiXQ','tm1Ctgi7CEmabw'),true);
-}
-
 /**
  * 数组重新按指定键排序
  */