💄 Updating the UI and style files.

Sherryclouds · Mar 18, 2020 · 8ee4598 · 8ee4598
1 parent 5441496
commit 8ee4598
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 52 deletions.
diff --git a/application/http/middleware/Initialize.php b/application/http/middleware/Initialize.php
@@ -24,47 +24,11 @@ public function handle(Request $request, \Closure $next)
         $banIp = $this->getConfig('ban_ip');
         if ($banIp) {
             $ips = explode(',', str_replace('，', ',', $banIp));
-            if ($this->banIp($request->ip(), $ips)) {
+            if (in_array($request->ip(), $ips)) {
                 throw new HttpResponseException(Response::code(403));
             }
         }
 
         return $next($request);
     }
-
-    /**
-     * 拦截某个IP, 支持通配符
-     *
-     * @param string $ip
-     * @param array $ips
-     * @return bool
-     */
-    private function banIp(string $ip, array $ips)
-    {
-        $parts = explode('.', $ip); // 分段当前 IP
-        $ban = false;
-        foreach ($ips as $item) {
-            // 如果直接匹配到
-            if ($item === $ip) {
-                $ban = true;
-                continue;
-            }
-
-            if (strpos($item, '*') !== false) {
-                $array = explode('.', $item);
-                $check = true;
-                for ($i = 0; $i < count($array); $i++) {
-                    if ($array[$i] !== '*' && $array[$i] !== $parts[$i]) {
-                        $check = false;
-                        break;
-                    }
-                }
-                if ($check) {
-                    $ban = true;
-                    break;
-                }
-            }
-        }
-        return $ban;
-    }
 }
diff --git a/application/index/controller/admin/System.php b/application/index/controller/admin/System.php
@@ -176,6 +176,10 @@ public function upgrade()
             Db::rollback();
             $upgrade->rmdir($upgrade->getWorkspace());
             $this->error($e->getMessage());
+        } catch (\HttpException $e) {
+            Db::rollback();
+            $upgrade->rmdir($upgrade->getWorkspace());
+            $this->error($e->getMessage());
         } catch (\Throwable $e) {
             Db::rollback();
             $upgrade->rmdir($upgrade->getWorkspace());

diff --git a/public/static/app/css/app.css b/public/static/app/css/app.css
diff --git a/public/static/app/css/app.css.map b/public/static/app/css/app.css.map
diff --git a/public/static/app/css/app.less b/public/static/app/css/app.less
@@ -700,13 +700,6 @@ body.mdui-theme-layout-dark {
 
     .highlight pre, pre {
       background-color: #585858;
-      code {
-        color: #ececec;
-      }
-    }
-
-    p code {
-      background-color: rgba(255, 255, 255, 0.13);
     }
 
     table {