Merge branch 'master' of ssh://192.168.8.213:10022/miaxis/zzjs

zzjs-admin/src/main/resources/application-dev.yml

@@ -92,6 +92,11 @@ app:
     appid: wx8f43db501343feab
     secret: 3509a81880669ffa6fa554b2aa050351
 
+# 极速云助手微信公众号
+gzh:
+    appid: "wxff332e2f6da86bf9"
+    secret: "65f267dcb2e387f7caf651a80a118253"
+
 # 腾讯cos
 cos:
     secretId: AKIDwISNOFsJXYGjy89FJI9UnzuZFgTtRgFe

zzjs-admin/src/main/resources/application-prod.yml

@@ -92,6 +92,11 @@ app:
     appid: wx8f43db501343feab
     secret: 3509a81880669ffa6fa554b2aa050351
 
+# 极速云助手微信公众号
+gzh:
+    appid: wxff332e2f6da86bf9
+    secret: 65f267dcb2e387f7caf651a80a118253
+
 # 腾讯cos
 cos:
     secretId: AKIDwISNOFsJXYGjy89FJI9UnzuZFgTtRgFe

zzjs-admin/src/test/java/com/miaxis/test/WxGzhTest.java

@@ -0,0 +1,80 @@
+package com.miaxis.test;
+
+import com.alibaba.fastjson.JSONObject;
+import com.miaxis.ZzjsApplication;
+import com.miaxis.feign.dto.WxGzhMini;
+import com.miaxis.feign.dto.WxGzhSend;
+import com.miaxis.feign.dto.WxSend;
+import com.miaxis.feign.service.IWxGzhService;
+import com.miaxis.feign.service.IWxSendService;
+import com.miaxis.feign.service.IWxService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@SpringBootTest(classes = ZzjsApplication.class)
+@RunWith(SpringRunner.class)
+public class WxGzhTest {
+
+
+    @Autowired
+    private IWxSendService wxSendService;
+
+    private String token = "45_Njoe3zgvKCg8xoD2BZWcfi2BjkibZcR7SfgtgiTr-GsJIc6AlAuYkB-Us211vA5rffZEtf-6eFrjVE9BXz2j2hLMl5X3C9RR6vApEDtR_Xi5hza5JFY1jBt4PQdAJZLPxHkijYGFnMqxWy7mURLhABAEBV";
+    private String token2 = "45_u4-UR-tGJPQ3B_ZMuGX1BaxQH_eRCJUu7QkFQv0AuHeDvAG8SUYR1tlfhp93SeNwX_xEBYBjJAKuy54DHZEZEl670bIDlLZyDfwOAtKQVgpohTJLJxs948lGRhGgQVgsbB0cYt1toCbbxM-TCIPjABAYEL";
+
+    @Value("${gzh.appid}")
+    private String appid;
+    @Value("${gzh.secret}")
+    private String secret;
+
+
+    @Test
+    public void getWxgetTokenService(){
+        String result = wxSendService.getAccessToken("client_credential",appid,secret);
+
+        System.out.println(result);
+        JSONObject json = JSONObject.parseObject(result);
+        String accessToken = json.get("access_token").toString();
+        String expiresIn = json.get("expires_in").toString();
+        System.out.println(accessToken);
+        System.out.println(expiresIn);
+    }
+
+    @Test
+    public void getWxGzhService(){
+        WxGzhSend gzhSend = new WxGzhSend();
+        gzhSend.setTouser("oYiEFwrmR6tquoFPXL2KlwT8WfWU");
+        gzhSend.setTemplate_id("3TKF3q46VuxrM2lsCOhs0S4-uH6UeND2FN-rJ4DUFYg");
+        gzhSend.setUrl("https://www.baidu.com/");
+        WxGzhMini wxGzhMini = new WxGzhMini();
+        wxGzhMini.setAppid("wx8f43db501343feab");
+        wxGzhMini.setPagepath("/pages/index/index");
+        gzhSend.setMiniprogram(wxGzhMini);
+
+
+        JSONObject jsonObject = new JSONObject();
+        JSONObject jsonObject1 = new JSONObject();
+        JSONObject jsonObject2 = new JSONObject();
+        JSONObject jsonObject3 = new JSONObject();
+        JSONObject jsonObject4 = new JSONObject();
+        jsonObject1.put("value","恭喜你购买成功！");
+        jsonObject1.put("color","#173177");
+        jsonObject2.put("value","巧克力");
+        jsonObject3.put("value","39.8元");
+        jsonObject4.put("value","这东西不错");
+
+        jsonObject.put("first",jsonObject1);
+        jsonObject.put("keyword1",jsonObject2);
+        jsonObject.put("keyword2",jsonObject3);
+        jsonObject.put("remark",jsonObject4);
+        gzhSend.setData(jsonObject);
+
+        String result = wxSendService.sendGzhMessage(token2,gzhSend);
+        System.out.println(result);
+    }
+
+}

