diff --git a/pom.xml b/pom.xml
index aaf8549..e2fd69e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
com.alibaba
fastjson
- 1.2.78
+ 1.2.79
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);
})
}
})