JavaWeb/web_toolset
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

更新版本号

Browse Source 
更新fastjson版本
修复分享文件点确定没反应的bug
删除一处多余日志
This commit is contained in:
Yutousama 2022-01-06 02:51:37 +08:00
parent 1497d11754
commit 4524b6f2c3
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -82,7 +82,7 @@
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>1.2.78</version> <version>1.2.79</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.jcraft/jsch --> <!-- https://mvnrepository.com/artifact/com.jcraft/jsch -->
<dependency> <dependency>

2
src/main/java/com/yutou/tools/ToolsApplication.java
View File

@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication @SpringBootApplication
public class ToolsApplication { 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) { public static void main(String[] args) {
System.out.println("当前版本号:" + version); System.out.println("当前版本号:" + version);

9
src/main/java/com/yutou/tools/nas/NasManager.java
View File

@ -26,7 +26,12 @@ import java.util.UUID;
@Controller @Controller
public class NasManager { 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 @Resource
NasAdminAddressDao adminAddressDao; NasAdminAddressDao adminAddressDao;
@ -203,7 +208,6 @@ public class NasManager {
JSONObject _data = JSONObject.parseObject(data); JSONObject _data = JSONObject.parseObject(data);
if (_data.getInteger("code") == 1) { if (_data.getInteger("code") == 1) {
RedisTools.set(token, data, 3600); RedisTools.set(token, data, 3600);
System.out.println("设置分享token:" + token + " -> " + data);
_data.put("token", token); _data.put("token", token);
} }
json.clear(); json.clear();
@ -224,7 +228,6 @@ public class NasManager {
url = "http://" + UpdateIp.nas_ip + ":8000"; url = "http://" + UpdateIp.nas_ip + ":8000";
} }
String _json = HttpTools.get(url + "/nas/music/playShare.do?token=" + JSONObject.parseObject(redis).getJSONObject("data").getString("share")); 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); JSONObject item = JSONObject.parseObject(_json);
if (item.getInteger("code") == 0) { if (item.getInteger("code") == 0) {
json.put("code", 0); json.put("code", 0);

2
web/html/body/nas/music.html
View File

@ -190,6 +190,8 @@
layer.prompt({ layer.prompt({
title:"分享链接", title:"分享链接",
value:"http://"+window.location.host+"/html/body/nas/music.html?share="+json.data.token value:"http://"+window.location.host+"/html/body/nas/music.html?share="+json.data.token
},function (value,index,elem){
layer.close(index);
}) })
} }
}) })