From f2700ac62d8d3d773b7a664915eaabd627b7a59c Mon Sep 17 00:00:00 2001
From: "363126523@qq.com" <363126523@qq.com>
Date: Mon, 31 May 2021 12:36:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=B8=BA0=E6=97=B6=E5=B9=B6=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E4=B8=8D=E4=BF=AE=E6=94=B9score?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=97=B6,=E5=9C=A8=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/model/User.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/application/admin/model/User.php b/application/admin/model/User.php
index 822c81b17..333e45707 100644
--- a/application/admin/model/User.php
+++ b/application/admin/model/User.php
@@ -47,12 +47,13 @@ class User extends Model
 
         self::beforeUpdate(function ($row) {
             $changedata = $row->getChangedData();
-            if (isset($changedata['money'])) {
-                $origin = $row->getOriginData();
+            $origin = $row->getOriginData();
+            if (isset($changedata['money']) && (float) $changedata['money'] !== (float) $origin['money']) {
+
                 MoneyLog::create(['user_id' => $row['id'], 'money' => $changedata['money'] - $origin['money'], 'before' => $origin['money'], 'after' => $changedata['money'], 'memo' => '管理员变更金额']);
             }
-            if (isset($changedata['score'])) {
-                $origin = $row->getOriginData();
+            if (isset($changedata['score'])  && (int) $changedata['score'] !== (int) $origin['score']) {
+
                 ScoreLog::create(['user_id' => $row['id'], 'score' => $changedata['score'] - $origin['score'], 'before' => $origin['score'], 'after' => $changedata['score'], 'memo' => '管理员变更积分']);
             }
         });
-- 
Gitee


From cb4843057a260e648c1e9eb7ca22e9755416ab14 Mon Sep 17 00:00:00 2001
From: "363126523@qq.com" <363126523@qq.com>
Date: Fri, 4 Jun 2021 11:51:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9C=A8=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=AC=AC=E4=B8=89=E6=96=B9=E5=AD=98=E5=82=A8,?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8$domain=E5=8F=82=E6=95=B0=E4=B8=BAhttp?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=97=B6,=E8=BD=AC=E6=8D=A2=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84url=E4=B8=8D=E7=94=9F=E6=95=88=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/common.php b/application/common.php
index fa160030b..27614e5f5 100755
--- a/application/common.php
+++ b/application/common.php
@@ -86,8 +86,10 @@ if (!function_exists('cdnurl')) {
     function cdnurl($url, $domain = false)
     {
         $regex = "/^((?:[a-z]+:)?\/\/|data:image\/)(.*)/i";
+        $regexDomain = "/^(?:[a-z]+:)?\/\/(.*)/i";
         $cdnurl = \think\Config::get('upload.cdnurl');
-        $url = preg_match($regex, $url) || ($cdnurl && stripos($url, $cdnurl) === 0) ? $url : $cdnurl . $url;
+        $url = !is_bool($domain) && preg_match($regexDomain, $domain) ? $domain . $url  : $url;
+        $url = preg_match($regex, $url) || ($cdnurl && stripos($url, $cdnurl) === 0) || $domain === false ? $url : $cdnurl . $url;
         if ($domain && !preg_match($regex, $url)) {
             $domain = is_bool($domain) ? request()->domain() : $domain;
             $url = $domain . $url;
-- 
Gitee