diff --git a/app-api/config/url-rules.php b/app-api/config/url-rules.php
index adc98ed..996efbe 100644
--- a/app-api/config/url-rules.php
+++ b/app-api/config/url-rules.php
@@ -5,13 +5,13 @@ return [
 
 
     'POST authDevice' => 'auth-device/index',
-    'POST authDeviceT' => 'auth-device/indext',
+    //'POST authDeviceT' => 'auth-device/indext',
     'POST checkOtaVersion' => 'upgrade/check-version',
     'POST reportOtaUpgradeEvent' => 'upgrade/report-upgrade-event',
     'POST checkAppVersion' => 'upgrade/check-app-version',
     'POST reportAppUpgradeEvent' => 'upgrade/report-app-upgrade-event',
     'POST reportDeviceVersion' => 'upgrade/report-device-version',
-    'POST CryptTxt' => 'auth-device/crypt-txt',
+    //'POST CryptTxt' => 'auth-device/crypt-txt',
     'GET errorPage' => 'site/error-page-info',
     'GET minaQuery' => 'site/mina-query',
 ];
\ No newline at end of file
diff --git a/app-api/controllers/AuthDeviceController.php b/app-api/controllers/AuthDeviceController.php
index 49e0a99..e1f176b 100644
--- a/app-api/controllers/AuthDeviceController.php
+++ b/app-api/controllers/AuthDeviceController.php
@@ -31,6 +31,7 @@ use function time;
 class AuthDeviceController extends BaseController
 {
     private static $SIGN_SALT = '13456';
+    private static $RANDOM_KEY_SALT = '12356';
 
     private static function myLog($str)
     {
@@ -38,10 +39,10 @@ class AuthDeviceController extends BaseController
     }
 
     /**
-     * 设备授权接口
+     * 设备授权接口，未加密的
      * @return stdClass
      */
-    public function actionIndex()
+    private function indexNoEncode()
     {
         $getPostData = file_get_contents('php://input', 'r');
         self::myLog('actionIndex postData:'.$getPostData);
@@ -50,6 +51,40 @@ class AuthDeviceController extends BaseController
     }
 
     /**
+     * 设备授权接口加密过的
+     * @return stdClass
+     */
+    public function actionIndex()
+    {
+        $e = new stdClass();
+        $e->content = '';
+
+        $getPostData = file_get_contents('php://input', 'r');
+        self::myLog('actionIndext postData:'.$getPostData);
+        $getPostData = json_decode($getPostData, true);
+        $randomKey = $getPostData['randomKey'];
+        $content = $getPostData['content'];
+        $rsaKeys = Yii::$app->params['AUTH_DEVICE_RSA_PKCS_1'];
+        $rsa = new RSACrypt($rsaKeys['PRIVATE'], $rsaKeys['PUBLIC']);
+        $randKey = $rsa->decrypt($randomKey);
+        if (16 != strlen($randKey)) {
+            // 检查randKey,当前只是做长度判断
+            $randKey = null;
+        } else {
+            $randKey = substr(md5($randKey. self::$RANDOM_KEY_SALT), 8, 16);
+        }
+
+        $aes = new Aes($randKey);
+        $contentStr = $aes->decrypt($content);
+        $authResult = $this->authDevice($contentStr);
+
+        $returnStr = json_encode($authResult, JSON_UNESCAPED_UNICODE);
+        $e->content = $aes->encrypt($returnStr);
+
+        return $e;
+    }
+
+    /**
      * @param $getPostData
      * @return stdClass
      */
@@ -70,7 +105,7 @@ class AuthDeviceController extends BaseController
         $manufactureNo	= isset($getPostData['manufacture'])?$getPostData['manufacture']:'';
         $deviceId	    = isset($getPostData['device_id'])?$getPostData['device_id']:'';
         $projectNo	    = isset($getPostData['project'])?$getPostData['project']:'';
-        $modelNo	        = isset($getPostData['model'])?$getPostData['model']:'';
+        $modelNo	    = isset($getPostData['model'])?$getPostData['model']:'';
         $productionNo	= isset($getPostData['production'])?$getPostData['production']:'';
         $timestamp       = isset($getPostData['timestamp'])?$getPostData['timestamp']:'';
         $sign	        = isset($getPostData['sign'])?$getPostData['sign']:'';
@@ -121,7 +156,9 @@ class AuthDeviceController extends BaseController
         $getPostData    = json_decode($getPostDataTxt, true);
         $randomKey = $getPostData['randomKey'];
         $content = $getPostData['content'];
-        $rsa = new RSACrypt();
+        $rsaKeys = Yii::$app->params['AUTH_DEVICE_RSA_PKCS_1'];
+        $rsa = new RSACrypt($rsaKeys['PRIVATE'], $rsaKeys['PUBLIC']);
+
         $randKey = $rsa->decrypt($randomKey);
         $aes = new Aes($randKey);
         $contentStr = $aes->decrypt($content);
@@ -137,34 +174,4 @@ class AuthDeviceController extends BaseController
         return $e;
     }
 
