From 51710175af0cdfe3286870fbce2f32347d2f1979 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Fri, 12 Nov 2021 17:05:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=91=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/crmeb/services/upload/storage/Oss.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crmeb/crmeb/services/upload/storage/Oss.php b/crmeb/crmeb/services/upload/storage/Oss.php
index bb95cd386..7c6f9876e 100644
--- a/crmeb/crmeb/services/upload/storage/Oss.php
+++ b/crmeb/crmeb/services/upload/storage/Oss.php
@@ -238,6 +238,7 @@ class Oss extends BaseUpload
                     if (!$waterConfig['watermark_text']) {
                         throw new ValidateException('请先配置水印文字');
                     }
+                    $waterConfig['watermark_text_color'] = str_replace('#', '', $waterConfig['watermark_text_color']);
                     $waterPath = $filePath .= '/watermark,text_' . base64_encode($waterConfig['watermark_text']) . ',color_' . $waterConfig['watermark_text_color'] . ',size_' . $waterConfig['watermark_text_size'] . ',g_' . ($this->position[$waterConfig['watermark_position']] ?? 'nw') . ',x_' . $waterConfig['watermark_x'] . ',y_' . $waterConfig['watermark_y'];
                     break;
             }