Merge pull request #810 from PBH-BTN/master

v7.2.1

Author: Ghost-chu

pkg/deb/DEBIAN/postinst

@@ -3,7 +3,7 @@
 getent passwd peerbanhelper > /dev/null || adduser --quiet --system --group --home /var/lib/peerbanhelper peerbanhelper
 chown -R peerbanhelper: /etc/peerbanhelper
 chown -R root: /usr/lib/peerbanhelper
-mkdir /var/log/peerbanhelper
+mkdir -p /var/log/peerbanhelper
 chown peerbanhelper: /var/log/peerbanhelper
 
 systemctl daemon-reload

pkg/deb/DEBIAN/preinst

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-# migrate <= 7.1.2
+# migrate < 7.2
 if getent passwd peerbanhelper | grep --quiet /nonexistent; then
 	deluser --quiet peerbanhelper
 	adduser --quiet --system --group --home /var/lib/peerbanhelper peerbanhelper

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.ghostchu.peerbanhelper</groupId>
     <artifactId>peerbanhelper</artifactId>
-    <version>7.2.0</version>
+    <version>7.2.1</version>
     <packaging>jar</packaging>
 
     <name>PeerBanHelper</name>

src/main/java/com/ghostchu/peerbanhelper/PeerBanHelperServer.java

@@ -4,7 +4,6 @@
 import com.ghostchu.peerbanhelper.alert.AlertManager;
 import com.ghostchu.peerbanhelper.database.Database;
 import com.ghostchu.peerbanhelper.database.dao.impl.BanListDao;
-import com.ghostchu.peerbanhelper.decentralized.IPFSBanListShare;
 import com.ghostchu.peerbanhelper.downloader.Downloader;
 import com.ghostchu.peerbanhelper.downloader.DownloaderLastStatus;
 import com.ghostchu.peerbanhelper.downloader.DownloaderLoginResult;
@@ -140,8 +139,8 @@ public class PeerBanHelperServer implements Reloadable {
     private BanListDao banListDao;
     @Autowired
     private Laboratory laboratory;
-    @Autowired
-    private IPFSBanListShare share;
+//    @Autowired
+//    private IPFSBanListShare share;
 
     public PeerBanHelperServer() {
         reloadConfig();
@@ -419,7 +418,7 @@ private void saveBanList() {
         }
         try {
             int count = banListDao.saveBanList(BAN_LIST);
-            share.publishUpdate();
+            //share.publishUpdate();
             log.info(tlUI(Lang.SAVED_BANLIST, count));
         } catch (Exception e) {
             log.error(tlUI(Lang.SAVE_BANLIST_FAILED), e);

src/main/java/com/ghostchu/peerbanhelper/config/MainConfigUpdateScript.java

@@ -78,7 +78,7 @@ public void pushProvidersCleanup() {
 
     @UpdateScript(version = 24)
     public void decentralizedConfiguration() {
-        conf.set("decentralized.enabled", true);
+        conf.set("decentralized.enabled", false);
         conf.set("decentralized.kubo-rpc", "/ip4/127.0.0.1/tcp/5001");
         conf.set("decentralized.features.publish-banlist", 3600000);
     }

webui/src/components/alert.vue

@@ -110,6 +110,7 @@ import { Button, Message, Notification } from '@arco-design/web-vue'
 import { computed, h, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRequest } from 'vue-request'
+import Markdown from './markdown.vue'
 const { t, d } = useI18n()
 const visable = ref(false)
 useRequest(