-    /**
-     * @return stdClass
-     */
-    public function actionIndext()
-    {
-        $e = new stdClass();
-        $e->content = '';
-
-        $getPostData = file_get_contents('php://input', 'r');
-        self::myLog('actionIndext postData:'.$getPostData);
-        $getPostData = json_decode($getPostData, true);
-        $randomKey = $getPostData['randomKey'];
-        $content = $getPostData['content'];
-        $rsa = new RSACrypt();
-        $randKey = $rsa->decrypt($randomKey);
-        if (16 != strlen($randKey)) {
-            // 检查randKey,当前只是做长度判断
-            $randKey = null;
-        }
-        $aes = new Aes($randKey);
-        $contentStr = $aes->decrypt($content);
-        $authResult = $this->authDevice($contentStr);
-
-        $returnStr = json_encode($authResult, JSON_UNESCAPED_UNICODE);
-
-        $e->content = $aes->encrypt($returnStr);
-
-        return $e;
-    }
-
 }
\ No newline at end of file
diff --git a/app-ht/modules/device/controllers/DeviceController.php b/app-ht/modules/device/controllers/DeviceController.php
index c703183..ad89553 100644
--- a/app-ht/modules/device/controllers/DeviceController.php
+++ b/app-ht/modules/device/controllers/DeviceController.php
@@ -716,7 +716,7 @@ class DeviceController extends BaseController
                 $e->success = false;
             } elseif(DeviceStatus::NO_AUTH == $deviceModel->status) {
                 $deviceModel->status = DeviceStatus::HAS_AUTH;
-                $deviceModel->auth_at = time();
+                //$deviceModel->auth_at = time();
                 $deviceModel->save();
                 $e->message = '已经存在该授权设备';
                 $e->success = false;
@@ -756,7 +756,7 @@ class DeviceController extends BaseController
             $newDeviceModel->device_id = $deviceId;
             $newDeviceModel->status = DeviceStatus::NO_AUTH;
             $newDeviceModel->apply_at = $tt ;
-            $newDeviceModel->auth_at = $tt;
+            //$newDeviceModel->auth_at = $tt;
             $newDeviceModel->save();
 
             $deviceFailModel->is_delete = 1;
diff --git a/app-ht/modules/device/views/device/delete-index.php b/app-ht/modules/device/views/device/delete-index.php
index 8c7356d..2508e64 100644
--- a/app-ht/modules/device/views/device/delete-index.php
+++ b/app-ht/modules/device/views/device/delete-index.php
@@ -21,11 +21,11 @@ $this->params['breadcrumbs'][] =  $this->title;
                 </div>
                 <label for="project" class="col-sm-1 control-label text-right">项目名：</label>
                 <div class="col-sm-2 form-inline">
-                    <input type="text" class="form-control" id="project" name="project" value="<?php if (!empty($gets['project'])){ echo $gets['project'];} ?>" autocomplete="off">
+                    <input type="text" class="form-control" id="project" placeholder="项目关键字" name="project" value="<?php if (!empty($gets['project'])){ echo $gets['project'];} ?>" autocomplete="off">
                 </div>
                 <label for="model" class="col-sm-1 control-label text-right">型号：</label>
                 <div class="col-sm-2 form-inline">
-                    <input type="text" class="form-control" id="model" name="model" value="<?php if (!empty($gets['model'])){ echo $gets['model'];} ?>" autocomplete="off">
+                    <input type="text" class="form-control" id="model" placeholder="型号关键字" name="model" value="<?php if (!empty($gets['model'])){ echo $gets['model'];} ?>" autocomplete="off">
                 </div>
                 <label for="status" class="col-sm-1 control-label text-right">状态：</label>
                 <div class="col-sm-2 form-inline">
@@ -42,11 +42,11 @@ $this->params['breadcrumbs'][] =  $this->title;
             <div class="form-group col-sm-12">
                 <label for="production" class="col-sm-1 control-label text-right">生产日期：</label>
                 <div class="col-sm-2 form-inline">
-                    <input type="text" class="form-control" id="production" name="production" value="<?php if (!empty($gets['production'])){ echo $gets['production'];} ?>" autocomplete="off">
+                    <input type="text" class="form-control" id="production" placeholder="生产日期关键字" name="production" value="<?php if (!empty($gets['production'])){ echo $gets['production'];} ?>" autocomplete="off">
                 </div>
                 <label for="manufacture" class="col-sm-1 control-label text-right">厂商：</label>
                 <div class="col-sm-2 form-inline">
-                    <input type="text" class="form-control" id="manufacture" name="manufacture" value="<?php if (!empty($gets['manufacture'])){ echo $gets['manufacture'];} ?>" autocomplete="off">
+                    <input type="text" class="form-control" id="manufacture" placeholder="厂商关键字" name="manufacture" value="<?php if (!empty($gets['manufacture'])){ echo $gets['manufacture'];} ?>" autocomplete="off">
                 </div>
                 <label for="mac" class="col-sm-1 control-label text-right">MAC地址：</label>
                 <div class="col-sm-2 form-inline">
diff --git a/app-ht/modules/device/views/device/index.php b/app-ht/modules/device/views/device/index.php
index 530529c..d24dad0 100644
--- a/app-ht/modules/device/views/device/index.php
+++ b/app-ht/modules/device/views/device/index.php
@@ -21,11 +21,11 @@ $this->params['breadcrumbs'][] =  $this->title;
                 </div>
                 <label for="project" class="col-sm-1 control-label text-right">项目名：</label>
                 <div class="col-sm-2 form-inline">
-                    <input type="text" class="form-control" id="project" name="project" value="<?php if (!empty($gets['project'])){ echo $gets['project'];} ?>" autocomplete="off">
+                    <input type="text" class="form-control" id="project" placeholder="项目关键字"  name="project" value="<?php if (!empty($gets['project'])){ echo $gets['project'];} ?>" autocomplete="off">
                 </div>
                 <label for="model" class="col-sm-1 control-label text-right">型号：</label>
                 <div class="col-sm-2 form-inline">
-                    <input type="text" class="form-control" id="model" name="model" value="<?php if (!empty($gets['model'])){ echo $gets['model'];} ?>" autocomplete="off">
+                    <input type="text" class="form-control" id="model" placeholder="型号关键字" name="model" value="<?php if (!empty($gets['model'])){ echo $gets['model'];} ?>" autocomplete="off">
                 </div>
                 <label for="status" class="col-sm-1 control-label text-right">状态：</label>
                 <div class="col-sm-2 form-inline">
@@ -42,11 +42,11 @@ $this->params['breadcrumbs'][] =  $this->title;
             <div class="form-group col-sm-12">
                 <label for="production" class="col-sm-1 control-label text-right">生产日期：</label>
                 <div class="col-sm-2 form-inline">
-                    <input type="text" class="form-control" id="production" name="production" value="<?php if (!empty($gets['production'])){ echo $gets['production'];} ?>" autocomplete="off">
+                    <input type="text" class="form-control" id="production" placeholder="生产日期关键字" name="production" value="<?php if (!empty($gets['production'])){ echo $gets['production'];} ?>" autocomplete="off">
                 </div>
                 <label for="manufacture" class="col-sm-1 control-label text-right">厂商：</label>
                 <div class="col-sm-2 form-inline">
-                    <input type="text" class="form-control" id="manufacture" name="manufacture" value="<?php if (!empty($gets['manufacture'])){ echo $gets['manufacture'];} ?>" autocomplete="off">
+                    <input type="text" class="form-control" id="manufacture" name="manufacture" placeholder="厂商关键字" value="<?php if (!empty($gets['manufacture'])){ echo $gets['manufacture'];} ?>" autocomplete="off">
                 </div>
                 <label for="mac" class="col-sm-1 control-label text-right">MAC地址：</label>
                 <div class="col-sm-2 form-inline">
diff --git a/app-ht/modules/home/controllers/WelcomeController.php b/app-ht/modules/home/controllers/WelcomeController.php
index 96abd29..6002b4c 100644
--- a/app-ht/modules/home/controllers/WelcomeController.php
+++ b/app-ht/modules/home/controllers/WelcomeController.php
@@ -2,8 +2,9 @@
 
 namespace app\ht\modules\home\controllers;
 
+use Yii;
 use app\ht\controllers\BaseController;
-
+use domain\manufacturer\ManufacturerRepository;
 class WelcomeController extends BaseController
 {
     /**
@@ -11,6 +12,18 @@ class WelcomeController extends BaseController
      */
     public function actionIndex()
     {
-        return $this->render("index");
+        $user = Yii::$app->user->identity;
+        $username = $user->username;
+        if ($user->is_manufacture) {
+            $manufacturer = ManufacturerRepository::findOne(['sys_user_id' => $user->username]);
+            if ($manufacturer) {
+                $username = $manufacturer->name;
+            }
+
+        }
+        $params = [
+            'username' => $username
+        ];
+        return $this->render("index", $params);
     }
 }
\ No newline at end of file
diff --git a/app-ht/modules/home/views/welcome/index.php b/app-ht/modules/home/views/welcome/index.php
index 1385326..457830f 100644
--- a/app-ht/modules/home/views/welcome/index.php
+++ b/app-ht/modules/home/views/welcome/index.php
@@ -28,6 +28,6 @@ $this->params['breadcrumbs'][] = '欢迎';
 <div class="panel panel-default">
     <div class="panel-body">
         <div class="image"><img src="<?php echo Url::to('@web/images/error-logo.png'); ?>"/></div>
-        <div class="welcome-text"><h1>欢迎 <?= Yii::$app->user->identity->username ?> 使用管理后台</h1></div>
+        <div class="welcome-text"><h1>欢迎 <?= $username ?> 使用管理后台</h1></div>
     </div>
 </div>
diff --git a/app-ht/modules/project/controllers/ProjectController.php b/app-ht/modules/project/controllers/ProjectController.php
index d27e1e5..fb03108 100644
--- a/app-ht/modules/project/controllers/ProjectController.php
+++ b/app-ht/modules/project/controllers/ProjectController.php
@@ -184,7 +184,7 @@ class ProjectController extends BaseController
     }
 
     /**
-     * 导出厂商数据
+     * 导出项目数据
      * @return string
      */
     public function actionExport()
