Skip to content

S
shop
Commit 067224da authored by 张永's avatar 张永
Browse files
Options

改取IP方法

parent 7493a769
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java
View file @ 067224da
...@@ -1493,9 +1493,9 @@ public class OrderServiceImpl implements OrderService { ...@@ -1493,9 +1493,9 @@ public class OrderServiceImpl implements OrderService {
} }
public static void main(String[] args) { public static void main(String[] args) {
String aa = "20230421121212"; OrderServiceImpl a = new OrderServiceImpl();
String a1 = DateUtil.format(DateUtil.parse(aa, DateUtil.FMT_YYYYMMddHHMMSS), DateUtil.FMT_DATE_SECOND); //a.createPayFile("111","120","D:\\data\\erp\\callback\\","tet");
System.out.println(a1); a.delPayFile("111","120","D:\\data\\erp\\callback\\");
} }
} }
src/main/java/com/egolm/shop/common/component/IDCSystemLogAspect.java
View file @ 067224da
...@@ -30,6 +30,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature; ...@@ -30,6 +30,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
import com.egolm.common.DateUtil; import com.egolm.common.DateUtil;
import com.egolm.common.GsonUtil; import com.egolm.common.GsonUtil;
import com.egolm.common.jdbc.JdbcTemplate; import com.egolm.common.jdbc.JdbcTemplate;
import com.egolm.common.web.ServletUtil;
import com.egolm.shop.bean.TIdcServicesLogs; import com.egolm.shop.bean.TIdcServicesLogs;
import com.egolm.shop.common.utils.ShopUtil; import com.egolm.shop.common.utils.ShopUtil;
...@@ -108,7 +109,7 @@ public class IDCSystemLogAspect { ...@@ -108,7 +109,7 @@ public class IDCSystemLogAspect {
if (request != null) { if (request != null) {
logMap.put("sUserAgent", request.getHeader(HttpHeaders.USER_AGENT)); logMap.put("sUserAgent", request.getHeader(HttpHeaders.USER_AGENT));
logMap.put("sHttpMethod", request.getMethod()); 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))); logMap.put("sRequestText", GsonUtil.toJson(ShopUtil.getParameterMap(request)));
} }
......
src/main/resources/templates/redmine.html
View file @ 067224da
...@@ -24,8 +24,9 @@ ...@@ -24,8 +24,9 @@
</head> </head>
<body> <body>
<div id="app"> <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">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> <el-divider content-position="left">V1.1.7.5 2024-4-23</el-divider>
<p class="title">1.增加接口签名验证及开关</p> <p class="title">1.增加接口签名验证及开关</p>
<p class="title">2.需求 #16555、需求 #16563 需求 #16542,需求 #16595</p> <p class="title">2.需求 #16555、需求 #16563 需求 #16542,需求 #16595</p>
......
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