henryC
/
flyfish-framework
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix

This commit is contained in:
wangyu 2021-01-14 15:02:10 +08:00
parent ca5fffd70a
commit 0a79d57337
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogContext.java
View File

@ -10,6 +10,7 @@ import lombok.AccessLevel;
import lombok.Data; import lombok.Data;
import lombok.Setter; import lombok.Setter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ClassUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.Signature; import org.aspectj.lang.Signature;
@ -68,11 +69,12 @@ public class LogContext {
MethodSignature methodSignature = (MethodSignature) signature; MethodSignature methodSignature = (MethodSignature) signature;
Operation operation = AnnotationUtils.findAnnotation(methodSignature.getMethod(), Operation.class); Operation operation = AnnotationUtils.findAnnotation(methodSignature.getMethod(), Operation.class);
if (null != operation) { if (null != operation) {
Class<?> targetClass = joinPoint.getTarget().getClass();
LogContext context = new LogContext(); LogContext context = new LogContext();
context.startTime = System.currentTimeMillis(); context.startTime = System.currentTimeMillis();
context.module = determineModule(operation, joinPoint.getTarget().getClass()); context.module = determineModule(operation, targetClass);
context.business = operation.value(); context.business = operation.value();
context.signature = joinPoint.getSignature().getName(); context.signature = ClassUtils.getCanonicalName(targetClass) + "." + methodSignature.getName();
context.args = joinPoint.getArgs(); context.args = joinPoint.getArgs();
context.valid = true; context.valid = true;
log.info("监测到支持的切点：{}, {}", context.module, operation.value()); log.info("监测到支持的切点：{}, {}", context.module, operation.value());

3
flyfish-user/src/main/java/com/flyfish/framework/controller/UserController.java
View File

@ -1,5 +1,6 @@
package com.flyfish.framework.controller; package com.flyfish.framework.controller;
import com.flyfish.framework.annotations.Operation;
import com.flyfish.framework.bean.Result; import com.flyfish.framework.bean.Result;
import com.flyfish.framework.configuration.annotations.CurrentUser; import com.flyfish.framework.configuration.annotations.CurrentUser;
import com.flyfish.framework.domain.UserPasswordDto; import com.flyfish.framework.domain.UserPasswordDto;
@ -34,6 +35,7 @@ public class UserController extends BaseController<User, UserQo> {
* @return 结果 * @return 结果
*/ */
@PutMapping("{id}/passwords") @PutMapping("{id}/passwords")
@Operation("重置密码")
public Result<Void> resetPassword(@PathVariable String id, @RequestBody User body, @CurrentUser User user) { public Result<Void> resetPassword(@PathVariable String id, @RequestBody User body, @CurrentUser User user) {
Assert.hasText(body.getPassword(), "重置密码必需携带密码！"); Assert.hasText(body.getPassword(), "重置密码必需携带密码！");
Assert.isTrue(Optional.ofNullable(user.getRoles()).map(roles -> roles.stream().anyMatch(Role::getAdmin)) Assert.isTrue(Optional.ofNullable(user.getRoles()).map(roles -> roles.stream().anyMatch(Role::getAdmin))
@ -56,6 +58,7 @@ public class UserController extends BaseController<User, UserQo> {
* @return 结果 * @return 结果
*/ */
@PutMapping("/passwords") @PutMapping("/passwords")
@Operation("修改密码")
public Result<Void> changePassword(@RequestBody UserPasswordDto passwordDto, @CurrentUser User user) { public Result<Void> changePassword(@RequestBody UserPasswordDto passwordDto, @CurrentUser User user) {
// 检查原密码 // 检查原密码
Assert.isTrue(passwordEncoder.matches(passwordDto.getOldPassword(), user.getPassword()), "原密码不正确！"); Assert.isTrue(passwordEncoder.matches(passwordDto.getOldPassword(), user.getPassword()), "原密码不正确！");