Merge pull request #4 from xelloss00x/main

[feature] [1.1.0.0]

Author: wisdom555

CHANGELOG.md

@@ -11,4 +11,10 @@
 
 [1.0.1.1] - 2021-01-27
 
-* 优化OPPO获取AuthToken的机制
+* 优化OPPO获取AuthToken的机制
+
+[1.1.0.0] - 2021-02-04
+
+* 去除org.reflections.reflections依赖，涉及到使用reflections工具的地方自己实现
+* 调用XM和OP上传接口上传失败后，XM和OP的返回信息完整输出到返回结果的data中
+* XM的图片上传接口由/media/upload/smallIcon调整为/media/upload/image

README.md

@@ -11,7 +11,7 @@
 <dependency>
     <groupId>com.getui.push</groupId>
     <artifactId>getui-3rd-push-utils</artifactId>
-    <version>1.0.0.0</version>
+    <version>1.1.0.0</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.getui.push</groupId>
     <artifactId>getui-3rd-push-utils</artifactId>
-    <version>1.0.1.1</version>
+    <version>1.1.0.0</version>
     <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -60,11 +60,6 @@
             <artifactId>logback-classic</artifactId>
             <version>1.1.7</version>
         </dependency>
-        <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <version>0.9.11</version>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/com.github.ben-manes.caffeine/caffeine -->
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>

src/main/java/com/getui/gtps/manufacturer/ManufacturerFactory.java

@@ -3,7 +3,8 @@
 import com.getui.gtps.config.CommonConfig;
 import com.getui.gtps.config.GtSDKConstants;
 import com.getui.gtps.exception.AuthFailedException;
-import org.reflections.Reflections;
+import com.getui.gtps.manufacturer.oppo.OppoService;
+import com.getui.gtps.manufacturer.xm.XmService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,6 +15,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -39,6 +41,13 @@ public class ManufacturerFactory {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ManufacturerFactory.class);
 
+    private static final Set<Class<? extends BaseManufacturer>> subTypes = new HashSet<Class<? extends BaseManufacturer>>() {
+        {
+            add(XmService.class);
+            add(OppoService.class);
+        }
+    };
+
     /**
      * 手动配置线程执行器的线程池大小，线程数请结合BaseManufacturer子类梳理调节
      */
@@ -68,8 +77,6 @@ public static synchronized void init() {
      * 多厂商服务实例初始化
      */
     private static void initManufacturersInstance() {
-        Reflections reflections = new Reflections(BaseManufacturer.class.getPackage().getName());
-        Set<Class<? extends BaseManufacturer>> subTypes = reflections.getSubTypesOf(BaseManufacturer.class);
         subTypes.forEach(clazz -> {
             String name = "";
             try {

src/main/java/com/getui/gtps/manufacturer/oppo/OppoService.java

@@ -151,7 +151,7 @@ private Result uploadIcon(File file, String cacheKey) {
                 } else if (OppoConstants.ReturnCode.InvalidAuthCode.getCode() == returnCode) {
                     return Result.invalidAuthToken();
                 } else {
-                    return Result.fail(jsonNode.get("message").textValue());
+                    return Result.fail(jsonNode.toString());
                 }
             } catch (JsonProcessingException e) {
                 LOGGER.error("OppoService uploadIcon error. ", e);
@@ -191,7 +191,7 @@ private Result uploadPic(File file, String cacheKey) {
                 } else if (OppoConstants.ReturnCode.InvalidAuthCode.getCode() == returnCode) {
                     return Result.invalidAuthToken();
                 } else {
-                    return Result.fail(jsonNode.get("message").textValue());
+                    return Result.fail(jsonNode.toString());
                 }
             } catch (JsonProcessingException e) {
                 LOGGER.error("OppoService uploadIcon error. ", e);

src/main/java/com/getui/gtps/manufacturer/xm/XmService.java

@@ -71,17 +71,19 @@ private Result uploadIcon(File file, String cacheKey) {
         Map<String, String> headParameters = new HashMap<>();
         headParameters.put("Authorization", "key=" + this.getAppSecret());
         Map<String, String> requestParameters = new HashMap<>();
-        HttpResponse httpResponse = HttpUtils.postFile(XmConstants.RequestPath.UPLOAD_ICON.getPath(), headParameters, requestParameters, file, CommonConfig.callTimeout);
+        requestParameters.put("is_global", "false");
+        requestParameters.put("is_icon", "true");
+        HttpResponse httpResponse = HttpUtils.postFile(XmConstants.RequestPath.UPLOAD_PIC.getPath(), headParameters, requestParameters, file, CommonConfig.callTimeout);
         LOGGER.info("XmService uploadIcon httpResponse: {}", httpResponse.toString());
         if (httpResponse.success()) {
             try {
                 JsonNode jsonNode = new ObjectMapper().readTree(httpResponse.getContent());
                 if (0 == jsonNode.get("code").intValue()) {
-                    String url = jsonNode.get("data").get("small_icon_url").textValue();
+                    String url = jsonNode.get("data").get("icon_url").textValue();
                     this.cacheMap.put(ICON_URL, CacheServiceFactory.getCacheService(CaffeineCacheService.class).set(cacheKey, url));
                     return Result.success(url);
                 } else {
-                    return Result.fail(jsonNode.get("description").textValue());
+                    return Result.fail(jsonNode.toString());
                 }
             } catch (JsonProcessingException e) {
                 LOGGER.error("XmService uploadIcon error. ", e);
@@ -113,7 +115,7 @@ private Result uploadPic(File file, String cacheKey) {
                     this.cacheMap.put(PIC_URL, CacheServiceFactory.getCacheService(CaffeineCacheService.class).set(cacheKey, url));
                     return Result.success(url);
                 } else {
-                    return Result.fail(jsonNode.get("description").textValue());
+                    return Result.fail(jsonNode.toString());
                 }
             } catch (JsonProcessingException e) {
                 LOGGER.error("XmService uploadIcon error. ", e);