zzjs-admin/src/test/java/com/miaxis/test/WxTest.java

@@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.miaxis.ZzjsApplication;
 import com.miaxis.feign.dto.AddTemplate;
 import com.miaxis.feign.dto.WxSend;
-import com.miaxis.feign.service.IWxAddTemplate;
 import com.miaxis.feign.service.IWxSendService;
-import com.miaxis.feign.service.IWxTemplateList;
-import com.miaxis.feign.service.IWxgetTokenService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,43 +16,39 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 public class WxTest {
 
-    private String token ="45_NDxpMTA7H4BUlbToZa9IHTCe4zyctpzyt_RNoaIOAGxTAtT_OQ3fZ2iTuSyXjILqC21eG8Pcyi6756FCSR0YWDbXyMoyL3GdJ9JHNm-qhZQZfEIwLe12TC2_b7f3Zmkj684Ph7xfu6bmNB8TSRJcAEAYXP";
-    @Autowired
-    private IWxgetTokenService wxgetTokenService;
-    @Autowired
-    private IWxSendService wxSendService;
-    @Autowired
-    private IWxAddTemplate wxAddTemplate;
+    private String token ="45__6qC8wIAVRtGuk7lz5IlBk678dvuA3383qRGcHJ721sttRJSvxwz6ppCXHIfSFs6AWVdfek21KYvmokK1C3NlUnfYPXm_pKAhm61d9Q6pA1CENOAyIxbX3nJ5NP1knSZUzMLN73pRtGdNXvYWPEgAHARKZ";
+
+    private String token2 ="45_nGtdvZCMg8Kqr74QKw2po6FfKfdUaMYVGOGnnkz1ft1sSF8PzfYTk3hoxjynUx6cgos0WgpGUMU8ymmSw73s3UOkhb__vBJrFUyRLtDzAcQgk34IiRprxcrRo_unC_RftEklW6VM8bc0F7dCXALdAFABEP";
 
     @Autowired
-    private IWxTemplateList wxTemplateList;
+    private IWxSendService wxSendService;
 
 
 
     @Value("${app.appid}")
     private String appid;
-
     @Value("${app.secret}")
     private String secret;
 
+
+    /**
+     * 获取微信小程序token
+     */
     @Test
     public void getWxgetTokenService(){
-        String result = wxgetTokenService.getAccessToken("client_credential",appid,secret);
-
+        String result = wxSendService.getAccessToken("client_credential",appid,secret);
         JSONObject json = JSONObject.parseObject(result);
         String accessToken = json.get("access_token").toString();
         String expiresIn = json.get("expires_in").toString();
-
         System.out.println(accessToken);
         System.out.println(expiresIn);
-
     }
 
     @Test
     public void getWxSendService(){
         WxSend wxSend = new WxSend();
-        wxSend.setAccess_token(token);
-        wxSend.setTouser("oO7PJ5JxqYj0kVYLb1e3FG55mD8E");
+        wxSend.setAccess_token(token2);
+        wxSend.setTouser("oO7PJ5FlradAM7tqw3TM2zvEj4O4");
         wxSend.setTemplate_id("NlZAFJj1p5aHFOg6BBesP7xFAJh5kIZ0kp_YwtJje0g");
         wxSend.setPage("/pages/index/index?active=user");
 
@@ -79,22 +72,5 @@ public class WxTest {
     }
 
 
-    @Test
-    public void addWxTemplate(){
-        AddTemplate addTemplate = new AddTemplate();
-        addTemplate.setAccess_token(token);
-        addTemplate.setTid("gAayj95qwP5C59NApKj9VCis3zpnfg5G3TqJIOx-CGc");
-        Integer[] intList = {1,2,3};
-        addTemplate.setKidList(intList);
-        addTemplate.setSceneDesc("测试模板");
-        String result = wxAddTemplate.addTemplate(token,addTemplate);
-        System.out.println(result);
-    }
-
-    @Test
-    public void getWxTemplate(){
-        String result =  wxTemplateList.getAccessToken(token);;
-        System.out.println(result);
-    }
 
 }

zzjs-service/src/main/java/com/miaxis/feign/dto/WxGzhMini.java

@@ -0,0 +1,11 @@
+package com.miaxis.feign.dto;
+
+import lombok.Data;
+
+@Data
+public class WxGzhMini {
+
+    private String appid; //是 所需跳转到的小程序appid（该小程序appid必须与发模板消息的公众号是绑定关联关系，暂不支持小游戏）
+    private String pagepath; // 否	所需跳转到小程序的具体页面路径，支持带参数,（示例index?foo=bar），要求该小程序已发布，暂不支持小游戏
+
+}

zzjs-service/src/main/java/com/miaxis/feign/dto/WxGzhSend.java

@@ -0,0 +1,16 @@
+package com.miaxis.feign.dto;
+
+import lombok.Data;
+
+@Data
+public class WxGzhSend {
+
+
+    //公共参数
+    private String touser; //是	接收者（用户）的 openid
+    private String template_id;  // 是	所需下发的订阅模板id
+    private String url; // 否 模板跳转链接（海外帐号没有跳转能力）
+    private WxGzhMini miniprogram; //否	跳小程序所需数据，不需跳小程序可不用传该数据
+    private Object data; //是 模板数据
+
+}

zzjs-service/src/main/java/com/miaxis/feign/service/IWxAddTemplate.java

@@ -1,20 +0,0 @@
-package com.miaxis.feign.service;
-
-import com.miaxis.common.config.FeignConfig;
-import com.miaxis.feign.dto.AddTemplate;
-import com.miaxis.feign.dto.WxSend;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- *
- * 微信接口
- */
-@FeignClient(name="wxAddTemplate",
-        url = "https://api.weixin.qq.com/wxaapi/newtmpl",configuration = FeignConfig.class)
-public interface IWxAddTemplate {
-
-    @PostMapping(value = "/addtemplate")
-    String addTemplate(@RequestParam("access_token") String accessToken, AddTemplate addTemplate);
-}

zzjs-service/src/main/java/com/miaxis/feign/service/IWxGzhService.java

@@ -0,0 +1,24 @@
+package com.miaxis.feign.service;
+
+import com.miaxis.common.config.FeignConfig;
+import com.miaxis.feign.dto.WxGzhSend;
+import com.miaxis.feign.dto.WxSend;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+
+/**
+ *
+ * 微信公众号接口
+ */
+@FeignClient(name="wxGzhService",
+        url = "https://api.weixin.qq.com/cgi-bin",configuration = FeignConfig.class)
+public interface IWxGzhService {
+
+
+
+
+
+}

zzjs-service/src/main/java/com/miaxis/feign/service/IWxSendService.java

@@ -2,8 +2,10 @@ package com.miaxis.feign.service;
 
 import com.miaxis.common.config.FeignConfig;
 import com.miaxis.feign.dto.Pdd;
+import com.miaxis.feign.dto.WxGzhSend;
 import com.miaxis.feign.dto.WxSend;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -12,11 +14,17 @@ import org.springframework.web.bind.annotation.RequestParam;
  * 微信接口
  */
 @FeignClient(name="wxSendService",
-        url = "https://api.weixin.qq.com/cgi-bin/message",configuration = FeignConfig.class)
+        url = "https://api.weixin.qq.com/cgi-bin",configuration = FeignConfig.class)
 public interface IWxSendService {
 
-    @PostMapping(value = "/subscribe/send")
+    @PostMapping(value = "/message/subscribe/send")
     String sendMessage(@RequestParam("access_token")String accessToken, WxSend wxSend);
 
+    @PostMapping(value = "/message/template/send")
+    String sendGzhMessage(@RequestParam("access_token")String accessToken, WxGzhSend wxGzhSend);
 
+    @GetMapping(value = "/token")
+    String getAccessToken(@RequestParam("grant_type") String grant_type,
+                          @RequestParam("appid") String appid,
+                          @RequestParam("secret") String secret);
 }

