Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

1098226878

2021-09-06 8d0d2ac5db499a72cc029c6c5ced1d4f82c2c4d1

 service-front/src/main/java/com/java110/front/controller/wechat/StaffWechatAuthController.java

old mode 100644
new mode 100755
@@ -47,6 +47,7 @@

    /**
     * 微信登录接口
     * /app/loginStaffWechatAuth
     *
     * @param request
     */
@@ -65,19 +66,20 @@

    /**
     * 微信公众号号鉴权
     * /app/staffAuth
     *
     * @param request
     */
    @RequestMapping(path = "/staffAuth")
    public ResponseEntity<String> staffAuth(@RequestParam String redirectUrl,
                                            @RequestParam String errorUrl,
                                            @RequestParam String loginFlag,
    public ResponseEntity<String> staffAuth(@RequestParam(value = "communityId") String communityId,
                                            @RequestParam(value = "staffId") String staffId,
                                            @RequestParam(value = "storeId") String storeId,
                                            @RequestParam(value = "appId") String appId,
                                            HttpServletRequest request,
                                            HttpServletResponse response) {
        IPageData pd = PageData.newInstance().builder("", "", "", "",
                "login", "", "", "", request.getHeader("app-id")
        );
        return staffAuthSMOImpl.refreshToken(pd, redirectUrl, errorUrl, loginFlag, request, response);
                "login", "", "", "", appId);
        return staffAuthSMOImpl.refreshToken(pd, communityId, staffId, storeId, request, response);

    }