Beta44

Broadcast.go

@@ -3,8 +3,6 @@ package main
 import (
 	"log"
 	"math/rand"
-	"net/http"
-	"net/url"
 	"strconv"
 	"time"
 
@@ -34,7 +32,7 @@ func (task *palworldBroadcast) RunpalworldBroadcast() {
 	log.Println("准备进行全服推送...现已支持所有语言broadcast!")
 	// 初始化RCON客户端
 	address := task.Config.Address + ":" + strconv.Itoa(task.Config.WorldSettings.RconPort)
-	rconClient := NewRconClient(address, task.Config.WorldSettings.AdminPassword, task.BackupTask)
+	rconClient := NewRconClient(address, task.Config.WorldSettings.AdminPassword, task.BackupTask, &task.Config)
 	if rconClient == nil {
 		log.Println("RCON客户端初始化失败,无法进行定期推送,请按教程正确开启rcon和设置服务端admin密码")
 		return
@@ -46,32 +44,6 @@ func (task *palworldBroadcast) RunpalworldBroadcast() {
 
 		// 获取随机选择的消息
 		randomMessage := task.Config.RegularMessages[randomIndex]
-
-		// 根据task.Config.UseDLL来决定发送方式
-		if task.Config.UseDll {
-			// 使用HTTP请求发送消息
-			dllPort, err := strconv.Atoi(task.Config.DllPort)
-			if err != nil {
-				log.Printf("Error converting DllPort from string to int: %v", err)
-				// 處理錯誤，例如返回或設置一個默認值
-				return
-			}
-			base := "http://127.0.0.1:" + strconv.Itoa(dllPort) + "/rcon?text="
-
-			messageText := url.QueryEscape("broadcast " + randomMessage)
-			fullURL := base + messageText
-
-			resp, err := http.Get(fullURL)
-			if err != nil {
-				log.Printf("Error sending HTTP request: %v", err)
-			} else {
-				defer resp.Body.Close()
-				// 这里可以添加对resp的处理逻辑
-				log.Println("Broadcast message sent successfully via HTTP")
-			}
-		} else {
-			// 使用Broadcast函数发送消息
-			Broadcast(randomMessage, rconClient)
-		}
+		Broadcast(randomMessage, rconClient, task.Config.UseDll)
 	}
 }

config/config.go

@@ -64,6 +64,7 @@ type Config struct {
 	EnableEngineSetting       bool               `json:"enableEngineSetting"`       // 是否开启引擎设置
 	EnableBotNotification     bool               `json:"enableBotNotification"`     // 是否开启机器人广播
 	EnableRebootLater         bool               `json:"enableRebootLater"`         // 是否开启延时关闭&重启
+	OverrideDLL               bool               `json:"overrideDLL"`               // 是否由palgo中内置的dll覆盖游戏目录的dll
 }
 
 // 默认配置
@@ -89,6 +90,7 @@ var defaultConfig = Config{
 	AutolaunchWebui:           true,
 	EnableUe4Debug:            false,
 	EnableEngineSetting:       true,
+	OverrideDLL:               true,
 	BackupInterval:            1800,                                                        // 30 分钟
 	MemoryCheckInterval:       30,                                                          // 30 秒
 	MemoryUsageThreshold:      80,                                                          // 80%

front/palworld-front/src/components/PalguardManage.vue

@@ -0,0 +1,189 @@
+<template>
+  <q-page class="q-pa-md">
+    <div class="q-mb-md">
+      <q-btn label="保存配置" color="primary" @click="saveConfig" />
+      <q-btn
+        label="重启服务器"
+        color="negative"
+        @click="restartServer"
+        class="q-ml-md"
+      />
+    </div>
+    <q-form class="q-gutter-md">
+      <q-toggle v-model="config.RCONbase64" label="RCON 基于 Base64" />
+      <q-field label="管理员 IP">
+        <q-chip
+          v-for="(ip, index) in config.adminIPs"
+          :key="index"
+          removable
+          @remove="config.adminIPs.splice(index, 1)"
+        >
+          {{ ip }}
+        </q-chip>
+        <q-input
+          v-model="newAdminIP"
+          dense
+          placeholder="添加新 IP"
+          @keyup.enter="addAdminIP"
+        />
+      </q-field>
+      <q-toggle v-model="config.allowAdminCheats" label="允许管理员作弊" />
+      <q-toggle
+        v-model="config.allowNoSpoilModWhichCanCrashYourServer"
+        label="允许NoSpoil模组（可能会崩溃服务器）"
+      />
+      <q-toggle
+        v-model="config.allowSpawningNPCItems"
+        label="允许生成 NPC 物品"
+      />
+      <q-toggle v-model="config.announceConnections" label="公告连接" />
+      <q-toggle v-model="config.announcePunishments" label="公告惩罚" />
+      <q-field label="禁止的聊天词">
+        <q-chip
+          v-for="(word, index) in config.bannedChatWords"
+          :key="index"
+          removable
+          @remove="config.bannedChatWords.splice(index, 1)"
+        >
+          {{ word }}
+        </q-chip>
+        <q-input
+          v-model="newBannedChatWord"
+          dense
+          placeholder="添加新聊天禁词"
+          @keyup.enter="addBannedChatWord"
+        />
+      </q-field>
+      <q-field label="禁止的玩家昵称">
+        <q-chip
+          v-for="(name, index) in config.bannedNames"
+          :key="index"
+          removable
+          @remove="config.bannedNames.splice(index, 1)"
+        >
+          {{ name }}
+        </q-chip>
+        <q-input
+          v-model="newBannedName"
+          dense
+          placeholder="添加新禁止玩家昵称"
+          @keyup.enter="addBannedName"
+        />
+      </q-field>
+      <q-toggle
+        v-model="config.blockNPCVendorCapture"
+        label="阻止 NPC 商人捕获"
+      />
+      <q-toggle
+        v-model="config.blockTowerBossCapture"
+        label="阻止塔楼 Boss 捕获"
+      />
+      <q-toggle v-model="config.chatBypassWait" label="聊天绕过等待" />
+      <q-toggle v-model="config.isChineseCmd" label="中文命令" />
+      <q-toggle v-model="config.isStealingAllowed" label="允许偷窃" />
+      <q-toggle v-model="config.logChat" label="输出聊天信息日志" />
+      <q-toggle v-model="config.logNetworking" label="输出网络日志" />
+      <q-toggle v-model="config.logRCON" label="输出RCON日志" />
+      <q-input
+        v-model="config.pveMaxToPalBanThreshold"
+        label="PvE 最大宠物封禁阈值"
+        type="number"
+      />
+      <q-input
+        v-model="config.pvpMaxToBuildingDamage"
+        label="PvP 对建筑伤害最大值"
+        type="number"
+      />
+      <q-input
+        v-model="config.pvpMaxToPalDamage"
+        label="PvP 对宠物伤害最大值"
+        type="number"
+      />
+      <q-input
+        v-model="config.pvpMaxToPlayerDamage"
+        label="PvP 对玩家伤害最大值"
+        type="number"
+      />
+      <q-toggle v-model="config.shouldBanCheaters" label="应封禁作弊者" />
+      <q-toggle v-model="config.shouldIPBanCheaters" label="应 IP 封禁作弊者" />
+      <q-toggle v-model="config.shouldKickCheaters" label="应踢出作弊者" />
+      <q-toggle v-model="config.shouldWarnCheaters" label="应警告作弊者" />
+      <q-toggle
+        v-model="config.shouldWarnCheatersReason"
+        label="警告作弊者原因"
+      />
+      <q-toggle v-model="config.steamidProtection" label="Steam ID 保护" />
+      <q-toggle v-model="config.useAdminWhitelist" label="使用管理员白名单" />
+      <q-toggle v-model="config.useWhitelist" label="使用白名单" />
+      <q-input
+        v-model="config.whitelistMessage"
+        label="白名单消息"
+        type="textarea"
+      />
+    </q-form>
+  </q-page>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useQuasar } from 'quasar';
+import axios from 'axios';
+const $q = useQuasar();
+const config = ref({});
+
+onMounted(async () => {
+  try {
+    const response = await axios.get('/api/getpalguardjson', {
+      withCredentials: true,
+    });
+    config.value = response.data;
+    $q.notify({
+      type: 'positive',
+      message: '配置加载成功',
+    });
+  } catch (error) {
+    console.error('Error fetching configuration:', error);
+    $q.notify({
+      type: 'negative',
+      message: '获取配置失败',
+    });
+  }
+});
+
+const saveConfig = async () => {
+  try {
+    await axios.post('/api/savepalguardjson', config.value, {
+      withCredentials: true,
+    });
+    $q.notify({
+      type: 'positive',
+      message: '配置已保存！',
+    });
+  } catch (error) {
+    console.error('Error saving configuration:', error);
+    $q.notify({
+      type: 'negative',
+      message: '保存配置失败',
+    });
+  }
+};
+
+const restartServer = async () => {
+  try {
+    const response = await axios.post(
+      '/api/restart',
+      {},
+      {
+        withCredentials: true,
+      }
+    );
+    if (response.status === 200) {
+      alert('服务器重启命令已发送！');
+    } else {
+      console.error('服务器重启失败：', response.status);
+    }
+  } catch (error) {
+    console.error('Error sending restart command:', error);
+  }
+};
+</script>

front/palworld-front/src/pages/IndexView.vue

@@ -16,6 +16,7 @@
         <q-tab name="server-check" label="主机管理" />
         <q-tab name="save-manage" label="存档管理" />
         <q-tab name="bot-manage" label="机器人管理" />
+        <q-tab name="palguard-manage" label="palguard管理" />
       </q-tabs>
     </q-header>
 
@@ -39,13 +40,13 @@
             @click="restartServer"
             class="q-mt-md"
           />
-           <!-- 答疑按钮 -->
-           <q-btn
-           color="secondary"
-           label="遇到问题,答疑按钮"
-           @click="getGroupLink"
-           class="q-mt-md"
-         />
+          <!-- 答疑按钮 -->
+          <q-btn
+            color="secondary"
+            label="遇到问题,答疑按钮"
+            @click="getGroupLink"
+            class="q-mt-md"
+          />
           <!-- 文本输入框 -->
           <q-input
             filled
@@ -89,6 +90,11 @@
             label="是否开启UE4窗口(关闭可以解决闪退,内存占用问题)"
             class="q-my-md"
           />
+          <q-toggle
+            v-model="config.overrideDLL"
+            label="是否覆盖dll(不开请自己管理palguard和ue4的dll)"
+            class="q-my-md"
+          />
           <q-toggle
             v-model="config.enableEngineSetting"
             label="是否启用引擎配置,部分电脑修改引擎配置会卡顿,可关闭"
@@ -318,20 +324,20 @@
         </div>
       </q-page>
       <q-page padding v-if="tab === 'server'">
-         <!-- 保存按钮 -->
-         <q-btn
-         color="primary"
-         label="保存"
-         @click="saveConfig"
-         class="q-mt-md"
-       />
-       <!-- 重启服务端按钮 -->
-       <q-btn
-         color="secondary"
-         label="重启服务端"
-         @click="restartServer"
-         class="q-mt-md"
-       />
+        <!-- 保存按钮 -->
+        <q-btn
+          color="primary"
+          label="保存"
+          @click="saveConfig"
+          class="q-mt-md"
+        />
+        <!-- 重启服务端按钮 -->
+        <q-btn
+          color="secondary"
+          label="重启服务端"
+          @click="restartServer"
+          class="q-mt-md"
+        />
         <!-- 服务端配置修改页面内容 -->
         <div class="q-gutter-xs q-mt-md">
           <div class="text-subtitle2">服务端配置修改</div>
@@ -1056,6 +1062,10 @@
       <q-page padding v-if="tab === 'bot-manage'">
         <bot-manage />
       </q-page>
+      <!-- palguard管理组件 -->
+      <q-page padding v-if="tab === 'palguard-manage'">
+        <palguard-manage />
+      </q-page>
     </q-page-container>
   </q-layout>
 </template>
@@ -1070,13 +1080,16 @@
 import SaveManage from 'components/SaveManage.vue';
 import BotManage from 'components/BotManage.vue';
 import BanManage from 'components/BanManage.vue';
+import PalguardManage from 'components/PalguardManage.vue';
+
+const $q = useQuasar();
 
 //给components传递数据
 const props = defineProps({
   uin: Number,
 });
 
 const players = ref([]);
 
 const status = ref(null); // 假设 ProcessInfo 是一个对象，这里使用 null 作为初始值
 
@@ -1090,11 +1103,11 @@
 const showDifficultyTooltip = ref(false);
 const showDeathPenaltyTooltip = ref(false);
 
 const toggleTooltip = (type) => {
   showDeathPenaltyTooltip.value = !showDeathPenaltyTooltip.value;
 };
 
 const toggleTooltip2 = (type) => {
   showDifficultyTooltip.value = !showDifficultyTooltip.value;
 };
 
@@ -1146,7 +1159,6 @@
 }
 
 onMounted(async () => {
-  const $q = useQuasar();
   try {
     const response = await axios.get('/api/getjson', {
       withCredentials: true, // 确保携带 cookie
@@ -1166,7 +1178,6 @@
 });
 
 const saveConfig = async () => {
-  const $q = useQuasar();
   try {
     await axios.post('/api/savejson', config.value, {
       withCredentials: true, // 确保携带 cookie

memorycheck.go

@@ -73,7 +73,7 @@ func (task *MemoryCheckTask) checkMemory() {
 		log.Printf("Memory usage is above %v%%. Running clean command.", threshold)
 		// 初始化RCON客户端
 		address := task.Config.Address + ":" + strconv.Itoa(task.Config.WorldSettings.RconPort)
-		rconClient := NewRconClient(address, task.Config.WorldSettings.AdminPassword, task.BackupTask)
+		rconClient := NewRconClient(address, task.Config.WorldSettings.AdminPassword, task.BackupTask, &task.Config)
 		if rconClient == nil {
 			log.Println("RCON客户端初始化失败,无法处理内存使用情况,请按教程正确开启rcon和设置服务端admin密码")
 			return