From 4c407c5b60613da686dd49d328177b3ce8700d9f Mon Sep 17 00:00:00 2001
From: fanxb <fleyx20@outlook.com>
Date: Sat, 13 Mar 2021 17:16:12 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E5=B1=8F=E5=B9=95=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bookmark/service/impl/BookmarkServiceImpl.java |  2 +-
 bookmark_front/src/layout/main/Content.vue         | 14 ++++++++++++--
 bookmark_front/src/layout/main/Top.vue             |  2 +-
 .../src/views/main/pages/things/BookmarkManage.vue |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java
index 41edd91..27adf80 100644
--- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java
+++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java
@@ -283,7 +283,7 @@ public class BookmarkServiceImpl implements BookmarkService {
         }
         try {
             URL urlObj = new URL(url);
-            byte[] data = HttpUtil.download(urlIconAddress + "/icon?url=" + urlObj.getHost() + "&size=15..32..120");
+            byte[] data = HttpUtil.download(urlIconAddress + "/icon?url=" + urlObj.getHost() + "&size=8..16..32");
             String base64 = new String(Base64.getEncoder().encode(data));
             if (StrUtil.isEmpty(base64)) {
                 return "data:image/png;base64," + base64;
diff --git a/bookmark_front/src/layout/main/Content.vue b/bookmark_front/src/layout/main/Content.vue
index a896ec2..fd36d1e 100644
--- a/bookmark_front/src/layout/main/Content.vue
+++ b/bookmark_front/src/layout/main/Content.vue
@@ -15,13 +15,23 @@ export default {};
 
 .main {
   position: relative;
-
   margin: 0 auto;
   padding: 0.08rem;
   margin-top: @topHeight;
   min-height: calc(~"100vh" - @sum);
-  width: 90%;
   font-size: 0.14rem;
   background-color: white;
 }
+
+@media screen and (max-width: 500px) {
+  .main {
+    width: 96%;
+  }
+}
+
+@media screen and (min-width: 500px) {
+  .main {
+    width: 90%;
+  }
+}
 </style>
diff --git a/bookmark_front/src/layout/main/Top.vue b/bookmark_front/src/layout/main/Top.vue
index 5bde2d6..46758f4 100644
--- a/bookmark_front/src/layout/main/Top.vue
+++ b/bookmark_front/src/layout/main/Top.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="main" v-if="userInfo">
-    <a class="ico" href="/"><img src="/static/img/bookmarkLogo.png" /></a>
+    <a class="ico" href="/"><img src="/static/img/bookmarkLogo.png" style="height:100%" /></a>
     <a-dropdown>
       <div class="user">
         <img :src="userInfo.icon" class="userIcon" />
diff --git a/bookmark_front/src/views/main/pages/things/BookmarkManage.vue b/bookmark_front/src/views/main/pages/things/BookmarkManage.vue
index 69c1093..9d658e2 100644
--- a/bookmark_front/src/views/main/pages/things/BookmarkManage.vue
+++ b/bookmark_front/src/views/main/pages/things/BookmarkManage.vue
@@ -41,7 +41,7 @@
       <a-dropdown :trigger="['contextmenu']" slot="nodeTitle" slot-scope="rec">
         <div class="titleContext">
           <a-icon type="folder" v-if="!rec.dataRef.isLeaf" />
-          <img v-else-if="rec.dataRef.icon.length>0" :src="rec.dataRef.icon" style="width:1.2em" />
+          <img v-else-if="rec.dataRef.icon.length>0" :src="rec.dataRef.icon" style="width:16px" />
           <a-icon type="book" v-else />
           <span @click.prevent style="display:inline-block;min-width:50%;padding-left:0.4em">
             {{rec.dataRef.name}}