优化二维码生成

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

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.front.controller.wechat;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.base.controller.BaseController;
+import com.java110.core.context.IPageData;
+import com.java110.core.context.PageData;
+import com.java110.front.smo.staff.IStaffAuthSMO;
+import com.java110.utils.constant.CommonConstant;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * 微信小程序登录处理类
+ */
+@RestController
+@RequestMapping(path = "/app")
+public class StaffWechatAuthController extends BaseController {
+    private final static Logger logger = LoggerFactory.getLogger(StaffWechatAuthController.class);
+
+    @Autowired
+    private IStaffAuthSMO staffAuthSMOImpl;
+
+
+    /**
+     * 微信登录接口
+     *
+     * @param request
+     */
+    @RequestMapping(path = "/loginStaffWechatAuth")
+    public ResponseEntity<String> loginStaffWechatAuth(HttpServletRequest request) {
+
+        Map<String, String> params = getParameterStringMap(request);
+        String appId = params.get("appId");
+        IPageData pd = PageData.newInstance().builder("", "", "", JSONObject.toJSONString(params),
+                "login", "", "", "", appId
+        );
+        ResponseEntity responseEntity = staffAuthSMOImpl.getPageAccessToken(pd, request);
+        request.setAttribute(CommonConstant.CONTEXT_PAGE_DATA, pd);
+        return responseEntity;
+    }
+
+    /**
+     * 微信公众号号鉴权
+     *
+     * @param request
+     */
+    @RequestMapping(path = "/staffAuth")
+    public ResponseEntity<String> staffAuth(@RequestParam String redirectUrl,
+                                            @RequestParam String errorUrl,
+                                            @RequestParam String loginFlag,
+                                            HttpServletRequest request,
+                                            HttpServletResponse response) {
+        IPageData pd = PageData.newInstance().builder("", "", "", "",
+                "login", "", "", "", request.getHeader("app-id")
+        );
+        return staffAuthSMOImpl.refreshToken(pd, redirectUrl, errorUrl, loginFlag, request, response);
+
+    }
+
+}

service-front/src/main/java/com/java110/front/smo/staff/IStaffAuthSMO.java

@@ -0,0 +1,39 @@
+package com.java110.front.smo.staff;
+
+import com.java110.core.context.IPageData;
+import com.java110.utils.exception.SMOException;
+import org.springframework.http.ResponseEntity;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 组织管理管理服务接口类
+ * <p>
+ * add by wuxw 2019-06-29
+ */
+public interface IStaffAuthSMO {
+
+
+
+    /**
+     * 获取access_token
+     *
+     * @param pd
+     * @return
+     * @throws SMOException
+     */
+    ResponseEntity<String> getPageAccessToken(IPageData pd,HttpServletRequest request) throws SMOException;
+
+
+    /**
+     * 微信刷新token
+     *
+     * @param pd
+     * @return
+     * @throws SMOException
+     */
+    ResponseEntity<String> refreshToken(IPageData pd, String redirectUrl, String errorUrl,
+                                        String loginFlag,
+                                        HttpServletRequest request, HttpServletResponse response) throws SMOException;
+}

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

