添加开发规和skill
This commit is contained in:
@@ -5,7 +5,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
|
||||
import org.aspectj.lang.annotation.Around;
|
||||
import org.aspectj.lang.annotation.Aspect;
|
||||
import org.jiayunet.annotation.FuncPermission;
|
||||
import org.jiayunet.server.FuncPermissionServer;
|
||||
import org.jiayunet.service.FuncPermissionService;
|
||||
import org.jiayunet.tool.UserSecurityTool;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
@@ -22,7 +22,7 @@ import org.springframework.stereotype.Component;
|
||||
public class FuncPermissionAspect {
|
||||
|
||||
@Autowired
|
||||
private FuncPermissionServer funcPermissionServer;
|
||||
private FuncPermissionService funcPermissionService;
|
||||
|
||||
@Around("@annotation(funcPermission)")
|
||||
public Object check(ProceedingJoinPoint joinPoint, FuncPermission funcPermission) throws Throwable {
|
||||
@@ -33,14 +33,14 @@ public class FuncPermissionAspect {
|
||||
log.info("功能权限校验 userId:{} funcCode:{}", userId, funcCode);
|
||||
|
||||
// 校验权限 + 扣减库存,返回使用记录ID
|
||||
Long logId = funcPermissionServer.checkAndDeduct(userId, funcCode);
|
||||
Long logId = funcPermissionService.checkAndDeduct(userId, funcCode);
|
||||
|
||||
// 放行,业务异常时回退使用记录和库存
|
||||
try {
|
||||
return joinPoint.proceed();
|
||||
} catch (Exception e) {
|
||||
log.warn("业务异常,回退使用记录 logId:{} userId:{} funcCode:{}", logId, userId, funcCode);
|
||||
funcPermissionServer.rollbackUsage(logId, userId, funcCode);
|
||||
funcPermissionService.rollbackUsage(logId, userId, funcCode);
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package org.jiayunet.controller;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.jiayunet.pojo.dto.SmsLoginDto;
|
||||
import org.jiayunet.pojo.vo.LoginVo;
|
||||
import org.jiayunet.server.LoginServer;
|
||||
import org.jiayunet.service.LoginService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@@ -22,17 +22,17 @@ import javax.validation.constraints.Pattern;
|
||||
@Validated
|
||||
public class LoginController {
|
||||
|
||||
private LoginServer loginServer;
|
||||
private LoginService loginService;
|
||||
|
||||
@PostMapping("/sms/sendCode")
|
||||
public boolean sendCode(@RequestParam @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确") String mobileNumber) {
|
||||
return loginServer.sendCode(mobileNumber);
|
||||
return loginService.sendCode(mobileNumber);
|
||||
}
|
||||
|
||||
@PostMapping("/login/smsLogin")
|
||||
public LoginVo smsLogin(@Validated @RequestBody SmsLoginDto dto,
|
||||
HttpServletRequest request,
|
||||
HttpServletResponse response) {
|
||||
return loginServer.smsLogin(dto.getMobileNumber(), dto.getCode(), dto.getInviteCode(), request, response);
|
||||
return loginService.smsLogin(dto.getMobileNumber(), dto.getCode(), dto.getInviteCode(), request, response);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ package org.jiayunet.controller;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.jiayunet.pojo.vo.RouteMenuVo;
|
||||
import org.jiayunet.server.RouteMenuServer;
|
||||
import org.jiayunet.service.RouteMenuService;
|
||||
import org.jiayunet.tool.UserSecurityTool;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
@@ -20,7 +20,7 @@ import java.util.List;
|
||||
@AllArgsConstructor
|
||||
public class RouteMenuController {
|
||||
|
||||
private RouteMenuServer routeMenuServer;
|
||||
private RouteMenuService routeMenuService;
|
||||
|
||||
/**
|
||||
* 获取当前用户有效路由菜单(树形结构)
|
||||
@@ -28,6 +28,6 @@ public class RouteMenuController {
|
||||
@GetMapping("/menu")
|
||||
public List<RouteMenuVo> getUserRoutes() {
|
||||
Long userId = UserSecurityTool.getUserId();
|
||||
return routeMenuServer.getUserRoutes(userId);
|
||||
return routeMenuService.getUserRoutes(userId);
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package org.jiayunet.server;
|
||||
package org.jiayunet.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
@@ -25,7 +25,7 @@ import java.time.ZoneId;
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class FuncPermissionServer {
|
||||
public class FuncPermissionService {
|
||||
|
||||
@Autowired
|
||||
private FuncPermissionMapper funcPermissionMapper;
|
||||
+8
-8
@@ -1,4 +1,4 @@
|
||||
package org.jiayunet.server;
|
||||
package org.jiayunet.service;
|
||||
|
||||
import com.auth0.jwt.JWT;
|
||||
import com.auth0.jwt.algorithms.Algorithm;
|
||||
@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class LoginServer {
|
||||
public class LoginService {
|
||||
|
||||
@Value("${app.secret.token:youweiqingnian123}")
|
||||
private String secret;
|
||||
@@ -51,7 +51,7 @@ public class LoginServer {
|
||||
private int deviceOnlineQuantity;
|
||||
|
||||
@Autowired
|
||||
private SmsServer smsServer;
|
||||
private SmsService smsService;
|
||||
|
||||
@Autowired
|
||||
private UserMapper userMapper;
|
||||
@@ -60,7 +60,7 @@ public class LoginServer {
|
||||
private RedisServerTool redisServerTool;
|
||||
|
||||
@Autowired
|
||||
private UserRegisterServer userRegisterServer;
|
||||
private UserRegisterService userRegisterService;
|
||||
|
||||
/**
|
||||
* 发送短信验证码
|
||||
@@ -72,7 +72,7 @@ public class LoginServer {
|
||||
String code = String.valueOf((int) ((Math.random() * 9 + 1) * 100000));
|
||||
variable.setCode(code);
|
||||
|
||||
return smsServer.send(mobileNumber, SmsTemplateEnum.UNIVERSAL, variable);
|
||||
return smsService.send(mobileNumber, SmsTemplateEnum.UNIVERSAL, variable);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -84,7 +84,7 @@ public class LoginServer {
|
||||
Assert.hasText(code, "验证码不能为空");
|
||||
|
||||
// 校验验证码
|
||||
boolean verified = smsServer.verify(mobileNumber, SmsTemplateEnum.UNIVERSAL, code);
|
||||
boolean verified = smsService.verify(mobileNumber, SmsTemplateEnum.UNIVERSAL, code);
|
||||
if (!verified) {
|
||||
throw new BusinessException(BusinessExpCodeEnum.UNKNOWN_ERROR, "验证码错误或已过期");
|
||||
}
|
||||
@@ -94,7 +94,7 @@ public class LoginServer {
|
||||
|
||||
// 用户不存在则自动注册
|
||||
if (user == null) {
|
||||
user = userRegisterServer.register(mobileNumber, inviteCode);
|
||||
user = userRegisterService.register(mobileNumber, inviteCode);
|
||||
}
|
||||
|
||||
// 检查用户状态
|
||||
@@ -147,7 +147,7 @@ public class LoginServer {
|
||||
redisServerTool.set(redisKey, info, tokenExceedTime, TimeUnit.SECONDS);
|
||||
|
||||
// 清除验证码
|
||||
smsServer.clear(mobileNumber, SmsTemplateEnum.UNIVERSAL);
|
||||
smsService.clear(mobileNumber, SmsTemplateEnum.UNIVERSAL);
|
||||
|
||||
// 设置Cookie
|
||||
Cookie cookie = new Cookie("Token", token);
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package org.jiayunet.server;
|
||||
package org.jiayunet.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
@@ -23,7 +23,7 @@ import java.util.stream.Collectors;
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class RouteMenuServer {
|
||||
public class RouteMenuService {
|
||||
|
||||
@Autowired
|
||||
private UserRouteMenuStockMapper userRouteMenuStockMapper;
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package org.jiayunet.server;
|
||||
package org.jiayunet.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -23,7 +23,7 @@ import java.time.Instant;
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class UserRegisterServer {
|
||||
public class UserRegisterService {
|
||||
|
||||
/**
|
||||
* 邀请码字符集(大写字母+数字)
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package org.jiayunet.server;
|
||||
package org.jiayunet.service;
|
||||
|
||||
import com.wechat.pay.java.service.partnerpayments.nativepay.model.Transaction;
|
||||
import com.wechat.pay.java.service.refund.model.RefundNotification;
|
||||
Reference in New Issue
Block a user