java110 5 lat temu
rodzic
commit
83b8db7d50

+ 1 - 1
service-common/src/main/java/com/java110/common/api/MachineApi.java

@@ -33,7 +33,7 @@ public class MachineApi {
      * @path /app/machine/openDoor
      */
     @RequestMapping(value = "/openDoor", method = RequestMethod.POST)
-    public ResponseEntity<String> saveAttrValue(@RequestBody JSONObject reqJson) {
+    public ResponseEntity<String> openDoor(@RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区信息");
         Assert.hasKeyAndValue(reqJson, "machineCode", "请求报文中未包含设备信息");

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

@@ -57,7 +57,7 @@ public class StaffWechatAuthController extends BaseController {
         Map<String, String> params = getParameterStringMap(request);
         String appId = params.get("appId");
         IPageData pd = PageData.newInstance().builder("", "", "", JSONObject.toJSONString(params),
-                "auth", "", "", "", appId
+                "login", "", "", "", appId
         );
         ResponseEntity responseEntity = staffAuthSMOImpl.getPageAccessToken(pd, request);
         request.setAttribute(CommonConstant.CONTEXT_PAGE_DATA, pd);

+ 1 - 1
service-front/src/main/java/com/java110/front/smo/staff/impl/StaffAuthSMOImpl.java

@@ -142,7 +142,7 @@ public class StaffAuthSMOImpl extends AbstractFrontServiceSMO implements IStaffA
                                                     + "/app/loginStaffWechatAuth?appId=992020061452450002&staffId="
                                                     + staffId + "&storeId=" + storeId + "&wId=" + WechatFactory.getWId(smallWeChatDto.getAppId())),
                                             "UTF-8")).replace("STATE", "1");
-
+            response.sendRedirect(openUrl);
         } catch (Exception e) {
             logger.error("微信公众号鉴权 redirectUrl 错误 " + url, e);
             throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, e.getLocalizedMessage());