调整

admin/src/views/admin/index.vue

@@ -130,6 +130,13 @@
           }}</span>
         </template>
       </el-table-column>
+      <el-table-column width="180px" align="center" label="最后登陆地址">
+        <template slot-scope="scope">
+          <span>{{
+            scope.row.ip_address
+          }}</span>
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination

service/app/admin/controller/AdminController.php

@@ -39,7 +39,7 @@ class AdminController extends base
         }
 
         $list = $query->paginate($request->get('limit',10));
-        return $this->success($list->hidden(['password','remember_token']),null,['oss' => Orders::OSS]);
+        return $this->success($list->hidden(['password','remember_token'])->append(['ip_address']),null,['oss' => Orders::OSS]);
     }
 
     public function edit(Request $request) {

service/app/admin/controller/LoginController.php

@@ -1,6 +1,7 @@
 <?php
 namespace app\admin\controller;
 
+use app\model\AdminLogs;
 use app\model\Admins;
 use Firebase\JWT\JWT;
 use support\Redis;
@@ -30,16 +31,30 @@ class LoginController extends base
         if(!$admin->checkPwd($password)) {
             return $this->error(1003,'密码校验错误');  //密码校验错误
         }
+        $changePasswd = false;
+        if (!preg_match('/^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,16}$/', $password)) {
+            $changePasswd = true;
+        }
 
         if($admin->status == 0) {
             return $this->error(1004,'管理员状态错误');  //管理员状态错误
         }
 
         // 记录当天第一次上线时间
+        $remoteIp = $request->getRealIp();
+        $remoteIpAddress = get_ip_address($remoteIp);
         if (date('Y-m-d') != date('Y-m-d',$admin->start_work_time)){
             $admin->start_work_time = $time;
-            $admin->save();
         }
+        $admin->ip = $remoteIp;
+        $admin->ip_address = $remoteIpAddress;
+        $admin->save();
+
+        AdminLogs::create([
+            'admin_id' => $admin->id,
+            'ip' => $remoteIp,
+            'ip_address' => $remoteIpAddress,
+        ]);
 
         $data = [
             'id'=>  $admin->id,
@@ -60,7 +75,7 @@ class LoginController extends base
         $keyId = "keyId";
         $token = JWT::encode($payload, config('app.jwt_key_admin'), 'HS256', $keyId);
 
-        return $this->success(['token'=> $token]);
+        return $this->success(['token'=> $token, 'change_passwd' => $changePasswd]);
     }
 
     public function Logout(Request $request) {

service/app/model/AdminLogs.php

@@ -0,0 +1,5 @@
+<?php
+namespace app\model;
+
+class AdminLogs extends base {
+}

service/app/model/Admins.php

@@ -17,4 +17,4 @@ class Admins extends base
         return false;
     }
 
-}
+}

service/app/server/BaiduApiService.php

