Skip to content

Commit 2ffaf3f

Browse files
author
zhangtao
committed
Change 去掉jdk中过期的api
1 parent 320cf8d commit 2ffaf3f

File tree

7 files changed

+418
-499
lines changed

7 files changed

+418
-499
lines changed

guns-service/src/main/java/cn/enilu/guns/aop/LogAop.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
import cn.enilu.guns.bean.annotion.core.BussinessLog;
44
import cn.enilu.guns.bean.core.ShiroUser;
5-
import cn.enilu.guns.bean.dictmap.base.AbstractDictMap;
65
import cn.enilu.guns.bean.vo.SpringContextHolder;
76
import cn.enilu.guns.dao.cache.TokenCache;
8-
import cn.enilu.guns.factory.Contrast;
97
import cn.enilu.guns.platform.log.LogManager;
108
import cn.enilu.guns.platform.log.LogTaskFactory;
119
import cn.enilu.guns.service.system.LogObjectHolder;
1210
import cn.enilu.guns.shiro.ShiroKit;
11+
import cn.enilu.guns.utils.BeanUtil;
1312
import cn.enilu.guns.utils.HttpKit;
1413
import cn.enilu.guns.utils.StringUtils;
1514
import org.aspectj.lang.ProceedingJoinPoint;
@@ -109,14 +108,13 @@ private void handle(ProceedingJoinPoint point) throws Exception {
109108
Object obj1 = LogObjectHolder.me().get();
110109
Map<String, String> obj2 = HttpKit.getRequestParameters();
111110
try {
112-
msg = Contrast.contrastObj(dictClass, key, obj1, obj2);
111+
msg = BeanUtil.contrastObj(key, obj1, obj2);
113112
}catch (Exception e){
114113

115114
}
116115
} else {
117116
Map<String, String> parameters = HttpKit.getRequestParameters();
118-
AbstractDictMap dictMap = (AbstractDictMap) dictClass.newInstance();
119-
msg = Contrast.parseMutiKey(dictMap,key,parameters);
117+
msg = BeanUtil.parseMutiKey(parameters);
120118
}
121119

122120
LogManager.me().executeLog(LogTaskFactory.bussinessLog(idUser, bussinessName, className, methodName, msg));

guns-service/src/main/java/cn/enilu/guns/factory/Contrast.java

Lines changed: 0 additions & 211 deletions
This file was deleted.

guns-service/src/main/java/cn/enilu/guns/warpper/LogWarpper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cn.enilu.guns.warpper;
22

3-
import cn.enilu.guns.factory.Contrast;
43
import cn.enilu.guns.service.system.impl.ConstantFactory;
4+
import cn.enilu.guns.utils.Constants;
55
import cn.enilu.guns.utils.DateUtil;
66
import cn.enilu.guns.utils.ToolUtil;
77

@@ -34,8 +34,8 @@ public void warpTheMap(Map<String, Object> map) {
3434
}
3535
map.put("createtime",DateUtil.format((Date) map.get("createTime"),"yyyy-MM-dd hh:MM:ss"));
3636
//如果信息中包含分割符号;;; 则分割字符串返给前台
37-
if (ToolUtil.isNotEmpty(message) && message.indexOf(Contrast.separator) != -1) {
38-
String[] msgs = message.split(Contrast.separator);
37+
if (ToolUtil.isNotEmpty(message) && message.indexOf(Constants.SEPARATOR) != -1) {
38+
String[] msgs = message.split(Constants.SEPARATOR);
3939
map.put("regularMessage",msgs);
4040
}else{
4141
map.put("regularMessage",message);

guns-utils/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
<groupId>com.google.guava</groupId>
2020
<artifactId>guava</artifactId>
2121
</dependency>
22+
<dependency>
23+
<groupId>org.springframework.boot</groupId>
24+
<artifactId>spring-boot-starter-data-jpa</artifactId>
25+
</dependency>
2226
<dependency>
2327
<groupId>org.springframework.boot</groupId>
2428
<artifactId>spring-boot-starter-logging</artifactId>

0 commit comments

Comments
 (0)