fix V2ray

app/Components/Helpers.php

@@ -82,7 +82,7 @@ class Helpers {
 		// 生成一个可用端口
 		$user->port = self::systemConfig()['is_rand_port']? Helpers::getRandPort() : Helpers::getOnlyPort();
 		$user->passwd = makeRandStr();
-		$user->uuid = createGuid();
+		$user->vmess_id = createGuid();
 		$user->enable = 1;
 		$user->method = Helpers::getDefaultMethod();
 		$user->protocol = Helpers::getDefaultProtocol();

app/Http/Controllers/Admin/ToolsController.php

@@ -174,7 +174,7 @@ class ToolsController extends Controller {
 					$obj->password = Hash::make('123456');
 					$obj->port = $user->port;
 					$obj->passwd = $user->passwd;
-					$obj->uuid = $user->uuid;
+					$obj->vmess_id = $user->uuid;
 					$obj->transfer_enable = $user->transfer_enable;
 					$obj->method = $user->method;
 					$obj->protocol = $user->protocol;

app/Http/Controllers/AdminController.php

@@ -261,7 +261,7 @@ class AdminController extends Controller {
 			$user->password = Hash::make($request->input('password')?: makeRandStr());
 			$user->port = $request->input('port')?: $this->makePort();
 			$user->passwd = $request->input('passwd')?: makeRandStr();
-			$user->uuid = $request->input('uuid')?: createGuid();
+			$user->vmess_id = $request->input('uuid')?: createGuid();
 			$user->transfer_enable = toGB($request->input('transfer_enable')?: 0);
 			$user->enable = $request->input('enable')?: 0;
 			$user->method = $request->input('method');
@@ -382,7 +382,7 @@ class AdminController extends Controller {
 					'email'           => $email,
 					'port'            => $port,
 					'passwd'          => $request->input('passwd')?: makeRandStr(),
-					'uuid'            => $request->input('uuid')?: createGuid(),
+					'vmess_id'        => $request->input('uuid')?: createGuid(),
 					'transfer_enable' => toGB($transfer_enable?: 0),
 					'enable'          => $status < 0? 0 : $request->input('enable'),
 					'method'          => $request->input('method'),

app/Http/Controllers/Controller.php

@@ -167,7 +167,7 @@ class Controller extends BaseController {
 							"ps"   => $node->name,
 							"add"  => $host,
 							"port" => $node->v2_port,
-							"id"   => $user->uuid,
+							"id"   => $user->vmess_id,
 							"aid"  => $node->v2_alter_id,
 							"net"  => $node->v2_net,
 							"type" => $node->v2_type,
@@ -176,7 +176,7 @@ class Controller extends BaseController {
 							"tls"  => $node->v2_tls? "tls" : ""
 						], JSON_PRETTY_PRINT));
 				}else{
-					$data = "服务器：".$host.PHP_EOL."IPv6：".($node->ipv6?: "").PHP_EOL."端口：".$node->v2_port.PHP_EOL."加密方式：".$node->v2_method.PHP_EOL."用户ID：".$user->uuid.PHP_EOL."额外ID：".$node->v2_alter_id.PHP_EOL."传输协议：".$node->v2_net.PHP_EOL."伪装类型：".$node->v2_type.PHP_EOL."伪装域名：".($node->v2_host?: "").PHP_EOL."路径：".($node->v2_path?: "").PHP_EOL."TLS：".($node->v2_tls? "tls" : "").PHP_EOL;
+					$data = "服务器：".$host.PHP_EOL."IPv6：".($node->ipv6?: "").PHP_EOL."端口：".$node->v2_port.PHP_EOL."加密方式：".$node->v2_method.PHP_EOL."用户ID：".$user->vmess_id.PHP_EOL."额外ID：".$node->v2_alter_id.PHP_EOL."传输协议：".$node->v2_net.PHP_EOL."伪装类型：".$node->v2_type.PHP_EOL."伪装域名：".($node->v2_host?: "").PHP_EOL."路径：".($node->v2_path?: "").PHP_EOL."TLS：".($node->v2_tls? "tls" : "").PHP_EOL;
 				}
 				break;
 			case 3:

app/Models/User.php

@@ -16,7 +16,7 @@ use Illuminate\Notifications\Notifiable;
  * @property string                                                                                                         $password        密码
  * @property int                                                                                                            $port            代理端口
  * @property string                                                                                                         $passwd          代理密码
- * @property string                                                                                                         $uuid
+ * @property string                                                                                                         $vmess_id
  * @property int                                                                                                            $transfer_enable 可用流量，单位字节，默认1TiB
  * @property int                                                                                                            $u               已上传流量，单位字节
  * @property int                                                                                                            $d               已下载流量，单位字节
@@ -88,7 +88,7 @@ use Illuminate\Notifications\Notifiable;
  * @method static Builder|User whereU($value)
  * @method static Builder|User whereUpdatedAt($value)
  * @method static Builder|User whereUsername($value)
- * @method static Builder|User whereUuid($value)
+ * @method static Builder|User whereVmessId($value)
  * @method static Builder|User whereWechat($value)
  * @mixin \Eloquent
  */

resources/views/admin/user/userInfo.blade.php

@@ -353,7 +353,7 @@
 			$('#protocol').selectpicker('val', '{{$user->protocol}}')
 			$('#obfs').selectpicker('val', '{{$user->obfs}}')
 			$('#speed_limit').val('{{$user->speed_limit}}')
-			$('#uuid').val('{{$user->uuid}}')
+			$('#uuid').val('{{$user->vmess_id}}')
 			@else
 			$('#level').selectpicker('val', '0')
 			@endisset

sql/db.sql

@@ -142,7 +142,7 @@ CREATE TABLE `user`
     `password`        VARCHAR(64)          NOT NULL DEFAULT '' COMMENT '密码',
     `port`            SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' COMMENT '代理端口',
     `passwd`          VARCHAR(16)          NOT NULL DEFAULT '' COMMENT '代理密码',
-    `uuid`            VARCHAR(64)          NOT NULL DEFAULT '',
+    `vmess_id`        VARCHAR(64)          NOT NULL DEFAULT '',
     `transfer_enable` BIGINT(20) UNSIGNED  NOT NULL DEFAULT '1099511627776' COMMENT '可用流量，单位字节，默认1TiB',
     `u`               BIGINT(20) UNSIGNED  NOT NULL DEFAULT '0' COMMENT '已上传流量，单位字节',
     `d`               BIGINT(20) UNSIGNED  NOT NULL DEFAULT '0' COMMENT '已下载流量，单位字节',

sql/mod/20200624.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `user`
+    CHANGE `uuid` `vmess_id` VARCHAR(64) NOT NULL DEFAULT '';