更新版本号
更新fastjson版本 修复分享文件点确定没反应的bug 删除一处多余日志
This commit is contained in:
parent
1497d11754
commit
4524b6f2c3
2
pom.xml
2
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>
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
})
|
||||
}
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user