From 85b1e7237c151f7a4d39fe0addb0c264fe7a544e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= <jianweie@163.com>
Date: Mon, 6 Sep 2021 07:17:08 +0000
Subject: [PATCH] =?UTF-8?q?!126=20=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=8F=91=E5=B8=83=E5=A2=9E=E5=8A=A0=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E7=BA=AF=E5=9C=B0=E5=9D=80=E5=8F=91=E5=B8=83=E3=80=82?=
 =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=AE=BE=E8=AE=A1=E9=80=89=E6=8B=A9=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=A7=86=E5=9B=BE=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82=20*=20!125=20=E4=BF=AE=E5=A4=8D=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E9=80=89=E6=8B=A9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E9=94=99=E8=AF=AF=20*=20=E3=80=90=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=96=87=E7=AB=A0=E5=8F=91=E5=B8=83=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=A7=86=E9=A2=91=E7=BA=AF=E5=9C=B0=E5=9D=80=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E3=80=82=20*=20=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6HangFire=E5=88=9D=E5=A7=8B=E5=8C=96=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E3=80=82=20*=20=E3=80=90=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E8=B0=83=E6=95=B4=E4=BD=A3=E9=87=91=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=98=9F=E5=88=97=E4=B8=BA=E5=BB=B6=E8=BF=9F?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=98=9F=E5=88=97=EF=BC=8C=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=B9=B6=E5=8F=91=E4=B8=8B?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82=20*=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?=
 =?UTF-8?q?=E5=A4=9A=E7=A7=8D=E7=8E=AF=E5=A2=83=E4=B8=8B=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?ip=E5=9C=B0=E5=9D=80=E9=95=BF=E5=BA=A6=E8=BF=87=E9=95=BF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BD=BF=E7=94=A8MapToIPv4=E3=80=82?=
 =?UTF-8?q?=20*=20Merge=20branch=20'master'=20into=20dahuihui/develop=20*?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=95=8F=E6=84=9F=E8=AF=8D=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E7=BB=86=E8=8A=82=20*=20=E8=B0=83=E6=95=B4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8tabel=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=94=B9=E4=B8=BAtabel=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=88=B7=E6=96=B0=20*=20=E3=80=90=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E5=90=8E=E7=AB=AF=E9=A6=96=E9=A1=B5=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E9=97=AE=E9=A2=98=20*=20=E3=80=90=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=91=E5=AE=8C=E5=96=84=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E3=80=90=E8=81=94=E7=B3=BB=E5=AE=A2=E6=9C=8D?=
 =?UTF-8?q?=E3=80=91=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
 =?UTF-8?q?=20*=20Merge=20branch=20'master'=20into=20dahuihui/develop=20*?=
 =?UTF-8?q?=20Merge=20branch=20'master'=20into=20dahuihui/develop=20*=20my?=
 =?UTF-8?q?sql=E6=95=B0=E6=8D=AE=E5=BA=93=E6=96=B0=E5=A2=9E=E9=98=BF?=
 =?UTF-8?q?=E9=87=8C=E4=BA=91dms=E5=AF=BC=E5=87=BA=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E3=80=82=E5=88=A0=E9=99=A4phpmyadmin=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E3=80=82=20*=20=E5=8D=87=E7=BA=A7=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=20*=20Merge=20branch=20'ma?=
 =?UTF-8?q?ster'=20into=20dahuihui/develop=20*=20Merge=20branch=20'master'?=
 =?UTF-8?q?=20into=20dahuihui/develop=20*=201=E3=80=81=E3=80=90=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E9=87=8D=E5=86=99=E5=90=8E=E7=AB=AFUI?=
 =?UTF-8?q?=E6=A1=86=E6=9E=B6100=E5=A4=9A=E4=B8=AAHTML=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E5=8F=8A=E7=BB=86=E8=8A=82=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=E3=80=82=20*=20=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20*=20=E6=84=9F=E8=B0=A2=E5=A4=A7=E5=AE=B6=E3=80=82?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8D=90=E8=B5=A0=E5=90=8D=E5=8D=95=E3=80=82?=
 =?UTF-8?q?=20*=20Merge=20branch=20'master'=20into=20dahuihui/develop=20*?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E6=9C=AA=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96MediatR=E5=AF=BC=E8=87=B4=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=20*=20Merge=20branch=20'master'=20i?=
 =?UTF-8?q?nto=20dahuihui/develop=20*=20=E3=80=90=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E3=80=91=E5=8F=91=E8=B4=A7=E6=96=B9=E5=BC=8F=E8=B0=83=E5=A2=9E?=
 =?UTF-8?q?=E4=B8=BA=E6=89=B9=E9=87=8F=E8=AE=A2=E5=8D=95=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E5=92=8C=E5=8D=95=E4=B8=AA=E8=AE=A2=E5=8D=95=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=EF=BC=9B=E3=80=90=E5=90=8E=E7=AB=AF=E3=80=91=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E3=80=90=E9=97=A8=E5=BA=97=E8=87=AA=E6=8F=90=E3=80=91=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8F=91=E8=B4=A7=EF=BC=8C=E5=B9=B6=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=AE=BE=E7=BD=AE=E5=BC=80=E5=90=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=BD=93=E5=BC=80=E5=90=AF=E5=90=8E=E3=80=90=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E8=87=AA=E6=8F=90=E3=80=91=E8=AE=A2=E5=8D=95=E5=B0=86=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8F=91=E8=B4=A7=EF=BC=8C=E2=80=A6=20*=20=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=E5=95=86=E5=93=81=E5=B1=95=E7=A4=BA=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=20*=20=E5=9B=A0mysql=E4=B8=8D=E6=94=AF=E6=8C=81=E4=B8=80?=
 =?UTF-8?q?=E5=AE=9A=E6=A0=BC=E5=BC=8F=E6=95=B0=E6=8D=AE=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86longtext=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B8=BAtext=E6=A0=BC=E5=BC=8F=EF=BC=8C=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E5=AF=8C=E6=96=87=E6=9C=AC=E5=AD=97=E6=AE=B5=E4=B8=BA?=
 =?UTF-8?q?longtext=E6=A0=BC=E5=BC=8F=20*=20Merge=20branch=20'master'=20in?=
 =?UTF-8?q?to=20dahuihui/develop=20*=20=E4=BF=AE=E5=A4=8D=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E9=A1=B5=E9=9D=A2=E8=AE=BE=E8=AE=A1=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E7=BB=84=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98=20#I42RJ?=
 =?UTF-8?q?4=20=20=20#I3VUZR=20*=20=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=AE=BE=E8=AE=A1=EF=BC=8C=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E7=BB=84=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98=20#I42RJ4=20*=20M?=
 =?UTF-8?q?erge=20branch=20'master'=20into=20dahuihui/develop=20*=20Merge?=
 =?UTF-8?q?=20branch=20'master'=20into=20dahuihui/develop=20*=20=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=99=BB=E5=BD=95=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81=E4=B8=8D=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=20*=20=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=90=86=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=B1=A0=E5=95=86=E5=93=81=E5=90=8C=E6=AD=A5=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82=20*=20Me?=
 =?UTF-8?q?rge=20branch=20'develop'=20into=20dahuihui/develop=20*=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsku=E5=88=A0=E9=99=A4=E5=8D=95=E4=B8=AA?=
 =?UTF-8?q?=E8=B4=A7=E5=93=81=E5=90=8E=EF=BC=8C=E6=9C=AA=E6=B8=85=E7=90=86?=
 =?UTF-8?q?cache=E5=AF=BC=E8=87=B4=E9=87=8D=E5=A4=8D=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82=EF=BC=88=E6=84=9F=E8=B0=A2?=
 =?UTF-8?q?vikinghunter=E6=8F=90=E4=BE=9B=E4=BF=AE=E6=94=B9=E5=BB=BA?=
 =?UTF-8?q?=E8=AE=AE=EF=BC=89=20#I44XMY=20*=201=E3=80=81=E3=80=90=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E3=80=91=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=90=8C=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=B7=AE=E5=BC=82=E5=8C=96=E9=97=AE=E9=A2=98=E3=80=82=20#I45QK?=
 =?UTF-8?q?Z=20*=20Merge=20branch=20'develop'=20into=20dahuihui/develop=20?=
 =?UTF-8?q?*=201=E3=80=81=E3=80=90=E5=90=8E=E7=AB=AF=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BF=9D=E5=AD=98=E5=95=86=E5=93=81=E6=9C=AA=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0sku=E5=BA=8F=E5=88=97=E9=97=AE=E9=A2=98=E3=80=82#I44OO?=
 =?UTF-8?q?G=20*=20=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=96=B0pages=E4=B8=BB?=
 =?UTF-8?q?=E9=94=AE=E6=97=A0=E8=AF=B4=E6=98=8E=E5=AF=BC=E8=87=B4=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E3=80=82=20*=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsku=E8=BE=93=E5=85=A5=E5=B0=8F=E5=86=99?=
 =?UTF-8?q?=E9=80=97=E5=8F=B7=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BC=9A=E8=A2=AB=E6=88=AA=E6=96=AD=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=20*=20=E4=BF=AE=E5=A4=8D=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E5=BC=95=E7=94=A8=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=9B=AE=E5=BD=95=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82=20*=20Merge=20branch=20'develop'=20into=20dahuihui/de?=
 =?UTF-8?q?velop=20*=20=E4=BF=AE=E5=A4=8Dredis=E6=8F=90=E7=A4=BA=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E5=8F=B7=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=E3=80=82?=
 =?UTF-8?q?=20*=20=E3=80=90=E6=8E=A5=E5=8F=A3=E3=80=91=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E5=A4=B1=E8=B4=A5=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E5=AD=98=E5=82=A8=E6=95=B0=E6=8D=AE=E9=95=BF=E5=BA=A6?=
 =?UTF-8?q?=E8=BF=87=E7=9F=AD=E5=AF=BC=E8=87=B4=E5=86=99=E5=85=A5=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98=E3=80=82=20*=20=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=20*=20=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF=E8=BD=AC=E5=8F=91?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20*=20=E8=B0=83=E6=95=B4=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=20*=20=E4=BF=AE=E5=A4=8Dgithub=E9=93=BE=E6=8E=A5=20*=201?=
 =?UTF-8?q?=E3=80=81=E3=80=90=E5=90=8E=E7=AB=AF=E3=80=91=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91=E4=B8=AD=E7=9A=84=E3=80=90?=
 =?UTF-8?q?MediatR=E3=80=91=E5=8F=8A=E4=B8=AD=E4=BB=8B=E8=80=85=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=90=AF=E7=94=A8=E3=80=90Redis=E9=98=9F?=
 =?UTF-8?q?=E5=88=97=E3=80=91=E5=A4=84=E7=90=86=E3=80=82=20*=20Merge=20bra?=
 =?UTF-8?q?nch=20'develop'=20into=20dahuihui/develop=20*=20=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E7=BC=96=E8=BE=91=E5=99=A8=E4=B8=BACKEditor5=20*=20Me?=
 =?UTF-8?q?rge=20branch=20'develop'=20into=20dahuihui/develop=20*=20Merge?=
 =?UTF-8?q?=20branch=20'develop'=20into=20dahuihui/develop=20*=20=E3=80=90?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E3=80=91=E4=BC=98=E5=8C=96=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=9D=83=E9=99=90=E8=A7=92=E8=89=B2=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=8D=E5=B0=84controller=E5=92=8Caction=E7=9A=84=E6=95=88?=
 =?UTF-8?q?=E7=8E=87=E9=97=AE=E9=A2=98=E3=80=82=20*=20=E3=80=90=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E3=80=91=E4=BF=AE=E5=A4=8D=E5=90=8E=E7=AB=AF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=95=86=E5=93=81=E9=97=AE=E9=A2=98=E3=80=82=20*=20?=
 =?UTF-8?q?=E3=80=90=E5=90=8E=E7=AB=AF=E3=80=91=E4=BF=AE=E5=A4=8D=E8=85=BE?=
 =?UTF-8?q?=E8=AE=AF=E4=BA=91cos=E5=AD=98=E5=82=A8=E6=9C=AA=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8bucket=E9=97=AE=E9=A2=98=E3=80=82#I42DF0=20*=20Merge?=
 =?UTF-8?q?=20branch=20'develop'=20into=20dahuihui/develop=20*=20=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8=E6=96=B0=E5=9F=9F=E5=90=8D=E5=8F=8A=E6=BC=94=E7=A4=BA?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=20*=20Merge=20branch=20'develop'=20into=20da?=
 =?UTF-8?q?huihui/develop=20*=20Merge=20branch=20'develop'=20into=20dahuih?=
 =?UTF-8?q?ui/develop=20*=20=E8=B0=83=E6=95=B4=E8=AF=B4=E6=98=8E=20*=20Mer?=
 =?UTF-8?q?ge=20branch=20'develop'=20into=20dahuihui/develop=20*=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=20*=20=E4=BF=AE=E5=A4=8D=E5=9F=9F=E5=90=8D=E8=BD=AC?=
 =?UTF-8?q?=E5=8F=91=E8=8E=B7=E5=8F=96ip=E5=9C=B0=E5=9D=80=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E8=BF=87=E9=95=BF=E9=97=AE=E9=A2=98=E3=80=82=20*=201?=
 =?UTF-8?q?=E3=80=81=E3=80=90=E5=90=8E=E7=AB=AF=E3=80=91=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=94=99=E8=AF=AF=E8=BF=94=E5=9B=9E=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E3=80=822=E3=80=81=E3=80=90=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E3=80=91=E4=BF=AE=E5=A4=8D20=E6=97=A5?=
 =?UTF-8?q?=E5=88=A0=E9=99=A43=E4=B8=AA=E8=A1=A8=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=AA=E6=B8=85=E7=90=86=E5=B9=B2=E5=87=80=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82=20*=20Merge=20branch=20'develop'=20into=20dahuihui/de?=
 =?UTF-8?q?velop=20*=20Merge=20branch=20'develop'=20into=20dahuihui/develo?=
 =?UTF-8?q?p=20*=20=E8=B0=83=E6=95=B4=E5=85=A8=E5=B1=80=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8F=90=E7=A4=BA=E8=AF=AD=20*=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=95=86=E5=93=81=E6=89=B9=E9=87=8F=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=B1=95=E7=A4=BA=E7=95=8C=E9=9D=A2=E3=80=82#I3X8PP?=
 =?UTF-8?q?=20*=20Merge=20branch=20'develop'=20into=20dahuihui/develop=20*?=
 =?UTF-8?q?=20Merge=20branch=20'develop'=20into=20dahuihui/develop=20*=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=87=E6=BB=A4=E6=95=8F=E6=84=9F=E8=AF=8D?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=E3=80=82#I3W6CM=20*=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0Issue=20=E5=92=8C=20Pull=20Request=20=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=20*=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B7=AF=E5=BE=84=E4=B8=8A=E4=BC=A0=E8=87=B3?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E6=A0=B9=E7=9B=AE=E5=BD=95=EF=BC=8C=E8=80=8C?=
 =?UTF-8?q?=E9=9D=9Ewwwroot=E7=9A=84=E9=97=AE=E9=A2=98=20#I41TD1=20*=20Mer?=
 =?UTF-8?q?ge=20branch=20'develop'=20into=20dahuihui/develop=20*=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E7=9A=84=E8=A1=A8=E5=8D=95=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=20*=20=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=96=B0=E6=95=B0=E6=8D=AE=E5=BA=93=20*=20=E3=80=90=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E3=80=91=E4=BF=AE=E5=A4=8Dmysql=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93decimal=E7=B1=BB=E5=9E=8B=E6=9C=AA=E5=B8=A6?=
 =?UTF-8?q?=E5=B0=8F=E6=95=B0=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82#I3WAUY?=
 =?UTF-8?q?=20*=20=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8F=8A?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=20*=202021-07-20=20*=20Merge=20branch=20'dev?=
 =?UTF-8?q?elop'=20into=20dahuihui/develop=20*=20=E4=BF=AE=E5=A4=8Dwebapi?=
 =?UTF-8?q?=E4=B8=8D=E8=BF=9B=E5=85=A5=E8=B0=83=E8=AF=95=E6=96=AD=E7=82=B9?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82=20*=20Merge=20branch=20'de?=
 =?UTF-8?q?velop'=20into=20dahuihui/develop=20*=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=89=8D=E5=90=8E=E7=AB=AF=E5=88=86=E7=A6=BB?=
 =?UTF-8?q?table=E9=9D=A2=E6=9D=BF=E5=90=AF=E7=94=A8=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=9F=9F=E5=90=8D=E9=97=AE=E9=A2=98=E3=80=82=20*=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0=E5=89=8D=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E5=88=86=E7=A6=BB=E5=9F=9F=E5=90=8D=E6=9C=AA=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=B0html=E9=97=AE=E9=A2=98=E3=80=82=20*=20Merge=20branch?=
 =?UTF-8?q?=20'develop'=20into=20dahuihui/develop=20*=20=E3=80=90=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E3=80=91=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=94=A8=E6=88=B7=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6=E9=97=AE=E9=A2=98=E3=80=82=20*=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E7=BB=B4=E6=8A=A4=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20*=201=E3=80=81=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=B3=A8=E5=86=8C=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E4=BA=A4=E4=BA=92=E4=BA=8B=E6=83=85=E3=80=82=E4=B8=8D?=
 =?UTF-8?q?=E7=84=B6=E7=9B=9B=E6=B4=BE=E7=9A=84=E7=BB=84=E4=BB=B6=E6=9C=89?=
 =?UTF-8?q?bug=EF=BC=8C=E5=9C=A8=E4=B8=8D=E6=B3=A8=E5=86=8C=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E5=85=AC=E4=BC=97=E5=8F=B7=E5=8F=AA=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=EF=BC=8C=E8=BF=9B=E8=A1=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=93=8D=E4=BD=9C=EF=BC=8C=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E8=BF=98=E6=98=AF=E8=B5=B0=E7=9A=84=E6=98=AF=E5=BE=AE=E2=80=A6?=
 =?UTF-8?q?=20*=20=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=8D=E6=8E=A8=E9=80=81=E7=9A=84=E9=97=AE=E9=A2=98=20*=20Me?=
 =?UTF-8?q?rge=20branch=20'develop'=20into=20dahuihui/develop=20*=20Merge?=
 =?UTF-8?q?=20branch=20'develop'=20into=20dahuihui/develop=20*=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=BF=87=E6=9C=9F=E5=A4=B1=E6=95=88=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=20*=20=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=99=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E4=BA=8B=E5=8A=A1=20*=20=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=AB=AF=E6=8F=90=E7=A4=BA=E7=95=8C=E9=9D=A2=20*=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=BC=B9=E7=AA=97=E4=B8=8D=E5=B1=85=E4=B8=AD=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20*=20=E8=B0=83=E6=95=B4=E4=B8=80=E4=BA=9B=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E6=96=B9=E5=BC=8F=20*=20=E4=BF=AE=E5=A4=8Duni-app?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=EF=BC=8C=E7=94=A8=E6=88=B7=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=90=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E3=80=91=E6=8C=89=E9=92=AE=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20*=201=E3=80=81=E4=BF=AE=E5=A4=8Dmysql=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E4=B8=8B,=E6=8A=A5=E8=A1=A8=E7=BB=9F=E8=AE=A1sql?=
 =?UTF-8?q?=E7=9A=84=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF=E3=80=822?=
 =?UTF-8?q?=E3=80=81=E4=B8=BA=E6=96=B9=E4=BE=BF=E5=89=8D=E7=AB=AF=E5=9C=A8?=
 =?UTF-8?q?=E4=B8=8D=E9=83=A8=E7=BD=B2=E6=8E=A5=E5=8F=A3=E5=8F=8A=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?uni-app=E5=89=8D=E7=AB=AF=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=86=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E2=80=A6=20*=20Merge=20branch=20'develop'=20into=20da?=
 =?UTF-8?q?huihui/develop=20*=20=E8=B0=83=E6=95=B4=E5=91=BD=E5=90=8D=20*?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0docker-compose=E9=83=A8=E7=BD=B2=20*=20Mer?=
 =?UTF-8?q?ge=20branch=20'develop'=20into=20dahuihui/develop=20*=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=A0linux=E4=B8=8B=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8E=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E4=B8=8D=E5=AF=B9=E5=BA=94=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=89=BE=E4=B8=8D=E5=88=B0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E8=A1=A8=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E7=89=B9?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=8F=91=E5=B8=83=E4=B8=80=E4=BB=BD=E8=A1=A8?=
 =?UTF-8?q?=E5=90=8D=E4=B8=8E=E5=AE=9E=E4=BD=93=E5=90=8D=E7=A7=B0=E4=B8=80?=
 =?UTF-8?q?=E4=B8=80=E5=AF=B9=E5=BA=94=E8=84=9A=E6=9C=AC=E3=80=82=20*=20?=
 =?UTF-8?q?=E6=96=B0mysql=E8=A1=A8=E5=90=8D=E5=AD=98=E5=9C=A8=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E5=86=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/lib/custom/js/main.js             |  2 +-
 .../content/article/articles/create.html      | 22 +++++++++++++++++++
 .../views/content/article/articles/edit.html  | 22 +++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/js/main.js b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/js/main.js