diff --git a/app-ht/views/dashboard/index.php b/app-ht/views/dashboard/index.php
index fa46a88..3f4edc0 100644
--- a/app-ht/views/dashboard/index.php
+++ b/app-ht/views/dashboard/index.php
@@ -1,7 +1,7 @@
 <?php
 
 use yii\helpers\Url;
-
+use domain\manufacturer\ManufacturerRepository;
 $this->title = '欢迎';
 $this->params['breadcrumbs'][] = '欢迎';
 ?>
@@ -28,6 +28,17 @@ $this->params['breadcrumbs'][] = '欢迎';
 <div class="panel panel-default">
     <div class="panel-body">
         <div class="image"><img src="<?php echo Url::to('@web/images/error-logo.png'); ?>"/></div>
-        <div class="welcome-text"><h1>欢迎 <?= Yii::$app->user->identity->username ?> 使用OTA管理后台</h1></div>
+        <div class="welcome-text"><h1>欢迎 <?php
+                $user = Yii::$app->user->identity;
+                $username = $user->username;
+                if ($user->is_manufacture) {
+                    $manufacturer = ManufacturerRepository::findOne(['sys_user_id' => $user->id]);
+                    if ($manufacturer) {
+                        $username = $manufacturer->name;
+                    }
+
+                }
+               echo $username;
+                ?> 使用OTA管理后台</h1></div>
     </div>
 </div>
