Skip to content

Commit 966fa6f

Browse files
qianmoQqianmoQ
authored
Merge pull request #2 from springstack/develop
Develop
2 parents fef2ac4 + c75e428 commit 966fa6f

File tree

636 files changed

+1401
-737
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

636 files changed

+1401
-737
lines changed

‎README.md‎

Lines changed: 1 addition & 6 deletions

bootstack-aop/pom.xml renamed to aop/pom.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>incubator-bootstack</artifactId>
88
<groupId>com.bootstack</groupId>
9-
<version>1.0.4</version>
9+
<version>1.0.5</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>
@@ -35,7 +35,11 @@
3535
</dependency>
3636
<dependency>
3737
<groupId>com.bootstack</groupId>
38-
<artifactId>bootstack-service</artifactId>
38+
<artifactId>bootstack-storage-mysql</artifactId>
39+
</dependency>
40+
<dependency>
41+
<groupId>com.bootstack</groupId>
42+
<artifactId>bootstack-storage-mongodb</artifactId>
3943
</dependency>
4044
</dependencies>
4145

bootstack-aop/src/main/java/com/bootstack/aop/log/ControllerLogAspect.java renamed to aop/src/main/java/com/bootstack/aop/log/ControllerLogAspect.java

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@
1717
*/
1818
package com.bootstack.aop.log;
1919

20-
import com.bootstack.model.system.interfaces.SystemInterfaceModel;
21-
import com.bootstack.model.system.log.SystemLogModel;
22-
import com.bootstack.model.system.log.SystemLogTypeModel;
23-
import com.bootstack.model.system.method.SystemMethodModel;
24-
import com.bootstack.model.user.UserModel;
25-
import com.bootstack.service.system.interfaces.SystemInterfaceService;
26-
import com.bootstack.service.system.log.SystemLogService;
27-
import com.bootstack.service.system.method.SystemMethodService;
28-
import com.bootstack.service.user.UserService;
20+
import com.bootstack.storage.mongodb.model.system.SystemLogToMongoDbModel;
21+
import com.bootstack.storage.mongodb.service.system.log.SystemLogToMongoDbService;
22+
import com.bootstack.storage.mysql.model.system.interfaces.SystemInterfaceModel;
23+
import com.bootstack.storage.mysql.model.system.log.SystemLogModel;
24+
import com.bootstack.storage.mysql.model.system.log.SystemLogTypeModel;
25+
import com.bootstack.storage.mysql.model.system.method.SystemMethodModel;
26+
import com.bootstack.storage.mysql.model.user.UserModel;
27+
import com.bootstack.storage.mysql.service.system.interfaces.SystemInterfaceService;
28+
import com.bootstack.storage.mysql.service.system.log.SystemLogService;
29+
import com.bootstack.storage.mysql.service.system.method.SystemMethodService;
30+
import com.bootstack.storage.mysql.service.user.UserService;
2931
import org.aspectj.lang.JoinPoint;
3032
import org.aspectj.lang.annotation.AfterReturning;
3133
import org.aspectj.lang.annotation.Aspect;
@@ -64,6 +66,9 @@ public class ControllerLogAspect {
6466
@Autowired
6567
private SystemMethodService systemMethodService;
6668

69+
@Autowired
70+
private SystemLogToMongoDbService systemLogToMongoDbService;
71+
6772
@Pointcut("execution(* com.bootstack.core.controller..*.*(..))")
6873
private void controller() {
6974
}
@@ -88,18 +93,29 @@ public void doBefore(JoinPoint joinPoint) throws Throwable {
8893
}
8994
}
9095
}
91-
SystemLogModel log = new SystemLogModel();
92-
log.setUrl(request.getServletPath());
93-
log.setArgs(Arrays.toString(joinPoint.getArgs()));
94-
log.setClazz(joinPoint.getSignature().getDeclaringTypeName());
95-
log.setClassMethod(joinPoint.getSignature().getName());
96-
log.setMethod(request.getMethod());
97-
log.setRemoteIp(request.getRemoteAddr());
98-
SystemLogTypeModel logType = new SystemLogTypeModel();
99-
logType.setId(4L);
100-
log.setType(logType);
101-
log.setUser(user);
102-
this.systemLogService.insertModel(log);
96+
// SystemLogModel log = new SystemLogModel();
97+
// log.setUrl(request.getServletPath());
98+
// log.setArgs(Arrays.toString(joinPoint.getArgs()));
99+
// log.setClazz(joinPoint.getSignature().getDeclaringTypeName());
100+
// log.setClassMethod(joinPoint.getSignature().getName());
101+
// log.setMethod(request.getMethod());
102+
// log.setRemoteIp(request.getRemoteAddr());
103+
// SystemLogTypeModel logType = new SystemLogTypeModel();
104+
// logType.setId(4L);
105+
// log.setType(logType);
106+
// log.setUser(user);
107+
// this.systemLogService.insertModel(log);
108+
// 存储日志信息到Mongo中
109+
SystemLogToMongoDbModel logToMongoDbModel = new SystemLogToMongoDbModel();
110+
logToMongoDbModel.setUrl(request.getServletPath());
111+
logToMongoDbModel.setArgs(Arrays.toString(joinPoint.getArgs()));
112+
logToMongoDbModel.setClazz(joinPoint.getSignature().getDeclaringTypeName());
113+
logToMongoDbModel.setClassMethod(joinPoint.getSignature().getName());
114+
logToMongoDbModel.setMethod(request.getMethod());
115+
logToMongoDbModel.setRemoteIp(request.getRemoteAddr());
116+
logToMongoDbModel.setUserId(user.getId());
117+
logToMongoDbModel.setUserName(user.getName());
118+
this.systemLogToMongoDbService.insertModel(logToMongoDbModel);
103119
}
104120