index 13a4186..eecea6d 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/js/main.js
+++ b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/js/main.js
@@ -915,7 +915,7 @@ Vue.component('layout-config', {
                 area: ['800px', '550px'],
                 id: 'LAY-app-CoreCmsCommon-GetGood',
                 success: function (layero, index) {
-                    layui.view(this.id).render('common/getGood', null).done(function () { });
+                    layui.view(this.id).render('common/getGoodList', null).done(function () { });
                 }
             });
         },
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articles/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articles/create.html
index 454b761..bb47309 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articles/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articles/create.html
@@ -136,6 +136,28 @@
                     .create(document.querySelector('#editor'),
                         {
                             language: 'zh-cn',
+                            mediaEmbed: {
+                                providers: [
+                                    {
+                                        name: 'myprovider',
+                                        url: [
+                                            /^.*/
+                                        ],
+                                        html: match => {
+                                            //获取媒体url
+                                            const input = match['input'];
+                                            return (
+                                                '<div style="position: relative; padding-bottom: 100%; height: 0; padding-bottom: 70%;">' +
+                                                    `<iframe src="${input}" ` +
+                                                    'style="position: absolute; width: 100%; height: 100%; top: 0; left: 0;" ' +
+                                                    'frameborder="0" allowtransparency="true" allow="encrypted-media">' +
+                                                    '</iframe>' +
+                                                    '</div>'
+                                            );
+                                        }
+                                    }
+                                ]
+                            }
                         })
                     .then(editor => {
                         editor.plugins.get('FileRepository').createUploadAdapter = (loader) => {
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articles/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articles/edit.html
index 018bc11..607756d 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articles/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articles/edit.html
@@ -136,6 +136,28 @@
                     .create(document.querySelector('#editor'),
                         {
                             language: 'zh-cn',
+                            mediaEmbed: {
+                                providers: [
+                                    {
+                                        name: 'myprovider',
+                                        url: [
+                                            /^.*/
+                                        ],
+                                        html: match => {
+                                            //获取媒体url
+                                            const input = match['input'];
+                                            return (
+                                                '<div style="position: relative; padding-bottom: 100%; height: 0; padding-bottom: 70%;">' +
+                                                    `<iframe src="${input}" ` +
+                                                    'style="position: absolute; width: 100%; height: 100%; top: 0; left: 0;" ' +
+                                                    'frameborder="0" allowtransparency="true" allow="encrypted-media">' +
+                                                    '</iframe>' +
+                                                    '</div>'
+                                            );
+                                        }
+                                    }
+                                ]
+                            }
                         })
                     .then(editor => {
                         editor.plugins.get('FileRepository').createUploadAdapter = (loader) => {