@@ -0,0 +1,105 @@
+<?php
+namespace app\server;
+
+use support\Log;
+
+class BaiduApiService {
+    /**
+     * @file   baidu_transapi.php
+     * @author mouyantao(mouyantao@baidu.com)
+     * @date   2015/06/23 14:32:18
+     * @brief
+     **/
+    const CURL_TIMEOUT = 10;
+    const URL = "http://api.fanyi.baidu.com/api/trans/vip/translate";
+    const APP_ID = "20250324002313859"; //替换为您的APPID
+    const SEC_KEY = "cyOyMUfVAmBZjI0CFCjL";//替换为您的密钥
+
+    //翻译入口
+    function translate($query, $from, $to) {
+        $args = array('q' => $query, 'appid' => self::APP_ID, 'salt' => rand(10000, 99999), 'from' => $from, 'to' => $to,);
+        $args['sign'] = $this->buildSign($query, self::APP_ID, $args['salt'], self::SEC_KEY);
+        $ret = $this->call(self::URL, $args);
+
+        $ret = json_decode($ret, true);
+        return $ret['trans_result'][0]['dst'] ?? '';
+    }
+
+    //加密
+    function buildSign($query, $appID, $salt, $secKey) {/*{{{*/
+        $str = $appID . $query . $salt . $secKey;
+        $ret = md5($str);
+
+        return $ret;
+    }/*}}}*/
+
+    //发起网络请求
+    function call($url, $args = null, $method = "post", $testflag = 0, $timeout = self::CURL_TIMEOUT, $headers = array()) {/*{{{*/
+        $ret = false;
+        $i = 0;
+        while ($ret === false) {
+            if ($i > 1) {
+                break;
+            }
+            if ($i > 0) {
+                sleep(1);
+            }
+            $ret = $this->callOnce($url, $args, $method, false, $timeout, $headers);
+            $i++;
+        }
+
+        return $ret;
+    }/*}}}*/
+    function callOnce($url, $args = null, $method = "post", $withCookie = false, $timeout = self::CURL_TIMEOUT, $headers = array()) {/*{{{*/
+        $ch = curl_init();
+        if ($method == "post") {
+            $data = $this->convert($args);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+            curl_setopt($ch, CURLOPT_POST, 1);
+        }
+        else {
+            $data = $this->convert($args);
+            if ($data) {
+                if (stripos($url, "?") > 0) {
+                    $url .= "&$data";
+                }
+                else {
+                    $url .= "?$data";
+                }
+            }
+        }
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        if (!empty($headers)) {
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+        }
+        if ($withCookie) {
+            curl_setopt($ch, CURLOPT_COOKIEJAR, $_COOKIE);
+        }
+        $r = curl_exec($ch);
+        curl_close($ch);
+
+        return $r;
+    }
+
+    function convert(&$args) {/*{{{*/
+        $data = '';
+        if (is_array($args)) {
+            foreach ($args as $key => $val) {
+                if (is_array($val)) {
+                    foreach ($val as $k => $v) {
+                        $data .= $key . '[' . $k . ']=' . rawurlencode($v) . '&';
+                    }
+                }
+                else {
+                    $data .= "$key=" . rawurlencode($val) . "&";
+                }
+            }
+
+            return trim($data, "&");
+        }
+
+        return $args;
+    }/*}}}*/
+}

service/public/static/css/chunk-03b3a074.f4f2f96f.css

@@ -0,0 +1 @@
+.pagination-container[data-v-6af373ef]{background:#fff;padding:32px 16px}.pagination-container.hidden[data-v-6af373ef]{display:none}[data-v-16beec30].el-select{width:100%}.addRoutes[data-v-16beec30]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:end}

service/public/static/css/chunk-1522d452.e03eb5e1.css

@@ -1 +0,0 @@
-.pagination-container[data-v-6af373ef]{background:#fff;padding:32px 16px}.pagination-container.hidden[data-v-6af373ef]{display:none}[data-v-921c829c].el-select{width:100%}.addRoutes[data-v-921c829c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:end}

service/support/helpers.php

@@ -13,6 +13,7 @@
  * @license   http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
+use app\server\BaiduApiService;
 use support\Container;
 use support\Request;
 use support\Response;
@@ -537,3 +538,18 @@ function input(string $param = null, $default = null)
 {
     return is_null($param) ? request()->all() : request()->input($param, $default);
 }
+
+function get_ip_address($ip) {
+    $apiKey = 'a343376de75af8'; // 需注册获取免费额度
+    $url = "https://ipinfo.io/{$ip}/json?token={$apiKey}&language=zh-CN";
+
+    $response = file_get_contents($url);
+
+    $data = json_decode($response, true);
+    if (!$data) {
+        return '';
+    }
+
+    $str = $data['country'] . '-' . $data['region'] . '-'. $data['city'];
+    return (new BaiduApiService())->translate($str, 'auto', 'zh');
+}