From a824cdc4979c9b70c05b37804d3f9dc2b547d0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=AB=E8=90=BD=E6=97=B6?= <rugtee@outlook.com>
Date: Thu, 21 Nov 2024 11:54:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[fix]=E5=A4=8D=E5=88=B6=E6=BF=80=E6=B4=BB?=
 =?UTF-8?q?=E7=A0=81=E9=A1=B5=E9=9D=A2=E6=BB=9A=E5=8A=A8=E5=88=B0=E5=BA=95?=
 =?UTF-8?q?=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/js/index.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/static/js/index.js b/src/main/resources/static/js/index.js
index 5ef82a9..56ded80 100644
--- a/src/main/resources/static/js/index.js
+++ b/src/main/resources/static/js/index.js
@@ -74,16 +74,22 @@ $(document).ready(function() {
             return navigator.clipboard.writeText(val);
         } else {
             console.log(val);
+            const scrollX = window.scrollX;
             const textArea = document.createElement('textarea')
             textArea.value = val
             // 使text area不在viewport，同时设置不可见
             document.body.appendChild(textArea)
             textArea.focus()
             textArea.select()
-            return new Promise((res, rej) => {
-                document.execCommand('copy') ? res() : rej()
-                textArea.remove()
-            })
+            try {
+                const result = document.execCommand('copy');
+                return result ? Promise.resolve() : Promise.reject();
+            } catch (e) {
+                return Promise.reject(e);
+            } finally {
+                textArea.remove();
+                window.scrollTo(scrollX, 0);
+            }
         }
     };
 

From 02dcc8d7f4c304020558991c9a754761f013f84e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=AB=E8=90=BD=E6=97=B6?= <rugtee@outlook.com>
Date: Thu, 21 Nov 2024 13:10:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[fix]docker=E8=BF=90=E8=A1=8C=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/jetbrains/help/util/FileTools.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/jetbrains/help/util/FileTools.java b/src/main/java/com/jetbrains/help/util/FileTools.java
index 5b78a16..d14b1cd 100644
--- a/src/main/java/com/jetbrains/help/util/FileTools.java
+++ b/src/main/java/com/jetbrains/help/util/FileTools.java
@@ -8,7 +8,7 @@ import org.springframework.boot.system.ApplicationHome;
 import org.springframework.core.io.ClassPathResource;
 
 import java.io.File;
-import java.io.IOException;
+import java.io.InputStream;
 
 public interface FileTools {
 
@@ -30,14 +30,14 @@ public interface FileTools {
         File file = getFile(path);
         if (ObjectUtil.isNotNull(application.getSource())) {
             ClassPathResource classPathResource = new ClassPathResource(path);
-            File classPathFile = FileUtil.file(classPathResource.getPath());
             if (classPathResource.exists() && !file.exists()) {
-                try {
-                    FileUtil.writeFromStream(classPathResource.getInputStream(), classPathFile);
+                try (InputStream inputStream = classPathResource.getInputStream()) {
+                    FileUtil.writeFromStream(inputStream, file);
                 } catch (Exception e) {
-                    throw new IllegalArgumentException(CharSequenceUtil.format("{} File read failed", classPathFile.getPath()), e);
+                    throw new IllegalArgumentException(
+                            CharSequenceUtil.format("{} File read or write failed", path), e
+                    );
                 }
-                FileUtil.copy(classPathFile, file, true);
             }
         }
         return file;