From 6159dc58f50d3e4680779b7989bbd4d49a76bad5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 09 五月 2025 19:13:35 +0800
Subject: [PATCH] 添加日志
---
src/main/java/com/taoke/autopay/controller/WebApiController.java | 223 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 180 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/taoke/autopay/controller/WebApiController.java b/src/main/java/com/taoke/autopay/controller/WebApiController.java
index 07aa96b..c4fdc9a 100644
--- a/src/main/java/com/taoke/autopay/controller/WebApiController.java
+++ b/src/main/java/com/taoke/autopay/controller/WebApiController.java
@@ -6,18 +6,22 @@
import com.taoke.autopay.entity.KeyOrder;
import com.taoke.autopay.entity.SystemConfigKeyEnum;
import com.taoke.autopay.entity.WxUserInfo;
+import com.taoke.autopay.entity.agent.ChannelAgent;
import com.taoke.autopay.exception.KeyOrderException;
import com.taoke.autopay.exception.KeyVerifyException;
import com.taoke.autopay.exception.WxOrderCountException;
+import com.taoke.autopay.manager.PayCountVerifyManager;
import com.taoke.autopay.service.KeyOrderService;
import com.taoke.autopay.service.SystemConfigService;
import com.taoke.autopay.service.WxUserService;
+import com.taoke.autopay.service.agent.ChannelAgentService;
import com.taoke.autopay.utils.*;
import com.taoke.autopay.vo.SubmitKeyInfo;
import net.sf.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
+import org.springframework.util.AntPathMatcher;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.yeshi.utils.UrlUtils;
@@ -27,7 +31,10 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Controller
@RequestMapping("webapi")
@@ -47,25 +54,30 @@
@Resource
private SystemConfigService systemConfigService;
+ @Resource
+ private PayCountVerifyManager payCountVerifyManager;
+
+ @Resource
+ private ChannelAgentService channelAgentService;
- private void addKey(SubmitKeyInfo keyInfo, Long wxUid) throws KeyVerifyException, KeyOrderException, WxOrderCountException {
+ private KeyOrder addKey(SubmitKeyInfo keyInfo, Long wxUid) throws KeyVerifyException, KeyOrderException, WxOrderCountException {
// 鏌ヨ娌℃湁澶勭悊鐨勬暟閲�
- long notProcessCount = keyOrderService.countUserNotDoOrder(wxUid, new Date(System.currentTimeMillis() - 1000*60*30));
- if(notProcessCount>0){
+ long notProcessCount = keyOrderService.countUserNotDoOrder(wxUid, new Date(System.currentTimeMillis() - 1000 * 60 * 30));
+ if (notProcessCount > 0) {
throw new WxOrderCountException("涓婁竴涓彛浠ゅ皻鏈鐞嗗畬锛�");
}
// 瑙ｆ瀽閾炬帴
List<String> urllist = UrlUtils.parseUrlsFromText(keyInfo.getKey());
String verifyAlipayKey = systemConfigService.getValueCache(SystemConfigKeyEnum.ALIPAY_KEY_VERIFY);
- DYOrderDto orderDto =null;
+ DYOrderDto orderDto = null;
int orderType = Constant.ORDER_TYPE_UNKNOWN;
if (verifyAlipayKey != null && verifyAlipayKey.trim().equalsIgnoreCase("1")) {
try {
// 闇�瑕侀獙璇佹敮浠樺疂鍙ｄ护
- if (urllist.size() < 1) {
+ if (urllist.isEmpty()) {
throw new Exception("鍙ｄ护涓笉鍖呭惈閾炬帴");
}
AlipayOrderUtil.AlipayOrderTradeInfo tradeInfo = AlipayOrderUtil.getTradeInfo(urllist.get(0));
@@ -97,9 +109,7 @@
throw new KeyVerifyException(KeyVerifyException.CODE_COMMON, e.getMessage());
}
}
-
-
- KeyOrder order = keyOrderService.addKeyOrder(keyInfo, wxUid, TimeUtil.getGernalTime(System.currentTimeMillis(), Constant.DB_DAY_FORMAT),orderType, orderDto);
+ KeyOrder order = keyOrderService.addKeyOrder(keyInfo, wxUid, TimeUtil.getGernalTime(System.currentTimeMillis(), Constant.DB_DAY_FORMAT), orderType, orderDto);
Long uid = keyOrderService.getCanDistributeUid(Constant.MAX_PAY_ACCOUNT_QUEUE_SIZE);
if (uid != null) {
KeyOrder orderUpdate = new KeyOrder();
@@ -108,8 +118,7 @@
orderUpdate.setDistributeTime(new Date());
keyOrderService.update(orderUpdate);
}
-
-
+ return order;
}
private void verifySubmitKey(String key) throws Exception {
@@ -122,6 +131,8 @@
}
}
+ private Map<String, IPUtil.IPInfo> ipInfoMap = new HashMap<>();
+
@ResponseBody
@RequestMapping(value = "submitKeyV4")
public String submitKeyV4(SubmitKeyInfo keyInfo, HttpSession session, HttpServletRequest request) {
@@ -130,6 +141,44 @@
WxUserInfo user = (WxUserInfo) session.getAttribute(Constant.SESSION_KEY_USER);
if (StringUtil.isNullOrEmpty(keyInfo.getKey())) {
return JsonUtil.loadFalseResult("璇蜂笂浼爇ey");
+ }
+ String ip = IPUtil.getRemotIP(request);
+ keyInfo.setIp(ip);
+ if (!ipInfoMap.containsKey(ip)) {
+ try {
+ IPUtil.IPInfo ipInfo = IPUtil.getLocalIPInfo(ip);
+ ipInfoMap.put(ip, ipInfo);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ keyInfo.setIpInfo(ipInfoMap.get(ip));
+
+ AntPathMatcher pathMatcher = new AntPathMatcher();
+
+ Map<String, String> paramsMap = HttpUtil.getPramsFromUrl(keyInfo.getReferer());
+ if (paramsMap.containsKey("a") && ipInfoMap.get(ip) != null) {
+ String alias = paramsMap.get("a");
+ ChannelAgent agent = channelAgentService.selectByAlias(alias);
+ if (!StringUtil.isNullOrEmpty(agent.getShieldedAreas())) {
+ String[] res = agent.getShieldedAreas().split(",");
+ String ipInfoStr = ipInfoMap.get(ip).getProvince() + "/" + ipInfoMap.get(ip).getCity();
+ boolean shield = false;
+ for (String pattern : res) {
+ if (pathMatcher.match(pattern, ipInfoStr)) {
+ shield = true;
+ break;
+ }
+ }
+ if (shield) {
+ // 鍒ゆ柇鐢ㄦ埛鏄惁涓虹櫧鍚嶅崟
+ if (user.getStatus() != WxUserInfo.STATUS_WHITE) {
+ // 涓嶆槸鐧藉悕鍗曟墠闄愬埗
+ LogUtil.loggerDebug.warn("鍖哄煙灞忚斀锛歿}-{}", ip, new Gson().toJson(ipInfoMap.get(ip)));
+ return JsonUtil.loadFalseResult("鏆傛椂鏃犳硶涓婁紶鍙ｄ护");
+ }
+ }
+ }
}
try {
@@ -165,9 +214,12 @@
return JsonUtil.loadTrueResult(Constant.RESULT_CODE_NEED_LOGIN, root);
}
wxLogger.info("寰俊鏈夋巿鏉�:" + session.getId());
+ LogUtil.loggerDebug.warn("GEO淇℃伅锛歿}-{}-{}", user.getId(), ip, new Gson().toJson(ipInfoMap.get(ip)));
try {
- addKey(keyInfo, user.getId());
- return JsonUtil.loadTrueResult("");
+ KeyOrder order = addKey(keyInfo, user.getId());
+ JSONObject data = new JSONObject();
+ data.put("id", order.getId());
+ return JsonUtil.loadTrueResult(data);
} catch (KeyOrderException e) {
e.printStackTrace();
return JsonUtil.loadFalseResult(e.getMessage());
@@ -188,16 +240,43 @@
}
+ private WxUserInfo wxLogin(String code, HttpSession session) throws Exception {
+ WXAppInfoDto wxApp = systemConfigService.getWxAppInfoCache();
+ WxApiUtil.WXAccessTokenInfo tokenInfo = WxApiUtil.getAcessTokenInfo(code, wxApp);
+ if (tokenInfo != null && !StringUtil.isNullOrEmpty(tokenInfo.getOpenid())) {
+ WxApiUtil.WXUserInfo wxUserInfo = null;
+ if (tokenInfo.getScope() != null && tokenInfo.getScope().contains("snsapi_userinfo")) {
+ try {
+ wxUserInfo = WxApiUtil.getUserInfo(tokenInfo.getAccess_token(), tokenInfo.getOpenid());
+ wxLogger.info("瑙ｆ瀽缁撴灉", new Gson().toJson(wxUserInfo));
+ } catch (Exception e) {
+ wxLogger.error("瑙ｆ瀽鍑洪敊", e);
+ }
+ }
+ if (wxUserInfo == null) {
+ wxUserInfo = new WxApiUtil.WXUserInfo();
+ wxUserInfo.setOpenid(tokenInfo.getOpenid());
+ }
+ WxUserInfo user = wxUserService.login(wxUserInfo);
+ session.setAttribute(Constant.SESSION_KEY_USER, user);
+ wxLogger.info("寰俊淇濆瓨鐢ㄦ埛淇℃伅锛歿} id-{}", session.getId(), user.getId());
+ return user;
+ }
+ throw new Exception("鑾峰彇鎺堟潈淇℃伅寮傚父");
+ }
+
@RequestMapping(value = "wxLogin")
- public void wxLogin(String code, String state, HttpServletRequest request, HttpServletResponse response, HttpSession session) throws IOException {
+ public void wxLogin(String code, String state, HttpServletRequest request, HttpServletResponse
+ response, HttpSession session) throws IOException {
// 鏍规嵁code鑾峰彇openid
SubmitKeyInfo alipayKeyInfo = (SubmitKeyInfo) session.getAttribute(Constant.SESSION_KEY_TEMP_ALIPAY_KEY);
- wxLogger.info("寰俊鎺堟潈鍥炶皟锛歿} code-{} referer-{}", session.getId(), code, alipayKeyInfo.getReferer());
+ if (alipayKeyInfo != null) {
+ wxLogger.info("寰俊鎺堟潈鍥炶皟锛歿} code-{} referer-{}", session.getId(), code, alipayKeyInfo.getReferer());
+ }
String failLink = systemConfigService.getValueCache(SystemConfigKeyEnum.WX_LOGIN_FAIL_LINK);
- String referer = alipayKeyInfo.getReferer();
+ String referer = alipayKeyInfo != null ? alipayKeyInfo.getReferer() : "";
try {
- WXAppInfoDto wxApp = systemConfigService.getWxAppInfoCache();
String successLink = systemConfigService.getValueCache(SystemConfigKeyEnum.WX_LOGIN_SUCCESS_LINK);
if (!StringUtil.isNullOrEmpty(referer)) {
Map<String, String> params = HttpUtil.getPramsFromUrl(referer);
@@ -205,34 +284,31 @@
successLink = HttpUtil.getWholeUrl(HttpUtil.getUrlWithoutParams(referer), params);
}
- WxApiUtil.WXAccessTokenInfo tokenInfo = WxApiUtil.getAcessTokenInfo(code, wxApp);
- if (tokenInfo != null && !StringUtil.isNullOrEmpty(tokenInfo.getOpenid())) {
- WxApiUtil.WXUserInfo wxUserInfo = null;
- if (tokenInfo.getScope() != null && tokenInfo.getScope().contains("snsapi_userinfo")) {
- try {
- wxUserInfo = WxApiUtil.getUserInfo(tokenInfo.getAccess_token(), tokenInfo.getOpenid());
- wxLogger.info("瑙ｆ瀽缁撴灉", new Gson().toJson(wxUserInfo));
- } catch (Exception e) {
- wxLogger.error("瑙ｆ瀽鍑洪敊", e);
- }
- }
- if (wxUserInfo == null) {
- wxUserInfo = new WxApiUtil.WXUserInfo();
- wxUserInfo.setOpenid(tokenInfo.getOpenid());
- }
- WxUserInfo user = wxUserService.login(wxUserInfo);
- session.setAttribute(Constant.SESSION_KEY_USER, user);
- wxLogger.info("寰俊淇濆瓨鐢ㄦ埛淇℃伅锛歿} id-{}", session.getId(), user.getId());
-
- wxLogger.info("浠巗ession璇诲彇鍒発ey锛歿}", alipayKeyInfo);
- if (alipayKeyInfo != null) {
- addKey(alipayKeyInfo, user.getId());
- }
- response.sendRedirect(successLink);
+ WxUserInfo user = wxLogin(code, session);
+ if(alipayKeyInfo==null){
+ // 鏅�氱櫥褰�
+ wxLogger.info("鏅�氱櫥褰曟垚鍔�");
+ response.sendRedirect("/credit/index.html?state=SUCCESS");
return;
}
- } catch (Exception e) {
- e.printStackTrace();
+
+ wxLogger.info("浠巗ession璇诲彇鍒発ey锛歿}", alipayKeyInfo);
+ if (alipayKeyInfo != null) {
+ if (!ipInfoMap.containsKey(alipayKeyInfo.getIp())) {
+ try {
+ IPUtil.IPInfo ipInfo = IPUtil.getLocalIPInfo(alipayKeyInfo.getIp());
+ ipInfoMap.put(alipayKeyInfo.getIp(), ipInfo);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ addKey(alipayKeyInfo, user.getId());
+ }
+ response.sendRedirect(successLink);
+ return;
+
+ } catch (
+ Exception e) {
wxLogger.error("鎺堟潈澶辫触锛歿}", e.getMessage());
if (!StringUtil.isNullOrEmpty(referer)) {
Map<String, String> params = HttpUtil.getPramsFromUrl(referer);
@@ -243,4 +319,65 @@
response.sendRedirect(failLink);
}
+
+ /**
+ * 鏌ヨ鍙ｄ护鎻愪氦缁撴灉
+ *
+ * @param id
+ * @param request
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "queryKeyResult")
+ public String queryKeyResult(String id, HttpServletRequest request) {
+ KeyOrder keyOrder = keyOrderService.selectById(id);
+ if (keyOrder == null) {
+ return JsonUtil.loadFalseResult("鍙ｄ护涓嶅瓨鍦�");
+ }
+ String desc = "";
+ switch (keyOrder.getState()) {
+ case KeyOrder.STATE_NOT_PROCESS:
+ if (keyOrder.getDistributeClientUid() == null) {
+ desc = "鍙ｄ护宸叉彁浜わ紝绛夊緟鏀粯涓�...";
+ } else {
+ desc = "鏀粯鎺掗槦涓�...";
+ }
+ break;
+ case KeyOrder.STATE_NOT_PAY:
+ desc = "姝ｅ湪鏀粯涓紝鏀粯瀹屾垚鍚庢墠鍙户缁彁浜ゅ彛浠ゃ��";
+ break;
+ case KeyOrder.STATE_PAY:
+ desc = "鏀粯鎴愬姛";
+ break;
+ case KeyOrder.STATE_REJECT_PAY:
+ desc = keyOrder.getStateDesc();
+ break;
+ }
+ JSONObject data = new JSONObject();
+ data.put("state_desc", desc);
+ data.put("finish", keyOrder.getState() == KeyOrder.STATE_PAY || keyOrder.getState() == KeyOrder.STATE_REJECT_PAY ? 1 : 0);
+ return JsonUtil.loadTrueResult(data);
+ }
+
+ /**
+ * 鏌ヨ鏀粯鍓╀綑娆℃暟
+ *
+ * @param session
+ * @param request
+ * @return
+ */
+
+ @ResponseBody
+ @RequestMapping(value = "queryPayLeftCount")
+ public String queryPayLeftCount(HttpSession session, HttpServletRequest request) {
+ WxUserInfo user = (WxUserInfo) session.getAttribute(Constant.SESSION_KEY_USER);
+ if (user == null || user.getId() == null) {
+ return JsonUtil.loadFalseResult("鐢ㄦ埛灏氭湭鐧诲綍");
+ }
+ // 鏌ヨ鏀粯鍓╀綑娆℃暟
+ Map<Integer, Long> map = payCountVerifyManager.computeUserLeftPayCount(user.getId());
+ return JsonUtil.loadTrueResult(new Gson().toJson(map));
+ }
+
+
}
--
Gitblit v1.8.0