Changes

.idea/workspace.xml

@@ -6,7 +6,9 @@
   <component name="ChangeListManager">
     <list default="true" id="09451f28-815a-407f-8951-727d305b50a4" name="Changes" comment="Changes">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/Client/V3Controller.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/Client/V3Controller.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/Client/V4Controller.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/Client/V4Controller.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/lang/zh-CN/validation.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/zh-CN/validation.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/api.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -378,7 +380,10 @@
       <workItem from="1741756792720" duration="702000" />
       <workItem from="1741757796035" duration="7383000" />
       <workItem from="1741765840066" duration="6426000" />
-      <workItem from="1741836315642" duration="9892000" />
+      <workItem from="1741836315642" duration="9903000" />
+      <workItem from="1741924782890" duration="4397000" />
+      <workItem from="1742356565477" duration="2737000" />
+      <workItem from="1742627488124" duration="1451000" />
     </task>
     <task id="LOCAL-00001" summary="Changes">
       <option name="closed" value="true" />
@@ -668,7 +673,15 @@
       <option name="project" value="LOCAL" />
       <updated>1741775063611</updated>
     </task>
-    <option name="localTasksCounter" value="37" />
+    <task id="LOCAL-00037" summary="Changes">
+      <option name="closed" value="true" />
+      <created>1741851831310</created>
+      <option name="number" value="00037" />
+      <option name="presentableId" value="LOCAL-00037" />
+      <option name="project" value="LOCAL" />
+      <updated>1741851831310</updated>
+    </task>
+    <option name="localTasksCounter" value="38" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

app/Http/Controllers/Api/Client/V3Controller.php

@@ -24,7 +24,7 @@ class V3Controller  extends Controller
 {
     public function __construct()
     {
-        $this->middleware('auth:api')->except('login','Ping','refreshByUser', 'register', 'shop', 'getConfig','version','buy','ClashConfig','getsysconfig');
+        $this->middleware('auth:api')->except('login','logout','Ping','refreshByUser', 'register', 'shop', 'getConfig','version','buy','ClashConfig','getsysconfig');
         auth()->shouldUse('api');
     }
     public function Ping()
@@ -442,4 +442,13 @@ class V3Controller  extends Controller
 
     }
 
+
+    public function logout()
+    {
+        auth()->logout();
+
+        return response()->json(['ret' => 1,'data'=>'ok']);
+    }
+
+
 }

app/Http/Controllers/Api/Client/V4Controller.php

@@ -27,7 +27,8 @@ class V4Controller  extends Controller
             'password' => 'required|string|min:6',
         ]);
         if ($validator->fails()) {
-            return response()->json(['ret' => 0, 'msg' => $validator->errors()->all()], 200);
+            $errors = implode("\n", $validator->errors()->all());
+            return response()->json(['ret' => 0, 'msg' => $errors], 200);
         }
 
         if ($token = auth()->attempt($validator->validated())) {
@@ -38,6 +39,7 @@ class V4Controller  extends Controller
     }
     protected function createNewToken($request,$token)
     {
+
         $user = auth()->user();
         //判断到期
         $expireTime = $user["expired_at"];
@@ -48,7 +50,7 @@ class V4Controller  extends Controller
 
         $usedTraffic = $user->usedTraffic();
         if ($usedTraffic >= $user["transfer_enable"]){
-            return response()->json(['ret' => 446, 'msg' => "流量已经用完，"], 200);
+            return response()->json(['ret' => 446, 'msg' => "流量已经用完，请购买加油包"], 200);
         }
 
         $userinfo = $user->profile();

resources/lang/zh-CN/validation.php

@@ -27,7 +27,7 @@ return [
     'digits_between'       => ':attribute 必须是介于 :min 和 :max 位的数字。',
     'dimensions'           => ':attribute 图片尺寸不正确。',
     'distinct'             => ':attribute 已经存在。',
-    'email'                => ':attribute 不是一个合法的邮箱。',
+    'email'                => ':attribute 用户名必须是邮箱。',
     'ends_with'            => ':attribute 必须以 :values 为结尾。',
     'exists'               => ':attribute 不存在。',
     'file'                 => ':attribute 必须是文件。',

routes/api.php

@@ -91,6 +91,7 @@ Route::group(['namespace' => 'Api\Client', 'prefix' => 'client/code'], function
 
 Route::group(['namespace' => 'Api\Client', 'middleware' => 'api', 'prefix' => 'client/v3'], function () {
     Route::post('login', 'V3Controller@login'); // 登陆
+    Route::post('logout', 'V3Controller@logout'); // 登出
     Route::get('Ping', 'V3Controller@Ping'); // 登陆
     Route::get('SProxy_config', 'V3Controller@ClashConfig')->name('SProxy_config');; // 登陆
     Route::get('authUser', 'V3Controller@authUser'); // 验证用户