Merge branch 'feature/manage-user' into 'develop'

api/controllers/AirDropController.php

@@ -18,27 +18,29 @@ class AirDropController extends BaseController
         $data = Yii::$app->request->get();
 
         $identifier = $data['identifier'] ?? null;
-        $miner_address = $data['miner_address'] ?? null;
-        if (false == $identifier || false == $miner_address) {
+        if (false == $identifier) {
             $this->code = -1;
             $this->msg = '设备号错误，请重新输入.';
             goto doEnd;
         }
 
-//        $exist = AirDropRulePool::find()->where(['identifier' => $identifier])->one();
-//        if (false == $exist || false == $exist->rule) {
-//            $this->code = -1;
-//            $this->msg = '设备号错误，请重新输入.';
-//            goto doEnd;
-//        }
-
-        $exist = AirDrop::find()->where(['identifier' => $identifier, 'miner_address' => $miner_address])->one();
+        $exist = AirDropRulePool::find()->where(['identifier' => $identifier])->one();
         if (false == $exist || false == $exist->rule) {
             $this->code = -1;
             $this->msg = '设备号错误，请重新输入.';
             goto doEnd;
         }
 
+        $miner_address = $data['miner_address'] ?? null;
+        if (!empty($miner_address)) {
+            $exist = AirDrop::find()->where(['identifier' => $identifier, 'miner_address' => $miner_address])->one();
+            if (false == $exist) {
+                $this->code = -1;
+                $this->msg = '设备号和矿工地址不匹配，请重新确认.';
+                goto doEnd;
+            }
+        }
+
         doEnd :
         return ['code' => $this->code, 'msg' => $this->msg, 'data' => $this->data];
     }

common/models/Admin.php

@@ -26,7 +26,7 @@ use yii\web\IdentityInterface;
  */
 class Admin extends \common\modelsgii\Admin implements IdentityInterface
 {
-    const STATUS_DELETED = 0;
+    const STATUS_DELETED = 2;
     const STATUS_ACTIVE = 1;
 
     /**
@@ -34,7 +34,7 @@ class Admin extends \common\modelsgii\Admin implements IdentityInterface
      */
     public static function findIdentity($uid)
     {
-        return static::find()->where(['uid' => $uid, 'status' => self::STATUS_ACTIVE])->one();
+        return static::find()->where(['uid' => $uid])->one();
     }
 
     /**
@@ -45,7 +45,7 @@ class Admin extends \common\modelsgii\Admin implements IdentityInterface
      */
     public static function findByUsername($username)
     {
-        return static::findOne(['username' => $username, 'status' => self::STATUS_ACTIVE]);
+        return static::findOne(['username' => $username]);
     }
 
     /**

common/models/User.php

@@ -23,8 +23,8 @@ use yii\web\IdentityInterface;
  */
 class User extends ActiveRecord implements IdentityInterface
 {
-    const STATUS_DELETED = 0;
-    const STATUS_ACTIVE = 10;
+    const STATUS_DELETED = 2;
+    const STATUS_ACTIVE = 1;
 
     const AUTH_SUPER = 'administrator';
 

common/service/exchange/Hd.php

@@ -14,7 +14,7 @@ class Hd extends Exchange implements ExchangeInterface
 {
     protected $supported_symbol = 'supported_symbol_hd';
     protected $quotation_prefix = 'quotation_hd_';
-    protected $base_url = 'https://app.honordecent.com/exchange/getHdcCurrPrice';
+    protected $base_url = 'https://app.honordecent.com/exchange/getNowData';
 
     public function symbolExists($tag = 'HDC', $aim = "USDT")
     {
@@ -58,7 +58,7 @@ class Hd extends Exchange implements ExchangeInterface
         $res = $curl->get($this->base_url, false);
         if (is_array($res) && 1 == $res['code']) {
             $key = $this->quotation_prefix . 'HDCUSDT';
-            $this->redis->hmset($key, 'low', $res['data'], 'high', $res['data'], 'last', $res['data']);
+            $this->redis->hmset($key, 'low', $res['data']['currPrice'], 'high', $res['data']['currPrice'], 'last', $res['data']['currPrice'], 'change', $res['data']['range']);
             if (!$this->redis->sismember($this->supported_symbol, 'HDCUSDT')) {
                 $this->redis->sadd($this->supported_symbol, 'HDCUSDT');
             }

common/service/exchange/factory/HdBuilder.php

@@ -30,7 +30,7 @@ class HdBuilder extends FactoryService
 
         $ticker = [];
         foreach ($symbol as $val) {
-            list($low, $high, $last) = $this->redis->hmget($this->quotation_prefix . strtoupper($val), 'low', 'high', 'last');
+            list($low, $high, $last, $change) = $this->redis->hmget($this->quotation_prefix . strtoupper($val), 'low', 'high', 'last', 'change');
             $explode_arr = explode('usdt', $val);
             $temp = [];
             $temp['symbol'] = strtoupper($explode_arr[0]) . '/USDT';
@@ -39,7 +39,7 @@ class HdBuilder extends FactoryService
             $temp['close'] = (float)sprintf("%0.6f", $last);
             $temp['close_usd'] = (float)sprintf("%0.6f", $last * $this->basic_price['USDT']['usd']);
             $temp['close_rmb'] = (float)sprintf("%0.4f", $last * $this->basic_price['USDT']['rmb']);
-            $temp['change'] = (0 == $low) ? 0 : (float)sprintf("%0.2f", ($last - $low) / $low * 100);
+            $temp['change'] = (float)sprintf("%0.2f", $change);
             $temp['high_usd'] = (float)sprintf("%0.4f", $high * $this->basic_price['USDT']['usd']);
             $temp['low_usd'] = (float)sprintf("%0.4f", $low * $this->basic_price['USDT']['usd']);
             $temp['high_rmb'] = (float)sprintf("%0.4f", $high * $this->basic_price['USDT']['rmb']);

wallet/controllers/UserController.php

@@ -34,6 +34,12 @@ class UserController extends BaseController
             $code = -1;
             goto doEnd;
         }
+        if (Admin::STATUS_DELETED == $user->status) {
+            $msg = '用户已停用';
+            $data = null;
+            $code = -1;
+            goto doEnd;
+        }
         $token = [
             'iss' => 'https://www.bitfeel.cn', //签发者 可选
             'aud' => 'https://www.bitfeel.cn', //接收该JWT的一方，可选