105121
@AfterReturning(returning = "response", pointcut = "controller()")

bootstack-aop/src/main/java/com/bootstack/aop/log/package-info.java renamed to aop/src/main/java/com/bootstack/aop/log/package-info.java

File renamed without changes.

bootstack-aop/src/main/java/com/bootstack/aop/package-info.java renamed to aop/src/main/java/com/bootstack/aop/package-info.java

File renamed without changes.

bootstack-aop/src/main/java/com/bootstack/aop/validation/package-info.java renamed to aop/src/main/java/com/bootstack/aop/validation/package-info.java

File renamed without changes.

bootstack-aop/src/main/java/com/bootstack/aop/validation/user/UserRequiredParamPathAndQueryAopValidation.java renamed to aop/src/main/java/com/bootstack/aop/validation/user/UserRequiredParamPathAndQueryAopValidation.java

File renamed without changes.

bootstack-aop/src/main/java/com/bootstack/aop/validation/user/UserRequiredParamPathAndQueryAopValidationAspet.java renamed to aop/src/main/java/com/bootstack/aop/validation/user/UserRequiredParamPathAndQueryAopValidationAspet.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919

2020
import com.bootstack.common.enums.SystemMessageEnums;
2121
import com.bootstack.common.enums.UserMessageEnums;
22-
import com.bootstack.model.user.UserModel;
23-
import com.bootstack.service.user.UserService;
24-
import com.fasterxml.jackson.databind.ObjectMapper;
22+
import com.bootstack.storage.mysql.model.user.UserModel;
23+
import com.bootstack.storage.mysql.service.user.UserService;
2524
import com.google.gson.Gson;
2625
import lombok.extern.slf4j.Slf4j;
2726
import org.aspectj.lang.JoinPoint;
@@ -84,4 +83,4 @@ public void paramValidation(JoinPoint point, UserRequiredParamPathAndQueryAopVal
8483
}
8584
}
8685

87-
}
86+
}

bootstack-aop/src/main/java/com/bootstack/aop/validation/user/package-info.java renamed to aop/src/main/java/com/bootstack/aop/validation/user/package-info.java

File renamed without changes.

‎bootstack-core/src/main/java/com/bootstack/core/config/datasource/package-info.java‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)