From 8b2f36fb725e4373e88898a9d84545ce70d13525 Mon Sep 17 00:00:00 2001
From: fanxb <fleyx20@outlook.com>
Date: Mon, 15 Mar 2021 17:43:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=B9=A6=E7=AD=BE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E8=A7=A3=E6=9E=90=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fanxb/bookmark/common/util/HttpUtil.java  |  2 +-
 .../components/main/things/AddBookmark.vue    |  2 +-
 data/maven/settings.xml                       |  1 +
 start.sh                                      | 23 ++++++++++++++++---
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/util/HttpUtil.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/util/HttpUtil.java
index 07f448a..5b3b836 100644
--- a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/util/HttpUtil.java
+++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/util/HttpUtil.java
@@ -212,7 +212,7 @@ public class HttpUtil {
                 if (typeClass.getCanonicalName().equals(JSONObject.class.getCanonicalName())) {
                     return (T) JSONObject.parseObject(str);
                 } else if (typeClass.getCanonicalName().equals(JSONArray.class.getCanonicalName())) {
-                    return (T) str;
+                    return (T) JSONArray.parseArray(str);
                 } else {
                     throw new CustomException("仅支持JSONObject,JSONArray");
                 }
diff --git a/bookmark_front/src/components/main/things/AddBookmark.vue b/bookmark_front/src/components/main/things/AddBookmark.vue
index b5e6fb1..7bc9fba 100644
--- a/bookmark_front/src/components/main/things/AddBookmark.vue
+++ b/bookmark_front/src/components/main/things/AddBookmark.vue
@@ -67,7 +67,7 @@ export default {
       this.form.name = this.targetNode.name;
       this.form.url = this.form.type === "0" ? this.targetNode.url : "";
     }
-    this.token = window.token;
+    this.token = this.$store.state.globalConfig.token;
     this.form.path = this.targetNode == null ? "" : this.targetNode.path + (this.isAdd ? "." + this.targetNode.bookmarkId : "");
   },
   methods: {
diff --git a/data/maven/settings.xml b/data/maven/settings.xml
index f7a72df..8220936 100644
--- a/data/maven/settings.xml
+++ b/data/maven/settings.xml
@@ -51,6 +51,7 @@ under the License.
    |
    | Default: ${user.home}/.m2/repository 
    -->
+  <localRepository>/var/maven/.m2/repository</localRepository>
 
   <!-- interactiveMode
    | This will determine whether maven prompts you when it needs input. If set to false,
diff --git a/start.sh b/start.sh
index c5bd576..3198770 100755
--- a/start.sh
+++ b/start.sh
@@ -36,8 +36,25 @@ export MANAGE_USER_ID=-1
 
 
 # 前端打包
-docker run -it --rm --name buildBookmark -v $base/bookmark_front:/opt/front node:lts-buster-slim  bash -c "cd /opt/front &&   yarn --registry https://registry.npm.taobao.org && yarn build"
+docker run -it --rm --name buildBookmark --user ${UID} -v $base/bookmark_front:/opt/front node:lts-buster-slim  bash -c "cd /opt/front &&   yarn --registry https://registry.npm.taobao.org && yarn build"
 # 后端打包
-docker run -it --rm --name buildBookmark  -v $base/data/maven/mavenRep:/root/.m2 -v $base/data/maven/settings.xml:/usr/share/maven/conf/settings.xml -v $base/bookMarkService:/code maven:latest bash -c "cd /code && mvn clean install"
+docker run -it --rm --name buildBookmark --user ${UID} -v $base/data/maven/mavenRep:/var/maven/.m2: -v $base/data/maven/settings.xml:/usr/share/maven/conf/settings.xml -v $base/bookMarkService:/code maven:latest bash -c "cd /code && mvn clean install"
 
-docker-compose up -d
+start="start"
+stop="stop"
+restart="restart"
+delete="delete"
+
+if [  -z $1 ] || [ $1 == $start ];then
+  echo "start"
+  docker-compose up -d
+elif [ $1 == $stop ];then
+  echo "stop"
+  docker-compose stop 
+elif [ $1 == $restart ];then
+  echo "restart"
+  docker-compose restart 
+elif [ $1 == $delete ];then
+  echo "delete"
+  docker-compose down
+fi