日常开发

app/Http/Controllers/RegisterController.php

@@ -134,7 +134,17 @@ class RegisterController extends Controller
                 $affUser = User::query()->where('id', $aff)->first();
                 $referral_uid = $affUser ? $aff : 0;
             } else {
-                $referral_uid = 0;
+                // 如果使用邀请码，则将邀请码也列入aff
+                if ($code) {
+                    $inviteCode = Invite::query()->where('code', $code)->where('status', 0)->first();
+                    if ($inviteCode) {
+                        $referral_uid = $inviteCode->uid;
+                    } else {
+                        $referral_uid = 0;
+                    }
+                } else {
+                    $referral_uid = 0;
+                }
             }
 
             // 最后一个可用端口

database/seeds/ConfigTableSeeder.php

@@ -65,6 +65,9 @@ class ConfigTableSeeder extends Seeder
         DB::insert("INSERT INTO `config` VALUES ('52', 'youzan_client_secret', '');");
         DB::insert("INSERT INTO `config` VALUES ('53', 'kdt_id', '');");
         DB::insert("INSERT INTO `config` VALUES ('54', 'initial_labels_for_user', '');");
+        DB::insert("INSERT INTO `config` VALUES ('55', 'website_analytics', '');");
+        DB::insert("INSERT INTO `config` VALUES ('56', 'website_customer_service', '');");
+        DB::insert("INSERT INTO `config` VALUES ('57', 'register_ip_limit', 5);");
         DB::insert("INSERT INTO `config` VALUES ('58', 'goods_purchase_limit_strategy', 'none');");
     }
 }

resources/lang/en/home.php

