diff --git a/pom.xml b/pom.xml
index 798a269..ca0a9f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,11 +6,11 @@
com.qiwenshare
qiwenshare
- 1.2.1
+ 1.2.2
qiwen-file
- 1.2.1-SNAPSHOT
+ 1.2.2-SNAPSHOT
qiwen-file
pan.qiwenshare.com
jar
@@ -35,7 +35,6 @@
org.springdoc
springdoc-openapi-ui
- 1.6.1
@@ -55,10 +54,6 @@
mysql-connector-java
runtime
-
- cn.hutool
- hutool-all
-
@@ -109,7 +104,6 @@
commons-io
commons-io
- 2.11.0
@@ -117,20 +111,10 @@
jaudiotagger
-
- com.github.stuxuhai
- jpinyin
-
-
-
-
-
-
-
org.apache.maven.plugins
@@ -192,6 +176,7 @@
+
diff --git a/src/main/java/com/qiwenshare/file/aop/WebLogAcpect.java b/src/main/java/com/qiwenshare/file/aop/WebLogAcpect.java
index 4e52212..4301944 100644
--- a/src/main/java/com/qiwenshare/file/aop/WebLogAcpect.java
+++ b/src/main/java/com/qiwenshare/file/aop/WebLogAcpect.java
@@ -5,7 +5,6 @@ import com.qiwenshare.common.result.RestResult;
import com.qiwenshare.common.util.security.JwtUser;
import com.qiwenshare.common.util.security.SessionUtil;
import com.qiwenshare.file.api.IOperationLogService;
-import com.qiwenshare.file.api.IUserService;
import com.qiwenshare.file.util.OperationLogUtil;
import com.qiwenshare.file.vo.user.UserLoginVo;
import org.aspectj.lang.JoinPoint;
diff --git a/src/main/java/com/qiwenshare/file/component/AsyncTaskComp.java b/src/main/java/com/qiwenshare/file/component/AsyncTaskComp.java
index f8c17bd..c454de4 100644
--- a/src/main/java/com/qiwenshare/file/component/AsyncTaskComp.java
+++ b/src/main/java/com/qiwenshare/file/component/AsyncTaskComp.java
@@ -190,6 +190,7 @@ public class AsyncTaskComp {
saveUserFile.setFileName(fileName);
userFileMapper.insert(saveUserFile);
}
+ fileDealComp.restoreParentFilePath(qiwenFile, userFile.getUserId());
return new AsyncResult("saveUnzipFile");
}
diff --git a/src/main/java/com/qiwenshare/file/component/FileDealComp.java b/src/main/java/com/qiwenshare/file/component/FileDealComp.java
index 4ec7ed6..54117d6 100644
--- a/src/main/java/com/qiwenshare/file/component/FileDealComp.java
+++ b/src/main/java/com/qiwenshare/file/component/FileDealComp.java
@@ -5,11 +5,8 @@ import cn.hutool.core.util.IdUtil;
import co.elastic.clients.elasticsearch.ElasticsearchClient;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.github.stuxuhai.jpinyin.PinyinException;
-import com.github.stuxuhai.jpinyin.PinyinFormat;
-import com.github.stuxuhai.jpinyin.PinyinHelper;
import com.qiwenshare.common.util.DateUtil;
-import com.qiwenshare.common.util.HttpsUtils;
+import com.qiwenshare.common.util.MusicUtils;
import com.qiwenshare.file.api.IShareFileService;
import com.qiwenshare.file.api.IShareService;
import com.qiwenshare.file.api.IUserService;
@@ -400,7 +397,7 @@ public class FileDealComp {
downloadFile.getOssClient().shutdown();
}
fileBean.setFileUrl(fileUrl);
- fileBean.setFileId(null);
+ fileBean.setFileId(IdUtil.getSnowflakeNextIdStr());
fileMapper.insert(fileBean);
userFile.setFileId(fileBean.getFileId());
userFile.setUploadTime(DateUtil.getCurrentTime());
@@ -527,7 +524,8 @@ public class FileDealComp {
if (StringUtils.isEmpty(music.getLyrics())) {
try {
- String lyc = getLyc(music.getArtist(), music.getTitle());
+
+ String lyc = MusicUtils.getLyc(music.getArtist(), music.getTitle(), music.getAlbum());
music.setLyrics(lyc);
} catch (Exception e) {
log.info(e.getMessage());
@@ -548,87 +546,4 @@ public class FileDealComp {
}
}
- public String getLyc(String singerName, String mp3Name) {
- Map headMap = new HashMap<>();
- headMap.put("Referer", "https://y.qq.com/");
- String s = HttpsUtils.doGetString("https://c.y.qq.com/splcloud/fcgi-bin/smartbox_new.fcg?_=1651992748984&cv=4747474&ct=24&format=json&inCharset=utf-8&outCharset=utf-8¬ice=0&platform=yqq.json&needNewCode=1&uin=0&g_tk_new_20200303=5381&g_tk=5381&hostUin=0&is_xml=0&key=" + mp3Name.replaceAll(" ", ""), headMap);
- Map map = JSON.parseObject(s, Map.class);
- Map data = (Map) map.get("data");
- Map song = (Map) data.get("song");
- List