Merge branch 'master' of wangchaoqun/wxservice into master

src/main/java/com/ematou/wxservice/common/web/R.java

@@ -38,7 +38,7 @@ public class R<T> {
         return this;
     }
 
-    public R<?> error(String message) {
+    public R<T> error(String message) {
         this.setCode(ResponseCodeConstant.code_100);
         this.setMessage(message);
         this.setData(null);

src/main/java/com/ematou/wxservice/controller/WeChatMessageController.java

@@ -80,8 +80,13 @@ public class WeChatMessageController {
      */
     @PostMapping("/generateqRcode")
     public R<Object> generateqRcode(@RequestBody JSONObject msg){
-
-        return new R<>().success(weChatMessageService.generateqRcodeService(msg));
+        log.info("生成取件二维码！");
+        try {
+            return new R<>().success(weChatMessageService.generateqRcodeService(msg));
+        }catch (Exception e){
+            log.error("生成取件二维码失败！",e);
+            return new R<>().error("生成取件二维码失败!");
+        }
     }
 
 }

src/main/java/com/ematou/wxservice/service/WeChatMessageService.java

@@ -68,6 +68,7 @@ public class WeChatMessageService {
         String response = weChatApiRestTemplate.getForOther(String.format(WeChatApi.GET_TOKEN_NEW.getUrl(), wechat));
         AccessToken accessToken = JSON.parseObject(response).getObject("data", AccessToken.class);
         String msg = HttpUtils.sendPost(" https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token="+accessToken.getAccessToken(),msgmap.toJSONString());
+        logger.info("请求微信接口生成二维码图片，微信返回信息：" + msg);
         return msg;
 
     }

src/main/resources/application-qh.yml

@@ -6,8 +6,10 @@ wx:
     appId: wx8735db2da152ce19
     appSecret: 016edeba9d3f0508c95476ceec5f65e4
 spring:
-  profiles:
-    active: qh
+  config:
+    activate:
+      on-profile: qh
+
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
 #    username: tuser