From 4524b6f2c328830e288c67d2b70c617c51451323 Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Thu, 6 Jan 2022 02:51:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=20=E6=9B=B4=E6=96=B0fastjson=E7=89=88=E6=9C=AC=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=88=86=E4=BA=AB=E6=96=87=E4=BB=B6=E7=82=B9=E7=A1=AE?=
 =?UTF-8?q?=E5=AE=9A=E6=B2=A1=E5=8F=8D=E5=BA=94=E7=9A=84bug=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=B8=80=E5=A4=84=E5=A4=9A=E4=BD=99=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                             | 2 +-
 src/main/java/com/yutou/tools/ToolsApplication.java | 2 +-
 src/main/java/com/yutou/tools/nas/NasManager.java   | 9 ++++++---
 web/html/body/nas/music.html                        | 2 ++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index aaf8549..e2fd69e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.78</version>
+            <version>1.2.79</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.jcraft/jsch -->
         <dependency>
diff --git a/src/main/java/com/yutou/tools/ToolsApplication.java b/src/main/java/com/yutou/tools/ToolsApplication.java
index c771163..bb5f812 100644
--- a/src/main/java/com/yutou/tools/ToolsApplication.java
+++ b/src/main/java/com/yutou/tools/ToolsApplication.java
@@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class ToolsApplication {
-    public static final String version="1.4.2";
+    public static final String version="1.4.3";
 
     public static void main(String[] args) {
         System.out.println("当前版本号:" + version);
diff --git a/src/main/java/com/yutou/tools/nas/NasManager.java b/src/main/java/com/yutou/tools/nas/NasManager.java
index ed37a1b..13b0d93 100644
--- a/src/main/java/com/yutou/tools/nas/NasManager.java
+++ b/src/main/java/com/yutou/tools/nas/NasManager.java
@@ -26,7 +26,12 @@ import java.util.UUID;
 
 @Controller
 public class NasManager {
-    public static final String NasUrl="http://yutou233.cn";
+    public static String NasUrl="http://yutou233.cn";
+    static {
+        if ("dev".equals(ConfigTools.load(ConfigTools.CONFIG, "model"))) {
+            NasUrl="http://192.168.31.88";
+        }
+    }
     @Resource
     NasAdminAddressDao adminAddressDao;
 
@@ -203,7 +208,6 @@ public class NasManager {
         JSONObject _data = JSONObject.parseObject(data);
         if (_data.getInteger("code") == 1) {
             RedisTools.set(token, data, 3600);
-            System.out.println("设置分享token:" + token + " -> " + data);
             _data.put("token", token);
         }
         json.clear();
@@ -224,7 +228,6 @@ public class NasManager {
                 url = "http://" + UpdateIp.nas_ip + ":8000";
             }
             String _json = HttpTools.get(url + "/nas/music/playShare.do?token=" + JSONObject.parseObject(redis).getJSONObject("data").getString("share"));
-            System.out.println(_json);
             JSONObject item = JSONObject.parseObject(_json);
             if (item.getInteger("code") == 0) {
                 json.put("code", 0);
diff --git a/web/html/body/nas/music.html b/web/html/body/nas/music.html
index 1a51367..12b6852 100644
--- a/web/html/body/nas/music.html
+++ b/web/html/body/nas/music.html
@@ -190,6 +190,8 @@
                                 layer.prompt({
                                     title:"分享链接",
                                     value:"http://"+window.location.host+"/html/body/nas/music.html?share="+json.data.token
+                                },function (value,index,elem){
+                                    layer.close(index);
                                 })
                             }
                         })