改取IP方法

067224da · 张永 · 7493a769 · 067224da · 067224da · 067224da
Commit 067224da authored May 22, 2024 by 张永
3 changed files
--- a/src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java
@@ -1493,9 +1493,9 @@ public class OrderServiceImpl implements OrderService {
 	}
 	
 	public static void main(String[] args) {
-		String aa = "20230421121212";
-		String a1 = DateUtil.format(DateUtil.parse(aa, DateUtil.FMT_YYYYMMddHHMMSS), DateUtil.FMT_DATE_SECOND);
-		System.out.println(a1);
+		OrderServiceImpl a = new OrderServiceImpl();
+		//a.createPayFile("111","120","D:\\data\\erp\\callback\\","tet");
+		a.delPayFile("111","120","D:\\data\\erp\\callback\\");
 	}

 }
--- a/src/main/java/com/egolm/shop/common/component/IDCSystemLogAspect.java
+++ b/src/main/java/com/egolm/shop/common/component/IDCSystemLogAspect.java
@@ -30,6 +30,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.egolm.common.DateUtil;
 import com.egolm.common.GsonUtil;
 import com.egolm.common.jdbc.JdbcTemplate;
+import com.egolm.common.web.ServletUtil;
 import com.egolm.shop.bean.TIdcServicesLogs;
 import com.egolm.shop.common.utils.ShopUtil; 

@@ -108,7 +109,7 @@ public class IDCSystemLogAspect {
 		     if (request != null) {
 		         logMap.put("sUserAgent", request.getHeader(HttpHeaders.USER_AGENT));
 		         logMap.put("sHttpMethod", request.getMethod());
-		         logMap.put("sIp", ShopUtil.getIpAddress(request));
+		         logMap.put("sIp",  ServletUtil.remoteIp(request));
 		         logMap.put("sRequestText", GsonUtil.toJson(ShopUtil.getParameterMap(request)));
 		         
 		     }

--- a/src/main/resources/templates/redmine.html
+++ b/src/main/resources/templates/redmine.html
@@ -24,8 +24,9 @@
 </head>
 <body>
 	<div id="app">
-		<el-divider content-position="left">V1.1.7.6 2024-5-6</el-divider>
+		<el-divider content-position="left">V1.1.7.6 2024-5-22</el-divider>
 		 <p class="title">1.支付回调失败状态为99的，刚写文件，需求 #16796</p>
+		 <p class="title">2.改取IP方法,需求 #16869</p>
 	     <el-divider content-position="left">V1.1.7.5 2024-4-23</el-divider>
 		 <p class="title">1.增加接口签名验证及开关</p> 
 		 <p class="title">2.需求 #16555、需求 #16563   需求 #16542,需求 #16595</p>