From 917f6e99febb74150641be7e6206bba6e5572ddc Mon Sep 17 00:00:00 2001
From: suyi <suyibk@qq.com>
Date: Tue, 29 Oct 2024 15:38:40 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/components/analysis-xlsx/index.vue | 53 ++++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/admin/src/components/analysis-xlsx/index.vue b/admin/src/components/analysis-xlsx/index.vue
index 25fccda..f7376ac 100644
--- a/admin/src/components/analysis-xlsx/index.vue
+++ b/admin/src/components/analysis-xlsx/index.vue
@@ -1,10 +1,10 @@
 <template>
     <el-upload
         ref="uploadRef"
-        class="upload-demo"
         action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
         :auto-upload="false"
         :limit="1"
+        :on-exceed="handleExceed"
         :on-change="beforeUpload"
         :show-file-list="false"
         accept=".xlsx,.xls"
@@ -15,31 +15,40 @@
 
 <script lang="ts" setup>
 import { read, utils } from "xlsx"
+import { genFileId, type UploadInstance, type UploadProps, type UploadRawFile } from "element-plus"
 const emit = defineEmits(["success", "error"])
-
+const uploadRef = ref<UploadInstance>()
+const handleExceed: UploadProps["onExceed"] = (files) => {
+    uploadRef.value!.clearFiles()
+    const file = files[0] as UploadRawFile
+    file.uid = genFileId()
+    uploadRef.value!.handleStart(file)
+}
 const beforeUpload = async (file: any) => {
-    console.log(file)
-    const reader = new FileReader()
-    reader.readAsBinaryString(file.raw)
-    reader.onload = (e: any) => {
-        const data = e.target.result
-        const zzexcel = read(data, {
-            type: "binary"
-        })
-        console.log("zzexcel", zzexcel)
-        const result = []
-        for (let i = 0; i < zzexcel.SheetNames.length; i++) {
-            const newData = utils.sheet_to_json(zzexcel.Sheets[zzexcel.SheetNames[i]], {
-                defval: props.defval,
-                blankrows: props.blankrows,
-                skipHidden: props.skipHidden,
-                raw: props.raw,
-                rawNumbers: props.rawNumbers,
-                header: props.header
+    try {
+        const reader = new FileReader()
+        reader.readAsBinaryString(file.raw)
+        reader.onload = (e: any) => {
+            const data = e.target.result
+            const zzexcel = read(data, {
+                type: "binary"
             })
-            result.push(...newData)
+            const result = []
+            for (let i = 0; i < zzexcel.SheetNames.length; i++) {
+                const newData = utils.sheet_to_json(zzexcel.Sheets[zzexcel.SheetNames[i]], {
+                    defval: props.defval,
+                    blankrows: props.blankrows,
+                    skipHidden: props.skipHidden,
+                    raw: props.raw,
+                    rawNumbers: props.rawNumbers,
+                    header: props.header
+                })
+                result.push(...newData)
+            }
+            emit("success", result, file)
         }
-        emit("success", result)
+    } catch (e) {
+        emit("error", e)
     }
 }
 const props = withDefaults(
-- 
Gitee


From ddb6af1464cfc3027fc5cc51863944c8c9462c4a Mon Sep 17 00:00:00 2001
From: suyi <suyibk@qq.com>
Date: Tue, 29 Oct 2024 16:09:05 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/utils/util.ts | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/admin/src/utils/util.ts b/admin/src/utils/util.ts
index 03b776c..c73c99f 100644
--- a/admin/src/utils/util.ts
+++ b/admin/src/utils/util.ts
@@ -1,6 +1,7 @@
 import { isObject } from "@vue/shared"
 import { cloneDeep } from "lodash"
 import { writeFile as xlsxWriteFile, utils as xlsxUtils } from "xlsx"
+import feedback from "@/utils/feedback"
 
 /**
  * @description 添加单位
@@ -172,3 +173,27 @@ export const toSheet = async (rows: any, otherJson: any, fileName: string) => {
     xlsxUtils.book_append_sheet(wb, ws, "Sheet1")
     xlsxWriteFile(wb, fileName + ".xlsx")
 }
+/**
+ * 前端生成表格
+ * @param func ((params):Promise<any>=>{}) 请求接口需要返回
+ * {
+ *     rows:[{'姓名':'张三'},{'姓名':'王五'}],
+ *     headers:['姓名'],
+ *     file_name:'文件名',
+ * }
+ * @param otherObj {} 接口追加参数
+ */
+export const toSheetByFunc = async (func: any, otherObj: any) => {
+    feedback.loading("正在导出中...")
+    try {
+        const res = await func({
+            export: 2,
+            ...otherObj
+        })
+        if (res) {
+            await toSheet(res.rows, { header: res.headers }, res.file_name)
+        }
+    } finally {
+        feedback.closeLoading()
+    }
+}
-- 
Gitee


From 5fe34e5c827378fee347d4d3cbde403e635eea93 Mon Sep 17 00:00:00 2001
From: 0xcp <14924292+PCFFx0@user.noreply.gitee.com>
Date: Sat, 2 Nov 2024 17:32:11 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=AE=B9=E5=99=A8?=
 =?UTF-8?q?=E5=8C=96=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  34 +
 admin/Dockerfile                              |  32 +
 admin/README.md                               |  23 +
 admin/nginx.conf                              |  26 +
 pc/Dockerfile                                 |  32 +
 pc/README.md                                  |  25 +
 pc/nginx.conf                                 |  26 +
 server/Dockerfile                             |  72 ++
 server/docker-compose.yaml                    |  23 +
 server/docker/docker-run.sh                   |  19 +
 .../ext/opis/closure/SerializableClosure.php  | 685 ++++++++++++++++++
 11 files changed, 997 insertions(+)
 create mode 100644 admin/Dockerfile
 create mode 100644 admin/nginx.conf
 create mode 100644 pc/Dockerfile
 create mode 100644 pc/nginx.conf
 create mode 100644 server/Dockerfile
 create mode 100644 server/docker-compose.yaml
 create mode 100644 server/docker/docker-run.sh
 create mode 100644 server/ext/opis/closure/SerializableClosure.php

diff --git a/README.md b/README.md
index 30ba8ab..bf12a2e 100644
--- a/README.md
+++ b/README.md
@@ -167,6 +167,40 @@ public function __unserialize($data)
 $this->unserialize($data);
 }
 ```
+
+## Docker 部署
+
+
+### 前置要求
+
+- Docker
+- Docker Compose
+
+### 部署步骤
+
+1. 确保你已经配置好 `server/.env` 文件
+
+2. 在项目根目录下运行：
+```bash
+# 构建并启动服务
+docker-compose up -d
+
+# 查看服务状态
+docker-compose ps
+
+# 查看服务日志
+docker-compose logs -f server
+
+# 停止服务
+docker-compose down
+
+# 重启服务
+docker-compose restart
+
+# 重新构建并启动服务
+docker-compose up -d --build
+```
+
 # Manual (文档)
 
 https://www.workerman.net/doc/webman
diff --git a/admin/Dockerfile b/admin/Dockerfile
new file mode 100644
index 0000000..abe6249
--- /dev/null
+++ b/admin/Dockerfile
@@ -0,0 +1,32 @@
+# 构建阶段
+FROM node:20-alpine as build-stage
+
+# 设置工作目录
+WORKDIR /app
+
+# 复制 package.json 和 package-lock.json (如果存在)
+COPY package*.json ./
+
+# 安装依赖
+RUN npm install
+
+# 复制项目文件
+COPY . .
+
+# 构建项目
+RUN npm run build
+
+# 生产阶段
+FROM nginx:stable-alpine as production-stage
+
+# 复制构建产物到 Nginx 目录
+COPY --from=build-stage /app/dist /usr/share/nginx/html
+
+# 复制自定义 Nginx 配置（如果需要）
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
+# 暴露 80 端口
+EXPOSE 80
+
+# 启动 Nginx
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/admin/README.md b/admin/README.md
index 077a568..d479bdc 100644
--- a/admin/README.md
+++ b/admin/README.md
@@ -44,3 +44,26 @@ npm run build
 ```sh
 npm run lint
 ```
+
+### Docker 使用说明
+
+构建镜像：
+```bash
+# 构建指定版本
+docker build -t admin-vue:1.0.0 .
+
+# 构建并同时标记为 latest
+docker build -t admin-vue:1.0.0 -t admin-vue:latest .
+
+# 仅构建 latest 版本
+docker build -t admin-vue:latest .
+```
+
+运行容器：
+```bash
+# 运行指定版本
+docker run -d -p 80:8001 admin-vue:1.0.0
+
+# 运行最新版本
+docker run -d -p 80:8001 admin-vue:latest
+```
diff --git a/admin/nginx.conf b/admin/nginx.conf
new file mode 100644
index 0000000..d8c17eb
--- /dev/null
+++ b/admin/nginx.conf
@@ -0,0 +1,26 @@
+server {
+    listen 8001;
+    server_name 127.0.0.1;
+    
+    root /usr/share/nginx/html;
+    index index.html;
+
+    # gzip 配置
+    gzip on;
+    gzip_min_length 1k;
+    gzip_comp_level 9;
+    gzip_types text/plain text/css text/javascript application/json application/javascript application/x-javascript application/xml;
+    gzip_vary on;
+    gzip_disable "MSIE [1-6]\.";
+
+    # 路由重写，支持 history 模式
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+
+    # 静态资源缓存
+    location /assets {
+        expires 1y;
+        add_header Cache-Control "public, no-transform";
+    }
+}
\ No newline at end of file
diff --git a/pc/Dockerfile b/pc/Dockerfile
new file mode 100644
index 0000000..cd10288
--- /dev/null
+++ b/pc/Dockerfile
@@ -0,0 +1,32 @@
+# 构建阶段
+FROM node:20-alpine as build-stage
+
+# 设置工作目录
+WORKDIR /app
+
+# 复制 package.json 和 package-lock.json (如果存在)
+COPY package*.json ./
+
+# 安装依赖
+RUN npm install
+
+# 复制项目文件
+COPY . .
+
+# 构建项目
+RUN npm run build
+
+# 生产阶段
+FROM nginx:stable-alpine as production-stage
+
+# 复制构建产物到 Nginx 目录
+COPY --from=build-stage /app/dist /usr/share/nginx/html
+
+# 复制自定义 Nginx 配置（如果需要）
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
+# 暴露 8002 端口
+EXPOSE 8002
+
+# 启动 Nginx
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/pc/README.md b/pc/README.md
index d90610e..5b8175c 100644
--- a/pc/README.md
+++ b/pc/README.md
@@ -40,3 +40,28 @@ npm run preview
 ```
 
 Checkout the [deployment documentation](https://v3.nuxtjs.org/guide/deploy/presets) for more information.
+
+
+
+### Docker 使用说明
+
+构建镜像：
+```bash
+# 构建指定版本
+docker build -t pc-vue:1.0.0 .
+
+# 构建并同时标记为 latest
+docker build -t pc-vue:1.0.0 -t pc-vue:latest .
+
+# 仅构建 latest 版本
+docker build -t pc-vue:latest .
+```
+
+运行容器：
+```bash
+# 运行指定版本
+docker run -d -p 80:8002 pc-vue:1.0.0
+
+# 运行最新版本
+docker run -d -p 80:8002 pc-vue:latest
+```
diff --git a/pc/nginx.conf b/pc/nginx.conf
new file mode 100644
index 0000000..848b4b3
--- /dev/null
+++ b/pc/nginx.conf
@@ -0,0 +1,26 @@
+server {
+    listen 80;
+    server_name 127.0.0.1;
+    
+    root /usr/share/nginx/html;
+    index index.html;
+
+    # gzip 配置
+    gzip on;
+    gzip_min_length 1k;
+    gzip_comp_level 9;
+    gzip_types text/plain text/css text/javascript application/json application/javascript application/x-javascript application/xml;
+    gzip_vary on;
+    gzip_disable "MSIE [1-6]\.";
+
+    # 路由重写，支持 history 模式
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+
+    # 静态资源缓存
+    location /assets {
+        expires 1y;
+        add_header Cache-Control "public, no-transform";
+    }
+}
\ No newline at end of file
diff --git a/server/Dockerfile b/server/Dockerfile
new file mode 100644
index 0000000..2fac363
--- /dev/null
+++ b/server/Dockerfile
@@ -0,0 +1,72 @@
+FROM php:8.2-cli-alpine
+
+# 安装系统依赖
+RUN apk add --no-cache \
+    linux-headers \
+    libpng-dev \
+    oniguruma-dev \
+    libxml2-dev \
+    libzip-dev \
+    icu-dev \
+    libmcrypt-dev \
+    bzip2-dev \
+    libsodium-dev \
+    sqlite-dev \
+    autoconf \
+    gcc \
+    make \
+    g++
+
+# 安装 PHP 扩展
+RUN docker-php-ext-install \
+    pdo_mysql \
+    mbstring \
+    exif \
+    pcntl \
+    bcmath \
+    gd \
+    zip \
+    intl \
+    soap \
+    sockets \
+    opcache \
+    bz2 \
+    shmop \
+    sysvmsg \
+    sysvsem \
+    sysvshm
+
+# 安装额外的 PECL 扩展
+RUN pecl install redis igbinary mcrypt \
+    && docker-php-ext-enable redis igbinary mcrypt
+
+# 设置指定的 disable_functions
+RUN echo "disable_functions = passthru,system,chroot,chgrp,chown,popen,ini_alter,ini_restore,dl,openlog,syslog,readlink,symlink,popepassthru,imap_open,apache_setenv" > /usr/local/etc/php/php.ini
+
+
+# 安装 Composer
+COPY --from=composer:2.5.8 /usr/bin/composer /usr/bin/composer
+
+# 设置工作目录
+WORKDIR /app
+
+# 首先复制 composer.json 文件
+COPY composer.json composer.lock .
+# 然后复制其余项目文件
+COPY . .
+
+# 安装项目依赖
+RUN COMPOSER_ALLOW_SUPERUSER=1 composer install --no-interaction --optimize-autoloader --ignore-platform-reqs
+
+
+# 替换 SerializableClosure.php 文件
+RUN cp ext/opis/closure/SerializableClosure.php vendor/opis/closure/src/SerializableClosure.php
+
+# 创建安装锁文件
+RUN touch config/install.lock
+
+# 暴露端口
+EXPOSE 8787
+
+# 启动命令
+CMD ["php", "start.php", "start"]
\ No newline at end of file
diff --git a/server/docker-compose.yaml b/server/docker-compose.yaml
new file mode 100644
index 0000000..8a0acf2
--- /dev/null
+++ b/server/docker-compose.yaml
@@ -0,0 +1,23 @@
+services:
+  server:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: server
+    ports:
+      - "8789:8789"
+      - "8790:8790"
+      - "8791:8791"
+      - "8792:8792"
+    environment:
+      - TIMEZONE=Asia/Shanghai
+    volumes:
+      - ./.env:/app/.env
+      - ./runtime:/app/runtime
+      - ./php-logs:/usr/local/var/log/php
+    networks:
+      - webman-network
+
+networks:
+  webman-network:
+    driver: bridge 
\ No newline at end of file
diff --git a/server/docker/docker-run.sh b/server/docker/docker-run.sh
new file mode 100644
index 0000000..9e7cc3a
--- /dev/null
+++ b/server/docker/docker-run.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+
+# 如果 .env 文件不存在，则从示例文件复制并等待用户确认
+if [ ! -f .env ]; then
+    echo "Creating .env file from .example.env"
+    cp ../.example.env ../.env
+    
+    while true; do
+        read -p "请检查并修改 .env 文件。完成后输入 'Y' 继续: " answer
+        if [ "$answer" = "Y" ]; then
+            break
+        fi
+        echo "请继续修改 .env 文件..."
+    done
+fi
+
+# 启动 Docker Compose 服务
+docker-compose up -d
\ No newline at end of file
diff --git a/server/ext/opis/closure/SerializableClosure.php b/server/ext/opis/closure/SerializableClosure.php
new file mode 100644
index 0000000..1679e7f
--- /dev/null
+++ b/server/ext/opis/closure/SerializableClosure.php
@@ -0,0 +1,685 @@
+<?php
+/* ===========================================================================
+ * Copyright (c) 2018-2021 Zindex Software
+ *
+ * Licensed under the MIT License
+ * =========================================================================== */
+
+namespace Opis\Closure;
+
+use Closure;
+use Serializable;
+use SplObjectStorage;
+use ReflectionObject;
+
+/**
+ * Provides a wrapper for serialization of closures
+ */
+class SerializableClosure implements Serializable
+{
+    /**
+     * @var Closure Wrapped closure
+     *
+     * @see \Opis\Closure\SerializableClosure::getClosure()
+     */
+    protected $closure;
+
+    /**
+     * @var ReflectionClosure A reflection instance for closure
+     *
+     * @see \Opis\Closure\SerializableClosure::getReflector()
+     */
+    protected $reflector;
+
+    /**
+     * @var mixed Used at deserialization to hold variables
+     *
+     * @see \Opis\Closure\SerializableClosure::unserialize()
+     * @see \Opis\Closure\SerializableClosure::getReflector()
+     */
+    protected $code;
+
+    /**
+     * @var string Closure's ID
+     */
+    protected $reference;
+
+    /**
+     * @var string Closure scope
+     */
+    protected $scope;
+
+    /**
+     * @var ClosureContext Context of closure, used in serialization
+     */
+    protected static $context;
+
+    /**
+     * @var ISecurityProvider|null
+     */
+    protected static $securityProvider;
+
+    /** Array recursive constant*/
+    const ARRAY_RECURSIVE_KEY = '¯\_(ツ)_/¯';
+
+    /**
+     * Constructor
+     *
+     * @param   Closure $closure Closure you want to serialize
+     */
+    public function __construct(Closure $closure)
+    {
+        $this->closure = $closure;
+        if (static::$context !== null) {
+            $this->scope = static::$context->scope;
+            $this->scope->toserialize++;
+        }
+    }
+    public function __serialize()
+    {
+        return $this->serialize();
+    }
+    public function __unserialize($data)
+    {
+    $this->unserialize($data);
+    }
+    /**
+     * Get the Closure object
+     *
+     * @return  Closure The wrapped closure
+     */
+    public function getClosure()
+    {
+        return $this->closure;
+    }
+
+    /**
+     * Get the reflector for closure
+     *
+     * @return  ReflectionClosure
+     */
+    public function getReflector()
+    {
+        if ($this->reflector === null) {
+            $this->reflector = new ReflectionClosure($this->closure);
+            $this->code = null;
+        }
+
+        return $this->reflector;
+    }
+
+    /**
+     * Implementation of magic method __invoke()
+     */
+    public function __invoke()
+    {
+        return call_user_func_array($this->closure, func_get_args());
+    }
+
+    /**
+     * Implementation of Serializable::serialize()
+     *
+     * @return  string  The serialized closure
+     */
+    public function serialize()
+    {
+        if ($this->scope === null) {
+            $this->scope = new ClosureScope();
+            $this->scope->toserialize++;
+        }
+
+        $this->scope->serializations++;
+
+        $scope = $object = null;
+        $reflector = $this->getReflector();
+
+        if($reflector->isBindingRequired()){
+            $object = $reflector->getClosureThis();
+            static::wrapClosures($object, $this->scope);
+            if($scope = $reflector->getClosureScopeClass()){
+                $scope = $scope->name;
+            }
+        } else {
+            if($scope = $reflector->getClosureScopeClass()){
+                $scope = $scope->name;
+            }
+        }
+
+        $this->reference = spl_object_hash($this->closure);
+
+        $this->scope[$this->closure] = $this;
+
+        $use = $this->transformUseVariables($reflector->getUseVariables());
+        $code = $reflector->getCode();
+
+        $this->mapByReference($use);
+
+        $ret = \serialize(array(
+            'use' => $use,
+            'function' => $code,
+            'scope' => $scope,
+            'this' => $object,
+            'self' => $this->reference,
+        ));
+
+        if (static::$securityProvider !== null) {
+            $data = static::$securityProvider->sign($ret);
+            $ret =  '@' . $data['hash'] . '.' . $data['closure'];
+        }
+
+        if (!--$this->scope->serializations && !--$this->scope->toserialize) {
+            $this->scope = null;
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Transform the use variables before serialization.
+     *
+     * @param  array  $data The Closure's use variables
+     * @return array
+     */
+    protected function transformUseVariables($data)
+    {
+        return $data;
+    }
+
+    /**
+     * Implementation of Serializable::unserialize()
+     *
+     * @param   string $data Serialized data
+     * @throws SecurityException
+     */
+    public function unserialize($data)
+    {
+        ClosureStream::register();
+
+        if (static::$securityProvider !== null) {
+            if ($data[0] !== '@') {
+                throw new SecurityException("The serialized closure is not signed. ".
+                    "Make sure you use a security provider for both serialization and unserialization.");
+            }
+
+            if ($data[1] !== '{') {
+                $separator = strpos($data, '.');
+                if ($separator === false) {
+                    throw new SecurityException('Invalid signed closure');
+                }
+                $hash = substr($data, 1, $separator - 1);
+                $closure = substr($data, $separator + 1);
+
+                $data = ['hash' => $hash, 'closure' => $closure];
+
+                unset($hash, $closure);
+            } else {
+                $data = json_decode(substr($data, 1), true);
+            }
+
+            if (!is_array($data) || !static::$securityProvider->verify($data)) {
+                throw new SecurityException("Your serialized closure might have been modified and it's unsafe to be unserialized. " .
+                    "Make sure you use the same security provider, with the same settings, " .
+                    "both for serialization and unserialization.");
+            }
+
+            $data = $data['closure'];
+        } elseif ($data[0] === '@') {
+            if ($data[1] !== '{') {
+                $separator = strpos($data, '.');
+                if ($separator === false) {
+                    throw new SecurityException('Invalid signed closure');
+                }
+                $hash = substr($data, 1, $separator - 1);
+                $closure = substr($data, $separator + 1);
+
+                $data = ['hash' => $hash, 'closure' => $closure];
+
+                unset($hash, $closure);
+            } else {
+                $data = json_decode(substr($data, 1), true);
+            }
+
+            if (!is_array($data) || !isset($data['closure']) || !isset($data['hash'])) {
+                throw new SecurityException('Invalid signed closure');
+            }
+
+            $data = $data['closure'];
+        }
+
+        $this->code = \unserialize($data);
+
+        // unset data
+        unset($data);
+
+        $this->code['objects'] = array();
+
+        if ($this->code['use']) {
+            $this->scope = new ClosureScope();
+            $this->code['use'] = $this->resolveUseVariables($this->code['use']);
+            $this->mapPointers($this->code['use']);
+            extract($this->code['use'], EXTR_OVERWRITE | EXTR_REFS);
+            $this->scope = null;
+        }
+
+        $this->closure = include(ClosureStream::STREAM_PROTO . '://' . $this->code['function']);
+
+        if($this->code['this'] === $this){
+            $this->code['this'] = null;
+        }
+
+        $this->closure = $this->closure->bindTo($this->code['this'], $this->code['scope']);
+
+        if(!empty($this->code['objects'])){
+            foreach ($this->code['objects'] as $item){
+                $item['property']->setValue($item['instance'], $item['object']->getClosure());
+            }
+        }
+
+        $this->code = $this->code['function'];
+    }
+
+    /**
+     * Resolve the use variables after unserialization.
+     *
+     * @param  array  $data The Closure's transformed use variables
+     * @return array
+     */
+    protected function resolveUseVariables($data)
+    {
+        return $data;
+    }
+
+    /**
+     * Wraps a closure and sets the serialization context (if any)
+     *
+     * @param   Closure $closure Closure to be wrapped
+     *
+     * @return  self    The wrapped closure
+     */
+    public static function from(Closure $closure)
+    {
+        if (static::$context === null) {
+            $instance = new static($closure);
+        } elseif (isset(static::$context->scope[$closure])) {
+            $instance = static::$context->scope[$closure];
+        } else {
+            $instance = new static($closure);
+            static::$context->scope[$closure] = $instance;
+        }
+
+        return $instance;
+    }
+
+    /**
+     * Increments the context lock counter or creates a new context if none exist
+     */
+    public static function enterContext()
+    {
+        if (static::$context === null) {
+            static::$context = new ClosureContext();
+        }
+
+        static::$context->locks++;
+    }
+
+    /**
+     * Decrements the context lock counter and destroy the context when it reaches to 0
+     */
+    public static function exitContext()
+    {
+        if (static::$context !== null && !--static::$context->locks) {
+            static::$context = null;
+        }
+    }
+
+    /**
+     * @param string $secret
+     */
+    public static function setSecretKey($secret)
+    {
+        if(static::$securityProvider === null){
+            static::$securityProvider = new SecurityProvider($secret);
+        }
+    }
+
+    /**
+     * @param ISecurityProvider $securityProvider
+     */
+    public static function addSecurityProvider(ISecurityProvider $securityProvider)
+    {
+        static::$securityProvider = $securityProvider;
+    }
+
+    /**
+     * Remove security provider
+     */
+    public static function removeSecurityProvider()
+    {
+        static::$securityProvider = null;
+    }
+
+    /**
+     * @return null|ISecurityProvider
+     */
+    public static function getSecurityProvider()
+    {
+        return static::$securityProvider;
+    }
+
+    /**
+     * Wrap closures
+     *
+     * @internal
+     * @param $data
+     * @param ClosureScope|SplObjectStorage|null $storage
+     */
+    public static function wrapClosures(&$data, SplObjectStorage $storage = null)
+    {
+        if($storage === null){
+            $storage = static::$context->scope;
+        }
+
+        if($data instanceof Closure){
+            $data = static::from($data);
+        } elseif (is_array($data)){
+            if(isset($data[self::ARRAY_RECURSIVE_KEY])){
+                return;
+            }
+            $data[self::ARRAY_RECURSIVE_KEY] = true;
+            foreach ($data as $key => &$value){
+                if($key === self::ARRAY_RECURSIVE_KEY){
+                    continue;
+                }
+                static::wrapClosures($value, $storage);
+            }
+            unset($value);
+            unset($data[self::ARRAY_RECURSIVE_KEY]);
+        } elseif($data instanceof \stdClass){
+            if(isset($storage[$data])){
+                $data = $storage[$data];
+                return;
+            }
+            $data = $storage[$data] = clone($data);
+            foreach ($data as &$value){
+                static::wrapClosures($value, $storage);
+            }
+            unset($value);
+        } elseif (is_object($data) && ! $data instanceof static){
+            if(isset($storage[$data])){
+                $data = $storage[$data];
+                return;
+            }
+            $instance = $data;
+            $reflection = new ReflectionObject($instance);
+            if(!$reflection->isUserDefined()){
+                $storage[$instance] = $data;
+                return;
+            }
+            $storage[$instance] = $data = $reflection->newInstanceWithoutConstructor();
+
+            do{
+                if(!$reflection->isUserDefined()){
+                    break;
+                }
+                foreach ($reflection->getProperties() as $property){
+                    if($property->isStatic() || !$property->getDeclaringClass()->isUserDefined()){
+                        continue;
+                    }
+                    $property->setAccessible(true);
+                    if (PHP_VERSION >= 7.4 && !$property->isInitialized($instance)) {
+                        continue;
+                    }
+                    $value = $property->getValue($instance);
+                    if(is_array($value) || is_object($value)){
+                        static::wrapClosures($value, $storage);
+                    }
+                    $property->setValue($data, $value);
+                };
+            } while($reflection = $reflection->getParentClass());
+        }
+    }
+
+    /**
+     * Unwrap closures
+     *
+     * @internal
+     * @param $data
+     * @param SplObjectStorage|null $storage
+     */
+    public static function unwrapClosures(&$data, SplObjectStorage $storage = null)
+    {
+        if($storage === null){
+            $storage = static::$context->scope;
+        }
+
+        if($data instanceof static){
+            $data = $data->getClosure();
+        } elseif (is_array($data)){
+            if(isset($data[self::ARRAY_RECURSIVE_KEY])){
+                return;
+            }
+            $data[self::ARRAY_RECURSIVE_KEY] = true;
+            foreach ($data as $key => &$value){
+                if($key === self::ARRAY_RECURSIVE_KEY){
+                    continue;
+                }
+                static::unwrapClosures($value, $storage);
+            }
+            unset($data[self::ARRAY_RECURSIVE_KEY]);
+        }elseif ($data instanceof \stdClass){
+            if(isset($storage[$data])){
+                return;
+            }
+            $storage[$data] = true;
+            foreach ($data as &$property){
+                static::unwrapClosures($property, $storage);
+            }
+        } elseif (is_object($data) && !($data instanceof Closure)){
+            if(isset($storage[$data])){
+                return;
+            }
+            $storage[$data] = true;
+            $reflection = new ReflectionObject($data);
+
+            do{
+                if(!$reflection->isUserDefined()){
+                    break;
+                }
+                foreach ($reflection->getProperties() as $property){
+                    if($property->isStatic() || !$property->getDeclaringClass()->isUserDefined()){
+                        continue;
+                    }
+                    $property->setAccessible(true);
+                    if (PHP_VERSION >= 7.4 && !$property->isInitialized($data)) {
+                        continue;
+                    }
+                    $value = $property->getValue($data);
+                    if(is_array($value) || is_object($value)){
+                        static::unwrapClosures($value, $storage);
+                        $property->setValue($data, $value);
+                    }
+                };
+            } while($reflection = $reflection->getParentClass());
+        }
+    }
+
+    /**
+     * Creates a new closure from arbitrary code,
+     * emulating create_function, but without using eval
+     *
+     * @param string$args
+     * @param string $code
+     * @return Closure
+     */
+    public static function createClosure($args, $code)
+    {
+        ClosureStream::register();
+        return include(ClosureStream::STREAM_PROTO . '://function(' . $args. '){' . $code . '};');
+    }
+
+    /**
+     * Internal method used to map closure pointers
+     * @internal
+     * @param $data
+     */
+    protected function mapPointers(&$data)
+    {
+        $scope = $this->scope;
+
+        if ($data instanceof static) {
+            $data = &$data->closure;
+        } elseif (is_array($data)) {
+            if(isset($data[self::ARRAY_RECURSIVE_KEY])){
+                return;
+            }
+            $data[self::ARRAY_RECURSIVE_KEY] = true;
+            foreach ($data as $key => &$value){
+                if($key === self::ARRAY_RECURSIVE_KEY){
+                    continue;
+                } elseif ($value instanceof static) {
+                    $data[$key] = &$value->closure;
+                } elseif ($value instanceof SelfReference && $value->hash === $this->code['self']){
+                    $data[$key] = &$this->closure;
+                } else {
+                    $this->mapPointers($value);
+                }
+            }
+            unset($value);
+            unset($data[self::ARRAY_RECURSIVE_KEY]);
+        } elseif ($data instanceof \stdClass) {
+            if(isset($scope[$data])){
+                return;
+            }
+            $scope[$data] = true;
+            foreach ($data as $key => &$value){
+                if ($value instanceof SelfReference && $value->hash === $this->code['self']){
+                    $data->{$key} = &$this->closure;
+                } elseif(is_array($value) || is_object($value)) {
+                    $this->mapPointers($value);
+                }
+            }
+            unset($value);
+        } elseif (is_object($data) && !($data instanceof Closure)){
+            if(isset($scope[$data])){
+                return;
+            }
+            $scope[$data] = true;
+            $reflection = new ReflectionObject($data);
+            do{
+                if(!$reflection->isUserDefined()){
+                    break;
+                }
+                foreach ($reflection->getProperties() as $property){
+                    if($property->isStatic() || !$property->getDeclaringClass()->isUserDefined()){
+                        continue;
+                    }
+                    $property->setAccessible(true);
+                    if (PHP_VERSION >= 7.4 && !$property->isInitialized($data)) {
+                        continue;
+                    }
+                    $item = $property->getValue($data);
+                    if ($item instanceof SerializableClosure || ($item instanceof SelfReference && $item->hash === $this->code['self'])) {
+                        $this->code['objects'][] = array(
+                            'instance' => $data,
+                            'property' => $property,
+                            'object' => $item instanceof SelfReference ? $this : $item,
+                        );
+                    } elseif (is_array($item) || is_object($item)) {
+                        $this->mapPointers($item);
+                        $property->setValue($data, $item);
+                    }
+                }
+            } while($reflection = $reflection->getParentClass());
+        }
+    }
+
+    /**
+     * Internal method used to map closures by reference
+     *
+     * @internal
+     * @param   mixed &$data
+     */
+    protected function mapByReference(&$data)
+    {
+        if ($data instanceof Closure) {
+            if($data === $this->closure){
+                $data = new SelfReference($this->reference);
+                return;
+            }
+
+            if (isset($this->scope[$data])) {
+                $data = $this->scope[$data];
+                return;
+            }
+
+            $instance = new static($data);
+
+            if (static::$context !== null) {
+                static::$context->scope->toserialize--;
+            } else {
+                $instance->scope = $this->scope;
+            }
+
+            $data = $this->scope[$data] = $instance;
+        } elseif (is_array($data)) {
+            if(isset($data[self::ARRAY_RECURSIVE_KEY])){
+                return;
+            }
+            $data[self::ARRAY_RECURSIVE_KEY] = true;
+            foreach ($data as $key => &$value){
+                if($key === self::ARRAY_RECURSIVE_KEY){
+                    continue;
+                }
+                $this->mapByReference($value);
+            }
+            unset($value);
+            unset($data[self::ARRAY_RECURSIVE_KEY]);
+        } elseif ($data instanceof \stdClass) {
+            if(isset($this->scope[$data])){
+                $data = $this->scope[$data];
+                return;
+            }
+            $instance = $data;
+            $this->scope[$instance] = $data = clone($data);
+
+            foreach ($data as &$value){
+                $this->mapByReference($value);
+            }
+            unset($value);
+        } elseif (is_object($data) && !$data instanceof SerializableClosure){
+            if(isset($this->scope[$data])){
+                $data = $this->scope[$data];
+                return;
+            }
+
+            $instance = $data;
+            $reflection = new ReflectionObject($data);
+            if(!$reflection->isUserDefined()){
+                $this->scope[$instance] = $data;
+                return;
+            }
+            $this->scope[$instance] = $data = $reflection->newInstanceWithoutConstructor();
+
+            do{
+                if(!$reflection->isUserDefined()){
+                    break;
+                }
+                foreach ($reflection->getProperties() as $property){
+                    if($property->isStatic() || !$property->getDeclaringClass()->isUserDefined()){
+                        continue;
+                    }
+                    $property->setAccessible(true);
+                    if (PHP_VERSION >= 7.4 && !$property->isInitialized($instance)) {
+                        continue;
+                    }
+                    $value = $property->getValue($instance);
+                    if(is_array($value) || is_object($value)){
+                        $this->mapByReference($value);
+                    }
+                    $property->setValue($data, $value);
+                }
+            } while($reflection = $reflection->getParentClass());
+        }
+    }
+
+}
-- 
Gitee


From d862c5ca0c76973fd7014cadc3bfdf885716391d Mon Sep 17 00:00:00 2001
From: suyi <suyibk@qq.com>
Date: Sat, 2 Nov 2024 18:59:02 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/.example.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/.example.env b/server/.example.env
index 53a29f4..108add1 100644
--- a/server/.example.env
+++ b/server/.example.env
@@ -1 +1 @@
-#debug
APP_DEBUG=true
#sql debug打印
SQL_DEBUG=true

#服务提供端口
SERVER_LISTEN="http://127.0.0.1:8789"
#慢业务端口
SLOW_PROCESS_STATUS=
SLOW_SERVER_LISTEN=http://127.0.0.1:8790
#SSE服务端消息推送
SSE_SERVER_LISTEN = "http://127.0.0.1:8791"
SSE_STATUS = ""
#http-chunk服务端消息推送
CHUNK_SERVER_LISTEN = "http://127.0.0.1:8792"
CHUNK_STATUS = ""
#定时任务
CRONTAB_STATUS=
#数据库链接
DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=server_admin
DB_USERNAME=root
DB_PASSWORD=root
DB_PREFIX=la_
#SESSION存储引擎
SESSION_DRIVER=redis
#缓存前缀
CACHE_PREFIX=report_admin
#SESSION存储前缀
CACHE_SESSION_PREFIX=report_admin_session
#redis配置
REDIS_CONNECTION=default
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
REDIS_DB=24
#redis队列配置
REDIS_QUEUE_STATUS=
REDIS_QUEUE_PREFIX=report_admin_queue
REDIS_QUEUE_CONNECTION=default
REDIS_QUEUE_HOST=127.0.0.1
REDIS_QUEUE_PASSWORD=
REDIS_QUEUE_PORT=6379
REDIS_QUEUE_DB=0
#密码凭证
UNIQUE_IDENTIFICATION = "8727"
\ No newline at end of file
+#debug
APP_DEBUG=true
#sql debug打印
SQL_DEBUG=true

#服务提供端口
SERVER_LISTEN="http://0.0.0.0:8789"
#慢业务端口
SLOW_PROCESS_STATUS=
SLOW_SERVER_LISTEN=http://0.0.0.0:8790
#SSE服务端消息推送
SSE_SERVER_LISTEN = "http://0.0.0.0:8791"
SSE_STATUS = ""
#http-chunk服务端消息推送
CHUNK_SERVER_LISTEN = "http://0.0.0.0:8792"
CHUNK_STATUS = ""
#定时任务
CRONTAB_STATUS=
#数据库链接
DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=server_admin
DB_USERNAME=root
DB_PASSWORD=root
DB_PREFIX=la_
#SESSION存储引擎
SESSION_DRIVER=redis
#缓存前缀
CACHE_PREFIX=report_admin
#SESSION存储前缀
CACHE_SESSION_PREFIX=report_admin_session
#redis配置
REDIS_CONNECTION=default
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
REDIS_DB=24
#redis队列配置
REDIS_QUEUE_STATUS=
REDIS_QUEUE_PREFIX=report_admin_queue
REDIS_QUEUE_CONNECTION=default
REDIS_QUEUE_HOST=127.0.0.1
REDIS_QUEUE_PASSWORD=
REDIS_QUEUE_PORT=6379
REDIS_QUEUE_DB=0
#密码凭证
UNIQUE_IDENTIFICATION = "8727"
\ No newline at end of file
-- 
Gitee


From 105ec49b5fe9e24401a4621e47795f686059667d Mon Sep 17 00:00:00 2001
From: suyi <suyibk@qq.com>
Date: Sat, 2 Nov 2024 19:47:11 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E5=BC=80=E5=90=AFevent=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/Dockerfile | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/server/Dockerfile b/server/Dockerfile
index 2fac363..ac802bf 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,5 +1,7 @@
 FROM php:8.2-cli-alpine
-
+# 设置环境变量，避免交互式安装提示
+ENV DEBIAN_FRONTEND=noninteractive
+RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories
 # 安装系统依赖
 RUN apk add --no-cache \
     linux-headers \
@@ -17,6 +19,14 @@ RUN apk add --no-cache \
     make \
     g++
 
+RUN apk update \
+    && apk add \
+       curl openssl openssh openntpd \
+       ca-certificates libressl-dev \
+       libzip-dev zlib-dev libjpeg-turbo-dev libpng-dev libxml2-dev \
+       make g++ gcc libc-dev pkgconf file libtool autoconf automake \
+       libevent-dev
+
 # 安装 PHP 扩展
 RUN docker-php-ext-install \
     pdo_mysql \
@@ -34,16 +44,18 @@ RUN docker-php-ext-install \
     shmop \
     sysvmsg \
     sysvsem \
-    sysvshm
+    sysvshm \
+    fileinfo
 
 # 安装额外的 PECL 扩展
-RUN pecl install redis igbinary mcrypt \
-    && docker-php-ext-enable redis igbinary mcrypt
+RUN pecl install redis igbinary mcrypt event \
+    && docker-php-ext-enable redis igbinary mcrypt event
 
 # 设置指定的 disable_functions
 RUN echo "disable_functions = passthru,system,chroot,chgrp,chown,popen,ini_alter,ini_restore,dl,openlog,syslog,readlink,symlink,popepassthru,imap_open,apache_setenv" > /usr/local/etc/php/php.ini
 
-
+# event需要比sockets后加载 https://www.yangdx.com/2022/08/219.html
+RUN mv /usr/local/etc/php/conf.d/docker-php-ext-event.ini /usr/local/etc/php/conf.d/docker-php-ext-z-event.ini
 # 安装 Composer
 COPY --from=composer:2.5.8 /usr/bin/composer /usr/bin/composer
 
-- 
Gitee


From c855610e485246e846fc13b5f1e0b69657edd1d5 Mon Sep 17 00:00:00 2001
From: suyi <suyibk@qq.com>
Date: Sat, 2 Nov 2024 19:53:36 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.en.md        | 35 ++++++++++++++++++++++++++++++++++-
 README.md           |  1 +
 server/README.en.md | 32 ++++++++++++++++++++++++++++++++
 server/README.md    | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/README.en.md b/README.en.md
index c077923..647947c 100644
--- a/README.en.md
+++ b/README.en.md
@@ -159,9 +159,10 @@ pc
 v5 - Serialization Warning Issue Note: As of PHP 8.1.0, classes that implement the Serializable interface will have a deprecation warning if they do not implement both the __serialize() and __unserialize() methods.
 
 Opis\\Closure\\SerializableClosure implements the Serializable interface, which is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary)
+
 vendor/opis/closure/src/SerializableClosure.php
 ```
-添加以下代码：
+insert code：
 public function __serialize()
 {
 return $this->serialize();
@@ -171,6 +172,38 @@ public function __unserialize($data)
 $this->unserialize($data);
 }
 ```
+## Docker Deployment
+
+
+### Prerequisites
+
+- Docker
+- Docker Compose
+
+### Deployment Steps
+
+1. Ensure that you have configured the server/.env file.
+
+2. Run the following commands in the project root directory:
+```bash
+# Build and start the services  
+docker-compose up -d
+
+# Check the status of the services  
+docker-compose ps
+
+# View the service logs  
+docker-compose logs -f server
+
+# Stop the services 
+docker-compose down
+
+# Restart the services  
+docker-compose restart
+
+# Rebuild and start the services  
+docker-compose up -d --build
+```
 
 # Manual (文档)
 
diff --git a/README.md b/README.md
index bf12a2e..a276dc5 100644
--- a/README.md
+++ b/README.md
@@ -155,6 +155,7 @@ pc端页面伪静态
 v5版本-序列化警告问题 注意：从 PHP 8.1.0 起，实现 Serializable 接口的类如果没有同时实现 __serialize()、__unserialize() 方法，将产生弃用警告。
 
 Opis\\Closure\\SerializableClosure implements the Serializable interface, which is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary)
+
 vendor/opis/closure/src/SerializableClosure.php
 ```
 添加以下代码：
diff --git a/server/README.en.md b/server/README.en.md
index c077923..05bae08 100644
--- a/server/README.en.md
+++ b/server/README.en.md
@@ -159,6 +159,7 @@ pc
 v5 - Serialization Warning Issue Note: As of PHP 8.1.0, classes that implement the Serializable interface will have a deprecation warning if they do not implement both the __serialize() and __unserialize() methods.
 
 Opis\\Closure\\SerializableClosure implements the Serializable interface, which is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary)
+
 vendor/opis/closure/src/SerializableClosure.php
 ```
 添加以下代码：
@@ -171,7 +172,38 @@ public function __unserialize($data)
 $this->unserialize($data);
 }
 ```
+## Docker Deployment
+
+
+### Prerequisites
+
+- Docker
+- Docker Compose
+
+### Deployment Steps
+
+1. Ensure that you have configured the server/.env file.
 
+2. Run the following commands in the project root directory:
+```bash
+# Build and start the services  
+docker-compose up -d
+
+# Check the status of the services  
+docker-compose ps
+
+# View the service logs  
+docker-compose logs -f server
+
+# Stop the services 
+docker-compose down
+
+# Restart the services  
+docker-compose restart
+
+# Rebuild and start the services  
+docker-compose up -d --build
+```
 # Manual (文档)
 
 https://www.workerman.net/doc/webman
diff --git a/server/README.md b/server/README.md
index 30ba8ab..bba6a24 100644
--- a/server/README.md
+++ b/server/README.md
@@ -155,6 +155,7 @@ pc端页面伪静态
 v5版本-序列化警告问题 注意：从 PHP 8.1.0 起，实现 Serializable 接口的类如果没有同时实现 __serialize()、__unserialize() 方法，将产生弃用警告。
 
 Opis\\Closure\\SerializableClosure implements the Serializable interface, which is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary)
+
 vendor/opis/closure/src/SerializableClosure.php
 ```
 添加以下代码：
@@ -167,6 +168,38 @@ public function __unserialize($data)
 $this->unserialize($data);
 }
 ```
+## Docker 部署 server
+
+
+### 前置要求
+
+- Docker
+- Docker Compose
+
+### 部署步骤
+
+1. 确保你已经配置好 `server/.env` 文件
+
+2. 在项目根目录下运行：
+```bash
+# 构建并启动服务
+docker-compose up -d
+
+# 查看服务状态
+docker-compose ps
+
+# 查看服务日志
+docker-compose logs -f server
+
+# 停止服务
+docker-compose down
+
+# 重启服务
+docker-compose restart
+
+# 重新构建并启动服务
+docker-compose up -d --build
+```
 # Manual (文档)
 
 https://www.workerman.net/doc/webman
-- 
Gitee


From f5bd9089d252dbe3158c6bb749a1c5462d5bca4f Mon Sep 17 00:00:00 2001
From: suyi <suyibk@qq.com>
Date: Mon, 4 Nov 2024 17:10:46 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/app/common/service/storage/Driver.php  | 10 ++++++++++
 .../common/service/storage/engine/Aliyun.php  |  5 +++++
 .../common/service/storage/engine/Local.php   |  7 +++++++
 .../common/service/storage/engine/Qcloud.php  |  5 +++++
 .../common/service/storage/engine/Qiniu.php   |  8 ++++++++
 .../common/service/storage/engine/Server.php  | 19 +++++++++++++------
 6 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/server/app/common/service/storage/Driver.php b/server/app/common/service/storage/Driver.php
index d604ada..6800c71 100644
--- a/server/app/common/service/storage/Driver.php
+++ b/server/app/common/service/storage/Driver.php
@@ -27,6 +27,16 @@ class Driver
         $this->engine = $this->getEngineClass($storage);
     }
 
+    /**
+     * 构建文件上传凭证
+     * @param $name
+     * @param $src
+     * @param $size
+     * @return string
+     */
+    public function getUploadToken($name,$src,$size){
+        return $this->engine->getUploadToken($name,$src,$size);
+    }
     /**
      * 设置上传的文件信息
      * @param string $name
diff --git a/server/app/common/service/storage/engine/Aliyun.php b/server/app/common/service/storage/engine/Aliyun.php
index a0cabb9..61c1cc3 100644
--- a/server/app/common/service/storage/engine/Aliyun.php
+++ b/server/app/common/service/storage/engine/Aliyun.php
@@ -111,4 +111,9 @@ class Aliyun extends Server
         return $this->fileName;
     }
 
+    public function getUploadToken($name,$src,$size)
+    {
+        // TODO: Implement getUploadToken() method.
+        return "";
+    }
 }
diff --git a/server/app/common/service/storage/engine/Local.php b/server/app/common/service/storage/engine/Local.php
index 92bdc19..5db0d29 100644
--- a/server/app/common/service/storage/engine/Local.php
+++ b/server/app/common/service/storage/engine/Local.php
@@ -56,4 +56,11 @@ class Local extends Server
     {
         return $this->fileName;
     }
+
+
+    public function getUploadToken($name,$src,$size)
+    {
+        // TODO: Implement getUploadToken() method.
+        return "";
+    }
 }
diff --git a/server/app/common/service/storage/engine/Qcloud.php b/server/app/common/service/storage/engine/Qcloud.php
index b09cc80..0ffd2f8 100644
--- a/server/app/common/service/storage/engine/Qcloud.php
+++ b/server/app/common/service/storage/engine/Qcloud.php
@@ -113,4 +113,9 @@ class Qcloud extends Server
         return $this->fileName;
     }
 
+    public function getUploadToken($name,$src,$size)
+    {
+        // TODO: Implement getUploadToken() method.
+        return "";
+    }
 }
diff --git a/server/app/common/service/storage/engine/Qiniu.php b/server/app/common/service/storage/engine/Qiniu.php
index 9387392..a25a368 100644
--- a/server/app/common/service/storage/engine/Qiniu.php
+++ b/server/app/common/service/storage/engine/Qiniu.php
@@ -133,4 +133,12 @@ class Qiniu extends Server
     {
         return $this->fileName;
     }
+
+
+    public function getUploadToken($name,$src,$size)
+    {
+        $dummyAuth = new Auth($this->config['access_key'], $this->config['secret_key']);
+        //size 单位byte
+        return $dummyAuth->uploadToken($this->config['bucket'], $src.'/'.$name, 3600, array('fsizeLimit'=>$size));
+    }
 }
diff --git a/server/app/common/service/storage/engine/Server.php b/server/app/common/service/storage/engine/Server.php
index 46663d6..9f2a872 100644
--- a/server/app/common/service/storage/engine/Server.php
+++ b/server/app/common/service/storage/engine/Server.php
@@ -41,20 +41,21 @@ abstract class Server
         if (empty($this->file)) {
             throw new Exception('未找到上传文件的信息');
         }
-        $this->file->extension = pathinfo($this->file->getUploadName(), PATHINFO_EXTENSION);
+
+        $extension = pathinfo($this->file->getUploadName(), PATHINFO_EXTENSION);
         $finfo = finfo_open(FILEINFO_MIME_TYPE);
-        $this->file->getMime = finfo_file($finfo, $this->file->getPathname());
+        $getMime = finfo_file($finfo, $this->file->getPathname());
         // 校验上传文件后缀
         $limit = array_merge(config('project.file_image'), config('project.file_video'));
-        if (!in_array(strtolower($this->file->extension), $limit)) {
-            throw new Exception('不允许上传' . $this->file->extension . '后缀文件');
+        if (!in_array(strtolower($extension), $limit)) {
+            throw new Exception('不允许上传' . $extension . '后缀文件');
         }
 
         // 文件信息
         $this->fileInfo = [
-            'ext'      => $this->file->extension,
+            'ext'      => $extension,
             'size'     => $this->file->getSize(),
-            'mime'     => $this->file->getMime,
+            'mime'     => $getMime,
             'name'     => $this->file->getUploadName(),
             'realPath' => $this->file->getRealPath(),
         ];
@@ -111,6 +112,12 @@ abstract class Server
      */
     abstract public function getFileName();
 
+    /**
+     * 构建文件上传凭证
+     * @return mixed
+     */
+    abstract public function getUploadToken($name,$src,$size);
+
     /**
      * 返回文件信息
      * @return mixed
-- 
Gitee


From fbe7d66b26eb2d7e1e16250e21261ead98fbbeab Mon Sep 17 00:00:00 2001
From: suyi <suyibk@qq.com>
Date: Mon, 4 Nov 2024 17:42:33 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=87=AD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminapi/controller/UploadController.php  |  40 ++--
 .../app/api/controller/UploadController.php   |  28 ++-
 server/app/common/service/UploadService.php   | 177 +++++++++---------
 3 files changed, 139 insertions(+), 106 deletions(-)

diff --git a/server/app/adminapi/controller/UploadController.php b/server/app/adminapi/controller/UploadController.php
index ac41384..d4390cb 100644
--- a/server/app/adminapi/controller/UploadController.php
+++ b/server/app/adminapi/controller/UploadController.php
@@ -10,6 +10,22 @@ use Tinywan\Storage\Storage;
 
 class UploadController extends BaseAdminController
 {
+    /**
+     * 获取上传凭证
+     * @return \support\Response
+     */
+    public function getUploadToken(): \support\Response
+    {
+
+        $name = $this->request->post('name', '');
+        $size = $this->request->post('size', '');
+        $uploadObj = (new UploadService());
+        $result = $uploadObj->getUploadToken($name,$size);
+        if ($result===false){
+            return $this->fail($uploadObj->getError());
+        }
+        return $this->data($result);
+    }
     /**
      * @notes 上传图片
      * @author 乔峰
@@ -17,13 +33,13 @@ class UploadController extends BaseAdminController
      */
     public function image()
     {
-        try {
-            $cid = $this->request->post('cid', 0);
-            $result = UploadService::image($cid);
-            return $this->success('上传成功', $result);
-        } catch (Exception $e) {
-            return $this->fail($e->getMessage());
+        $cid = $this->request->post('cid', 0);
+        $uploadObj = (new UploadService());
+        $result = $uploadObj->image($cid);
+        if ($result===false){
+            return $this->fail($uploadObj->getError());
         }
+        return $this->success('上传成功', $result);
     }
 
     /**
@@ -33,12 +49,12 @@ class UploadController extends BaseAdminController
      */
     public function video()
     {
-        try {
-            $cid = $this->request->post('cid', 0);
-            $result = UploadService::video($cid);
-            return $this->success('上传成功', $result);
-        } catch (Exception $e) {
-            return $this->fail($e->getMessage());
+        $cid = $this->request->post('cid', 0);
+        $uploadObj = (new UploadService());
+        $result = $uploadObj->video($cid);
+        if ($result===false){
+            return $this->fail($uploadObj->getError());
         }
+        return $this->success('上传成功', $result);
     }
 }
\ No newline at end of file
diff --git a/server/app/api/controller/UploadController.php b/server/app/api/controller/UploadController.php
index 7217fe3..4e354d4 100644
--- a/server/app/api/controller/UploadController.php
+++ b/server/app/api/controller/UploadController.php
@@ -33,16 +33,30 @@ class UploadController extends BaseApiController
      * @author 段誉
      * @date 2022/9/20 18:11
      */
-    public function image()
+    public function image(): \support\Response
     {
-        try {
-            $result = UploadService::image(0, $this->userId,FileEnum::SOURCE_USER);
-            return $this->success('上传成功', $result);
-        } catch (Exception $e) {
-            return $this->fail($e->getMessage());
+        $uploadObj = (new UploadService());
+        $result = $uploadObj->image(0,$this->userId,FileEnum::SOURCE_USER);
+        if ($result===false){
+            return $this->fail($uploadObj->getError());
         }
+        return $this->success('上传成功', $result);
     }
 
+    /**
+     * 获取上传凭证
+     * @return \support\Response
+     */
+    public function getUploadToken(): \support\Response
+    {
 
-
+        $name = $this->request->post('name', '');
+        $size = $this->request->post('size', '');
+        $uploadObj = (new UploadService());
+        $result = $uploadObj->getUploadToken($name,$size);
+        if ($result===false){
+            return $this->fail($uploadObj->getError());
+        }
+        return $this->data($result);
+    }
 }
\ No newline at end of file
diff --git a/server/app/common/service/UploadService.php b/server/app/common/service/UploadService.php
index 4e0bf7f..ac5b94b 100644
--- a/server/app/common/service/UploadService.php
+++ b/server/app/common/service/UploadService.php
@@ -8,19 +8,51 @@ use app\common\enum\FileEnum;
 use app\common\model\file\File;
 use app\common\service\storage\Driver as StorageDriver;
 use Exception;
-class UploadService
+class UploadService extends BaseService
 {
+    /**
+     * 获取上传token,前端直接携带token上传文件
+     * @return array|false
+     */
+    public function getUploadToken($name,$size): array|false
+    {
+        $config = [
+            'default' => ConfigService::get('storage', 'default', 'local'),
+            'engine'  => ConfigService::get('storage') ?? ['local'=>[]],
+        ];
+        $saveDir = 'uploads/images/' .  date('Ymd').'/';
+        $extension = pathinfo($name, PATHINFO_EXTENSION);
+        $file_name = date('YmdHis') . substr(md5($name), 0, 5)
+            . str_pad(rand(0, 9999), 4, '0', STR_PAD_LEFT).$extension;
+        try {
+            // 2、执行文件上传
+            $StorageDriver = new StorageDriver($config);
+            $upload_token = $StorageDriver->getUploadToken($file_name, $saveDir, $size);
+            if (!$upload_token) {
+                $this->setError("当前上传引擎不支持认证方式上传");
+                return false;
+            }
+            return [
+                'upload_token'=>$upload_token,
+                'save_dir'=>$saveDir,
+                'upload_file_name'=>$name,
+                'upload_file_size'=>$size,
+            ];
+        }catch (Exception $e){
+            $this->setError($e->getMessage());
+            return false;
+        }
+    }
     /**
      * @notes 上传图片
      * @param $cid
      * @param int $user_id
      * @param string $saveDir
-     * @return array
-     * @throws Exception
+     * @return array|false
      * @author 乔峰
      * @date 2021/12/29 16:30
      */
-    public static function image($cid, int $sourceId = 0, int $source = FileEnum::SOURCE_ADMIN, string $saveDir = 'uploads/images')
+    public function image($cid, int $sourceId = 0, int $source = FileEnum::SOURCE_ADMIN, string $saveDir = 'uploads/images'): bool|array
     {
         try {
             $config = [
@@ -36,51 +68,15 @@ class UploadService
 
             // 校验上传文件后缀
             if (!in_array(strtolower($fileInfo['ext']), config('project.file_image'))) {
-                throw new Exception("上传图片不允许上传". $fileInfo['ext'] . "文件");
+                $this->setError("上传图片不允许上传". $fileInfo['ext'] . "文件");
+                return false;
             }
 
             // 上传文件
-            $saveDir = $saveDir . '/' .  date('Ymd');
-            if ($config['default']=='local'){
-                if (!$StorageDriver->upload(public_path()."/".$saveDir)) {
-                    throw new Exception($StorageDriver->getError());
-                }
-            }else{
-                if (!$StorageDriver->upload($saveDir)) {
-                    throw new Exception($StorageDriver->getError());
-                }
-            }
-
-            // 3、处理文件名称
-            if (strlen($fileInfo['name']) > 128) {
-                $name = substr($fileInfo['name'], 0, 123);
-                $nameEnd = substr($fileInfo['name'], strlen($fileInfo['name'])-5, strlen($fileInfo['name']));
-                $fileInfo['name'] = $name . $nameEnd;
-            }
-
-            // 4、写入数据库中
-            $file = File::create([
-                'cid'         => $cid,
-                'type'        => FileEnum::IMAGE_TYPE,
-                'name'        => $fileInfo['name'],
-                'uri'         => $saveDir.'/' . str_replace("\\","/", $fileName),
-                'source'      => $source,
-                'source_id'   => $sourceId,
-                'create_time' => time(),
-            ]);
-
-            // 5、返回结果
-            return [
-                'id'   => $file['id'],
-                'cid'  => $file['cid'],
-                'type' => $file['type'],
-                'name' => $file['name'],
-                'uri'  => FileService::getFileUrl($file['uri']),
-                'url'  => $file['uri']
-            ];
-
+            return $this->upload($saveDir,$config,$StorageDriver,$fileInfo,$cid,$source,$sourceId,$fileName);
         } catch (Exception $e) {
-            throw new Exception($e->getMessage());
+            $this->setError($e->getMessage());
+            return false;
         }
     }
 
@@ -90,12 +86,11 @@ class UploadService
      * @param $cid
      * @param int $user_id
      * @param string $saveDir
-     * @return array
-     * @throws Exception
+     * @return array|false
      * @author 乔峰
      * @date 2021/12/29 16:32
      */
-    public static function video($cid, int $sourceId = 0, int $source = FileEnum::SOURCE_ADMIN, string $saveDir = 'uploads/video')
+    public function video($cid, int $sourceId = 0, int $source = FileEnum::SOURCE_ADMIN, string $saveDir = 'uploads/video'): bool|array
     {
         try {
             $config = [
@@ -111,51 +106,59 @@ class UploadService
 
             // 校验上传文件后缀
             if (!in_array(strtolower($fileInfo['ext']), config('project.file_video'))) {
-                throw new Exception("上传视频不允许上传". $fileInfo['ext'] . "文件");
+                $this->setError("上传视频不允许上传". $fileInfo['ext'] . "文件");
+                return false;
             }
 
             // 上传文件
-            $saveDir = $saveDir . '/' .  date('Ymd');
-            if ($config['default']=='local'){
-                if (!$StorageDriver->upload(public_path()."/".$saveDir)) {
-                    throw new Exception($StorageDriver->getError());
-                }
-            }else{
-                if (!$StorageDriver->upload($saveDir)) {
-                    throw new Exception($StorageDriver->getError());
-                }
+            return $this->upload($saveDir,$config,$StorageDriver,$fileInfo,$cid,$source,$sourceId,$fileName);
+        } catch (Exception $e) {
+            $this->setError($e->getMessage());
+            return false;
+        }
+    }
+    private function upload($saveDir,$config,$StorageDriver,$fileInfo,$cid,$source,$sourceId,$fileName): bool|array
+    {
+        // 上传文件
+        $saveDir = $saveDir . '/' .  date('Ymd');
+        if ($config['default']=='local'){
+            if (!$StorageDriver->upload(public_path()."/".$saveDir)) {
+                $this->setError($StorageDriver->getError());
+                return false;
             }
-
-            // 3、处理文件名称
-            if (strlen($fileInfo['name']) > 128) {
-                $name = substr($fileInfo['name'], 0, 123);
-                $nameEnd = substr($fileInfo['name'], strlen($fileInfo['name'])-5, strlen($fileInfo['name']));
-                $fileInfo['name'] = $name . $nameEnd;
+        }else{
+            if (!$StorageDriver->upload($saveDir)) {
+                $this->setError($StorageDriver->getError());
+                return false;
             }
+        }
 
-            // 4、写入数据库中
-            $file = File::create([
-                'cid'         => $cid,
-                'type'        => FileEnum::VIDEO_TYPE,
-                'name'        => $fileInfo['name'],
-                'uri'         => $saveDir . '/' . str_replace("\\","/", $fileName),
-                'source'      => $source,
-                'source_id'   => $sourceId,
-                'create_time' => time(),
-            ]);
-
-            // 5、返回结果
-            return [
-                'id'   => $file['id'],
-                'cid'  => $file['cid'],
-                'type' => $file['type'],
-                'name' => $file['name'],
-                'uri'  => FileService::getFileUrl($file['uri']),
-                'url'  => $file['uri']
-            ];
-
-        } catch (Exception $e) {
-            throw new Exception($e->getMessage());
+        // 3、处理文件名称
+        if (strlen($fileInfo['name']) > 128) {
+            $name = substr($fileInfo['name'], 0, 123);
+            $nameEnd = substr($fileInfo['name'], strlen($fileInfo['name'])-5, strlen($fileInfo['name']));
+            $fileInfo['name'] = $name . $nameEnd;
         }
+
+        // 4、写入数据库中
+        $file = File::create([
+            'cid'         => $cid,
+            'type'        => FileEnum::VIDEO_TYPE,
+            'name'        => $fileInfo['name'],
+            'uri'         => $saveDir . '/' . str_replace("\\","/", $fileName),
+            'source'      => $source,
+            'source_id'   => $sourceId,
+            'create_time' => time(),
+        ]);
+
+        // 5、返回结果
+        return [
+            'id'   => $file['id'],
+            'cid'  => $file['cid'],
+            'type' => $file['type'],
+            'name' => $file['name'],
+            'uri'  => FileService::getFileUrl($file['uri']),
+            'url'  => $file['uri']
+        ];
     }
 }
\ No newline at end of file
-- 
Gitee


From e1f23079ef41842c4b78d5a79641cb4e6d270813 Mon Sep 17 00:00:00 2001
From: suyi <suyibk@qq.com>
Date: Mon, 4 Nov 2024 17:44:03 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=87=AD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/app/adminapi/controller/UploadController.php | 6 ++++--
 server/app/api/controller/UploadController.php      | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/app/adminapi/controller/UploadController.php b/server/app/adminapi/controller/UploadController.php
index d4390cb..71c0008 100644
--- a/server/app/adminapi/controller/UploadController.php
+++ b/server/app/adminapi/controller/UploadController.php
@@ -30,8 +30,9 @@ class UploadController extends BaseAdminController
      * @notes 上传图片
      * @author 乔峰
      * @date 2021/12/29 16:27
+     * @return \support\Response
      */
-    public function image()
+    public function image(): \support\Response
     {
         $cid = $this->request->post('cid', 0);
         $uploadObj = (new UploadService());
@@ -46,8 +47,9 @@ class UploadController extends BaseAdminController
      * @notes 上传视频
      * @author 乔峰
      * @date 2021/12/29 16:27
+     * @return \support\Response
      */
-    public function video()
+    public function video(): \support\Response
     {
         $cid = $this->request->post('cid', 0);
         $uploadObj = (new UploadService());
diff --git a/server/app/api/controller/UploadController.php b/server/app/api/controller/UploadController.php
index 4e354d4..32a3322 100644
--- a/server/app/api/controller/UploadController.php
+++ b/server/app/api/controller/UploadController.php
@@ -29,9 +29,9 @@ class UploadController extends BaseApiController
 
     /**
      * @notes 上传图片
-     * @return \support\Response
      * @author 段誉
      * @date 2022/9/20 18:11
+     * @return \support\Response
      */
     public function image(): \support\Response
     {
-- 
Gitee


From fe019620a6e20b7d504f1d9d4c2fba7d1770c2d4 Mon Sep 17 00:00:00 2001
From: suyi <suyibk@qq.com>
Date: Tue, 5 Nov 2024 15:16:32 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E5=AE=89=E8=A3=85=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/.example.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/.example.env b/server/.example.env
index 108add1..d684461 100644
--- a/server/.example.env
+++ b/server/.example.env
@@ -1 +1 @@
-#debug
APP_DEBUG=true
#sql debug打印
SQL_DEBUG=true

#服务提供端口
SERVER_LISTEN="http://0.0.0.0:8789"
#慢业务端口
SLOW_PROCESS_STATUS=
SLOW_SERVER_LISTEN=http://0.0.0.0:8790
#SSE服务端消息推送
SSE_SERVER_LISTEN = "http://0.0.0.0:8791"
SSE_STATUS = ""
#http-chunk服务端消息推送
CHUNK_SERVER_LISTEN = "http://0.0.0.0:8792"
CHUNK_STATUS = ""
#定时任务
CRONTAB_STATUS=
#数据库链接
DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=server_admin
DB_USERNAME=root
DB_PASSWORD=root
DB_PREFIX=la_
#SESSION存储引擎
SESSION_DRIVER=redis
#缓存前缀
CACHE_PREFIX=report_admin
#SESSION存储前缀
CACHE_SESSION_PREFIX=report_admin_session
#redis配置
REDIS_CONNECTION=default
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
REDIS_DB=24
#redis队列配置
REDIS_QUEUE_STATUS=
REDIS_QUEUE_PREFIX=report_admin_queue
REDIS_QUEUE_CONNECTION=default
REDIS_QUEUE_HOST=127.0.0.1
REDIS_QUEUE_PASSWORD=
REDIS_QUEUE_PORT=6379
REDIS_QUEUE_DB=0
#密码凭证
UNIQUE_IDENTIFICATION = "8727"
\ No newline at end of file
+#debug
APP_DEBUG=true
#sql debug打印
SQL_DEBUG=true

#服务提供端口
SERVER_LISTEN="http://0.0.0.0:8789"
#慢业务端口
SLOW_PROCESS_STATUS=
SLOW_SERVER_LISTEN=http://0.0.0.0:8790
#SSE服务端消息推送
SSE_SERVER_LISTEN = "http://0.0.0.0:8791"
SSE_STATUS = ""
#http-chunk服务端消息推送
CHUNK_SERVER_LISTEN = "http://0.0.0.0:8792"
CHUNK_STATUS = ""
#定时任务
CRONTAB_STATUS=
#数据库链接
DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=server_admin
DB_USERNAME=root
DB_PASSWORD=root
DB_PREFIX=la_
#SESSION存储引擎
SESSION_DRIVER=redis
#缓存前缀
CACHE_PREFIX=report_admin
#SESSION存储前缀
CACHE_SESSION_PREFIX=report_admin_session
#redis配置
REDIS_CONNECTION=default
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=
REDIS_PORT=6379
REDIS_DB=0
#redis队列配置
REDIS_QUEUE_STATUS=
REDIS_QUEUE_PREFIX=report_admin_queue
REDIS_QUEUE_CONNECTION=default
REDIS_QUEUE_HOST=127.0.0.1
REDIS_QUEUE_PASSWORD=
REDIS_QUEUE_PORT=6379
REDIS_QUEUE_DB=0
#密码凭证
UNIQUE_IDENTIFICATION = "8727"
\ No newline at end of file
-- 
Gitee


From 7fb8cd541f7ec36fa9cef89b0aa36e1745c18564 Mon Sep 17 00:00:00 2001
From: suyi <suyibk@qq.com>
Date: Tue, 5 Nov 2024 17:10:51 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=A0=E9=99=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/app/adminapi/validate/auth/RoleValidate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/app/adminapi/validate/auth/RoleValidate.php b/server/app/adminapi/validate/auth/RoleValidate.php
index 149458c..5680ce6 100644
--- a/server/app/adminapi/validate/auth/RoleValidate.php
+++ b/server/app/adminapi/validate/auth/RoleValidate.php
@@ -16,7 +16,7 @@ namespace app\adminapi\validate\auth;
 
 
 use app\common\validate\BaseValidate;
-use app\common\model\auth\{SystemRole, Admin};
+use app\common\model\auth\{AdminRole, SystemRole, Admin};
 
 /**
  * 角色验证器
@@ -110,7 +110,7 @@ class RoleValidate extends BaseValidate
      */
     public function checkAdmin($value, $rule, $data)
     {
-        if (Admin::where(['role_id' => $value])->find()) {
+        if (AdminRole::where('role_id',$value)->find()){
             return '有管理员在使用该角色，不允许删除';
         }
         return true;
-- 
Gitee


From 6d0b1cf17a909855e169df73b9358a5e655f6997 Mon Sep 17 00:00:00 2001
From: suyi <suyibk@qq.com>
Date: Tue, 5 Nov 2024 17:14:16 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E7=83=AD=E5=8A=A0=E8=BD=BD=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/docker-compose.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/server/docker-compose.yaml b/server/docker-compose.yaml
index 8a0acf2..6d7a973 100644
--- a/server/docker-compose.yaml
+++ b/server/docker-compose.yaml
@@ -12,9 +12,7 @@ services:
     environment:
       - TIMEZONE=Asia/Shanghai
     volumes:
-      - ./.env:/app/.env
-      - ./runtime:/app/runtime
-      - ./php-logs:/usr/local/var/log/php
+      - ./:/app
     networks:
       - webman-network
 
-- 
Gitee