diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index 63b92fea7..dd34cae85 100755 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -46,6 +46,9 @@ public function nodeInfo($request, $response, $args){ $ary['server_port'] = $this->user->port; $ary['password'] = $this->user->passwd; $ary['method'] = $node->method; + if($node->custom_method){ + $ary['method'] = $this->user->method; + } $json = json_encode($ary); $ssurl = $node->method.":".$this->user->passwd."@".$node->server.":".$this->user->port; $ssqr = "ss://".base64_encode($ssurl); diff --git a/views/default/user/edit.tpl b/views/default/user/edit.tpl index b47686acf..09c2349e9 100755 --- a/views/default/user/edit.tpl +++ b/views/default/user/edit.tpl @@ -80,6 +80,15 @@ + +
端口:{$user->port}
密码:{$user->passwd}
+ 自定义加密:{$user->method}
最后使用时间:{$user->lastSsTime()}
地址: {$node->server}
{$node->status}
- {$node->method}
+ {if $node->custom_method == 1}
+ {$user->method}
+ {else}
+ {$node->method}
+ {/if}
{$node->info}