@@ -0,0 +1,402 @@
+package com.java110.front.smo.staff.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.base.smo.front.AbstractFrontServiceSMO;
+import com.java110.core.context.IPageData;
+import com.java110.core.context.PageData;
+import com.java110.core.factory.AuthenticationFactory;
+import com.java110.core.factory.WechatFactory;
+import com.java110.dto.owner.OwnerAppUserDto;
+import com.java110.dto.smallWeChat.SmallWeChatDto;
+import com.java110.dto.user.UserDto;
+import com.java110.front.properties.WechatAuthProperties;
+import com.java110.front.smo.staff.IStaffAuthSMO;
+import com.java110.utils.cache.CommonCache;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.constant.ServiceCodeConstant;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.constant.WechatConstant;
+import com.java110.utils.exception.SMOException;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * wx登录
+ */
+@Service("staffAuthSMOImpl")
+public class StaffAuthSMOImpl extends AbstractFrontServiceSMO implements IStaffAuthSMO {
+
+    private final static Logger logger = LoggerFactory.getLogger(StaffAuthSMOImpl.class);
+
+    private final static int expireTime = 7200;
+
+    private final static int LOGIN_PAGE = 1;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Autowired
+    private RestTemplate outRestTemplate;
+
+    @Autowired
+    private WechatAuthProperties wechatAuthProperties;
+
+    @Override
+    public ResponseEntity<String> getPageAccessToken(IPageData pd, HttpServletRequest request) throws SMOException {
+        JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+        String authCode = paramIn.getString("code");
+        String state = paramIn.getString("state");
+        String paramStr = CommonCache.getAndRemoveValue(paramIn.getString("urlCode"));
+
+        if (StringUtil.isEmpty(paramStr)) {
+            return ResultVo.redirectPage("/");
+        }
+
+        JSONObject param = JSONObject.parseObject(paramStr);
+        String redirectUrl = param.getString("redirectUrl");
+        String errorUrl = param.getString("errorUrl");
+        String wId = paramIn.getString("wId");
+        SmallWeChatDto smallWeChatDto = null;
+        if (!StringUtil.isEmpty(wId)) {
+            paramIn.put("appId", WechatFactory.getAppId(wId));
+            smallWeChatDto = getSmallWechat(pd, paramIn);
+        }
+        if (smallWeChatDto == null) { //从配置文件中获取 小程序配置信息
+            smallWeChatDto = new SmallWeChatDto();
+            smallWeChatDto.setAppId(wechatAuthProperties.getWechatAppId());
+            smallWeChatDto.setAppSecret(wechatAuthProperties.getWechatAppSecret());
+            smallWeChatDto.setMchId(wechatAuthProperties.getMchId());
+            smallWeChatDto.setPayPassword(wechatAuthProperties.getKey());
+        }
+
+        String url = WechatConstant.APP_GET_ACCESS_TOKEN_URL.replace("APPID", smallWeChatDto.getAppId())
+                .replace("SECRET", smallWeChatDto.getAppSecret())
+                .replace("CODE", authCode);
+
+        ResponseEntity<String> paramOut = outRestTemplate.getForEntity(url, String.class);
+
+        logger.debug("调用微信换去openId ", paramOut);
+        if (paramOut.getStatusCode() != HttpStatus.OK) {
+            return ResultVo.redirectPage(errorUrl);
+
+        }
+
+        JSONObject paramObj = JSONObject.parseObject(paramOut.getBody());
+
+        //获取 openId
+        String openId = paramObj.getString("openid");
+
+        int loginFlag = paramIn.getInteger("loginFlag");
+        //说明是登录页面，下发code 就可以，不需要下发key 之类
+        if (loginFlag == LOGIN_PAGE) {
+            //将openId放到redis 缓存，给前段下发临时票据
+            String code = UUID.randomUUID().toString();
+            CommonCache.setValue(code, openId, expireTime);
+            return ResultVo.redirectPage(errorUrl + "?code=" + code);
+        }
+
+        //判断当前openId 是否绑定了业主
+        pd = PageData.newInstance().builder("-1", "", "", pd.getReqData(),
+                "", "", "", "",
+                pd.getAppId());
+        OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+        ownerAppUserDto.setOpenId(openId);
+        List<OwnerAppUserDto> ownerAppUserDtos = super.getForApis(pd, ownerAppUserDto, ServiceCodeConstant.LIST_APPUSERBINDINGOWNERS, OwnerAppUserDto.class);
+
+        if (ownerAppUserDtos == null || ownerAppUserDtos.size() < 1) {
+            //将openId放到redis 缓存，给前段下发临时票据
+            String code = UUID.randomUUID().toString();
+            CommonCache.setValue(code, openId, expireTime);
+            return ResultVo.redirectPage(errorUrl + "?code=" + code);
+        }
+
+        // String accessToken = paramObj.getString("access_token");//暂时不用
+        Map userMap = new HashMap();
+        userMap.put(CommonConstant.LOGIN_USER_ID, ownerAppUserDtos.get(0).getUserId());
+        userMap.put(CommonConstant.LOGIN_USER_NAME, ownerAppUserDtos.get(0).getAppUserName());
+        String token = "";
+        try {
+            token = AuthenticationFactory.createAndSaveToken(userMap);
+            pd.setToken(token);
+        } catch (Exception e) {
+            logger.error("创建token失败");
+        }
+        //查询用户key
+        UserDto userDto = new UserDto();
+        userDto.setUserId(ownerAppUserDtos.get(0).getUserId());
+        UserDto tmpUserDto = super.getForApi(pd, userDto, ServiceCodeConstant.QUERY_USER_SECRET, UserDto.class);
+
+        if (StringUtil.isEmpty(tmpUserDto.getKey())) {
+            String code = UUID.randomUUID().toString();
+            CommonCache.setValue(code, openId, expireTime);
+            return ResultVo.redirectPage(errorUrl + "?code=" + code);
+        }
+        redirectUrl = redirectUrl + (redirectUrl.indexOf("?") > 0 ? "&key=" + tmpUserDto.getKey() : "?key=" + tmpUserDto.getKey());
+        return ResultVo.redirectPage(redirectUrl);
+
+    }
+
+    /**
+     * 刷新token
+     *
+     * @param pd
+     * @param redirectUrl
+     * @param request
+     * @param response
+     * @return
+     * @throws SMOException
+     */
+    @Override
+    public ResponseEntity<String> refreshToken(IPageData pd, String redirectUrl,
+                                               String errorUrl,
+                                               String loginFlag,
+                                               HttpServletRequest request, HttpServletResponse response) throws SMOException {
+        String wAppId = request.getHeader("w-app-id");
+        SmallWeChatDto smallWeChatDto = null;
+        if (!StringUtil.isEmpty(wAppId)) {
+            JSONObject paramIn = new JSONObject();
+            paramIn.put("appId", wAppId);
+            smallWeChatDto = getSmallWechat(pd, paramIn);
+        }
+        if (smallWeChatDto == null) { //从配置文件中获取 小程序配置信息
+            smallWeChatDto = new SmallWeChatDto();
+            smallWeChatDto.setAppId(wechatAuthProperties.getWechatAppId());
+            smallWeChatDto.setAppSecret(wechatAuthProperties.getWechatAppSecret());
+            smallWeChatDto.setMchId(wechatAuthProperties.getMchId());
+            smallWeChatDto.setPayPassword(wechatAuthProperties.getKey());
+        }
+
+        URL url = null;
+        String openUrl = "";
+        try {
+            url = new URL(redirectUrl);
+
+            String newUrl = url.getProtocol() + "://" + url.getHost();
+            if (url.getPort() > 0) {
+                newUrl += (":" + url.getPort());
+            }
+
+            openUrl = WechatConstant.OPEN_AUTH
+                    .replace("APPID", smallWeChatDto.getAppId())
+                    .replace("SCOPE", "snsapi_base")
+                    .replace(
+                            "REDIRECT_URL",
+                            URLEncoder
+                                    .encode(
+                                            (newUrl
+                                                    + "/app/loginStaffWechatAuth?appId=992020061452450002&wId=" + WechatFactory.getWId(wAppId)),
+                                            "UTF-8")).replace("STATE", "1");
+
+        } catch (Exception e) {
+            logger.error("微信公众号鉴权 redirectUrl 错误 " + redirectUrl, e);
+            throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, e.getLocalizedMessage());
+        }
+
+        JSONObject urlObj = new JSONObject();
+        urlObj.put("openUrl", openUrl);
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_MACHINE_OK, ResultVo.MSG_OK, urlObj);
+    }
+
+    /**
+     * 公众号登录
+     *
+     * @param pd
+     * @param paramIn
+     * @param paramOut
+     * @param userId
+     * @param ownerAppUserDtos
+     * @return
+     */
+    private ResponseEntity<String> wechat(IPageData pd, JSONObject paramIn, JSONObject paramOut, String userId,
+                                          List<OwnerAppUserDto> ownerAppUserDtos) {
+
+        ResponseEntity<String> responseEntity = null;
+        //查询微信信息
+        pd = PageData.newInstance().builder(userId, "", "", pd.getReqData(),
+                "", "", "", "",
+                pd.getAppId());
+
+
+        String code = paramIn.getString("code");
+
+        String openId = CommonCache.getValue(code);
+
+        if (StringUtil.isEmpty(openId)) {
+            responseEntity = new ResponseEntity<>("页面失效，请刷新后重试", HttpStatus.UNAUTHORIZED);
+            return responseEntity;
+        }
+
+        OwnerAppUserDto curOwnerApp = judgeCurrentOwnerBind(ownerAppUserDtos, OwnerAppUserDto.APP_TYPE_WECHAT);
+
+        //说明 当前的openId 就是最新的
+        if (curOwnerApp != null && openId.equals(curOwnerApp.getOpenId())) {
+            return new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
+        }
+
+        JSONObject userOwnerInfo = new JSONObject();
+        OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+        ownerAppUserDto.setOpenId(openId);
+        ownerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT);
+        if (curOwnerApp != null) {
+            ownerAppUserDto.setAppUserId(curOwnerApp.getAppUserId());
+            ownerAppUserDto.setCommunityId(curOwnerApp.getCommunityId());
+        } else {
+            ownerAppUserDto.setOldAppUserId(ownerAppUserDtos.get(0).getAppUserId());
+            ownerAppUserDto.setAppUserId("-1");
+            ownerAppUserDto.setCommunityId(ownerAppUserDtos.get(0).getCommunityId());
+        }
+
+        //查询微信信息
+        pd = PageData.newInstance().builder(userId, "", "", pd.getReqData(),
+                "", "", "", "",
+                pd.getAppId());
+
+        super.postForApi(pd, ownerAppUserDto, ServiceCodeConstant.REFRESH_APP_USER_BINDING_OWNER_OPEN_ID,
+                OwnerAppUserDto.class);
+        return new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
+    }
+
+    private ResponseEntity<String> mina(IPageData pd, JSONObject paramIn, JSONObject paramOut, String userId, List<OwnerAppUserDto> ownerAppUserDtos) {
+
+        ResponseEntity<String> responseEntity = null;
+        //查询微信信息
+        pd = PageData.newInstance().builder(userId, "", "", pd.getReqData(),
+                "", "", "", "",
+                pd.getAppId());
+        responseEntity = this.callCenterService(restTemplate, pd, "",
+                ServiceConstant.SERVICE_API_URL + "/api/smallWeChat.listSmallWeChats?appId="
+                        + paramIn.getString("appId") + "&page=1&row=1&communityId=" + ownerAppUserDtos.get(0).getCommunityId(), HttpMethod.GET);
+
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            return responseEntity;
+        }
+        JSONObject smallWechatObj = JSONObject.parseObject(responseEntity.getBody().toString());
+        JSONArray smallWeChats = smallWechatObj.getJSONArray("smallWeChats");
+        String appId = wechatAuthProperties.getAppId();
+        String secret = wechatAuthProperties.getSecret();
+        if (smallWeChats.size() > 0) {
+            appId = smallWeChats.getJSONObject(0).getString("appId");
+            secret = smallWeChats.getJSONObject(0).getString("appSecret");
+        }
+
+        String code = paramIn.getString("code");
+        String urlString = "?appid={appId}&secret={secret}&js_code={code}&grant_type={grantType}";
+        String response = outRestTemplate.getForObject(
+                wechatAuthProperties.getSessionHost() + urlString, String.class,
+                appId,
+                secret,
+                code,
+                wechatAuthProperties.getGrantType());
+
+        logger.debug("wechatAuthProperties:" + JSONObject.toJSONString(wechatAuthProperties));
+
+        logger.debug("微信返回报文：" + response);
+
+        //Assert.jsonObjectHaveKey(response, "errcode", "返回报文中未包含 错误编码，接口出错");
+        JSONObject responseObj = JSONObject.parseObject(response);
+
+        if (responseObj.containsKey("errcode") && !"0".equals(responseObj.getString("errcode"))) {
+            throw new IllegalArgumentException("微信验证失败，可能是code失效" + responseObj);
+        }
+
+        String openId = responseObj.getString("openid");
+
+        OwnerAppUserDto ownerAppUserDto = judgeCurrentOwnerBind(ownerAppUserDtos, OwnerAppUserDto.APP_TYPE_WECHAT_MINA);
+
+        //说明 当前的openId 就是最新的
+        if (ownerAppUserDto != null && openId.equals(ownerAppUserDto.getOpenId())) {
+            return new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
+        }
+
+        OwnerAppUserDto tmpOwnerAppUserDto = new OwnerAppUserDto();
+        tmpOwnerAppUserDto.setOpenId(openId);
+        tmpOwnerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT_MINA);
+        if (ownerAppUserDto != null) {
+            tmpOwnerAppUserDto.setAppUserId(ownerAppUserDto.getAppUserId());
+            tmpOwnerAppUserDto.setCommunityId(ownerAppUserDto.getCommunityId());
+        } else {
+            tmpOwnerAppUserDto.setOldAppUserId(ownerAppUserDtos.get(0).getAppUserId());
+            tmpOwnerAppUserDto.setAppUserId("-1");
+            tmpOwnerAppUserDto.setCommunityId(ownerAppUserDtos.get(0).getCommunityId());
+        }
+        //查询微信信息
+        pd = PageData.newInstance().builder(userId, "", "", pd.getReqData(),
+                "", "", "", "",
+                pd.getAppId());
+
+        super.postForApi(pd, tmpOwnerAppUserDto, ServiceCodeConstant.REFRESH_APP_USER_BINDING_OWNER_OPEN_ID,
+                OwnerAppUserDto.class);
+        return new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
+    }
+
+    /**
+     * 判断 绑定表里是否存在当前 端 绑定信息
+     *
+     * @param ownerAppUserDtos
+     * @param appType
+     * @return
+     */
+    private OwnerAppUserDto judgeCurrentOwnerBind(List<OwnerAppUserDto> ownerAppUserDtos, String appType) {
+
+        for (OwnerAppUserDto ownerAppUserDto : ownerAppUserDtos) {
+            if (appType.equals(ownerAppUserDto.getAppType())) {
+                return ownerAppUserDto;
+            }
+        }
+        return null;
+    }
+
+    private SmallWeChatDto getSmallWechat(IPageData pd, JSONObject paramIn) {
+
+        ResponseEntity responseEntity = null;
+
+        pd = PageData.newInstance().builder(pd.getUserId(), "", "", pd.getReqData(),
+                "", "", "", "",
+                pd.getAppId());
+        responseEntity = this.callCenterService(restTemplate, pd, "",
+                ServiceConstant.SERVICE_API_URL + "/api/smallWeChat.listSmallWeChats?appId="
+                        + paramIn.getString("appId") + "&page=1&row=1", HttpMethod.GET);
+
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            return null;
+        }
+        JSONObject smallWechatObj = JSONObject.parseObject(responseEntity.getBody().toString());
+        JSONArray smallWeChats = smallWechatObj.getJSONArray("smallWeChats");
+
+        if (smallWeChats == null || smallWeChats.size() < 1) {
+            return null;
+        }
+
+        return BeanConvertUtil.covertBean(smallWeChats.get(0), SmallWeChatDto.class);
+    }
+
+    public RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
+
+    public void setRestTemplate(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+
+}

