Merge pull request #9 from Bin0524/master

pom.xml

@@ -16,7 +16,7 @@
         <java.target.version>1.7</java.target.version>
         <spring.version>5.1.4.RELEASE</spring.version>
         <org.slf4j.version>1.7.12</org.slf4j.version>
-        <jackson.version>2.9.8</jackson.version>
+        <jackson.version>2.10.0</jackson.version>
         <metrics.version>3.0.2</metrics.version>
     </properties>
     <!-- https://mvnrepository.com/artifact/com.codahale.metrics/metrics-core -->
@@ -413,7 +413,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.18</version>
+            <version>1.19</version>
         </dependency>
 
         <dependency>

src/main/java/com/qunar/qfproxy/controller/EmoDownloadController.java

@@ -5,6 +5,7 @@
 import com.qunar.qfproxy.constants.StorageConfig;
 import com.qunar.qfproxy.model.EmoPackConf;
 import com.qunar.qfproxy.service.DownloadService;
+import com.qunar.qfproxy.utils.ErrorCodeUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,8 +18,10 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.PrintWriter;
 
 /**
  * EmoDownloadController
@@ -50,6 +53,41 @@ public void downloadEmotions(@PathVariable(value = "packageName") String package
             LOGGER.error("emo download fail", e);
         }
     }
+    @RequestMapping("/d/e/{packageKey}/{shortcut}/{typeName}")
+    @ResponseBody
+    public void downloadEmotion(@PathVariable(value = "packageKey") String packageKey,
+                                @PathVariable(value = "shortcut") String shortcut,
+                                @PathVariable(value = "typeName") String typeName,
+                                HttpServletRequest request,
+                                HttpServletResponse response) {
+        StringBuilder emoPostion = new StringBuilder();
+        emoPostion.append(StorageConfig.SWIFT_FOLDER_EMO_PACKAGE).append(packageKey).append("/");
+        try {
+            File files = new File(emoPostion.toString());
+            String[] names = files.list();    //获取目录所有文件和路径,并以字符串数组返回
+            boolean findFlag = false;
+            for (String name : names) {
+                if (name.startsWith(shortcut + ".")) {
+                    emoPostion.append(name);
+                    findFlag = true;
+                    break;
+                }
+            }
+            if (!findFlag) {
+                response.reset();
+                response.setContentType("text/plain;charset=utf-8");
+                PrintWriter writer = response.getWriter();
+                writer.write("error: file not exist! 文件不存在");
+                writer.flush();
+                return;
+            }
+            downloadService.downloadService(emoPostion.toString(), request, response);
+
+        } catch (IOException e) {
+            ErrorCodeUtil.catchExceptionAndSet(request, response, e);
+            LOGGER.error("download emotion error,packageKey:{},shortcut:{},typeName:{}", packageKey, shortcut, typeName, e);
+        }
+    }
 
     @RequestMapping("/d/e/{key:.*}")
     @ResponseBody
@@ -61,7 +99,7 @@ public void downloadEmotion(
         downloadService.downloadService(fileName, request, response);
     }
 
-    @RequestMapping("/d/getEmoConfig")
+    @RequestMapping("/d/e/config")
     @ResponseBody
     public Object getPackageName() {
         LOGGER.info("download the emoConfig");

src/main/resources/emoConfig.json

@@ -1,66 +1,5 @@
 {"data":[
     {
-      "pkgid": "niutuo",
-      "name": "牛驼表情",
-      "file": "http://ip:8080/file/v1/emo/d/z/niutuo",
-      "desc": "扩展表情包,下载后可显示牛驼表情",
-      "thumb": "http://ip:8080/file/v1/emo/d/e/niutuo_conver.gif",
-      "file_size": 881014,
-      "md5": "9ADCB1773831F2D36462F34CD3464646"
-    },
-    {
-      "pkgid": "doctorchen",
-      "name": "陈老师推荐",
-      "file": "hhttp://ip:8080/file/v1/emo/d/e/doctorchen_conver.gif",
-      "desc": "扩展表情",
-      "thumb": "http://ip:8080/file/v1/emo/d/e/doctorchen/0130697f45216566d78644368e3f08ba/org",
-      "file_size": 1200630,
-      "md5": "5AAB182B3A53E3C3D38CCB448126A5D2"
-    },
-    {
-      "pkgid": "4018",
-      "name": "王老师推荐",
-      "file": "http://ip:8080/file/v1/emo/d/z/4018",
-      "desc": "扩展表情",
-      "thumb": "http://ip:8080/file/v1/emo/d/e/4018_conver.gif",
-      "file_size": 186888,
-      "md5": "DBE284FB24935457B2A91146BB12803F"
-    },
-    {
-      "pkgid": "mop",
-      "name": "猫扑",
-      "file": "http://ip:8080/file/v1/emo/d/z/mop",
-      "desc": "扩展表情",
-      "thumb": "http://ip:8080/file/v1/emo/d/e/mop_conver.gif",
-      "file_size": 2126926,
-      "md5": "93AF1D7AA020BA5B96F4A4DE5B3FDC8F"
-    },
-    {
-      "pkgid": "SmallCamel",
-      "name": "小驼表情",
-      "file": "http://ip:8080/v1/emo/d/z/SmallCamel",
-      "desc": "扩展表情",
-      "thumb": "http://ip:8080/v1/emo/d/e/SmallCamel_conver.png",
-      "file_size": 109759,
-      "md5": "4F0E096B614BB4B6AD65394A26B06687"
-    },
-    {
-      "pkgid": "Hotel_Camel",
-      "name": "小骆驼-酒店",
-      "file": "http://ip:8080/file/v1/emo/d/z/Hotel_Camel",
-      "desc": "扩展表情",
-      "thumb": "http://ip:8080/file/v1/emo/d/e/Hotel_Camel_conver.gif",
-      "file_size": 109759,
-      "md5": "4F0E096B614BB4B6AD65394A26B06687"
-    },
-    {
-      "pkgid": "qunar_camel",
-      "name": "去哪儿小驼",
-      "file": "http://ip:8080/file/v1/emo/d/z/qunar_camel",
-      "desc": "扩展表情",
-      "thumb": "http://ip:8080/file/v1/emo/d/e/qunar_camel_conver.png",
-      "file_size": 663327,
-      "md5": "7b3f8d97c381070c09cdb08d728eea01"
     }
   ]
 }