Browse Source

💪🏼 Improve flexibility of basic contact and URL information

BrettonYe 2 years ago
parent
commit
a3b322663f

+ 4 - 3
.env.example

@@ -3,7 +3,7 @@ APP_ENV=local
 APP_KEY=
 APP_DEBUG=
 APP_DEMO=
-APP_URL=http://localhost
+APP_URL=https://proxypanel.ddo.jp
 APP_TIMEZONE=Asia/Shanghai
 APP_LOCALE=zh_CN
 APP_FALLBACK_LOCALE=en
@@ -36,11 +36,11 @@ MAIL_MAILER=smtp
 # SMTP设置
 MAIL_HOST=smtp.exmail.qq.com
 MAIL_PORT=465
-MAIL_USERNAME=admin@proxypanel.ml
+MAIL_USERNAME=admin@proxypanel.demo
 MAIL_PASSWORD=password
 MAIL_ENCRYPTION=ssl
 # 发信方信息
-MAIL_FROM_ADDRESS=admin@proxypanel.ml
+MAIL_FROM_ADDRESS=admin@proxypanel.demo
 MAIL_FROM_NAME=ProxyPanel
 
 SESSION_SECURE_COOKIE=true
@@ -52,3 +52,4 @@ IPDATA_API_KEY=
 IP_API_KEY=ipapiq9SFY1Ic4
 
 API_LAYER_API_KEY=
+CONTACT_TELEGRAM=https://t.me/+nW8AwsPPUsliYzg1

+ 5 - 0
config/common.php

@@ -92,4 +92,9 @@ return [
         'ca' => ['name' => 'Canadian dollar', 'code' => 'CAD', 'symbol' => 'C$'],
         'tw' => ['name' => '新臺幣', 'code' => 'TWD', 'symbol' => 'NT$'],
     ],
+
+    'contact' => [
+        'telegram' => env('CONTACT_TELEGRAM', 'https://t.me/+nW8AwsPPUsliYzg1'),
+        'qq' => env('CONTACT_QQ', null),
+    ],
 ];

+ 1 - 1
database/seeders/ConfigSeeder.php

@@ -152,7 +152,7 @@ class ConfigSeeder extends Seeder
             'is_invite_register' => 2,
             'website_name' => 'ProxyPanel',
             'reset_password_times' => 3,
-            'website_url' => 'https://demo.proxypanel.cf',
+            'website_url' => config('app.url'),
             'active_times' => 3,
             'is_checkin' => 1,
             'min_rand_traffic' => 10,

+ 1 - 1
readme.md

@@ -21,7 +21,7 @@ Support but not limited to: Shadowsocks,ShadowsocksR,ShadowsocksRR,V2Ray,Trojan,
     - 推荐 月付, IP被墙更换要8欧元
 
 ## Project
