Update:Fixed bugs

src/Driver/Mysql/Connection.php

@@ -1,54 +1,56 @@
 <?php
+
 namespace Qii\Driver\mysql;
 
 class Connection extends \Qii\Driver\ConnBase implements \Qii\Driver\ConnIntf
 {
-	const VERSION = '1.2';
-	protected $_dbInfo;
+    const VERSION = '1.2';
+    protected $_dbInfo;
 
-	public function __construct()
-	{
-		$this->_dbInfo = \Qii\Config\Register::getAppConfigure(\Qii\Config\Register::get(\Qii\Config\Consts::APP_DB));
-	}
+    public function __construct()
+    {
+        $this->_dbInfo = \Qii\Config\Register::getAppConfigure(\Qii\Config\Register::get(\Qii\Config\Consts::APP_DB));
+    }
 
-	/**
-	 * 获取读数据的连接资源
-	 */
-	public function getReadConnection()
-	{
-		$dbInfo = $this->_dbInfo['master'];
-		$useSlave = false;
+    /**
+     * 获取读数据的连接资源
+     */
+    public function getReadConnection()
+    {
+        $dbInfo = $this->_dbInfo['master'];
+        $useSlave = false;
 
-		if ($this->_dbInfo['readOrWriteSeparation'] && $this->_dbInfo['slave']) {
-			$i = rand(0, count($this->_dbInfo['slave']) - 1);
-			$dbInfo = $this->_dbInfo['slave'][$i];
-			$useSlave = true;
-		}
+        if ($this->_dbInfo['readOrWriteSeparation'] && $this->_dbInfo['slave']) {
+            $i = rand(0, count($this->_dbInfo['slave']) - 1);
+            $dbInfo = $this->_dbInfo['slave'][$i];
+            $useSlave = true;
+        }
 
-		if ($useSlave) {
-			try {
-				$connection = mysql_connect($dbInfo['host'], $dbInfo['user'], $dbInfo['password'], $dbInfo['db']);
-				if (!$connection) throw new \Qii\Exceptions\Errors(\Qii::i(1501, iconv("GBK", "UTF-8//TRANSLIT", mysql_error())), true);
-				return $connection;
-			} catch (Exception  $e) {
-				return $this->getWriteConnection();
-			}
-		}
-		return $this->getWriteConnection();
-	}
+        if ($useSlave) {
+            try {
+                $connection = mysql_connect($dbInfo['host'], $dbInfo['user'], $dbInfo['password'], $dbInfo['db']);
+                if (!$connection) throw new \Qii\Exceptions\Errors(\Qii::i(1501, iconv("GBK", "UTF-8//TRANSLIT", mysql_error())), true);
+                return $connection;
+            } catch (Exception  $e) {
+                return $this->getWriteConnection();
+            }
+        }
+        return $this->getWriteConnection();
+    }
 
-	/**
-	 * 获取写数据的连接资源
-	 *
-	 */
-	public function getWriteConnection()
-	{
-		try {
-			$connection = mysql_connect($dbInfo['host'], $dbInfo['user'], $dbInfo['password'], $dbInfo['db']);
-			if (!$connection) throw new \Qii\Exceptions\Errors(\Qii::i(1501, iconv("GBK", "UTF-8//TRANSLIT", mysql_error())), true);
-			return $connection;
-		} catch (Exception  $e) {
-			throw new \Qii\Exceptions\Errors(\Qii::i(1500, $dbInfo['host'], $dbInfo['user'], $dbInfo['password'], $dbInfo['db'], $e->getMessage()));
-		}
-	}
+    /**
+     * 获取写数据的连接资源
+     *
+     */
+    public function getWriteConnection()
+    {
+        $dbInfo = $this->_dbInfo['master'];
+        try {
+            $connection = mysql_connect($dbInfo['host'], $dbInfo['user'], $dbInfo['password'], $dbInfo['db']);
+            if (!$connection) throw new \Qii\Exceptions\Errors(\Qii::i(1501, iconv("GBK", "UTF-8//TRANSLIT", mysql_error())), true);
+            return $connection;
+        } catch (Exception  $e) {
+            throw new \Qii\Exceptions\Errors(\Qii::i(1500, $dbInfo['host'], $dbInfo['user'], $dbInfo['password'], $dbInfo['db'], toUTF8($e->getMessage())));
+        }
+    }
 }

