Procházet zdrojové kódy

Merge branch 'release_toaliyun_real_20230511' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_20230511

release_toaliyun_real
xhxu před 3 roky
rodič
revize
cd41097e45
2 změnil soubory, kde provedl 11 přidání a 6 odebrání
  1. +8
    -5
      mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java
  2. +3
    -1
      mallinkBApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java

+ 8
- 5
mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java Zobrazit soubor

@@ -75,6 +75,7 @@ public class WxInfoController extends BaseController {
String appId = param.get("appId"); String appId = param.get("appId");
String code = param.get("code"); String code = param.get("code");
String userId = param.get("bUserId"); String userId = param.get("bUserId");
String isCheck = param.get("isCheck");
if (StringUtils.isBlank(appId)) { if (StringUtils.isBlank(appId)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "appId不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "appId不能为空");
} }
@@ -130,11 +131,13 @@ public class WxInfoController extends BaseController {
return new ResultData(ErrorCode.SESSION_KEY_DECODE_ERR, resultMap); return new ResultData(ErrorCode.SESSION_KEY_DECODE_ERR, resultMap);
} }
try {
this.checkLoginUserPhone(buUser,openId,buUser.getPhone(), appPlat);
} catch (Exception e) {
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(), e.getMessage());
}
if (StringUtils.isNotBlank(isCheck) && "Y".equals(isCheck)) {
try {
this.checkLoginUserPhone(buUser,openId,buUser.getPhone(), appPlat);
} catch (Exception e) {
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(), e.getMessage());
}
}


logger.info("登录账号ID(bUserId):" + userId + "openId:" + openId); logger.info("登录账号ID(bUserId):" + userId + "openId:" + openId);
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();


+ 3
- 1
mallinkBApi/src/main/java/com/iformall/interceptor/RequestInterceptor.java Zobrazit soubor

@@ -48,7 +48,9 @@ public class RequestInterceptor extends HandlerInterceptorAdapter {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();


sb.append(request.getRequestURL().toString()); sb.append(request.getRequestURL().toString());

logger.info(">>>>>------>>>>>>"+sb.toString());
sb.append("method=").append(request.getMethod()).append("&"); sb.append("method=").append(request.getMethod()).append("&");


String ipaddress = IPUtil.getIpAddr(request); String ipaddress = IPUtil.getIpAddr(request);


Načítá se…
Zrušit
Uložit