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 --> + /var/maven/.m2/repository