@@ -5,7 +5,7 @@ return [
     'subscribe_address'               => 'My Subscribe Address',
     'copy_subscribe_address'          => 'Copy Address',
     'exchange_subscribe'              => 'Exchange Address',
-    'subscribe_warning'               => 'Warning: the subscription address is only for personal use, do not spread the address, otherwise it will lead to abnormal flow of your account.',
+    'subscribe_warning'               => 'Warning: this subscription address is for personal use only. Do not propagate the address.',
     'reset_password_title'            => 'Reset Password',
     'system_down'                     => 'The system is being maintained',
     'subscribe_baned'                 => 'Your subscription function has been banned. Please contact the administrator.',
@@ -22,7 +22,7 @@ return [
     'no_need_invite_codes'            => 'In the open registration system, no invitation code is required',
 
     // 首页
-    'ratio_tips'                      => 'Settlement Ratio: 1 means to settle 100M with 100M, 0.1 means to settle 10M with 100M, and 5 to express 500M with 100M.',
+    'ratio_tips'                      => 'It is recommended that the client that supports the node subscription can quickly synchronize the node information on the client side through the subscription function.',
     'subscribe_button'                => 'Subscribe',
     'account_info'                    => 'Account Info',
     'account_level'                   => 'Level',
@@ -117,7 +117,7 @@ return [
     'invite_code_table_status_un'     => 'Active',
     'invite_code_table_status_yes'    => 'Already Used',
     'invite_code_table_status_expire' => 'Overdue',
-    'invite_code_summary'             => 'total of :total invite codes',
+    'invite_code_summary'             => 'Total of :total invite codes',
 
     // 单据
     'invoice_title'                   => 'My Invoices',
@@ -160,9 +160,9 @@ return [
     'referral_table_date'             => 'Date',
     'referral_table_none'             => 'None Data',
     'referral_table_apply'            => 'Apply',
-    'referral_summary'                => 'total of :total records, total rewards of :amount RMB, minimum withdraw limit of :money RMB.',
+    'referral_summary'                => 'Total rebate :amount RMB (:total times), full :money RMB can apply for withdrawals.',
     'console'                         => 'Console',
     'profile'                         => 'Profile',
-    'logout'                          => 'Log out',
-    'promote'                         => 'Any actived freind you invited would bring you :traffic brandwidth as bonus. Meanwhile, you will get :referral_percent% cash reward every time your invited friends make payments.',
+    'logout'                          => 'Log Out',
+    'promote'                         => 'With your promotion link registration and activation, both of you will receive :traffic traffic awards; when they are consumed, you will receive :referral_percent% of their consumption amount as a reward.',
 ];

resources/lang/ko/home.php

@@ -2,10 +2,10 @@
 
 return [
     'panel'                           => '제어판',
-    'subscribe_address'               => 'Rss구독주소',
+    'subscribe_address'               => 'RSS구독주소',
     'copy_subscribe_address'          => '주소복사',
     'exchange_subscribe'              => '주소변경',
-    'subscribe_warning'               => 'Tips:이 주소는 개인VPN정보가 담긴RSS주소이므로 타인에거 알려수시면 안됩니다',
+    'subscribe_warning'               => '경고: 구독 주소 는 개인적 으로 사용 되 지 말고 이 주소 를 전파 하지 마시오',
     'reset_password_title'            => '비번리셋',
     'system_down'                     => '서비스 점금중',
     'subscribe_baned'                 => '구독주소가 금지되였습니다,관리자에게 문의해주세요',
@@ -53,7 +53,7 @@ return [
     'coupon_code'                     => '충전카드',
     'please_input_coupon'             => '충전 카드 번호를 입력하세요',
     'scan_qrcode'                     => '앱 으로 QR코드를 스켄해주시면 서버가 추가 됩니다',
-    'setting_info'                    => 'SS(R)서버 스팩',
+    'setting_info'                    => '설정 정보',
     'ratio'                           => '정산비율',
     'coupon_not_empty'                => '카드번호가 비였습니다',
     'recharging'                      => '충전중...',
@@ -63,7 +63,7 @@ return [
     // 用户资料
     'submit'                          => '확인',
     'contact'                         => '연락방식',
-    'ssr_setting'                     => 'SSR(R)설정',
+    'ssr_setting'                     => '에이전트 설정',
     'password'                        => '비밀번호',
     'new_password'                    => '새로운 비밀번호',
     'current_password'                => '현재 비밀번호',
@@ -71,7 +71,7 @@ return [
     'connection_password'             => '연결암호',
     'encrpytion'                      => '암호화 방식',
     'protocal'                        => '프로토콜',
-    'obfs'                            => '뒤섞다.',
+    'obfs'                            => '혼동',
 
     // 购买服务
     'service_title'                   => '서버구축',

resources/lang/zh-CN/home.php

@@ -5,10 +5,10 @@ return [
     'subscribe_address'               => '我的订阅地址',
     'copy_subscribe_address'          => '复制',
     'exchange_subscribe'              => '更换',
-    'subscribe_warning'               => '注意：该订阅地址仅限个人使用，请勿传播该地址，这会导致您的账号流量使用情况异常。',
+    'subscribe_warning'               => '警告：该订阅地址仅限个人使用，请勿传播该地址，否则会导致您的账号流量使用情况异常触发自动封号机制。',
     'reset_password_title'            => '重置密码',
     'system_down'                     => '系统维护中',
-    'subscribe_baned'                 => '您的订阅功能被暂时禁用，请联系管理员恢复',
+    'subscribe_baned'                 => '您的订阅功能被禁用，请联系管理员恢复',
 
     // 菜单
     'home'                            => '我的节点',
@@ -19,10 +19,10 @@ return [
     'tickets'                         => '服务单',
     'referrals'                       => '推广返利',
     'free_invite_codes_title'         => '免费邀请码',
-    'no_need_invite_codes'            => '现在无需邀请码，即可注册',
+    'no_need_invite_codes'            => '现在无需邀请码',
 
     // 首页
-    'ratio_tips'                      => '推荐使用支持节点订阅的代理客户端，只需填写一次，即可快捷方便的在客户端设置和同步节点信息。',
+    'ratio_tips'                      => '推荐使用支持节点订阅的客户端，通过订阅功能可以在客户端快速同步节点信息。',
     'subscribe_button'                => '获取订阅地址',
     'account_info'                    => '账号信息',
     'account_level'                   => '等级',
@@ -50,8 +50,8 @@ return [
     'redeem_score'                    => '兑换流量',
     'redeem'                          => '立即兑换',
     'redeem_info'                     => '您有 :score 积分，可兑换 :scoreM 免费流量。',
-    'coupon_code'                     => '优惠券码',
-    'please_input_coupon'             => '请输入优惠券码',
+    'coupon_code'                     => '充值券码',
+    'please_input_coupon'             => '请输入充值券码',
     'scan_qrcode'                     => '请使用客户端扫描二维码',
     'setting_info'                    => '配置信息',
     'ratio'                           => '结算比例',
@@ -90,7 +90,7 @@ return [
     'service_days'                    => '有效期',
     'service_buy_button'              => '购买',
     'day'                             => '天',
-    'coupon'                          => '优惠券',
+    'coupon'                          => '充值券',
     'redeem_coupon'                   => '使用',
     'service_type_1'                  => '流量包',
     'service_type_2'                  => '套餐',
@@ -164,5 +164,5 @@ return [
     'console'                         => '管理中心',
     'profile'                         => '个人设置',
     'logout'                          => '退出登入',
-    'promote'                         => '通过您的推广链接注册并激活，您和新用户都会获得 :traffic 流量奖励；当他们消费时，您将获得他们消费金额的 :referral_percent% 作为奖励。',
+    'promote'                         => '通过您的推广链接注册并激活，你们双方都将获得 :traffic 流量奖励；当他们消费时，您将获得他们消费金额的 :referral_percent% 作为奖励。',
 ];

resources/views/admin/editUser.blade.php

@@ -448,7 +448,8 @@
                 success: function (ret) {
                     layer.msg(ret.message, {time:1000}, function() {
                         if (ret.status == 'success') {
-                            window.location.href = '{{url('admin/userList?page=') . Request::get('page')}}';
+                            window.location.reload();
+                            //window.location.href = '{{url('admin/userList?page=') . Request::get('page')}}';
                         }
                     });
                 }