Skip to content

M
midjourney-proxy
Commit b078f4b0 by 李传峰
Options

Merge branch 'hotfix/errorLog' into 'release' 

bug: [none] ERROR日志处理 数字格式化异常

See merge request rays/pcloud-common-parent!302
parents 6fb6834e d1039273
Showing with 20 additions and 29 deletions
pcloud-common/src/main/java/com/pcloud/common/utils/cookie/Cookie.java
......@@ -4,7 +4,7 @@
package com.pcloud.common.utils.cookie;
import com.pcloud.common.permission.PermissionException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Map;
......@@ -164,14 +164,12 @@ public class Cookie {
if (userInfoArry[i].contains("channelId")) {
String[] channel = userInfoArry[i].split("=");
String channelId = channel[channel.length - 1];
userInfos.put("channelId", StringUtil.isEmpty(channelId) || "undefined".equalsIgnoreCase(channelId)
|| "null".equalsIgnoreCase(channelId) ? null : NumberUtil.toLong(channelId));
userInfos.put("channelId", parseLong(channelId));
}
if (userInfoArry[i].contains("officialAccountsId")) {
String[] wechat = userInfoArry[i].split("=");
String officialAccountsId = wechat[wechat.length - 1];
userInfos.put("officialAccountsId", StringUtil.isEmpty(officialAccountsId) || "undefined".equalsIgnoreCase(officialAccountsId)
|| "null".equalsIgnoreCase(officialAccountsId) ? null : NumberUtil.toLong(officialAccountsId));
userInfos.put("officialAccountsId", parseLong(officialAccountsId));
}
if (userInfoArry[i].contains("wechatUserId")) {
String[] user = userInfoArry[i].split("=");
......@@ -183,16 +181,14 @@ public class Cookie {
if (userInfoArry[i].contains("partyId")) {
String[] party = userInfoArry[i].split("=");
String partyId = party[party.length - 1];
userInfos.put("partyId", StringUtil.isEmpty(partyId) || "undefined".equalsIgnoreCase(partyId) || "null".equalsIgnoreCase(partyId)
? null : NumberUtil.toLong(partyId));
userInfos.put("partyId", parseLong(partyId));
}
// editBy TC cookie里面需要带上顾问,systemCode,是否系统,场景值
// modify by songx at 2017-05-17 如果值为undefined或者null直接跳过
if (userInfoArry[i].contains("adviserId")) {
String[] adviser = userInfoArry[i].split("=");
String adviserId = adviser[adviser.length - 1];
userInfos.put("adviserId", StringUtil.isEmpty(adviserId) || "undefined".equalsIgnoreCase(adviserId) || "null".equalsIgnoreCase(adviserId)
? null : NumberUtil.toLong(adviserId));
userInfos.put("adviserId", parseLong(adviserId));
}
if (userInfoArry[i].contains("systemCode")) {
String[] systemCode = userInfoArry[i].split("=");
......@@ -208,26 +204,22 @@ public class Cookie {
if (userInfoArry[i].contains("sceneId")) {
String[] scene = userInfoArry[i].split("=");
String sceneId = scene[scene.length - 1];
userInfos.put("sceneId", StringUtil.isEmpty(sceneId) || "undefined".equalsIgnoreCase(sceneId) || "null".equalsIgnoreCase(sceneId) ? null
: NumberUtil.toLong(sceneId));
userInfos.put("sceneId", parseLong(sceneId));
}
if (userInfoArry[i].contains("userId")) {
String[] userLogin = userInfoArry[i].split("=");
String userId = userLogin[userLogin.length - 1];
userInfos.put("userId", StringUtil.isEmpty(userId) || "undefined".equalsIgnoreCase(userId) || "null".equalsIgnoreCase(userId) ? null
: NumberUtil.toLong(userId));
userInfos.put("userId", parseLong(userId));
}
if (userInfoArry[i].contains("merchantMemberId")) {
String[] merchant = userInfoArry[i].split("=");
String merchantMemberId = merchant[merchant.length - 1];
userInfos.put("merchantMemberId", StringUtil.isEmpty(merchantMemberId) || "undefined".equalsIgnoreCase(merchantMemberId)
|| "null".equalsIgnoreCase(merchantMemberId) ? null : NumberUtil.toLong(merchantMemberId));
userInfos.put("merchantMemberId", parseLong(merchantMemberId));
}
if (userInfoArry[i].contains("agentMemberId")) {
String[] merchant = userInfoArry[i].split("=");
String agentMemberId = merchant[merchant.length - 1];
userInfos.put("agentMemberId", StringUtil.isEmpty(agentMemberId) || "undefined".equalsIgnoreCase(agentMemberId)
|| "null".equalsIgnoreCase(agentMemberId) ? null : NumberUtil.toLong(agentMemberId));
userInfos.put("agentMemberId", parseLong(agentMemberId));
}
// add by gaop
if (userInfoArry[i].contains(PREVIEW_TYPE)) {
......@@ -250,40 +242,35 @@ public class Cookie {
if (userInfoArry[i].contains(FIRST_TD)) {
String[] firstTD = userInfoArry[i].split("=");
String code = firstTD[firstTD.length - 1];
userInfos.put(FIRST_TD, StringUtil.isEmpty(code) || "undefined".equalsIgnoreCase(code) || "null".equalsIgnoreCase(code) ? null
: NumberUtil.toLong(code));
userInfos.put(FIRST_TD, parseLong(code));
}
if (userInfoArry[i].contains(SECOND_TD)) {
String[] secondTD = userInfoArry[i].split("=");
String code = secondTD[secondTD.length - 1];
userInfos.put(SECOND_TD, StringUtil.isEmpty(code) || "undefined".equalsIgnoreCase(code) || "null".equalsIgnoreCase(code) ? null
: NumberUtil.toLong(code));
userInfos.put(SECOND_TD, parseLong(code));
}
// add by gaop at 2019年5月6日16:23:32
if (userInfoArry[i].contains(BOOK_GROUP_ID)) {
String[] bookGroupId = userInfoArry[i].split("=");
String code = bookGroupId[bookGroupId.length - 1];
userInfos.put(BOOK_GROUP_ID, StringUtil.isEmpty(code) || "undefined".equalsIgnoreCase(code) || "null".equalsIgnoreCase(code) ? null
: NumberUtil.toLong(code));
userInfos.put(BOOK_GROUP_ID, parseLong(code));
}
if (userInfoArry[i].contains(CLASSIFY_ID)) {
String[] classifyId = userInfoArry[i].split("=");
String code = classifyId[classifyId.length - 1];
userInfos.put(CLASSIFY_ID, StringUtil.isEmpty(code) || "undefined".equalsIgnoreCase(code) || "null".equalsIgnoreCase(code) ? null
: NumberUtil.toLong(code));
userInfos.put(CLASSIFY_ID, parseLong(code));
}
if (userInfoArry[i].contains(QRCODE_ID)) {
String[] qrcodeId = userInfoArry[i].split("=");
String code = qrcodeId[qrcodeId.length - 1];
userInfos.put(QRCODE_ID, StringUtil.isEmpty(code) || "undefined".equalsIgnoreCase(code) || "null".equalsIgnoreCase(code) ? null
: NumberUtil.toLong(code));
userInfos.put(QRCODE_ID, parseLong(code));
}
if (userInfoArry[i].contains(MAIN_USER_ID)) {
String[] user = userInfoArry[i].split("=");
String mainUserId = user[user.length - 1];
userInfos.put("mainUserId", StringUtil.isEmpty(mainUserId) || "undefined".equalsIgnoreCase(mainUserId)
|| "null".equalsIgnoreCase(mainUserId) ? null : (!mainUserId.equals("-1") ? NumberUtil.toLong(mainUserId) : -1));
|| "null".equalsIgnoreCase(mainUserId) || !NumberUtil.isDigits(mainUserId) ? null : (!mainUserId.equals("-1") ? NumberUtil.toLong(mainUserId) : -1));
}
if (userInfoArry[i].contains(USER_LABEL)) {
String[] user = userInfoArry[i].split("=");
......@@ -298,6 +285,10 @@ public class Cookie {
return userInfos;
}
private static Long parseLong(String channelId) {
return StringUtil.isBlank(channelId) || !NumberUtil.isDigits(channelId) ? null : NumberUtil.toLong(channelId);
}
/**
* 获取对应的ID值
* @param userInfo
......@@ -310,7 +301,7 @@ public class Cookie {
if (Cookie._WECHAT_USER_ID.equalsIgnoreCase(type) && StringUtil.isEmpty(value)){
throw PermissionException.PERMISSION_USER_NOT_LOGIN;
}
return StringUtil.isEmpty(value) || "undefined".equalsIgnoreCase(value) || "null".equalsIgnoreCase(value) ? null : NumberUtil.toLong(value);
return parseLong(value);
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment