15954078560 2 лет назад
Родитель
Сommit
3595ba2105
2 измененных файлов с 8 добавлено и 1 удалено
  1. 7 0
      application/api/controller/User.php
  2. 1 1
      application/common/model/User.php

+ 7 - 0
application/api/controller/User.php

@@ -1017,6 +1017,13 @@ class User extends Api
                 $userInfo['wechat'] = '暂未设置微信号!';
             } elseif(!$userInfo['is_fate']) {
                 $userInfo['wechat'] = '******';
+            } else {
+                $public_key = "-----BEGIN PUBLIC KEY-----" .PHP_EOL.
+                    wordwrap(config('public_key'), 64, PHP_EOL, true) .
+                    PHP_EOL."-----END PUBLIC KEY-----";
+                $wechat = "";
+                openssl_public_encrypt($userInfo['wechat'], $wechat, $public_key);
+                $userInfo['wechat'] = base64_encode($wechat);
             }
 
             //查询在线状态和活跃状态

+ 1 - 1
application/common/model/User.php

@@ -191,7 +191,7 @@ class User extends Model
      */
     public static function getIsView($fate_user_id,$user_id) {
         // 获取是否已有眼缘
-        $is_fate = \app\common\model\UserFate::where(["user_id"=>$user_id,"fate_user_id"=>$fate_user_id])->find();
+        $is_fate = \app\common\model\UserFate::where(["user_id"=>$user_id,"fate_user_id"=>$fate_user_id, 'createtime' => ['egt', time() - 86400]])->find();
         $res['is_fate'] = $is_fate?1:0;
         return $is_fate?1:0;
     }