service-user/src/main/java/com/java110/user/api/StaffApi.java

@@ -7,8 +7,10 @@ import com.java110.user.bmo.staffAppAuth.IDeleteStaffAppAuthBMO;
 import com.java110.user.bmo.staffAppAuth.IGetStaffAppAuthBMO;
 import com.java110.user.bmo.staffAppAuth.ISaveStaffAppAuthBMO;
 import com.java110.user.bmo.staffAppAuth.IUpdateStaffAppAuthBMO;
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -111,4 +113,22 @@ public class StaffApi {
         staffAppAuthDto.setStaffId(userId);
         return getStaffAppAuthBMOImpl.get(staffAppAuthDto);
     }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param storeId 小区ID
+     * @return
+     * @serviceCode /staff/generatorQrCode
+     * @path /app/staff/generatorQrCode
+     */
+    @RequestMapping(value = "/generatorQrCode", method = RequestMethod.GET)
+    public ResponseEntity<String> generatorQrCode(@RequestHeader(value = "store-id") String storeId,
+                                                  @RequestHeader(value = "user-id") String userId,
+                                                  @RequestParam(value = "communityId") String communityId) {
+        String ownerUrl = MappingCache.getValue("OWNER_WECHAT_URL")
+                + "/app/staffAuth?storeId=" + storeId + "&staffId=" + userId
+                + "&communityId=" + communityId;
+        return ResultVo.createResponseEntity(ownerUrl);
+    }
 }