Merge branch 'tkk' into test

src/main/java/com/chaozhanggui/system/cashierservice/alipayUtil/AlipayUtil.java

@@ -66,7 +66,7 @@ public class AlipayUtil {
      * @param code  用户信息授权码
      * @return openId
      */
-    public String getOpenId(String code) throws AlipayApiException{
+    public String getOpenId(String code) throws Exception{
         AlipaySystemOauthTokenRequest req = new AlipaySystemOauthTokenRequest();
         //SDK已经封装掉了公共参数，这里只需要传入业务参数
         req.setCode(code);

src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java

@@ -118,15 +118,18 @@ public class LoginContoller {
                 return loginService.wxCustomLogin(openid, "", "", "", IpUtil.getIpAddr(request));
             } catch (Exception e) {
                 e.printStackTrace();
+                log.error("登录失败：",e);
             }
         }else if(AuthSource.ALIPAY.getValue().equals(source)){
             try {
                 String openId = alipayUtil.getOpenId(code);
                 return loginService.alipayCustomLogin(openId);
             }catch (AlipayApiException e){
+                log.error("登录失败：",e);
                 return Result.fail("登录失败："+e.getErrMsg());
             }catch (Exception e){
                 e.printStackTrace();
+                log.error("登录失败：",e);
             }
         }
         return Result.fail("登录失败");