fix:修复书签文件上传解析问题

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");
                 }

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: {

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,

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"
 
+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