From d0f49d0b9aa55579ac66394fb58c057951555876 Mon Sep 17 00:00:00 2001 From: laurieryayoi <14360417+laurieryayoi@users.noreply.github.com> Date: Sat, 23 Feb 2019 02:16:14 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9fetch=20wrapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uim-index-dev/src/js/fetch.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/uim-index-dev/src/js/fetch.js b/uim-index-dev/src/js/fetch.js index 987d1708..cb45c20d 100644 --- a/uim-index-dev/src/js/fetch.js +++ b/uim-index-dev/src/js/fetch.js @@ -10,15 +10,21 @@ * @param {string} method * @returns {function} - A Promise Object */ -export const _request = (url, body, method, credentials) => - fetch(url, { +export const _request = (url, body, method, credentials, headers) => { + let config = { method: method, body: body, headers: { 'content-type': 'application/json' }, credentials: credentials - }).then(resp => { + }; + + if (headers) { + config.headers = headers; + } + + return fetch(url, config).then(resp => { return Promise.all([resp.ok, resp.status, resp.json()]) }).then(([ok, status, json]) => { if (ok) { @@ -29,6 +35,7 @@ export const _request = (url, body, method, credentials) => }).catch(error => { throw error }) +} /** * A Wrapper of Fetch GET Method @@ -65,4 +72,4 @@ export const _get = (url, credentials) => * _post('https://example.com', JSON.stringify(data)).then(resp => { console.log(resp) }) */ -export const _post = (url, body, credentials) => _request(url, body, 'POST', credentials) +export const _post = (url, body, credentials, headers) => _request(url, body, 'POST', credentials, headers) From d70d68d19ea1c440b5ff25a3a00b6ddecbe091ed Mon Sep 17 00:00:00 2001 From: laurieryayoi <14360417+laurieryayoi@users.noreply.github.com> Date: Sat, 23 Feb 2019 02:59:23 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- uim-index-dev/package.json | 1 + uim-index-dev/src/main.js | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/uim-index-dev/package.json b/uim-index-dev/package.json index a104959e..e76ca6ce 100644 --- a/uim-index-dev/package.json +++ b/uim-index-dev/package.json @@ -9,6 +9,7 @@ }, "dependencies": { "@fortawesome/fontawesome-svg-core": "^1.2.15", + "@fortawesome/free-brands-svg-icons": "^5.7.2", "@fortawesome/free-regular-svg-icons": "^5.7.2", "@fortawesome/free-solid-svg-icons": "^5.7.2", "@fortawesome/vue-fontawesome": "^0.1.5", diff --git a/uim-index-dev/src/main.js b/uim-index-dev/src/main.js index 7801be76..9867270d 100644 --- a/uim-index-dev/src/main.js +++ b/uim-index-dev/src/main.js @@ -29,11 +29,15 @@ import { faArrowUp, faReply, faPencilAlt, - faYenSign + faYenSign, + faComments } from '@fortawesome/free-solid-svg-icons' import { faCopy } from '@fortawesome/free-regular-svg-icons' +import { + faAlipay +} from '@fortawesome/free-brands-svg-icons' import { FontAwesomeIcon, FontAwesomeLayers, @@ -66,7 +70,9 @@ let iconList = [ faReply, faPencilAlt, faYenSign, - faCopy + faCopy, + faAlipay, + faComments ] library.add(...iconList) From abe8359ecb9327d7e0697ef26d721dc3d8ee0293 Mon Sep 17 00:00:00 2001 From: CGDF <17256673+CGDF-Github@users.noreply.github.com> Date: Sat, 23 Feb 2019 07:47:10 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=85=E7=BD=91?= =?UTF-8?q?=E4=B8=AD=E8=BD=ACbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 -- app/Command/Job.php | 7 +++++-- app/Controllers/Admin/NodeController.php | 10 +++++++--- app/Models/Node.php | 6 ------ 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 45540ba8..0c62c62d 100644 --- a/README.md +++ b/README.md @@ -68,8 +68,6 @@ Wiki已经启用,欢迎为此面板维护wiki [**CGDF**](https://github.com/CGDF-GitHub) -- 一键国旗 -- 财务报表 - xcat一键update - 适配SSD - 用户列表分页加载 diff --git a/app/Command/Job.php b/app/Command/Job.php index 86bca1ef..dc7b8481 100644 --- a/app/Command/Job.php +++ b/app/Command/Job.php @@ -46,9 +46,12 @@ class Job if(!Tools::is_ip($node->server)){ if($node->changeNodeIp($node->server)){ $node->save(); + if ($node->sort == 0 || $node->sort == 10) { + Tools::updateRelayRuleIp($node); + } } - } - } + } + } } } diff --git a/app/Controllers/Admin/NodeController.php b/app/Controllers/Admin/NodeController.php index ffedf4d4..cf932f8b 100644 --- a/app/Controllers/Admin/NodeController.php +++ b/app/Controllers/Admin/NodeController.php @@ -148,16 +148,20 @@ class NodeController extends AdminController $success=$node->changeNodeIp($node->server); }else{ $success=$node->changeNodeIp($req_node_ip); - } + } } else { $node->node_ip=""; - } + } if (!$success) { $rs['ret'] = 0; $rs['msg'] = "更新节点IP失败,请检查您输入的节点地址是否正确!"; return $response->getBody()->write(json_encode($rs)); - } + } + + if ($node->sort == 0 || $node->sort == 10) { + Tools::updateRelayRuleIp($node); + } if ($node->sort==1) { $SS_Node=Node::where('sort', '=', 0)->where('server', '=', $request->getParam('server'))->first(); diff --git a/app/Models/Node.php b/app/Models/Node.php index 83facda0..a077a44e 100644 --- a/app/Models/Node.php +++ b/app/Models/Node.php @@ -156,12 +156,6 @@ class Node extends Model return false; } - $relay_rules = Relay::where('dist_node_id', $node_id)->get(); - foreach ($relay_rules as $relay_rule) { - $relay_rule->dist_ip = $ip; - $relay_rule->save(); - } - $this->attributes['node_ip'] = $ip; return true; } From 77e28cf3bcd763df26ea483c1883b7feccf37701 Mon Sep 17 00:00:00 2001 From: CGDF <17256673+CGDF-Github@users.noreply.github.com> Date: Tue, 26 Feb 2019 09:12:56 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E5=AD=97?= =?UTF-8?q?=E6=95=99=E7=A8=8B=E3=80=82user=E6=96=B0=E5=A2=9E=E2=80=9C?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=80=BB=E5=85=85=E5=80=BC=E2=80=9D=E5=87=BD?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controllers/Admin/UserController.php | 8 ++---- app/Models/User.php | 11 ++++++++ resources/views/material/user/index.tpl | 32 ++++++++++++++++++---- resources/views/material/user/nodeinfo.tpl | 2 +- 4 files changed, 40 insertions(+), 13 deletions(-) diff --git a/app/Controllers/Admin/UserController.php b/app/Controllers/Admin/UserController.php index 1e457f5f..87800881 100644 --- a/app/Controllers/Admin/UserController.php +++ b/app/Controllers/Admin/UserController.php @@ -363,12 +363,8 @@ class UserController extends AdminController $tempdata['ref_by_user_name'] = $ref_user->user_name; } } - $codes=Code::where('userid',$user->id)->get(); - $tempdata['top_up']=0; - foreach($codes as $code){ - $tempdata['top_up']+=$code->number; - } - $tempdata['top_up']=round($tempdata['top_up'],2); + + $tempdata['top_up']=$user->get_top_up(); array_push($data,$tempdata); } diff --git a/app/Models/User.php b/app/Models/User.php index edc11b04..ced5adbe 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -341,8 +341,19 @@ class User extends Model $ref_user_id, $ref_user_name); return $return_array; } + public function get_user_attributes($key) { return $this->attributes[$key]; } + + public function get_top_up() + { + $codes=Code::where('userid',$this->attributes['id'])->get(); + $top_up=0; + foreach($codes as $code){ + $top_up+=$code->number; + } + $top_up=round($top_up,2); + } } diff --git a/resources/views/material/user/index.tpl b/resources/views/material/user/index.tpl index d3c95236..cb34aac7 100644 --- a/resources/views/material/user/index.tpl +++ b/resources/views/material/user/index.tpl @@ -269,13 +269,23 @@ {else}
- visibility_off等级至少为{$display_ios_class}可见,如需升级请点击这里升级套餐。 + visibility_off等级至少为{$display_ios_class}可见,如需升级请点击这里升级套餐
{/if} {/if} -filter_1 在 Safari 中save_alt 点击安装 Potatso Lite 或在非国区AppStore中搜索Shadowrocket下载安装
filter_2 打开 Potatso Lite,点击添加代理,点击右上角的 + 号,选择“订阅”,名字任意填写,开启自动更新,URL填写以下地址并保存即可
-如果使用shadowrocket,打开 Shadowrocket,点击右上角的 + 号,类型选择“Subscribe”,URL填写以下地址并点击右上角完成即可。或使用how_to_vote小火箭一键{if $mergeSub!='true'}普通{/if}端口订阅 {if $mergeSub!='true'}how_to_vote小火箭一键单端口订阅{/if}
+build 工具一:Shadowrocket
+filter_1 使用共享账户登录 App Store (请勿在“设置”界面直接登录AppleID),搜索并下载Shadowrocket,期间可能会弹出付款,照做即可,不会产生真实扣费
+
filter_2 打开Shadowrocket,点击右上角的 + 号,“类型”选择“Subscribe”,点击复制本网页下方的“订阅地址”,粘贴到“URL”中,点击右上角的“完成”
+或在 Safari 中点击how_to_vote小火箭一键{if $mergeSub!='true'}普通端口{/if}订阅 {if $mergeSub!='true'}how_to_vote小火箭一键单端口订阅{/if}
+filter_3 选择一个节点,打开上方的连接开关即可
+build 工具二:Quantumult
+filter_1 使用共享账户登录 App Store (请勿在“设置”界面直接登录AppleID),搜索并下载Quantumult,期间可能会弹出付款,照做即可,不会产生真实扣费
+
filter_2 点击下方的“设置”,点击“订阅”,点击右上角的 + 号,选择“服务器”,“名称”任意填写,点击复制本网页下方的“订阅地址”,粘贴到“链接”中,点击右上角的“保存”
+filter_3 点击 Quantumult 底部菜单栏中间的图标,选择一个节点,再点击“主页”,打开右上角的开关即可
+build 工具三:Potatso Lite
+filter_1 在 Safari 中save_alt 点击安装 Potatso Lite,安装时如果弹出登录框则使用上方的账户
+filter_2 打开 Potatso Lite,点击添加代理,选择“订阅”,名字任意填写,点击复制本网页下方的“订阅地址”,粘贴到URL中,点击右上角的 √
+filter_3 选择一个代理节点,点击下方的“开始”即可
filter_1 在 Safari 中点击这里安装 Potatso Lite
-filter_2 打开节点列表,点开自己需要的节点详情,自行导入节点
+build 工具一:Shadowrocket
+filter_1 使用共享账户登录 App Store (请勿在“设置”界面直接登录AppleID),搜索并下载Shadowrocket,期间可能会弹出付款,照做即可,不会产生真实扣费
+
filter_2 打开节点列表,点开自己需要的节点详情,点击配置链接导入节点
+filter_3 选择一个节点,打开上方的连接开关即可
+build 工具二:Quantumult
+filter_1 使用共享账户登录 App Store (请勿在“设置”界面直接登录AppleID),搜索并下载Quantumult,期间可能会弹出付款,照做即可,不会产生真实扣费
+
filter_2 打开节点列表,点开自己需要的节点详情,点击配置链接导入节点
+filter_3 点击 Quantumult 底部菜单栏中间的图标,选择一个节点,再点击“主页”,打开右上角的开关即可
+build 工具三:Potatso Lite
+filter_1 在 Safari 中save_alt 点击安装 Potatso Lite,安装时如果弹出登录框则使用上方的账户
+filter_2 打开节点列表,点开自己需要的节点详情,点击配置链接导入节点
+filter_3 选择一个代理节点,点击下方的“开始”即可
filter_1save_alt 点击下载 SSD,save_alt 点击下载 SS 混淆插件
diff --git a/resources/views/material/user/nodeinfo.tpl b/resources/views/material/user/nodeinfo.tpl index 83305597..cbfd18f6 100755 --- a/resources/views/material/user/nodeinfo.tpl +++ b/resources/views/material/user/nodeinfo.tpl @@ -177,7 +177,7 @@Android 手机上用默认浏览器打开点我就可以直接添加了(给 Shadowsocks)
-iOS 上用 Safari 打开点我就可以直接添加了(给 Shadowrocket)
+ {else}您好,您目前的 加密方式,混淆,或者协议设置在 Shadowsocks 客户端下无法连接。请您选用 ShadowsocksR 客户端来连接,或者到 资料编辑 页面修改后再来查看此处。
{/if} From 3d8177b3e12d45f75aa9670e754c60695bb35a27 Mon Sep 17 00:00:00 2001 From: CGDF <17256673+CGDF-Github@users.noreply.github.com> Date: Tue, 26 Feb 2019 09:51:27 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/material/user/index.tpl | 1 + resources/views/material/user/nodeinfo.tpl | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/resources/views/material/user/index.tpl b/resources/views/material/user/index.tpl index cb34aac7..1b0c5313 100644 --- a/resources/views/material/user/index.tpl +++ b/resources/views/material/user/index.tpl @@ -806,6 +806,7 @@ $(".copy-text").click(function () { $("#result").modal(); $("#msg").html("已拷贝订阅链接,请您继续接下来的操作。"); }); + $(function(){ new Clipboard('.reset-link'); }); diff --git a/resources/views/material/user/nodeinfo.tpl b/resources/views/material/user/nodeinfo.tpl index cbfd18f6..753bcd7f 100755 --- a/resources/views/material/user/nodeinfo.tpl +++ b/resources/views/material/user/nodeinfo.tpl @@ -168,16 +168,16 @@Android 手机上用默认浏览器打开点我就可以直接添加了(给 ShadowsocksR APP)
-iOS 上用 Safari 打开点我就可以直接添加了(给 Shadowrocket)
+ + {else}您好,您目前的 加密方式,混淆,或者协议设置在 ShadowsocksR 客户端下无法连接。请您选用 Shadowsocks 客户端来连接,或者到 资料编辑 页面修改后再来查看此处。
{/if}