src/Driver/Mysqli/Connection.php

@@ -51,7 +51,7 @@ class Connection extends \Qii\Driver\ConnBase implements \Qii\Driver\ConnIntf
 			mysqli_select_db($connection, $dbInfo['db']);
 			return $connection;
 		} catch (Exception  $e) {
-			throw new \Qii\Exceptions\Errors(\Qii::i(1500, $dbInfo['host'], $dbInfo['user'], $dbInfo['password'], $dbInfo['db'], $e->getMessage()), __LINE__);
+			throw new \Qii\Exceptions\Errors(\Qii::i(1500, $dbInfo['host'], $dbInfo['user'], $dbInfo['password'], $dbInfo['db'], toUTF8($e->getMessage())), __LINE__);
 		}
 	}
 }

src/Driver/Pdo/Connection.php

@@ -68,7 +68,7 @@ class Connection extends \Qii\Driver\ConnBase implements \Qii\Driver\ConnIntf
 			}
 			return new \PDO($dsn, $dbInfo['user'], $dbInfo['password']);
 		} catch (Exception  $e) {
-			throw new \Qii\Exceptions\Errors(\Qii::i(1500, $dbInfo['host'], $dbInfo['user'], $dbInfo['password'], $dbInfo['db'], iconv('GB2312', 'UTF-8', $e->getMessage())), __LINE__);
+			throw new \Qii\Exceptions\Errors(\Qii::i(1500, $dbInfo['host'], $dbInfo['user'], $dbInfo['password'], $dbInfo['db'], toUTF8($e->getMessage())), __LINE__);
 		}
 	}
 }

src/Library/QrBackup.php

