2 Revize c8d116eff3 ... 678015663b

Autor SHA1 Zpráva Datum
  jinshihui 678015663b Merge remote-tracking branch 'origin/point_dev' into point_dev před 6 dny
  jinshihui e1f4d7fe86 优化代码 před 6 dny

+ 6 - 2
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/WeChatController.java

@@ -344,7 +344,6 @@ public class WeChatController extends BaseController {
      */
     @GetMapping("/getAccessToken")
     @ApiOperation("公众号网页登录")
-    @Log(title = "公众号网页登录", businessType = BusinessType.OTHER)
     public R<WxLoginUser> getAccessToken(@RequestParam String code) {
         // 发送get请求获取 AccessToken
         Map<?, ?> result = weChatUtil.getAccessToken(code);
@@ -410,10 +409,15 @@ public class WeChatController extends BaseController {
         return accessToken;
     }
 
+    /**
+     * 获取公众号二维码
+     *
+     * @param openId
+     * @return Map<?, ?> 包含二维码ticket的Map
+     */
     @ApiOperation("获取公众号二维码")
     @RequestMapping(value = "getwxQrCode", method = RequestMethod.GET)
     public Map<?, ?> getWxQrCodeUtil(@RequestParam String openId) {
-
         //获取access_token
         String token = weChatUtil.getToken();
         //获取的二维码ticket

+ 1 - 0
nightFragrance-admin/src/main/resources/application-dev.yml

@@ -236,6 +236,7 @@ wechat:
   get-code-url: https://open.weixin.qq.com/connect/oauth2/authorize
   # 回调地址
   redirect-url: https://city.baoxianzhanggui.com/nightFragrance/sq/getAccessToken
+  # 换取网页授权用户access_token的URL
   access-token-url: https://api.weixin.qq.com/sns/oauth2/access_token
   # 消息模版ID
   template-id-1: HU2LfMIes91Au9kxR3VEoNYuMayxZoPNsFRfWNCmKrQ

+ 0 - 4
nightFragrance-massage/src/main/java/com/ylx/massage/utils/WeChatUtil.java

@@ -246,14 +246,11 @@ public class WeChatUtil {
      * @return 返回包含微信公众号码ticket的Map
      */
     public Map<?, ?> getTicket(String token, String openId) {
-
         String url = "https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=" + token;
-
         String param = "{\"action_name\": \"QR_LIMIT_STR_SCENE\",\"action_info\": {\"scene\": {\"scene_str\": \"" + openId + "\"}}}";
 
         String rs = HttpUtil.post(url, param);
         Map<?, ?> map = JSONObject.parseObject(rs, Map.class);
-
 //        String ticket = map.get("ticket").toString();
 //
 //        String encode = null;
@@ -273,7 +270,6 @@ public class WeChatUtil {
 //        Map<?, ?> rsmap = JSONObject.parseObject(s, Map.class);
 //        return rsmap;
         return map;
-
     }