Jelajahi Sumber

fixed 忽视了casts在更新后立即生效,导致转换失败的要素

兔姬桑 4 tahun lalu
induk
melakukan
37fcb854a8

+ 4 - 4
app/Console/Commands/updateTextToJson.php

@@ -15,18 +15,18 @@ class updateTextToJson extends Command {
 	public function handle(): void {
 		Log::info('----------------------------【数据转换】开始----------------------------');
 		foreach(ReferralApply::all() as $referralApply){
-			$referralApply->link_logs = $this->convertToJson($referralApply->link_logs);
+			$referralApply->link_logs = $this->convertToJson($referralApply->getOriginal('link_logs'));
 			$referralApply->save();
 		}
 		Log::info('转换返利表完成');
 		foreach(UserGroup::all() as $userGroup){
-			$userGroup->nodes = $this->convertToJson($userGroup->nodes);
+			$userGroup->nodes = $this->convertToJson($userGroup->getOriginal('nodes'));
 			$userGroup->save();
 		}
 		Log::info('转换用户分组表完成');
 		foreach(RuleGroup::all() as $ruleGroup){
-			$ruleGroup->rules = $this->convertToJson($ruleGroup->rules);
-			$ruleGroup->nodes = $this->convertToJson($ruleGroup->nodes);
+			$ruleGroup->rules = $this->convertToJson($ruleGroup->getOriginal('rules'));
+			$ruleGroup->nodes = $this->convertToJson($ruleGroup->getOriginal('nodes'));
 			$ruleGroup->save();
 		}
 		Log::info('转换审核规则表完成');

+ 10 - 10
resources/views/admin/node/authList.blade.php

@@ -89,7 +89,7 @@
 							<div class="alert alert-info  text-break">
 								<div class="text-center red-700 mb-5">VNET-V2Ray</div>
 								(yum install curl 2> /dev/null || apt install curl 2> /dev/null) \<br>
-								&& curl -L -s https://bit.ly/2xoemF2 \<br>
+								&& curl -L -s http://mrw.so/5XKg2o \<br>
 								| WEB_API="{{\App\Components\Helpers::systemConfig()['web_api_url'] ?: \App\Components\Helpers::systemConfig()['website_url']}}" \<br>
 								NODE_ID={{$vl->node->id}} \<br>
 								NODE_KEY={{$vl->key}} \<br>
@@ -99,7 +99,7 @@
 								<div class="text-center red-700 mb-5">操作命令</div>
 								更新:同上
 								<br>
-								卸载:curl -L -s https://bit.ly/2xoemF2 | bash -s -- --remove
+								卸载:curl -L -s http://mrw.so/5XKg2o | bash -s -- --remove
 								<br>
 								启动:systemctl start vnet-v2ray
 								<br>
@@ -114,7 +114,7 @@
 							<div class="alert alert-info text-break">
 								<div class="text-center red-700 mb-5">V2Ray-Poseidon</div>
 								(yum install curl 2> /dev/null || apt install curl 2> /dev/null) \<br>
-								&& curl -L -s https://bit.ly/2VhvcPz \<br>
+								&& curl -L -s http://mrw.so/5Qe2UX \<br>
 								| WEB_API="{{\App\Components\Helpers::systemConfig()['web_api_url'] ?: \App\Components\Helpers::systemConfig()['website_url']}}" \<br>
 								NODE_ID={{$vl->node->id}} \<br>
 								NODE_KEY={{$vl->key}} \<br>
@@ -122,9 +122,9 @@
 								<br>
 								<br>
 								<div class="text-center red-700 mb-5">操作命令</div>
-								更新:curl -L -s https://bit.ly/2VhvcPz | bash
+								更新:curl -L -s http://mrw.so/5Qe2UX | bash
 								<br>
-								卸载:curl -L -s https://bit.ly/2SGFMMY | bash
+								卸载:curl -L -s http://mrw.so/5IHPR4 | bash
 								<br>
 								启动:systemctl start v2ray
 								<br>
@@ -143,7 +143,7 @@
 								<div class="alert alert-info text-break">
 									<div class="text-center red-700 mb-5">Trojan-Poseidon</div>
 									(yum install curl 2> /dev/null || apt install curl 2> /dev/null) \<br>
-									&& curl -L -s https://bit.ly/33UdELu \<br>
+									&& curl -L -s http://mrw.so/6cMfGy \<br>
 									| WEB_API="{{\App\Components\Helpers::systemConfig()['web_api_url'] ?: \App\Components\Helpers::systemConfig()['website_url']}}" \<br>
 									NODE_ID={{$vl->node->id}} \<br>
 									NODE_KEY={{$vl->key}} \<br>
@@ -152,9 +152,9 @@
 									<br>
 									<br>
 									<div class="text-center red-700 mb-5">操作命令</div>
-									更新:curl -L -s https://bit.ly/3esZ7ec | bash
+									更新:curl -L -s http://mrw.so/6cMfGy | bash
 									<br>
-									卸载:curl -L -s https://bit.ly/2Jl9bs7 | bash
+									卸载:curl -L -s http://mrw.so/5ulpvu | bash
 									<br>
 									启动:systemctl start trojanp
 									<br>
@@ -171,7 +171,7 @@
 							<div class="alert alert-info text-break">
 								<div class="text-center red-700 mb-5">VNET</div>
 								(yum install curl 2> /dev/null || apt install curl 2> /dev/null) \<br>
-								&& curl -L -s https://bit.ly/2RNkPk7 \<br>
+								&& curl -L -s http://mrw.so/6kit3t \<br>
 								| WEB_API="{{\App\Components\Helpers::systemConfig()['web_api_url'] ?: \App\Components\Helpers::systemConfig()['website_url']}}" \<br>
 								NODE_ID={{$vl->node->id}} \<br>
 								NODE_KEY={{$vl->key}} \<br>
@@ -181,7 +181,7 @@
 								<div class="text-center red-700 mb-5">操作命令</div>
 								更新:同上
 								<br>
-								卸载:curl -L -s https://bit.ly/2RNkPk7 | bash -s -- --remove
+								卸载:curl -L -s http://mrw.so/6kit3t | bash -s -- --remove
 								<br>
 								启动:systemctl start vnet
 								<br>

+ 1 - 1
sql/db.sql

@@ -1254,7 +1254,7 @@ CREATE TABLE `ss_node_ip`
     `user_id`    INT(10) UNSIGNED     NOT NULL DEFAULT '0' COMMENT '用户ID',
     `port`       SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' COMMENT '端口',
     `type`       CHAR(3)              NOT NULL DEFAULT 'tcp' COMMENT '类型:all、tcp、udp',
-    `ip`         JSON COMMENT '用户连接IP',
+    `ip`         JSON   TEXT COMMENT '连接IP:每个IP用,号隔开',
     `created_at` INT(10) UNSIGNED     NOT NULL DEFAULT '0' COMMENT '上报时间',
     PRIMARY KEY (`id`),
     KEY `idx_port` (`port`),

+ 0 - 3
sql/mod/20200805.sql

@@ -13,6 +13,3 @@ ALTER TABLE `user_group`
 ALTER TABLE `rule_group`
     CHANGE `rules` `rules` JSON DEFAULT NULL COMMENT '关联的规则ID,多个用,号分隔',
     CHANGE `nodes` `nodes` JSON DEFAULT NULL COMMENT '关联的节点ID,多个用,号分隔';
-
-ALTER TABLE `ss_node_ip`
-    CHANGE `ip` `ip` JSON COMMENT '用户连接IP';