From 04e1f7f0aeb929c0f0218cdb9876f3e5a5c041d0 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Thu, 1 Apr 2021 22:26:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=20=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Ajax.php |   5 ++---
 application/config.php                |   2 +-
 public/assets/img/bg-pattern.png      | Bin 633 -> 0 bytes
 public/assets/img/logo.svg            |  14 --------------
 4 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 public/assets/img/bg-pattern.png
 delete mode 100644 public/assets/img/logo.svg

diff --git a/application/admin/controller/Ajax.php b/application/admin/controller/Ajax.php
index 7a3d6e77..a1cc8a71 100644
--- a/application/admin/controller/Ajax.php
+++ b/application/admin/controller/Ajax.php
@@ -213,9 +213,8 @@ class Ajax extends Backend
                 case 'browser':
                     // 浏览器缓存
                     // 只有生产环境下才修改
-                    if (1 || !config('app_debug')) {
-                        $version = config('site.name');
-                        $version = '1.0.1';
+                    if (!config('app_debug')) {
+                        $version = config('site.version');
                         $newversion = preg_replace_callback("/(.*)\.([0-9]+)\$/", function ($match) {
                             return $match[1] . '.' . ($match[2] + 1);
                         }, $version);
diff --git a/application/config.php b/application/config.php
index b4f0899f..4d9624f4 100755
--- a/application/config.php
+++ b/application/config.php
@@ -292,7 +292,7 @@ return [
         //允许跨域的域名,多个以,分隔
         'cors_request_domain'   => 'localhost,127.0.0.1',
         //版本号
-        'version'               => '1.2.0.20210125_beta',
+        'version'               => '1.2.0.20210401_beta',
         //API接口地址
         'api_url'               => 'https://api.fastadmin.net',
     ],
diff --git a/public/assets/img/bg-pattern.png b/public/assets/img/bg-pattern.png
deleted file mode 100644
index cfd79110639b72f96f028efdba77979408402368..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 633
zcmeAS@N?(olHy`uVBq!ia0vp^&On^P!3-o{?X5izq_hHjLR^9Lbuc)1@Zjakmx0V{
z*RBB>K=SI<tLMM~C<SEy+|gkMRLxfs<QL3f%fKb?Zp^@-DFPI#S#u3&5#t9>7srr_
zTW_b|EqZLg;r3P1iMjCp|I*n@Zq;R{8+2J)Zx**Q|5@zE!o<FnOXoPpmRKMAK8vyy
zcQeCHEA9jps5G43wJvw>;<WSPEh&8k5&vI)`>Swj23wL~`^Qh;KI`<nSLai6OjXT&
zn_~FT^+K}3+ij|Hv#tpCG#ZF4n*I8Pz}8-cQUlXXvF-0CO?cYeu_*lPQ$>q)3(LHJ
z`q@vr&bvBUaS_`L)?|s^RvVe}ORiU5b2N7+bk3W#{qx7md@n3RC3{*8bG~oOZcARc
zz&c_{Y_R2(3D<XR@VivgQmlM=-skE2a%NwWc~u*?qt{j9aNou13p1-1N>}Lj+`m7$
z@YDWA!^quY36^RL-Y#bFW?ZtCb!&2__rVgM;~@0Mo^Q9<l)eJKK+fZQg~q)4eo^jx
zN9SiMo#Fd;HQ4=yvx9{M-!Ubw&*x=jzGk&Qu|N4z{Ve<ONiucw)-3jSVLf9ids9>M
zd1dCC@2+z^C6r_??Ef_J%v8~f?9LvKD}U-%aJX*Sw`6h$^R);|b&lN<7sLwZT>hf}
ztu~R7@3YSH*twg`*&q15du<Y-{B_x~z4~!!5odfZ&s(f^N#c&cq;GY1s}2SGy?szQ
z%|qg_j?9sRS2njClX3YHY1+A<%)nG!ZDGL@j#ZOpZaxh2kMwczlYi?^yD#2&2bcsH
NJYD@<);T3K0RU7EC)EG|

diff --git a/public/assets/img/logo.svg b/public/assets/img/logo.svg
deleted file mode 100644
index 176c0356..00000000
--- a/public/assets/img/logo.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="768px" height="1184px" viewBox="0 0 768 1184" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.7.1 (28215) - http://www.bohemiancoding.com/sketch -->
-    <title>Slice 1</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="logo" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M64.433651,605.899968 C20.067302,536.265612 0,469.698785 0,389.731348 C0,174.488668 171.922656,0 384,0 C596.077344,0 768,174.488668 768,389.731348 C768,469.698785 747.932698,536.265612 703.566349,605.899968 C614.4,753.480595 441.6,870.4 384,870.4 C326.4,870.4 153.6,753.480595 64.433651,605.899968 L64.433651,605.899968 Z" id="body" fill="#18BC9C"></path>
-        <path d="M429.648991,190.816 L430.160991,190.816 L429.648991,190.816 L429.648991,190.816 Z M429.648991,156 L427.088991,156 C419.408991,157.024 411.728991,160.608 404.560991,168.8 L403.024991,170.848 L206.928991,429.92 C198.736991,441.184 197.712991,453.984 204.368991,466.784 C210.512991,478.048 222.288991,485.728 235.600991,485.728 L336.464991,486.24 L304.208991,673.632 C301.648991,689.504 310.352991,705.376 325.200991,712.032 C329.808991,714.08 334.416991,714.592 339.536991,714.592 C349.776991,714.592 358.992991,709.472 366.160991,700.256 L561.744991,419.168 C569.936991,407.904 570.960991,395.104 564.304991,382.304 C557.648991,369.504 547.408991,363.36 533.072991,363.36 L432.208991,363.36 L463.952991,199.008 C464.464991,196.448 464.976991,193.376 464.976991,190.816 C464.976991,171.872 449.104991,156 431.184991,156 L429.648991,156 L429.648991,156 Z" id="flash" fill="#FFFFFF"></path>
-        <text id="FastAdmin" font-family="MyanmarMN, Myanmar MN" font-size="144" font-weight="normal" fill="#4A4A4A">
-            <tspan x="33" y="1121">FastAdmin</tspan>
-        </text>
-    </g>
-</svg>
\ No newline at end of file