Home Explore Help
Register Sign In
alroyso
/
v2board
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

feature: i18n

Tokumeikoi 4 years ago
parent
c984fa2e0b
commit
393680c963
14 changed files with 11 additions and 5 deletions
Split View Show Diff Stats
  1. 3 0
      app/Http/Controllers/Server/ShadowsocksTidalabController.php
  2. 3 0
      app/Http/Controllers/Server/TrojanTidalabController.php
  3. 1 1
      app/Services/UserService.php
  4. 0 0
      public/assets/admin/antd.async.js
  5. 0 0
      public/assets/admin/components.async.js
  6. 0 0
      public/assets/admin/components.chunk.css
  7. 0 0
      public/assets/admin/umi.js
  8. 0 0
      public/assets/user/components.async.js
  9. 0 0
      public/assets/user/components.chunk.css
  10. 0 0
      public/assets/user/umi.css
  11. 0 0
      public/assets/user/umi.js
  12. 0 0
      public/assets/user/vendors.async.js
  13. 2 2
      resources/views/admin.blade.php
  14. 2 2
      resources/views/app.blade.php

+ 3 - 0
app/Http/Controllers/Server/ShadowsocksTidalabController.php
View File 

@@ -73,10 +73,12 @@ class ShadowsocksTidalabController extends Controller
 
         Cache::put(CacheKey::get('SERVER_SHADOWSOCKS_ONLINE_USER', $server->id), count($data), 3600);
 
         $serverService = new ServerService();
 
         $userService = new UserService();
 
+        DB::beginTransaction();
 
         foreach ($data as $item) {
 
             $u = $item['u'] * $server->rate;
 
             $d = $item['d'] * $server->rate;
 
             if (!$userService->trafficFetch((float)$u, (float)$d, (int)$item['user_id'])) {
 
+                DB::rollBack();
 
                 return response([
 
                     'ret' => 0,
 
                     'msg' => 'user fetch fail'
 
@@ -92,6 +94,7 @@ class ShadowsocksTidalabController extends Controller
 
                 'trojan'
 
             );
 
         }
 
+        DB::commit();
 
 
         return response([
 
             'ret' => 1,

+ 3 - 0
app/Http/Controllers/Server/TrojanTidalabController.php
View File 

@@ -74,10 +74,12 @@ class TrojanTidalabController extends Controller
 
         Cache::put(CacheKey::get('SERVER_TROJAN_ONLINE_USER', $server->id), count($data), 3600);
 
         $serverService = new ServerService();
 
         $userService = new UserService();
 
+        DB::beginTransaction();
 
         foreach ($data as $item) {
 
             $u = $item['u'] * $server->rate;
 
             $d = $item['d'] * $server->rate;
 
             if (!$userService->trafficFetch($u, $d, $item['user_id'])) {
 
+                DB::rollBack();
 
                 return response([
 
                     'ret' => 0,
 
                     'msg' => 'user fetch fail'
 
@@ -93,6 +95,7 @@ class TrojanTidalabController extends Controller
 
                 'trojan'
 
             );
 
         }
 
+        DB::commit();
 
 
         return response([
 
             'ret' => 1,

+ 1 - 1
app/Services/UserService.php
View File 

@@ -80,7 +80,7 @@ class UserService
 
     {
 
         $user = User::find($userId);
 
         if (!$user) {
 
-            return false;
 
+            return true;
 
         }
 
         $user->t = time();
 
         $user->u = $user->u + $u;

File diff suppressed because it is too large
+ 0 - 0
public/assets/admin/antd.async.js


File diff suppressed because it is too large
+ 0 - 0
public/assets/admin/components.async.js


File diff suppressed because it is too large
+ 0 - 0
public/assets/admin/components.chunk.css


File diff suppressed because it is too large
+ 0 - 0
public/assets/admin/umi.js


File diff suppressed because it is too large
+ 0 - 0
public/assets/user/components.async.js


File diff suppressed because it is too large
+ 0 - 0
public/assets/user/components.chunk.css


File diff suppressed because it is too large
+ 0 - 0
public/assets/user/umi.css


File diff suppressed because it is too large
+ 0 - 0
public/assets/user/umi.js


File diff suppressed because it is too large
+ 0 - 0
public/assets/user/vendors.async.js


+ 2 - 2
resources/views/admin.blade.php
View File 

@@ -2,7 +2,7 @@
 
 <html>
 
 
 <head>
 
-    <link rel="stylesheet" href="/assets/admin/antd.chunk.css?v={{$verison}}">
 
+    <link rel="stylesheet" href="/assets/admin/components.chunk.css?v={{$verison}}">
 
     <link rel="stylesheet" href="/assets/admin/umi.css?v={{$verison}}">
 
     <link rel="stylesheet" href="/assets/admin/custom.css?v={{$verison}}">
 
     <meta charset="utf-8">
 
@@ -27,7 +27,7 @@
 
 <body>
 
 <div id="root"></div>
 
 <script src="/assets/admin/vendors.async.js?v={{$verison}}"></script>
 
-<script src="/assets/admin/antd.async.js?v={{$verison}}"></script>
 
+<script src="/assets/admin/components.async.js?v={{$verison}}"></script>
 
 <script src="/assets/admin/umi.js?v={{$verison}}"></script>
 
 <!-- Global site tag (gtag.js) - Google Analytics -->
 
 <script async src="https://www.googletagmanager.com/gtag/js?id=G-P1E9Z5LRRK"></script>

+ 2 - 2
resources/views/app.blade.php
View File 

@@ -2,7 +2,7 @@
 
 <html>
 
 
 <head>
 
-    <link rel="stylesheet" href="/assets/user/antd.chunk.css?v={{$verison}}">
 
+    <link rel="stylesheet" href="/assets/user/components.chunk.css?v={{$verison}}">
 
     <link rel="stylesheet" href="/assets/user/umi.css?v={{$verison}}">
 
     <link rel="stylesheet" href="/assets/user/custom.css?v={{$verison}}">
 
     <meta charset="utf-8">
 
@@ -28,7 +28,7 @@
 
 <body>
 
 <div id="root"></div>
 
 <script src="/assets/user/vendors.async.js?v={{$verison}}"></script>
 
-<script src="/assets/user/antd.async.js?v={{$verison}}"></script>
 
+<script src="/assets/user/components.async.js?v={{$verison}}"></script>
 
 <script src="/assets/user/umi.js?v={{$verison}}"></script>
 
 <!-- Global site tag (gtag.js) - Google Analytics -->
 
 <script async src="https://www.googletagmanager.com/gtag/js?id=G-P1E9Z5LRRK"></script>

Some files were not shown because too many files changed in this diff