diff --git a/app-ht/views/layouts/routes.php b/app-ht/views/layouts/routes.php
index e594394..e1b2438 100644
--- a/app-ht/views/layouts/routes.php
+++ b/app-ht/views/layouts/routes.php
@@ -49,31 +49,6 @@ if (isset($user->is_manufacture) && $user->is_manufacture == 1) {
             ]
         ],
         [
-            'path' => '/device',
-            'label' => '序列号',
-            'routes' => [
-                [
-                    'path' => '/device',
-                    'redirect' => '/device/device/index'
-                ],
-
-                ['label' => '序列号管理', 'path' => '/device/device/index'],
-                ['label' => '授权失败管理', 'path' => '/device/device/auth-fail-index'],
-                ['label' => '创建序列号', 'path' => '/device/device/create-device'],
-            ]
-        ],
-        [
-            'path' => '/upgrade',
-            'label' => '版本',
-            'routes' => [
-                [
-                    'path' => '/upgrade',
-                    'redirect' => '/upgrade/upgrade/index'
-                ],
-                ['label' => '版本管理', 'path'=> '/upgrade/upgrade/index'],
-            ]
-        ],
-        [
             'path' => '/project',
             'label' => '项目',
             'routes' => [
@@ -107,6 +82,31 @@ if (isset($user->is_manufacture) && $user->is_manufacture == 1) {
             ]
         ],
         [
+            'path' => '/device',
+            'label' => '序列号',
+            'routes' => [
+                [
+                    'path' => '/device',
+                    'redirect' => '/device/device/index'
+                ],
+
+                ['label' => '序列号管理', 'path' => '/device/device/index'],
+                ['label' => '授权失败管理', 'path' => '/device/device/auth-fail-index'],
+                ['label' => '创建序列号', 'path' => '/device/device/create-device'],
+            ]
+        ],
+        [
+            'path' => '/upgrade',
+            'label' => '版本',
+            'routes' => [
+                [
+                    'path' => '/upgrade',
+                    'redirect' => '/upgrade/upgrade/index'
+                ],
+                ['label' => '版本管理', 'path'=> '/upgrade/upgrade/index'],
+            ]
+        ],
+        [
             'path' => '/datas',
             'label' => '数据',
             'routes' => [
diff --git a/common/config/params.php b/common/config/params.php
index cf33723..50bccf9 100644
--- a/common/config/params.php
+++ b/common/config/params.php
@@ -11,5 +11,9 @@ return [
         'url' => 'https://kingboard-prod.oss-cn-shenzhen.aliyuncs.com',
         'styleUrl' => 'https://kingboard-prod.oss-cn-shenzhen.aliyuncs.com'
     ],
-    'UPGRADE_FILE_FROM' => 'FROM_ECS'
+    'UPGRADE_FILE_FROM' => 'FROM_ECS',
+    'AUTH_DEVICE_RSA_PKCS_1' => [
+        'PRIVATE' => require(__DIR__ . '/rsa/privateKey.php'),
+        'PUBLIC'  => require(__DIR__ . '/rsa/publicKey.php')
+    ]
 ];
diff --git a/common/config/rsa/privateKey.php b/common/config/rsa/privateKey.php
new file mode 100644
index 0000000..572bf11
--- /dev/null
+++ b/common/config/rsa/privateKey.php
@@ -0,0 +1,16 @@
+<?php
+return "-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDKdPhKQl9BGPtHXDjjqH3LztTkyJoJUOUQcggCPVa4HWkNCqRj
+2j7Kd+5C+i+TuFuqiWL32KKrDlm3kSFY8zW3VyUyqpJm/vgWgZDA+uGGTBsF6L38
+GVa5d1XHtWCmIp0QBxDo0cz9VFzxvwQCsC7g3RiXxzMBzH/rtFw0BlWf6wIDAQAB
+AoGBAIRn/V4rjDp5yRTBdp9FOYhKK6e4ni0Lj9OykBRO42EkMukJlbuMJ1apGtUI
+5Ia6opCkq2ombzRp/Tj1nJac8PpdKNz5iuRSpNxpjNOwY3goRYjg8St5o8U2ZVyP
+Buvli+Ew8NkQxU2MNcUiyShXfKunaVlvHT7qtgmggX2jCmUxAkEA9wPKu3ddzRax
+bfBuCTMXpjhop+rQQzmZsceltekbEDZ2QzFRQerKDZX1EypfXcPN3OkGgQRbkkvB
+QfHXXsA9+QJBANHSQPJ4Fj+IfUs8z1B2dTg4ddqTiNoUB0a5telxQR0qQ9j4FiC7
+z61Sg/IhWkJEivnNBfMvqJY9JZmJXaktlgMCQQDq3P8hGhDlFMOlXaqyMpM054OS
+zTAyCw14vPRxr2+dDbuKjdTOERkGq+N20p4UgD0345TcjTEoO8FIG1OE8tK5AkBC
+4XwmTbT5x234v4dtpHS02PpoE8L5kIzJNIURxjH1M/WwgVO8V2FZZAX+9japDOQn
+v/x3ied5DECh8jFSrd81AkAFrBlfAwUWJXM5yT1f0S6VjuXHJx47oljEJTEgFWKE
+2xHfk3V92zvNFGE95jDHq6CY6kxNSE1pF+u2uFVnV9sm
+-----END RSA PRIVATE KEY-----";
\ No newline at end of file
diff --git a/common/config/rsa/publicKey.php b/common/config/rsa/publicKey.php
new file mode 100644
index 0000000..f0fa85e
--- /dev/null
+++ b/common/config/rsa/publicKey.php
@@ -0,0 +1,7 @@
+<?php
+return "-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKdPhKQl9BGPtHXDjjqH3LztTk
+yJoJUOUQcggCPVa4HWkNCqRj2j7Kd+5C+i+TuFuqiWL32KKrDlm3kSFY8zW3VyUy
+qpJm/vgWgZDA+uGGTBsF6L38GVa5d1XHtWCmIp0QBxDo0cz9VFzxvwQCsC7g3RiX
+xzMBzH/rtFw0BlWf6wIDAQAB
+-----END PUBLIC KEY-----";
\ No newline at end of file
diff --git a/common/exts/RSACrypt.php b/common/exts/RSACrypt.php
index af85b92..f177124 100644
--- a/common/exts/RSACrypt.php
+++ b/common/exts/RSACrypt.php
@@ -4,30 +4,6 @@ namespace common\exts;
 
 class RSACrypt
 {
-
-    public static $private_key = "-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCpS7mxdU6svbDcs10qbq9f9t5D4yfqC1jLmZD3GDD4D/8TbNkf
-vcYDvde6nyPRSxrnzl9YmZhJKlP2iCIwdwwmW6yulXZyvPurfN/1AJt4JYDxnN/q
-u1bSG5DZMribLsR2dlfA5J0D6lQ7g40eSgp4D6UWy8ezLy6UWFQCrnUHEQIDAQAB
-AoGAQCQeoKtvOWdNIPEb9T2mWFdx8oqXzsapx8nQ8K1LsFBvNe7hfHMsGLLOjzhI
-G7223eiEm07mMaJF2XvOaEpSYX/qQ1LZRSdBrzCec1lcDbB95dcRg9NmgBuCpUxE
-3SGYm3VB8rurfsrRUUYoIbjWz8qyuIGdMbaNkHG/CpnUYpkCQQDfWYDYtQ3DxCt+
-JBoLfuCykk8+nIV12CIYb023naoR2s/aQQRk9BkGCkDrdOAgZAN3BGOHYseKAfTP
-nARDzfiDAkEAwgtYfgCDTOfW5/kJK1lZO21CdCCZnePwGYmWDLPzNiJIn8k0U6Ig
-9GmxG+0GKzY71XO8W3Nh18ilZbX9dYel2wJASQ+AJGNlc0pyZ7rrgiMo4YEWxwZw
-adIfpRqTs6KxhVGseFqYU2W94cns3pjG0BGnSIF5BUp8t1pYeKkyg/OWfQJBAK1w
-mq41IycQaoR5kfqPKDT32dgWc3gvDqKk2duM1KzkQ+meXAkM90u/VLDTURo6pYyK
-oCdVoHTRQRUCcAQnNNUCQQCO/zDRaY+5ssjPqj77eJqWfAhtbSDRRw+NurmUSas1
-FT1cD5nil+uT48bIRoC5nk/XWfvAvMg/Yw5bslGUNx7f
------END RSA PRIVATE KEY-----";
-
-    public static $public_key = "-----BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpS7mxdU6svbDcs10qbq9f9t5D
-4yfqC1jLmZD3GDD4D/8TbNkfvcYDvde6nyPRSxrnzl9YmZhJKlP2iCIwdwwmW6yu
-lXZyvPurfN/1AJt4JYDxnN/qu1bSG5DZMribLsR2dlfA5J0D6lQ7g40eSgp4D6UW
-y8ezLy6UWFQCrnUHEQIDAQAB
------END PUBLIC KEY-----";
-
     private $pubkey;
     private $privkey;
 
@@ -39,19 +15,8 @@ y8ezLy6UWFQCrnUHEQIDAQAB
     function __construct($privateKey = null, $publicKey = null)
     {
         // 获得资源类型公钥和私钥，
-        if ($publicKey) {
-            $_publicKey = $publicKey;
-        } else {
-            $_publicKey = self::$public_key;
-        }
-
-        if ($privateKey) {
-            $_privateKey = $privateKey;
-        } else {
-            $_privateKey =  self::$private_key;
-        }
-        $this->privkey = openssl_pkey_get_private($_privateKey);
-        $this->pubkey = openssl_pkey_get_public($_publicKey);
+        $this->privkey = openssl_pkey_get_private($privateKey);
+        $this->pubkey = openssl_pkey_get_public($publicKey);
     }
 
     /**
diff --git a/domain/device/Device.php b/domain/device/Device.php
index c169471..1bb23dc 100644
--- a/domain/device/Device.php
+++ b/domain/device/Device.php
@@ -63,7 +63,7 @@ class Device
             'status'        => $status,
             'has_re_auth'   => $hasReAuth,
             'apply_at'      => $applyAt,
-            'auth_at'       => time(),
+            //'auth_at'       => time(),
         ];
 
         return self::create($item);
@@ -140,7 +140,7 @@ class Device
                 $e->message = '授权成功, 重复授权';
                 $e->success = true;
                 $e->status = 4;
-            } else{
+            } else {
                 $deviceModel->status = DeviceStatus::HAS_AUTH;
                 $deviceModel->auth_at = time();
                 if ($deviceModel->save()){
@@ -201,9 +201,15 @@ class Device
                 $e->message = '授权失败，系统异常';
                 return $e;
             }
+            // 测试代码
+            if (strpos($deviceId, 'FAILDEVICE') === false) {
+                $status = DeviceStatus::HAS_AUTH;
+            } else {
+                $status = DeviceStatus::FAIL_AUTH;
+            }
             $newDeviceModel->device_id = $deviceId;
-            $newDeviceModel->status = DeviceStatus::HAS_AUTH;
-            $newDeviceModel->apply_at = $tt ;
+            $newDeviceModel->status = $status;
+            $newDeviceModel->apply_at = $tt;
             $newDeviceModel->auth_at = $tt;
             if ($newDeviceModel->save()) {
                 $e->message = '授权成功';
@@ -214,6 +220,14 @@ class Device
                 $e->message = '授权失败,系统异常';
                 $e->status  = 8; //系统异常
             }
+            /* 测试代码*/
+            if (DeviceStatus::FAIL_AUTH ==  $status) {
+                $e->message = '授权失败,系统异常';
+                $e->success = false;
+                $e->serial_no = '';
+                $e->status  = 8;
+                $e->mac = '';
+            }
 
             return $e;
         }
--
libgit2 0.21.0