optimize

Author: cmpan

README.md

@@ -3,13 +3,13 @@
 安全可靠的验证码，拥有很强的反机器识别能力，同时又不失人眼阅读体验。
 
 ## require
- - php 5.5+
+ - php 7.0+
  - GD2
 
 ## 安装
 该组件已包含在Windwork框架中，如果你已安装Windwork框架则可以直接使用。
 
-- 安装方式一：通过composer安装（推荐）  
+- 安装
 ```
 composer require windwork/captcha
 ```
@@ -24,12 +24,12 @@ use wf\captcha\Captcha;
 require_once 'vendor/autoload.php';
 
 $capt = new Captcha();
-$capt->setLevel(Captcha::LEVEL_NORMAL);
+//$capt->setLevel(Captcha::LEVEL_HEIGHT);
 $capt->create();
 
 // set to session
-session_start();
-$_SESSION['phrase'] = $capt->getPhrase();
+//session_start();
+//$_SESSION['phrase'] = $capt->getPhrase();
 
 $capt->output(90);
 

composer.json

@@ -5,8 +5,8 @@
 		"captcha",
 		"anti robot"
 	],
-	"version" : "1.2.0",
-	"time" : "2019-12-04 22:00:00",
+	"version" : "1.2.1",
+	"time" : "2019-12-05 16:30:00",
 	"require" : {
 		"php" : ">=7.0",
 		"ext-gd" : "*"

lib/Captcha.php

@@ -51,7 +51,6 @@ class Captcha implements CaptchaInterface
         'length'    => 4,      // 验证码位数
         'fontSize'  => 36,     // 验证码字体大小(px)
         'bgColor'   => [255,255,255],
-        'color'     => [],
     ];
 
     /**
@@ -72,7 +71,7 @@ class Captcha implements CaptchaInterface
      *
      * @var string
      */
-    protected $phraseSet = '23456789ABCDEFHKLMNPQRSTUVWXY';
+    protected $phraseSet = '2345679ABCDEFHKLMNPQRSTUVWXY';
 
     /**
      * 验证码图片实例
@@ -190,20 +189,17 @@ public function getPhrase()
     public function create()
     {
         // 图片宽(px)
-        $this->width = $this->cfg['length'] * $this->cfg['fontSize'] * 0.85;
+        $this->width = $this->cfg['length'] * $this->cfg['fontSize'] * 0.86;
 
         // 图片高(px)
         $this->height = $this->cfg['fontSize'] * 1.36;
 
         // 建立一幅 $this->width x $this->height 的图像
         $this->image = imagecreate($this->width, $this->height);
 
-        $bgColor = $this->cfg['bgColor'] ? $this->cfg['bgColor'] : [mt_rand(0x70, 0xff), mt_rand(0x70, 0xff), mt_rand(0x70, 0xff)];
+        $bgColor = $this->cfg['bgColor'];
         imagecolorallocate($this->image, $bgColor[0], $bgColor[1], $bgColor[2]);
 
-        if ($this->cfg['color']) {
-        }
-
         $this->phrase();
 
         if ($this->cfg['distort']) {
@@ -231,8 +227,7 @@ protected function phrase()
 
             // 倾斜度
             $gradient = mt_rand(-22, 22);
-            $colorRGB = self::COLORS[mt_rand(0, count(self::COLORS) - 1)];
-            $color = imagecolorallocate($this->image, $colorRGB[0], $colorRGB[1], $colorRGB[2]);
+            $color = imagecolorallocate($this->image, mt_rand(0, 200), mt_rand(0, 200), mt_rand(0, 200));
 
             // 绘制一个验证码字符
             imagettftext($this->image, $this->cfg['fontSize'], $gradient, $phraseNX, $this->cfg['fontSize']*1.1, $color, $this->getFont(), $phrase[$i]);
@@ -242,7 +237,6 @@ protected function phrase()
         $this->phrase = implode('', $phrase);
     }
 
-
     /**
      * 画一条由两条连在一起构成的随机正弦函数曲线作干扰线(你可以改成更帅的曲线函数)
      *
@@ -268,8 +262,7 @@ protected function curve()
 
         $px1 = mt_rand(0, $this->width/4);  // 曲线横坐标起始位置
         $px2 = mt_rand($px1 + $this->width/3, $this->width);  // 曲线横坐标结束位置
-        $colorRGB = self::COLORS[mt_rand(0, count(self::COLORS) - 1)];
-        $color = imagecolorallocate($this->image, $colorRGB[0], $colorRGB[1], $colorRGB[2]);
+        $color = imagecolorallocate($this->image, mt_rand(0, 200), mt_rand(0, 200), mt_rand(0, 200));
 
         for ($px = $px1; $px <= $px2; $px ++) {
             if ($w == 0) {

test/demo.php

@@ -6,12 +6,11 @@
 
 $capt = new Captcha();
 //$capt->setLevel(Captcha::LEVEL_HEIGHT);
-$capt->setLevel(Captcha::LEVEL_NORMAL);
 $capt->create();
 
 // set to session
-session_start();
-$_SESSION['phrase'] = $capt->getPhrase();
+//session_start();
+//$_SESSION['phrase'] = $capt->getPhrase();
 
 $capt->output(90);