From dcfe4978ec20df8ca8147cdf6ad005923eb353d2 Mon Sep 17 00:00:00 2001
From: xu <perelmen>
Date: Fri, 22 Nov 2019 14:41:18 +0800
Subject: [PATCH] app-api 1. F 统计接口用到的key 到一个地方 common 1. A 增加各类keys

---
 app-api/controllers/AuthDeviceController.php | 14 ++++++++++----
 common/config/params.php                     | 19 +++++++++++--------
 common/helpers/Utils.php                     | 12 +++++++-----
 console/controllers/TestController.php       |  4 ++--
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/app-api/controllers/AuthDeviceController.php b/app-api/controllers/AuthDeviceController.php
index 143f038..023936f 100644
--- a/app-api/controllers/AuthDeviceController.php
+++ b/app-api/controllers/AuthDeviceController.php
@@ -74,11 +74,17 @@ class AuthDeviceController extends BaseController
         $rsaKeys = Yii::$app->params['AUTH_DEVICE_RSA_PKCS_1'];
         $rsa = new RSACrypt($rsaKeys['PRIVATE'], $rsaKeys['PUBLIC']);
         $randKey = $rsa->decrypt($randomKey);
+        if (isset(Yii::$app->params['RANDOM_KEY_SALT']) && !empty(Yii::$app->params['RANDOM_KEY_SALT'])) {
+            $randomKey = Yii::$app->params['RANDOM_KEY_SALT'] ;
+        } else {
+            $randomKey = self::$RANDOM_KEY_SALT;
+        }
+
         if (16 != strlen($randKey)) {
             // 检查randKey,当前只是做长度判断
             $randKey = null;
         } else {
-            $randKey = substr(md5($randKey. self::$RANDOM_KEY_SALT), 8, 16);
+            $randKey = substr(md5($randKey. $randomKey), 8, 16);
         }
 
         $aes = new Aes($randKey);
@@ -127,10 +133,10 @@ class AuthDeviceController extends BaseController
             $e->message = '传入的数据字段格式不对';
             return $e;
         }
-        if (isset(Yii::$app->params['secretKey']) && !empty(Yii::$app->params['secretKey'])) {
-            $salt = Yii::$app->params['secretKey'];
+        if (isset(Yii::$app->params['SIGN_KEY']) && !empty(Yii::$app->params['SIGN_KEY'])) {
+            $salt = Yii::$app->params['SIGN_KEY'];
         } else {
-            $salt = isset(Yii::$app->params['secretKey'])? Yii::$app->params['secretKey']: self::$SIGN_SALT;
+            $salt = isset(Yii::$app->params['SIGN_KEY'])? Yii::$app->params['SIGN_KEY']: self::$SIGN_SALT;
         }
 
         $makeSign = md5($manufactureNo . $projectNo. $modelNo . $productionNo . $timestamp . $deviceId. $salt);
diff --git a/common/config/params.php b/common/config/params.php
index 262a6b9..02ab373 100644
--- a/common/config/params.php
+++ b/common/config/params.php
@@ -3,15 +3,18 @@ return [
     'adminEmail'                    => 'admin@example.com',
     'supportEmail'                  => 'support@example.com',
     'user.passwordResetTokenExpire' => 3600,
-    'ossOptions' => [
-        'accessKeyId' => 'LTAI4FkTRRhExNtjJNXGSFzL',
-        'accessKeySecret' => 'qimZCuCxMUClfZ5nFijJGTXMnDFklZ',
-        'endpoint' => 'kingboard-prod.oss-cn-shenzhen-internal.aliyuncs.com',
-        'bucket' => 'kingboard-prod',
-        'url' => 'https://kingboard-prod.oss-cn-shenzhen.aliyuncs.com',
-        'styleUrl' => 'https://kingboard-prod.oss-cn-shenzhen.aliyuncs.com'
-    ],
     'UPGRADE_FILE_FROM' => 'FROM_OSS',
+    'ossOptions'        => [
+        'accessKeyId'   => 'LTAI4FkTRRhExNtjJNXGSFzL',
+        'accessKeySecret'   => 'qimZCuCxMUClfZ5nFijJGTXMnDFklZ',
+        'endpoint'          => 'kingboard-prod.oss-cn-shenzhen-internal.aliyuncs.com',
+        'bucket'            => 'kingboard-prod',
+        'url'               => 'https://kingboard-prod.oss-cn-shenzhen.aliyuncs.com',
+        'styleUrl'          => 'https://kingboard-prod.oss-cn-shenzhen.aliyuncs.com'
+    ],
+    'GD_KEY'            => 'a09624f98c82f573140813d7fa25b805', //高德IP地址获取归属地 KEY 日配额100000次
+    'SIGN_KEY'          => '13456', //授权设备接口验证数据字段完整性签名用到的key
+    'RANDOM_KEY_SALT'   => '12356', //授权设备接口解密之后AES 用到的key
     'AUTH_DEVICE_RSA_PKCS_1' => [
         'PRIVATE' => require(__DIR__ . '/rsa/privateKey.php'),
         'PUBLIC'  => require(__DIR__ . '/rsa/publicKey.php')
diff --git a/common/helpers/Utils.php b/common/helpers/Utils.php
index 242c9a5..0414e45 100644
--- a/common/helpers/Utils.php
+++ b/common/helpers/Utils.php
@@ -2,13 +2,13 @@
 
 namespace common\helpers;
 
+use Yii;
 use common\exts\Http;
 use Faker\Provider\Uuid;
 
 class Utils
 {
     private static $vKey = 'thisisakey0olk2i8suwjshwks';
-    private static $GDKey = 'a09624f98c82f573140813d7fa25b805'; // 高德IP地址获取归属地 KEY 日配额100000次
 
     public static function getVKey()
     {
@@ -153,9 +153,6 @@ class Utils
         $buff = trim($buff, "&");
         return $buff;
     }
-    public static function genHashId($engineerId,$type ='_engineerKey='){
-       return md5( $engineerId.$type.self::$vKey);
-    }
 
     /**
      * 获取指定数值范围的随机浮点数
@@ -333,7 +330,12 @@ class Utils
      */
     public static function getAddressByIPAddress($ipAddress)
     {
-        $content = Http::get("https://restapi.amap.com/v3/ip?ip={$ipAddress}&output=json&key=" . self::$GDKey);
+        if (!isset(Yii::$app->params['GD_KEY']) || empty(Yii::$app->params['GD_KEY'])) {
+            return [];
+        }
+        $gdKey = Yii::$app->params['GD_KEY'];
+        $content = Http::get("https://restapi.amap.com/v3/ip?ip={$ipAddress}&output=json&key=" . $gdKey);
+
         $json = array();
         if ($content) {
             $json = json_decode($content, true);
diff --git a/console/controllers/TestController.php b/console/controllers/TestController.php
index ef8f428..0fb2841 100644
--- a/console/controllers/TestController.php
+++ b/console/controllers/TestController.php
@@ -268,8 +268,8 @@ class TestController extends Controller
 
     public function actionAuthDeviceN()
     {
-        $url = 'http://kingb:8012/app-api/web/authDeviceN';
-        //$url = 'http://47.107.95.101/app-api/web/authDeviceN';
+        //$url = 'http://kingb:8012/app-api/web/authDeviceN';
+        $url = 'http://47.107.95.101/app-api/web/authDeviceN';
         $manufactureNo = '0001';
         $device_id = 'BDEVICEG0000006';
         $projectNo = '0001';
--
libgit2 0.21.0