xushengqiang 5 years atrás
parent
commit
b0de7cfb45

+ 2 - 0
src/main/java/cn/efunbox/audio/entity/Album.java

@@ -53,6 +53,8 @@ public class Album implements Serializable {
      */
     private String volume;
 
+    private Integer mediaType;
+
     @Column(name = "product_package")
     private String productPackage;
 

+ 4 - 1
src/main/java/cn/efunbox/audio/impl/AlbumServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigInteger;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * AlbumServiceImpl
@@ -50,7 +51,9 @@ public class AlbumServiceImpl implements AlbumService {
     }
 
     private void fillSearchAlbum(Album album) {
-        album.setId(album.getId());
+        if (Objects.isNull(album.getMediaType())) {
+            album.setMediaType(1);
+        }
         if (StringUtils.isNotBlank(album.getName())) {
             album.setName("%" + album.getName() + "%");
         }

+ 1 - 0
src/main/java/cn/efunbox/audio/impl/AudioServiceImpl.java

@@ -233,6 +233,7 @@ public class AudioServiceImpl implements AudioService {
     private Album fillSearchAlbum(SearchVO searchVO) {
         Album album = new Album();
         album.setId(searchVO.getAlbumId());
+        album.setMediaType(searchVO.getMediaType());
         if (StringUtils.isNotBlank(searchVO.getAlbum())) {
             album.setName("%" + searchVO.getAlbum() + "%");
         }

+ 2 - 2
src/main/java/cn/efunbox/audio/utils/Encrypt.java

@@ -117,8 +117,8 @@ public class Encrypt {
     public static void main(String[] args) {
         Map<String,String> param = new HashMap<>();
         param.put("idChannel","1000");
-        param.put("idDevice","test");
-        String sign = Encrypt.createSHA256Sign(param,"AzaSB2RR0boUz1WQ");
+        param.put("idDevice","acf76362e77441fd8329384345d54156");
+        String sign = Encrypt.createSHA256Sign(param,"IhOTiTyMLDNNLFuP");
         log.info(sign);
     }
 }

+ 30 - 0
src/main/java/cn/efunbox/audio/utils/Test.java

@@ -0,0 +1,30 @@
+package cn.efunbox.audio.utils;
+
+import javazoom.jl.decoder.Bitstream;
+import javazoom.jl.decoder.BitstreamException;
+import javazoom.jl.decoder.Header;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLConnection;
+
+public class Test {
+    public static void main(String[] args) throws IOException, BitstreamException {
+		URL urlfile = new URL("http://sc1.111ttt.com/2015/1/06/06/99060941326.mp3");
+		URLConnection con = null;
+		try {
+			con = urlfile.openConnection();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		int b = con.getContentLength();//
+		BufferedInputStream bis = new BufferedInputStream(con.getInputStream());
+		Bitstream bt = new Bitstream(bis);
+		Header h = bt.readFrame();
+		int time = (int) h.total_ms(b);
+		System.out.println(time / 1000);
+	}
+
+}

+ 1 - 0
src/main/resources/application-dev.properties

@@ -66,4 +66,5 @@ ali.oss.accessKeySecret=YEm1VebbntRIGmV8s8N33LQfOoC2sA
 aliyun.oss.file.prefix=audio/album/
 efunbox.oss.img.url=http://ai-admin.image.ai160.com
 
+#interface.sign.key=IhOTiTyMLDNNLFuP
 interface.sign.key=AzaSB2RR0boUz1WQ