From 36d9ca2fcb1eb747e08d6a84d9976b2acbdc2b9a Mon Sep 17 00:00:00 2001
From: anfu <anfu@annon.cn>
Date: Fri, 13 Sep 2024 10:03:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=AF=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                     |  4 ++--
 Dockerfile               |  2 +-
 app/controller/Index.php |  5 ++---
 default.conf             |  2 ++
 start.php                | 11 ++++++-----
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.env b/.env
index 014b335..3b3fe44 100644
--- a/.env
+++ b/.env
@@ -10,5 +10,5 @@ DB_CHARSET = utf8
 
 DEFAULT_LANG = zh-cn
 
-SERVER_ADDR = 192.168.1.161
-SERVER_PORT = 8000
+SERVER_ADDR = 192.168.1.161:8000
+NACOS_ADDR = 192.168.1.105:8848
diff --git a/Dockerfile b/Dockerfile
index 6c7b1df..1fc95ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN set -eux \
 VOLUME /var/www/html
 
 ENV NACOS_ADDR="192.168.1.105:8848" \
-    SERVER_ADDR="192.168.1.161:80"
+    SERVER_ADDR="192.168.1.161:8000"
 
 ADD run.sh /run.sh
 ADD default.conf /etc/nginx/http.d/default.conf
diff --git a/app/controller/Index.php b/app/controller/Index.php
index 15477ee..d5e3e7c 100644
--- a/app/controller/Index.php
+++ b/app/controller/Index.php
@@ -22,8 +22,7 @@ class Index
         $file = request()->file('file');
         $trueName = $file->getOriginalName();
 
-        $serverIP = env('SERVER_ADDR', '192.168.1.161');
-        $serverPort = env('SERVER_PORT', 8000);
+        $serverIP = env('SERVER_ADDR', '192.168.1.161:8000');
 
         // 组装保存路径
         $savename = \think\facade\Filesystem::disk('upload')->putFile('upload', $file);
@@ -34,7 +33,7 @@ class Index
             'msg' => null,
             'data' => [
                 "name" => $trueName,
-                "url" => 'http://' . $serverIP . ':' . $serverPort . '/' . $savename,
+                "url" => 'http://' . $serverIP . '/' . $savename,
                 // "url" => 'http://192.168.1.105:8080/file/' . $savename,
             ]
         ]);
diff --git a/default.conf b/default.conf
index 8217b7a..eccbd5c 100644
--- a/default.conf
+++ b/default.conf
@@ -8,12 +8,14 @@ server {
   root /var/www/html/public;
   index index.php index.html index.htm index.nginx-debian.html;
 
+  # 伪静态
   location / {
     if (!-e $request_filename){
       rewrite  ^(.*)$  /index.php?s=$1  last;   break;
     }
   }
   
+  # 请求转发
   location ~ \.php$ {
     fastcgi_pass 127.0.0.1:9000;
     fastcgi_index index.php;
diff --git a/start.php b/start.php
index a771caf..509b10c 100644
--- a/start.php
+++ b/start.php
@@ -11,24 +11,25 @@ use think\Env;
 // 读取环境变量
 $env = new Env();
 $env->load(__DIR__ . '/.env');
-$serverIP = $env->get('SERVER_ADDR', '192.168.1.161');
-$serverPort = $env->get('SERVER_PORT', 8000);
+$serverAddr = $env->get('SERVER_ADDR', '192.168.1.161:8000');
+$nacosAddr = $env->get('NACOS_ADDR', '192.168.1.105:8848');
 
 $task = new Worker();
 
 // 定时触发邮件发送任务
 // 开启多少个进程运行定时任务，注意业务是否在多进程有并发问题
 $task->count = 1;
-$task->onWorkerStart = function(Worker $task) use ($serverIP, $serverPort)
+$task->onWorkerStart = function(Worker $task) use ($serverAddr, $nacosAddr)
 {
     $client = new Client([
         // nacos地址
-        "base_uri" => "http://192.168.1.105:8848",
+        "base_uri" => $nacosAddr,
         "timeout" => 5
     ]);
     // 每2.5秒执行一次
-    Timer::add(5, function() use ($client, $serverIP, $serverPort)
+    Timer::add(5, function() use ($client, $serverAddr)
     {
+        list ($serverIP, $serverPort) = explode(':', $serverAddr);
         $response = $client->request("put", "/nacos/v1/ns/instance/beat", [
             "form_params" => [
                 "serviceName" => "zeroerroa-file",