zzjs-service/src/main/java/com/miaxis/feign/service/IWxTemplateList.java

@@ -1,15 +0,0 @@
-package com.miaxis.feign.service;
-
-import com.miaxis.common.config.FeignConfig;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(name="wxTemplateList",
-        url = "https://api.weixin.qq.com/wxaapi/newtmpl/",configuration = FeignConfig.class)
-public interface IWxTemplateList {
-
-    @GetMapping(value = "/gettemplate")
-    String getAccessToken(@RequestParam("access_token") String access_token);
-
-}

zzjs-service/src/main/java/com/miaxis/feign/service/IWxgetTokenService.java

@@ -1,24 +0,0 @@
-package com.miaxis.feign.service;
-
-
-import com.miaxis.common.config.FeignConfig;
-import com.miaxis.feign.service.fallback.CarFallBackService;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-
-@FeignClient(name="wxgetTokenService",
-        url = "https://api.weixin.qq.com/cgi-bin",
-        fallbackFactory = CarFallBackService.class,configuration = FeignConfig.class)
-@Component
-public interface IWxgetTokenService {
-
-
-    @GetMapping(value = "/token")
-    String getAccessToken(@RequestParam("grant_type") String grant_type,
-               @RequestParam("appid") String appid,
-               @RequestParam("secret") String secret);
-
-}