@@ -1,509 +0,0 @@
-<?php
-/**
- * 二维码工具
- * 提供读取和生成二维码方法
- */
-
-namespace Qii\Library;
-
-\Qii\Autoloader\Psr4::getInstance()
-    ->setUseNamespaces([
-        ['Zxing', true],
-        ['QrCode', true],
-    ])
-    ->addNamespaces([
-        ['Zxing', Qii_DIR . DS . 'Library' . DS . 'QrReader'],
-        ['QrCode', Qii_DIR . DS . 'Library' . DS . 'QrCode'],
-    ]);
-use Zxing\QrReader;
-
-_require(__DIR__ . DS . 'QrReader' . DS . 'Common' . DS . 'customFunctions.php');
-_require(__DIR__ . DS . 'QrReader' . DS . 'QrReader.php');
-
-
-_require(__DIR__ . DS . 'QrCode' . DS . 'QRconst.php');
-_require(__DIR__ . DS . 'QrCode' . DS . 'QREncode.php');
-
-class Qr
-{
-    use \QrCode\traits\fill;
-    public function __construct()
-    {
-
-    }
-
-    /**
-     * 读取二维码中的内容
-     * @param string $image 图片地址
-     * @return string 内容
-     */
-    public function reader($image)
-    {
-        if (!file_exists($image)) {
-            throw new \Exception('Unknow image file', __LINE__);
-        }
-        $qrcode = new QrReader($image);
-        $text = $qrcode->text();
-        return $text;
-    }
-
-    /**
-     * 生成二维码
-     * @param string $txt 二维码文案
-     * @param int $pointSize 图片尺寸
-     * @param int $margin 图片边距
-     * @param int $errorLevel 错误级别
-     * @return null
-     */
-    public function creator($txt, $pointSize = 8, $margin = 1, $errorLevel = 4)
-    {
-        if (!$txt) return;
-        return \QrCode\QRcode::png($txt, false, $errorLevel, $pointSize, $margin);
-    }
-
-    /**
-     * @param string $txt 需要生成的内容
-     * @param int $pointSize 每个点的大小
-     * @param int $margin 边距
-     * @param int $errorLevel 错误级别
-     * @param array $options 额外选型
-     */
-    public function creatorColor($txt, $pointSize = 8, $margin = 1, $errorLevel = 4, $options = array())
-    {
-        $defaults = array(
-            'width' => 240, //图片大小
-            'logo' => 'static/images/logo.png', //logo
-            'bg' => '',
-            'pointColor' => '#CC0033', //定点颜色
-            'inPointColor' => '#000000',//内定点
-            'frontColor' => '#000000',//前景色
-            'bgColor' => '#FFFFFF', //背景色
-            'contentColor' => '#000000', //内容颜色
-            'style' => 1,
-        );
-        $options = array_merge($defaults, $options);
-
-        \QrCode\QRencode::factory($errorLevel, $pointSize, $margin);
-        $qrCls = new \QrCode\QRencode();
-        $data = $qrCls->encode($txt);
-
-
-        $pointColor = $this->hex2rgb($options['pointColor']);
-        $inPointColor = $this->hex2rgb($options['inPointColor']);
-        $frontColor = $this->hex2rgb($options['frontColor']);
-        $bgColor = $this->hex2rgb($options['bgColor']);
-        $contentColor = $this->hex2rgb($options['contentColor']);
-
-        $w = strlen($data[0]);
-        $h = count($data);
-
-        $imageSize = count($data) - 1;
-        $s = $pointSize;//每一块的大小
-
-
-        $img = ImageCreate($w * $pointSize, $h * $pointSize);
-
-        $bgColor = ImageColorAllocate($img, $bgColor['r'], $bgColor['g'], $bgColor['b']);//背景色
-        $pointColor = ImageColorAllocate($img, $pointColor['r'], $pointColor['g'], $pointColor['b']);//定点色
-        $inPointColor = ImageColorAllocate($img, $inPointColor['r'], $inPointColor['g'], $inPointColor['b']);//内定点
-        $frontColor = ImageColorAllocate($img, $frontColor['r'], $frontColor['g'], $frontColor['b']);//前景色
-        $contentColor = ImageColorAllocate($img, $contentColor['r'], $contentColor['g'], $contentColor['b']);//内容色
-
-        switch($options['style'])
-        {
-            case 1:
-                $img = $this->rectangle($data, $pointSize, $options);
-                header('Content-type:image/png');
-                imagepng($img);
-                break;
-        }
-        $y = 0;
-        foreach ($data as $row) {
-            $x = 0;
-            while ($x < $w) {
-                if (substr($row, $x, 1) == "1") {
-                    //返回字符串 string 由 start 和 length 参数指定的子字符串。
-                    //左上角定点
-                    if ($x < 7 && $y < 7) {
-                        //左上角定点的四个大角
-                        if ($x === 0 || $y === 0 || $x === 6 || $y === 6) {
-                            switch ($options['style']) {
-                                case 2:
-                                    //液态
-                                    if ($x === 0 && $y === 0) {
-                                        $this->roundedCorner($img, $x, $y, $s, $pointColor, true, false, false, false);
-                                    } else if ($x === 0 && $y === 6) {
-                                        $this->roundedCorner($img, $x, $y, $s, $pointColor, false, true, false, false);
-                                    } else if ($x === 6 && $y === 6) {
-                                        $this->roundedCorner($img, $x, $y, $s, $pointColor, false, false, true, false);
-                                    } else if ($x === 6 && $y === 0) {
-                                        $this->roundedCorner($img, $x, $y, $s, $pointColor, false, false, false, true);
-                                    } else {
-                                        imagefilledrectangle($img, $x * $pointSize, $y * $pointSize, ($x + 1) * $pointSize, ($y + 1) * $pointSize, $pointColor);
-                                    }
-                                    break;
-                                case 1:
-                                    //直角
-                                    imagefilledrectangle($img, $x * $pointSize, $y * $pointSize, ($x + 1) * $pointSize, ($y + 1) * $pointSize, $pointColor);
-                                    break;
-                                case 0:
-                                    //圆圈
-                                    imagefilledellipse($img, ($x * $pointSize) + ($pointSize / 2), ($y * $pointSize) + ($pointSize / 2), $pointSize, $pointSize, $pointColor);
-                                    break;
-                            }
-
-                        } else {
-                            switch ($options['style']) {
-                                case 2:
-                                    //液态
-                                    if ($x === 2 && $y === 2) {
-                                        $this->roundedCorner($img, $x, $y, $s, $inPointColor, true, false, false, false);
-                                    } else if ($x === 2 && $y === 4) {
-                                        $this->roundedCorner($img, $x, $y, $s, $inPointColor, false, true, false, false);
-                                    } else if ($x === 4 && $y === 4) {
-                                        $this->roundedCorner($img, $x, $y, $s, $inPointColor, false, false, true, false);
-                                    } else if ($x === 4 && $y === 2) {
-                                        $this->roundedCorner($img, $x, $y, $s, $inPointColor, false, false, false, true);
-                                    } else {
-                                        imagefilledrectangle($img, $x * $pointSize, $y * $pointSize, ($x + 1) * $pointSize, ($y + 1) * $pointSize, $inPointColor);
-                                    }
-                                    break;
-                                case 1:
-                                    //直角
-                                    imagefilledrectangle($img, $x * $pointSize, $y * $pointSize, ($x + 1) * $pointSize, ($y + 1) * $pointSize, $inPointColor);
-                                    break;
-                                case 0:
-                                    //圆圈
-                                    imagefilledellipse($img, ($x * $pointSize) + ($pointSize / 2), ($y * $pointSize) + ($pointSize / 2), $pointSize, $pointSize, $inPointColor);
-                                    break;
-                            }
-
-                        }
-
-                    } elseif ($x > $imageSize - 8 && $y < 7) { //右上角定点
-
-                        if ($x === $imageSize - 7 || $y === 0 || $x === $imageSize - 1 || $y === 6) {
-                            switch ($options['style']) {
-                                case 2:
-                                    //液态
-                                    if ($x === $imageSize - 7 && $y === 0) {
-                                        $this->roundedCorner($img, $x, $y, $s, $pointColor, true, false, false, false);
-                                    } else if ($x === $imageSize - 7 && $y === 6) {
-                                        $this->roundedCorner($img, $x, $y, $s, $pointColor, false, true, false, false);
-                                    } else if ($x === $imageSize - 1 && $y === 6) {
-                                        $this->roundedCorner($img, $x, $y, $s, $pointColor, false, false, true, false);
-                                    } else if ($x === $imageSize - 1 && $y === 0) {
-                                        $this->roundedCorner($img, $x, $y, $s, $pointColor, false, false, false, true);
-                                    } else {
-                                        imagefilledrectangle($img, $x * $pointSize, $y * $pointSize, ($x + 1) * $pointSize, ($y + 1) * $pointSize, $pointColor);
-                                    }
-                                    break;
-                                case 1:
-                                    //直角
-                                    imagefilledrectangle($img, $x * $pointSize, $y * $pointSize, ($x + 1) * $pointSize, ($y + 1) * $pointSize, $pointColor);
-                                    break;
-                                case 0:
-                                    //圆圈
-                                    imagefilledellipse($img, ($x * $pointSize) + ($pointSize / 2), ($y * $pointSize) + ($pointSize / 2), $pointSize, $pointSize, $pointColor);
-                                    break;
-                            }
-
-                        } else {
-                            switch ($options['style']) {
-                                case 2:
-                                    //液态
-                                    if ($x === $imageSize - 5 && $y === 2) {
-                                        $this->roundedCorner($img, $x, $y, $s, $inPointColor, true, false, false, false);
-                                    } else if ($x === $imageSize - 5 && $y === 4) {
-                                        $this->roundedCorner($img, $x, $y, $s, $inPointColor, false, true, false, false);
-                                    } else if ($x === $imageSize - 3 && $y === 4) {
-                                        $this->roundedCorner($img, $x, $y, $s, $inPointColor, false, false, true, false);
-                                    } else if ($x === $imageSize - 3 && $y === 2) {
-                                        $this->roundedCorner($img, $x, $y, $s, $inPointColor, false, false, false, true);
-                                    } else {
-                                        imagefilledrectangle($img, $x * $pointSize, $y * $pointSize, ($x + 1) * $pointSize, ($y + 1) * $pointSize, $inPointColor);
-                                    }
-                                    break;
-                                case 1:
-                                    //直角
-                                    imagefilledrectangle($img, $x * $pointSize, $y * $pointSize, ($x + 1) * $pointSize, ($y + 1) * $pointSize, $inPointColor);
-                                    break;
-                                case 0:
-                                    //圆圈
-                                    imagefilledellipse($img, ($x * $pointSize) + ($pointSize / 2), ($y * $pointSize) + ($pointSize / 2), $pointSize, $pointSize, $inPointColor);
-                                    break;
-                            }
-                        }
-
-                    } elseif ($y > count($data) - 9 && $x < 7) { //左下角定点
-                        if ($x === 0 || $y === $imageSize - 7 || $x === 6 || $y === $imageSize - 1) {
-                            switch ($options['style']) {
-                                case 2:
-                                    //液态
-                                    if ($x === 0 && $y === $imageSize - 7) {
-                                        $this->roundedCorner($img, $x, $y, $s, $pointColor, true, false, false, false);
-                                    } else if ($x === 0 && $y === $imageSize - 1) {
-                                        $this->roundedCorner($img, $x, $y, $s, $pointColor, false, true, false, false);
-                                    } else if ($x === 6 && $y === $imageSize - 1) {
-                                        $this->roundedCorner($img, $x, $y, $s, $pointColor, false, false, true, false);
-                                    } else if ($x === 6 && $y === $imageSize - 7) {
-                                        $this->roundedCorner($img, $x, $y, $s, $pointColor, false, false, false, true);
-                                    } else {
-                                        imagefilledrectangle($img, $x * $pointSize, $y * $pointSize, ($x + 1) * $pointSize, ($y + 1) * $pointSize, $pointColor);
-                                    }
-                                    break;
-                                case 1:
-                                    //直角
-                                    imagefilledrectangle($img, $x * $pointSize, $y * $pointSize, ($x + 1) * $pointSize, ($y + 1) * $pointSize, $pointColor);
-                                    break;
-                                case 0:
-                                    //圆圈
-                                    imagefilledellipse($img, ($x * $pointSize) + ($pointSize / 2), ($y * $pointSize) + ($pointSize / 2), $pointSize, $pointSize, $pointColor);
-                                    break;
-                            }
-
-
-                        } else {
-                            switch ($options['style']) {
-                                case 2:
-                                    //液态
-                                    if ($x === 2 && $y === $imageSize - 5) {
-                                        $this->roundedCorner($img, $x, $y, $s, $inPointColor, true, false, false, false);
-                                    } else if ($x === 2 && $y === $imageSize - 3) {
-                                        $this->roundedCorner($img, $x, $y, $s, $inPointColor, false, true, false, false);
-                                    } else if ($x === 4 && $y === $imageSize - 3) {
-                                        $this->roundedCorner($img, $x, $y, $s, $inPointColor, false, false, true, false);
-                                    } else if ($x === 4 && $y === $imageSize - 5) {
-                                        $this->roundedCorner($img, $x, $y, $s, $inPointColor, false, false, false, true);
-                                    } else {
-                                        imagefilledrectangle($img, $x * $pointSize, $y * $pointSize, ($x + 1) * $pointSize, ($y + 1) * $pointSize, $inPointColor);
-                                    }
-                                    break;
-                                case 1:
-                                    //直角
-                                    imagefilledrectangle($img, $x * $pointSize, $y * $pointSize, ($x + 1) * $pointSize, ($y + 1) * $pointSize, $inPointColor);
-                                    break;
-                                case 0:
-                                    //圆圈
-                                    imagefilledellipse($img, ($x * $pointSize) + ($pointSize / 2), ($y * $pointSize) + ($pointSize / 2), $pointSize, $pointSize, $inPointColor);
-                                    break;
-                            }
-
-                        }
-
-                    } else {
-                        //液态
-                        switch ($options['style']) {
-                            case 2:
-                                //上
-                                if ($y - 1 < 0) {
-                                    //靠边的块都属于0
-                                    $t = 0;
-                                } else {
-                                    $t = $data[$y - 1][$x];
-                                }
-                                //左上
-                                if ($x - 1 < 0 || $y - 1 < 0) {
-                                    $lt = 0;
-                                } else {
-                                    $lt = $data[$y - 1][$x - 1];
-                                }
-                                //左
-                                if ($x - 1 < 0) {
-                                    $l = 0;
-                                } else {
-                                    $l = $data[$y][$x - 1];
-                                }
-                                //左下
-                                if ($x - 1 < 0 || $y + 1 > $imageSize - 1) {
-                                    $lb = 0;
-                                } else {
-                                    $lb = $data[$y + 1][$x - 1];
-                                }
-                                //下
-                                if ($y + 1 > $imageSize - 1) {
-                                    $b = 0;
-                                } else {
-                                    $b = $data[$y + 1][$x];
-                                }
-                                //右下
-                                if ($x + 1 > $imageSize - 1 || $y + 1 > $imageSize - 1) {
-                                    $rb = 0;
-                                } else {
-                                    $rb = $data[$y + 1][$x + 1];
-                                }
-                                //右
-                                if ($x + 1 > $imageSize - 1) {
-                                    $r = 0;
-                                } else {
-                                    $r = $data[$y][$x + 1];
-                                }
-                                //右上
-                                if ($x + 1 > $imageSize - 1 || $y - 1 < 0) {
-                                    $rt = 0;
-                                } else {
-                                    $rt = $data[$y - 1][$x + 1];
-                                }
-
-                                //上+左+下+右=0 全圆
-                                if ($t == 0 && $l == 0 && $b == 0 && $r == 0) {
-                                    //全圆
-                                    imagefilledellipse($img, ($x * $s) + ($s / 2), ($y * $s) + ($s / 2), $s, $s, $frontColor);
-                                } elseif ($t == 0 && $l == 0 && $r == 0) {
-                                    //上半圆
-                                    $this->halfRounded($img, $x, $y, $s, $frontColor, true, false, false, false);
-                                } elseif ($t == 0 && $l == 0 && $b == 0) {
-                                    //左半圆
-                                    $this->halfRounded($img, $x, $y, $s, $frontColor, false, true, false, false);
-                                } elseif ($l == 0 && $b == 0 && $r == 0) {
-                                    //下半圆
-                                    $this->halfRounded($img, $x, $y, $s, $frontColor, false, false, true, false);
-                                } elseif ($t == 0 && $b == 0 && $r == 0) {
-                                    //右半圆
-                                    $this->halfRounded($img, $x, $y, $s, $frontColor, false, false, false, true);
-                                } elseif ($t == 0 && $l == 0) {
-                                    //左上角
-                                    $this->roundedCorner($img, $x, $y, $s, $frontColor, true, false, false, false);
-                                } elseif ($l == 0 && $b == 0) {
-                                    //左下角
-                                    $this->roundedCorner($img, $x, $y, $s, $frontColor, false, true, false, false);
-                                } elseif ($b == 0 && $r == 0) {
-                                    //右下角
-                                    $this->roundedCorner($img, $x, $y, $s, $frontColor, false, false, true, false);
-                                } elseif ($r == 0 && $t == 0) {
-                                    //右上角
-                                    $this->roundedCorner($img, $x, $y, $s, $frontColor, false, false, false, true);
-                                } else {
-                                    //直角
-                                    imagefilledrectangle($img, $x * $pointSize, $y * $pointSize, ($x + 1) * $pointSize, ($y + 1) * $pointSize, $frontColor);
-
-                                }
-                                break;
-
-                            case 1:
-                                //直角
-                                imagefilledrectangle($img, $x * $pointSize, $y * $pointSize, ($x + 1) * $pointSize, ($y + 1) * $pointSize, $frontColor);
-                                break;
-                            case 0:
-                                //圆圈
-                                imagefilledellipse($img, ($x * $pointSize) + ($pointSize / 2), ($y * $pointSize) + ($pointSize / 2), $pointSize, $pointSize, $frontColor);
-                                break;
-                        }
-                    }
-
-                } else {
-                    if ($x < 7 && $y < 7) {
-
-                    } elseif ($x > $imageSize - 8 && $y < 7) { //右上角定点
-
-                    } elseif ($y > count($data) - 9 && $x < 7) { //左下角定点
-
-                    } else {
-                        if ($options['style'] === 2) {
-                            //液态
-                            //为两个黑块之间的直角填充圆度
-                            //上
-                            if ($y - 1 < 0) {
-                                //靠边的块都属于0
-                                $t = 0;
-                            } else {
-                                $t = $data[$y - 1][$x];
-                            }
-                            //左上
-                            if ($x - 1 < 0 || $y - 1 < 0) {
-                                $lt = 0;
-                            } else {
-                                $lt = $data[$y - 1][$x - 1];
-                            }
-                            //左
-                            if ($x - 1 < 0) {
-                                $l = 0;
-                            } else {
-                                $l = $data[$y][$x - 1];
-                            }
-                            //左下
-                            if ($x - 1 < 0 || $y + 1 > $imageSize - 1) {
-                                $lb = 0;
-                            } else {
-                                $lb = $data[$y + 1][$x - 1];
-                            }
-                            //下
-                            if ($y + 1 > $imageSize - 1) {
-                                $b = 0;
-                            } else {
-                                $b = $data[$y + 1][$x];
-                            }
-                            //右下
-                            if ($x + 1 > $imageSize - 1 || $y + 1 > $imageSize - 1) {
-                                $rb = 0;
-                            } else {
-                                $rb = $data[$y + 1][$x + 1];
-                            }
-                            //右
-                            if ($x + 1 > $imageSize - 1) {
-                                $r = 0;
-                            } else {
-                                $r = $data[$y][$x + 1];
-                            }
-                            //右上
-                            if ($x + 1 > $imageSize - 1 || $y - 1 < 0) {
-                                $rt = 0;
-                            } else {
-                                $rt = $data[$y - 1][$x + 1];
-                            }
-                            $this->halfCorner($img, $x, $y, $s, $bgColor, $frontColor, $lt, $lb, $rb, $rt);
-                            /*
-                            if ($t == 1 && $lt == 1 && $l == 1) {
-                                //左上角
-                                $this->halfCorner($img, $x, $y, $s, $bgColor, $frontColor, true, false, false, false);
-                            }
-
-                            if ($l == 1 && $lb == 1 && $b == 1) {
-                                //左下角
-                                $this->halfCorner($img, $x, $y, $s, $bgColor, $frontColor, false, true, false, false);
-                            }
-                            if ($b == 1 && $rb == 1 && $r == 1) {
-                                //右下角
-                                $this->halfCorner($img, $x, $y, $s, $bgColor, $frontColor, false, false, true, false);
-                            }
-                            if ($r == 1 && $rt == 1 && $t == 1) {
-                                //右上角
-                                $this->halfCorner($img, $x, $y, $s, $bgColor, $frontColor, false, false, false, true);
-                            }
-                            */
-                        }
-
-                    }
-
-                }
-                $x++;
-            }
-            $y++;
-        }
-        //保存图片
-
-        $im = $this->resizeImage($img, $options['width'], $options['width']);
-
-
-        //增加logo
-        if (!empty($options['logo'])) {
-            $im = $this->imageAddLogo($im, $options['logo']);
-        }
-
-
-        //添加背景图
-        if (!empty($options['bg'])) {
-            $im = $this->imageAddBG($im, $options['bg']);
-        }
-        //保存图片
-        header('Content-type:image/png');
-        imagepng($im);
-    }
-
-
-    public function __call($method, $args)
-    {
-        $qrCls = new QRencode();
-        return call_user_func_array(array($qrCls, $method), $args);
-    }
-}