fix kkp and logoff out error

eiriksgata · Jan 31, 2024 · 9fe6bed · 9fe6bed
1 parent 79442f0
commit 9fe6bed
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/src/main/java/com/github/eiriksgata/rulateday/platform/config/WebPathConfig.java b/src/main/java/com/github/eiriksgata/rulateday/platform/config/WebPathConfig.java
@@ -16,7 +16,7 @@ public class WebPathConfig implements WebMvcConfigurer {
     /*
      * 文件默认存储位置
      */
-    public static String DEFAULT_FILE_PATH = System.getProperty("user.dir") + "/resources";
+    public static String DEFAULT_FILE_PATH = "resources";
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {

diff --git a/...java/com/github/eiriksgata/rulateday/platform/dice/instruction/MessageRecordInstruct.java b/...java/com/github/eiriksgata/rulateday/platform/dice/instruction/MessageRecordInstruct.java
@@ -87,7 +87,7 @@ public String closeGroupRecord(DiceMessageDTO data) {
             //TODO：上传文件API
             String fileName = chatRecordService.recordFileUpload(data.getMessageEvent().getGroup_id());
 
-            String resultText = CustomText.getText("chat.record.close") + "\n" + "http://localhost:12030/server/resources/chat/record/" + fileName;
+            String resultText = CustomText.getText("chat.record.close") + "\n" + GlobalData.configData.getString("server-address") +"/resources/chat/record/" + fileName;
             shamrockService.sendGroupMessage(data.getSanderId(), data.getMessageEvent().getGroup_id(), resultText, data.getWsServerEndpoint());
             GlobalData.groupChatRecordEnableMap.remove(data.getMessageEvent().getGroup_id() + "");
             GlobalData.groupChatRecordDataMap.remove(data.getMessageEvent().getGroup_id() + "");

diff --git a/...ava/com/github/eiriksgata/rulateday/platform/dice/service/impl/ChatRecordServiceImpl.java b/...ava/com/github/eiriksgata/rulateday/platform/dice/service/impl/ChatRecordServiceImpl.java
@@ -35,7 +35,7 @@ public void groupRecordHandler(DiceMessageDTO data) {
 
                 String filename = recordFileUpload(data.getMessageEvent().getGroup_id());
                 String resultText = CustomText.getText("chat.record.close") + "\n" +
-                        "http://localhost:12030/server/resources/chat/record/" + filename;
+                        GlobalData.configData.getString("server-address") + "/resources/chat/record/" + filename;
                 shamrockService.sendGroupMessage(
                         data.getSanderId(),
                         data.getMessageEvent().getGroup_id(),

diff --git a/...m/github/eiriksgata/rulateday/platform/dice/service/impl/RandomPictureApiServiceImpl.java b/...m/github/eiriksgata/rulateday/platform/dice/service/impl/RandomPictureApiServiceImpl.java
@@ -1,5 +1,6 @@
 package com.github.eiriksgata.rulateday.platform.dice.service.impl;
 
+import com.github.eiriksgata.rulateday.platform.dice.config.GlobalData;
 import com.github.eiriksgata.rulateday.platform.dice.dto.DiceMessageDTO;
 import com.github.eiriksgata.rulateday.platform.dice.service.RandomPictureApiService;
 import com.github.eiriksgata.rulateday.platform.utils.FileUtil;
@@ -24,9 +25,11 @@ public class RandomPictureApiServiceImpl implements RandomPictureApiService {
     public String urlEncodeAPI(DiceMessageDTO data, String url) {
         List<MessageContent> messageContentList = new ArrayList<>();
         String fileName = UUID.randomUUID() + ".jpg";
+
+        String address = GlobalData.configData.getString("server-address");
         try {
             FileUtil.downLoadFromUrl(url, "resources/images/" + fileName);
-            String serverUrl = "http://10.0.2.2:16467/resources/images/" + fileName;
+            String serverUrl = address + "/resources/images/" + fileName;
             messageContentList.add(new MessageContent().setTypeByImages(serverUrl));
 
             if (data.getMessageEvent().getSub_type().equals(EventEnum.MessageSubType.FRIEND.getName())) {

diff --git a/src/main/resources/application-config.yaml b/src/main/resources/application-config.yaml
@@ -1,6 +1,4 @@
 server:
   port: 16467
 
-resource:
-  path:
 
diff --git a/src/main/resources/application-security.yml b/src/main/resources/application-security.yml
@@ -1,3 +1,3 @@
 control-platform:
   security:
-    antMatchers: /webjars/**,/doc.html,/swagger-resources,/v2/**,/ws/**,/resources/chat/record/**,/resources/images/**
+    antMatchers: /webjars/**,/doc.html,/swagger-resources,/v2/**,/ws/**,/resources/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -40,4 +40,7 @@ pagehelper:
 
 robot:
   open:
-    register: true
+    register: true
+
+resource:
+  path:
diff --git a/src/main/resources/config.json b/src/main/resources/config.json
@@ -1,5 +1,5 @@
 {
-  "file.version": "1.0.6",
+  "file.version": "1.0.8",
   "master.QQ.number": "",
   "auto.accept.friend.request": true,
   "auto.accept.group.request": true,
@@ -9,6 +9,7 @@
     "remote": true,
     "userId": ""
   },
+  "server-address": "http://localhost:8089",
   "instructions.prefix.list": [
     ".",
     "。"