From c109748c79c12e1eb2c15c9637bd308140e78c24 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Wed, 9 Jul 2025 13:58:59 +0800 Subject: [PATCH 1/4] perf: env --- .env.dev | 32 ------------------------------- .env.local | 55 ------------------------------------------------------ .gitignore | 2 ++ 3 files changed, 2 insertions(+), 87 deletions(-) delete mode 100644 .env.dev delete mode 100644 .env.local diff --git a/.env.dev b/.env.dev deleted file mode 100644 index b5ddd24b..00000000 --- a/.env.dev +++ /dev/null @@ -1,32 +0,0 @@ -APP_DEBUG = true - -DB_TYPE = mysql -DB_HOST = localhost -DB_NAME = orico-official-website -DB_USER = orico-ow -DB_PASS = 14Xi17NIK8V2qAXE8oMataHEsaR8lE -DB_PORT = 3306 -DB_CHARSET = utf8mb4 -DB_PREFIX = ow_ - -DEFAULT_LANG = zh-cn - -# 前端代理服务器ip（影响使用代理访问情况下的客户端ip获取） -PROXY_SERVER_IP[] = 120.79.27.160 - -[JWT] -TTL=3600 -REFRESH_TTL=20160 -SECRET=b43e6276644ed60e65c50d1b324ba10b - -# 后台不需要登录的接口 -[ADMIN_AUTH] -WHITE_LIST[] = v1/user/login -WHITE_LIST[] = v1/user/captcha - -# 不需记录日志的接口 -[ADMIN_API] -IGNORE_LOGGING_LIST[] = v1/OperateLog/index -MAX_IMAGE_SIZE = 5mb # 图片上传最大限制 -MAX_VIDEO_SIZE = 150mb # 视频上传最大限制 -MAX_ATTACHMENT_SIZE = 100mb # 附件上传最大限制 diff --git a/.env.local b/.env.local deleted file mode 100644 index e9c25f0d..00000000 --- a/.env.local +++ /dev/null @@ -1,55 +0,0 @@ -APP_DEBUG = true - -DB_TYPE = mysql -DB_HOST = 127.0.0.1 -DB_NAME = orico-official-website -DB_USER = orico-official-website -DB_PASS = 14Xi17NIK8V2qAXE8oMataHEsaR8lE -DB_PORT = 3306 -DB_CHARSET = utf8mb4 -DB_PREFIX = ow_ - -DEFAULT_LANG = zh-cn - -# 前端代理服务器ip（影响使用代理访问情况下的客户端ip获取） -PROXY_SERVER_IP[] = 120.79.27.160 - -[JWT] -TTL=3600 -REFRESH_TTL=20160 -SECRET=b43e6276644ed60e65c50d1b324ba10b - -# 后台不需要登录的接口 -[ADMIN_AUTH] -WHITE_LIST[] = v1/user/login -WHITE_LIST[] = v1/user/captcha - -# 不需记录日志的接口 -[ADMIN_API] -IGNORE_LOGGING_LIST[] = v1/OperateLog/index -MAX_IMAGE_SIZE = 5mb; # 图片上传最大限制 -MAX_VIDEO_SIZE = 150mb; # 视频上传最大限制 -MAX_ATTACHMENT_SIZE = 100mb; # 附件上传最大限制 - -# 开放API -[OPENAPI] -RESOURCE_IMAGES_DOMAIN = http://local.orico.com; # 图片资源服务器地址 -RESOURCE_VIDEOS_DOMAIN = http://local.orico.com; # 视频资源服务器地址 - -# 视图模板规则配置 -[VIEW_TPL] -# 视图目录 -# query 规则：URL参数 mtpl=1 表示移动端访问 -# 例如：http://xxxx.com?mtpl=1 -# domain 规则：根据特定域名，判断是否移动端访问 -# 例如：http://mobile.orico.cn -RULE = query -# query 规则参数名 -RULE_QUERY_NAME = mtpl -# query 规则参数值 -RULE_QUERY_VALUE = 1 -# domain 规则协议 -RULE_DOMAIN_SCHEME[] = http -RULE_DOMAIN_SCHEME[] = https -# domain 规则域名 -RULE_DOMAIN_HOST = mobile.orico.cn \ No newline at end of file diff --git a/.gitignore b/.gitignore index fb5700d2..e4ce095a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ composer.phar composer.lock .DS_Store Thumbs.db +.env.dev +.env.local /.idea /.vscode From e1b4266513e1a71474cb25647ada9ebbdb22912c Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Wed, 9 Jul 2025 16:15:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?perf:=20redis=20env=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .example.env | 62 ++++++++++++++++++++++++++++++++++++++++++++---- config/cache.php | 8 +++---- 2 files changed, 61 insertions(+), 9 deletions(-) diff --git a/.example.env b/.example.env index c457fe52..b6a1a52b 100644 --- a/.example.env +++ b/.example.env @@ -1,11 +1,63 @@ APP_DEBUG = true DB_TYPE = mysql -DB_HOST = 127.0.0.1 -DB_NAME = test -DB_USER = username -DB_PASS = password +DB_HOST = localhost +DB_NAME = orico-official-website +DB_USER = orico-ow +DB_PASS = 14Xi17NIK8V2qAXE8oMataHEsaR8lE DB_PORT = 3306 -DB_CHARSET = utf8 +DB_CHARSET = utf8mb4 +DB_PREFIX = ow_ DEFAULT_LANG = zh-cn + +# 前端代理服务器ip（影响使用代理访问情况下的客户端ip获取） +PROXY_SERVER_IP[] = 120.79.27.160 + +# redis 配置 +REDIS_HOST = 127.0.0.1 +REDIS_PORT = 6379 +REDIS_PASSWORD = '' +REDIS_PREFIX = ow: + +[JWT] +TTL=3600 +REFRESH_TTL=20160 +SECRET=b43e6276644ed60e65c50d1b324ba10b + +# 后台不需要登录的接口 +[ADMIN_AUTH] +WHITE_LIST[] = v1/user/login +WHITE_LIST[] = v1/user/captcha +WHITE_LIST[] = receive_sync/category +WHITE_LIST[] = receive_sync/product + +# 不需记录日志的接口 +[ADMIN_API] +IGNORE_LOGGING_LIST[] = v1/OperateLog/index +MAX_IMAGE_SIZE = 5mb # 图片上传最大限制 +MAX_VIDEO_SIZE = 150mb # 视频上传最大限制 +MAX_ATTACHMENT_SIZE = 100mb # 附件上传最大限制 + +# 开放API +[OPENAPI] +RESOURCE_IMAGES_DOMAIN = http://local.orico.com; # 图片资源服务器地址 +RESOURCE_VIDEOS_DOMAIN = http://local.orico.com; # 视频资源服务器地址 + +# 视图模板规则配置 +[VIEW_TPL] +# 视图目录 +# query 规则：URL参数 mtpl=1 表示移动端访问 +# 例如：http://xxxx.com?mtpl=1 +# domain 规则：根据特定域名，判断是否移动端访问 +# 例如：http://mobile.orico.cn +RULE = query +# query 规则参数名 +RULE_QUERY_NAME = mtpl +# query 规则参数值 +RULE_QUERY_VALUE = 1 +# domain 规则协议 +RULE_DOMAIN_SCHEME[] = http +RULE_DOMAIN_SCHEME[] = https +# domain 规则域名 +RULE_DOMAIN_HOST = mobile.orico.cn \ No newline at end of file diff --git a/config/cache.php b/config/cache.php index 99470db4..4e25b937 100644 --- a/config/cache.php +++ b/config/cache.php @@ -29,15 +29,15 @@ return [ // 驱动方式 'type' => 'redis', // 服务器地址 - 'host' => '127.0.0.1', + 'host' => env('REDIS_HOST', '127.0.0.1'), // 端口 - 'port' => 6379, + 'port' => env('REDIS_PORT', 6379), // 密码 - 'password' => 'orico@f2b211', + 'password' => env('REDIS_PASSWORD', 'orico@f2b211'), // 缓存有效期 0表示永久缓存 'expire' => 0, // 缓存前缀 - 'prefix' => 'ow:', + 'prefix' => env('REDIS_PREFIX', 'ow:'), ] ], ]; From cbb0699faec65dc62219f6354e327dcd9756b098 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Wed, 9 Jul 2025 16:34:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?pref:=20think=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- think | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/think b/think index a42350f1..2429d223 100644 --- a/think +++ b/think @@ -7,4 +7,4 @@ namespace think; require __DIR__ . '/vendor/autoload.php'; // 应用初始化 -(new App())->setEnvName('local')->console->run(); \ No newline at end of file +(new App())->console->run(); \ No newline at end of file From 7045bd7b7d2280f7c391448f930218cf48f230c0 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Wed, 9 Jul 2025 17:30:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9analytics?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index/view/mobile/public/base.html | 4 ++-- app/index/view/pc/public/base.html | 4 ++-- app/index/view/pc/public/nas_base.html | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/index/view/mobile/public/base.html b/app/index/view/mobile/public/base.html index 992ba8fb..2edff31f 100644 --- a/app/index/view/mobile/public/base.html +++ b/app/index/view/mobile/public/base.html @@ -27,7 +27,7 @@ (function() { var u="//analytics.f2b211.com/"; _paq.push(['setTrackerUrl', u+'matomo.php']); - _paq.push(['setSiteId', '1']); + _paq.push(['setSiteId', '2']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); })(); @@ -37,7 +37,7 @@ {block name="header"} diff --git a/app/index/view/pc/public/base.html b/app/index/view/pc/public/base.html index 65a8d5c7..e344189a 100644 --- a/app/index/view/pc/public/base.html +++ b/app/index/view/pc/public/base.html @@ -112,7 +112,7 @@ (function() { var u="//analytics.f2b211.com/"; _paq.push(['setTrackerUrl', u+'matomo.php']); - _paq.push(['setSiteId', '1']); + _paq.push(['setSiteId', '2']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); })(); @@ -124,7 +124,7 @@ {block name="header"} diff --git a/app/index/view/pc/public/nas_base.html b/app/index/view/pc/public/nas_base.html index 3c695316..ea41ae66 100644 --- a/app/index/view/pc/public/nas_base.html +++ b/app/index/view/pc/public/nas_base.html @@ -55,7 +55,7 @@ (function() { var u="//analytics.f2b211.com/"; _paq.push(['setTrackerUrl', u+'matomo.php']); - _paq.push(['setSiteId', '1']); + _paq.push(['setSiteId', '2']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); })(); @@ -65,7 +65,7 @@ {block name="header"}