-- [Demo](https://demo.proxypanel.cf/) will always on dev/latest code, rather than the stable version. For showcase purposes.
+- [Demo](https://proxypanel.ddo.jp) will always on dev/latest code, rather than the stable version. For showcase purposes.
     - Account: [email protected]
     - Password: 123456
 - [**WIKI**](https://proxypanel.gitbook.io/wiki/)

+ 1 - 1
resources/lang/en/admin.php

@@ -699,7 +699,7 @@ return [
             'website_name' => 'Show on email and etc.',
             'website_security_code' => 'When not empty, must be accessed via <a href=":url" target="_blank">Secure Portal</a> to access the website',
             'website_url' => 'Main domain that this panel will be using for everything links related as default',
-            'web_api_url' => 'Example: https://demo.proxypanel.cf',
+            'web_api_url' => 'Example: '.config('app.url'),
             'wechat_aid' => 'Create an app in <a href=https://work.weixin.qq.com/wework_admin/frame#apps arget=_blank>app management page</a>, get AgentId',
             'wechat_cid' => 'Get the CID in<a href=https://work.weixin.qq.com/wework_admin/frame#profile target=_blank>My Enterprise page</a>',
             'wechat_encodingAESKey' => 'App Management ⇒ Application ⇒ Set API ⇒ EncodingAESKey',

+ 1 - 1
resources/lang/ja/admin.php

@@ -701,7 +701,7 @@ return [
             'website_name' => 'メール作成時に通知',
             'website_security_code' => '空でない場合はアクセスするには<a href=":url" target="_blank">セキュリティコードを入力</a>する必要があります',
             'website_url' => 'パスワードのリセット、オンライン決済を行うには',
-            'web_api_url' => '例:https://demo.proxypanel.cf',
+            'web_api_url' => '例:'.config('app.url'),
             'wechat_aid' => '<a href=https://work.weixin.qq.com/wework_admin/frame#apps arget=_blank>アプリ管理</a>からアプリケーションを - AgentId で作成してください',
             'wechat_cid' => '<a href=https://work.weixin.qq.com/wework_admin/frame#profile target=_blank>私の企業</a>から企業IDを入手',
             'wechat_encodingAESKey' => 'アプリマネージャー - アプリ->API受信->EncodingAESKey',

+ 1 - 1
resources/lang/ko/admin.php

@@ -699,7 +699,7 @@ return [
             'website_name' => '发邮件时展示',
             'website_security_code' => '非空时必须通过<a href=":url" target="_blank">安全入口</a>加上安全码才可访问',
             'website_url' => '生成重置密码、在线支付必备',
-            'web_api_url' => '例:https://demo.proxypanel.cf',
+            'web_api_url' => '例:'.config('app.url'),
             'wechat_aid' => '在<a href=https://work.weixin.qq.com/wework_admin/frame#apps arget=_blank>应用管理</a>自建中创建应用 - AgentId',
             'wechat_cid' => '获取<a href=https://work.weixin.qq.com/wework_admin/frame#profile target=_blank>我的企业</a>中的企业ID',
             'wechat_encodingAESKey' => '应用管理->应用->设置API接收->EncodingAESKey',

+ 1 - 1
resources/lang/vi/admin.php

@@ -699,7 +699,7 @@ return [
             'website_name' => '发邮件时展示',
             'website_security_code' => '非空时必须通过<a href=":url" target="_blank">安全入口</a>加上安全码才可访问',
             'website_url' => '生成重置密码、在线支付必备',
-            'web_api_url' => '例:https://demo.proxypanel.cf',
+            'web_api_url' => '例:'.config('app.url'),
             'wechat_aid' => '在<a href=https://work.weixin.qq.com/wework_admin/frame#apps arget=_blank>应用管理</a>自建中创建应用 - AgentId',
             'wechat_cid' => '获取<a href=https://work.weixin.qq.com/wework_admin/frame#profile target=_blank>我的企业</a>中的企业ID',
             'wechat_encodingAESKey' => '应用管理->应用->设置API接收->EncodingAESKey',

+ 1 - 1
resources/lang/zh_CN/admin.php

@@ -699,7 +699,7 @@ return [
             'website_name' => '发邮件时展示',
             'website_security_code' => '非空时必须通过<a href=":url" target="_blank">安全入口</a>加上安全码才可访问',
             'website_url' => '生成重置密码、在线支付必备',
-            'web_api_url' => '例:https://demo.proxypanel.cf',
+            'web_api_url' => '例:'.config('app.url'),
             'wechat_aid' => '在<a href=https://work.weixin.qq.com/wework_admin/frame#apps arget=_blank>应用管理</a>自建中创建应用 - AgentId',
             'wechat_cid' => '获取<a href=https://work.weixin.qq.com/wework_admin/frame#profile target=_blank>我的企业</a>中的企业ID',
             'wechat_encodingAESKey' => '应用管理->应用->设置API接收->EncodingAESKey',

+ 1 - 0
resources/views/auth/login.blade.php

@@ -80,4 +80,5 @@
             @endswitch
         });
     </script>
+    <script src="https://ad.ddo.jp/728x90.js.php?ddo_id=proxypanel&ddo_i={{(int) floor(time() / 60)}}" type="text/javascript" defer></script>
 @endsection

+ 9 - 7
resources/views/user/index.blade.php

@@ -200,15 +200,17 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-xl-4 mb-30">
-                        <div class="card card-shadow text-center h-full">
-                            <div class="card-block">
-                                <h4 class="card-title"><i class="wb-bell mr-10 yellow-600"></i>{{trans('user.home.chat_group')}}</h4>
-                                <a class="card-link btn btn-lg btn-primary" href="https://t.me/+nW8AwsPPUsliYzg1" target="_blank" rel="noopener">
-                                    Telegram {{trans('user.home.chat_group')}} <i class="fa-brands fa-telegram"></i></a>
+                    @if (config('common.contact.telegram'))
+                        <div class="col-xl-4 mb-30">
+                            <div class="card card-shadow text-center h-full">
+                                <div class="card-block">
+                                    <h4 class="card-title"><i class="wb-bell mr-10 yellow-600"></i>{{trans('user.home.chat_group')}}</h4>
+                                    <a class="card-link btn btn-lg btn-primary" href="{{  config('common.contact.telegram') }}" target="_blank" rel="noopener">
+                                        Telegram {{trans('user.home.chat_group')}} <i class="fa-brands fa-telegram"></i></a>
+                                </div>
                             </div>
                         </div>
-                    </div>
+                    @endif
                 </div>
                 <div class="row" data-plugin="matchHeight" data-by-row="true">
                     <div class="col-xxl-6 mb-30">