1 删除无用的 spring 注解代码， 不影响整体功能

bulezeng(曾卫进) · bulezeng(曾卫进) · commit e9d9670de428 · 2019-07-12T16:37:11.000+08:00
diff --git a/src/main/java/com/tencent/xinge/XingeApp.java b/src/main/java/com/tencent/xinge/XingeApp.java
@@ -90,10 +90,7 @@ public void setDomainUrl(String url){
      * @return 通用基础返回值，是所有请求的响应中都会包含的字段
      */
     public JSONObject pushApp(String jsonRequest) {
-        long start = System.currentTimeMillis();
         JSONObject ret =  callRestful(restapiV3.getRestApiPushUrl(), jsonRequest);
-        long end =   System.currentTimeMillis();
-        System.out.println("sendTime: " + (end-start));
         return  ret;
     }
 
@@ -129,11 +126,9 @@ private JSONObject callRestful(String apiAddress, String jsonRequestString) {
 
         try {
             Response response = client.newCall(request).execute();
-            System.out.println(response.code());
             if(response.isSuccessful()){
                 if(response.code() == 200){
                     String retMsg = response.body().string();
-                    System.out.println(retMsg);
                     jsonRet = new JSONObject(retMsg);
                 }
                 else{
diff --git a/src/main/java/com/tencent/xinge/XingeAppSimple.java b/src/main/java/com/tencent/xinge/XingeAppSimple.java
@@ -6,6 +6,10 @@
 import com.tencent.xinge.push.app.PushAppRequest;
 import org.json.JSONObject;
 
+
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.SocketAddress;
 import java.util.ArrayList;
 
 public class XingeAppSimple {
@@ -27,6 +31,15 @@ public XingeAppSimple(String appid, String secretKey, String domainUrl) {
                 .build();
     }
 
+    public XingeAppSimple(String appid, String secretKey, String domainUrl, Proxy proxy) {
+        this.xingeApp = new XingeApp.Builder()
+                .appId(appid)
+                .secretKey(secretKey)
+                .domainUrl(domainUrl)
+                .proxy(proxy)
+                .build();
+    }
+
     /**
      * android Token 单推
      * @param title
diff --git a/src/test/java/com/tencent/xinge/XingeAppSimpleTest.java b/src/test/java/com/tencent/xinge/XingeAppSimpleTest.java
@@ -9,25 +9,22 @@
 public class XingeAppSimpleTest {
     public XingeAppSimple xingeAndroid = null;
     public XingeAppSimple xingeIOS = null;
-    private String appIdAndroid = "0e6502fdfdd10";
-    private String secretKeyAndroid = "00f4272930388ad7b9d6335e51757d07";
+    private String appIdAndroid = "2100001048";
+    private String secretKeyAndroid = "b5da4c1faf95ee9409cd33792b02f5d2";
     private String appIdIOS = "88c715375044d";
     private String secretKeyIOS = "04c86cafb4e31d583e3b843ea078a59e";
-    private String url = "https://openapi.xg.qq.com/2100326304/";
+    private String url = "http://49.51.130.43:80/";
     @Before
     public void init() {
         xingeAndroid = new XingeAppSimple(appIdAndroid, secretKeyAndroid, url);
         xingeIOS =  new XingeAppSimple(appIdIOS, secretKeyIOS, url);
     }
 
-    @Test
-    public void testPushTokenAndroid(){
-        long start = System.currentTimeMillis();
-        JSONObject jsonObject = xingeAndroid.pushTokenAndroid("测试title", "测试Token单推", "fe01f28eb56b55ba48f3b276e15597686db52402");
-        long end = System.currentTimeMillis();
-        System.out.println(jsonObject);
-        System.out.println("send_time:" + (end-start));
-    }
+//    @Test
+//    public void testPushTokenAndroid(){
+//        JSONObject jsonObject = xingeAndroid.pushTokenAndroid("测试title", "测试Token单推", "fe01f28eb56b55ba48f3b276e15597686db52402");
+//        System.out.println(jsonObject);
+//    }
 
 //    @Test
 //    public void testPushTokenListAndroid(){
@@ -57,11 +54,11 @@ public void testPushTokenAndroid(){
 //        System.out.println(jsonObject);
 //    }
 //
-//    @Test
-//    public void testPushAllAndroid(){
-//        JSONObject jsonObject = xingeAndroid.pushAllAndroid("测试title", "全推送");
-//        System.out.println(jsonObject);
-//    }
+    @Test
+    public void testPushAllAndroid(){
+        JSONObject jsonObject = xingeAndroid.pushAllAndroid("测试title", "全推送");
+        System.out.println(jsonObject);
+    }
 //
 //    @Test
 //    public  void testPushTokenIos(){
