Merge branch 'develop'

Author: TOP-LH

.github/workflows/ci.yml

@@ -5,9 +5,9 @@ name: Java CI with Maven
 
 on:
   push:
-    # 拉取tag动作
-    tags:
-      - 'v*'
+    branches: [ release ]
+  pull_request:
+    branches: [ release ]
 
 jobs:
   build:
@@ -25,15 +25,15 @@ jobs:
       # 编译
       - name: Build with Maven
         run: mvn -B package --file pom.xml
-#      # 规范打包目录
-#      - name: Zip the Build
-#        run: |
-#          mkdir release
-#          cd ./src/PluginCore/bin/Release
-#          zip -r PluginCore-netcoreapp3.1.zip ./netcoreapp3.1/
-#          zip -r PluginCore-net5.0.zip ./net5.0/
-#          cd ../../../../
-#          mv ./src/PluginCore/bin/Release/*.zip ./
+      #      # 规范打包目录
+      #      - name: Zip the Build
+      #        run: |
+      #          mkdir release
+      #          cd ./src/PluginCore/bin/Release
+      #          zip -r PluginCore-netcoreapp3.1.zip ./netcoreapp3.1/
+      #          zip -r PluginCore-net5.0.zip ./net5.0/
+      #          cd ../../../../
+      #          mv ./src/PluginCore/bin/Release/*.zip ./
       # 创建发行版
       - name: Create Release
         uses: ncipollo/release-action@v1.10.0

.gitignore

@@ -15,6 +15,7 @@ target/
 
 ### IntelliJ IDEA ###
 .idea
+.fleet
 *.iws
 *.iml
 *.ipr
@@ -29,3 +30,9 @@ build/
 
 ### VS Code ###
 .vscode/
+
+### 忽略热部署 ###
+/nginx-ops-admin/src/main/resources/rebel.xml
+/nginx-ops-comm/src/main/resources/rebel.xml
+/nginx-ops-conf/src/main/resources/rebel.xml
+/nginx-ops-system/src/main/resources/rebel.xml

README.md

@@ -58,3 +58,4 @@ PS: 本项目采用Google编码风格, 如果您使用IDEA编程, 请下载googl
 
 ## 特别鸣谢
 
+<img alt="JetBrains Logo (Main) logo" height="200" src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" width="200"/>

image/img.png

@@ -8,8 +8,6 @@
 import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
-import io.github.nginx.ops.server.system.domain.dto.UserInfo;
-import io.github.nginx.ops.server.system.util.UserInfoUtils;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
@@ -27,10 +25,6 @@
 @Configuration
 public class MybatisPlusConfig implements MetaObjectHandler {
 
-  public static void main(String[] args) {
-    System.out.println("\"sys\".equals(\"nginx\") = " + "sys".equals("nginx"));
-  }
-
   @Override
   public void insertFill(MetaObject metaObject) {
     log.debug("start insert fill ....");
@@ -53,9 +47,8 @@ public void insertFill(MetaObject metaObject) {
   public void updateFill(MetaObject metaObject) {
     log.debug("start update fill ....");
     DateTime dateTime = new DateTime();
-    UserInfo userInfo = UserInfoUtils.getUserInfo();
-    this.strictInsertFill(
-        metaObject, "updateBy", String.class, userInfo.getSysUser().getLoginName());
+    // UserInfo userInfo = UserInfoUtils.getUserInfo();
+    this.strictInsertFill(metaObject, "updateBy", String.class, "test");
     this.strictUpdateFill(metaObject, "updateTime", Date.class, dateTime);
   }
 

nginx-ops-admin/src/main/java/io/github/nginx/ops/server/admin/config/MybatisPlusConfig.java

@@ -1,6 +1,7 @@
 package io.github.nginx.ops.server.admin.config;
 
-import cn.dev33.satoken.interceptor.SaAnnotationInterceptor;
+import cn.dev33.satoken.interceptor.SaInterceptor;
+import cn.dev33.satoken.stp.StpUtil;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -19,7 +20,18 @@ public class SaTokenConfigure implements WebMvcConfigurer {
    */
   @Override
   public void addInterceptors(InterceptorRegistry registry) {
-    // 注册 Sa-Token 拦截器，打开注解式鉴权功能
-    registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**");
+    // 注册 Sa-Token 拦截器，校验规则为 StpUtil.checkLogin() 登录校验。
+    registry
+        .addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin()))
+        .addPathPatterns("/**")
+        .excludePathPatterns("/doLogin", "/captcha")
+        .excludePathPatterns(
+            "/swagger-resources/**",
+            "/webjars/**",
+            "/v2/**",
+            "/swagger-ui.html/**",
+            "/doc.html/**",
+            "/error",
+            "/favicon.ico");
   }
 }

nginx-ops-admin/src/main/java/io/github/nginx/ops/server/admin/config/SaTokenConfigure.java

@@ -7,10 +7,22 @@
  */
 public class AdminReturnCodeConstant {
 
-  /** 验证码已过期 */
+  /** 验证码过期 */
   public static final String CAPTCHA_HAS_EXPIRED = "A0001";
   /** 登录名或密码错误 */
   public static final String USER_DOES_NOT_EXIST = "A0002";
   /** 账号被停用 */
   public static final String USER_NOT_ENABLE = "A0003";
+  /** 验证码错误 */
+  public static final String CAPTCHA_ERROR = "A0004";
+  /** 未提供token */
+  public static final String NOT_TOKEN = "A0005";
+  /** token无效 */
+  public static final String INVALID_TOKEN = "A0006";
+  /** token已过期 */
+  public static final String TOKEN_TIMEOUT = "A0007";
+  /** token已被顶下线 */
+  public static final String BE_REPLACED = "A0008";
+  /** token已被踢下线 */
+  public static final String KICK_OUT = "A0009";
 }

nginx-ops-admin/src/main/java/io/github/nginx/ops/server/admin/constant/AdminReturnCodeConstant.java

@@ -7,6 +7,7 @@
 import io.github.nginx.ops.server.comm.annotation.OperationLog;
 import io.github.nginx.ops.server.comm.domain.vo.R;
 import io.github.nginx.ops.server.comm.enums.BusinessTypeEnum;
+import io.github.nginx.ops.server.system.domain.dto.UserInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -41,6 +42,14 @@ public R login(@RequestBody @Valid LoginDTO dto, HttpServletRequest request) {
     return R.success("登录成功!", saTokenInfo);
   }
 
+  @GetMapping("user/info")
+  @ApiOperation("获取用户信息")
+  @OperationLog(title = "获取用户信息", businessType = BusinessTypeEnum.SELECT)
+  public R getUserInfo() {
+    UserInfo userInfo = server.getUserInfo();
+    return R.success("登录成功!", userInfo);
+  }
+
   @PostMapping("logout")
   @ApiOperation("登出接口")
   @OperationLog(title = "登出", businessType = BusinessTypeEnum.LOGIN)
@@ -51,7 +60,7 @@ public R logout() {
 
   @GetMapping("captcha")
   @ApiOperation("获取验证码")
-  @OperationLog(title = "获取验证码", businessType = BusinessTypeEnum.LOGIN)
+  @OperationLog(title = "获取验证码", businessType = BusinessTypeEnum.SELECT)
   public R captcha() {
     CaptchaVO captchaVO = server.captcha();
     return R.success("获取验证码成功!", captchaVO);

nginx-ops-admin/src/main/java/io/github/nginx/ops/server/admin/controller/AdminController.java

@@ -1,5 +1,8 @@
 package io.github.nginx.ops.server.admin.handler;
 
+import cn.dev33.satoken.exception.NotLoginException;
+import io.github.nginx.ops.server.admin.constant.AdminReturnCodeConstant;
+import io.github.nginx.ops.server.comm.constant.CommReturnCodeConstant;
 import io.github.nginx.ops.server.comm.domain.vo.R;
 import io.github.nginx.ops.server.comm.exception.BusinessException;
 import io.github.nginx.ops.server.system.service.SysReturnService;
@@ -31,45 +34,52 @@ public class GlobalExceptionHandler {
   @ExceptionHandler(BusinessException.class)
   public R handleBusinessException(BusinessException e, HttpServletRequest request) {
     log.warn("业务异常, 异常信息为:{}", e.getMessage(), e);
-    return R.error(sysReturnService.getMessage(e.getCode()));
+    return R.error(e.getCode(), sysReturnService.getMessage(e.getCode()));
   }
 
-  /** 拦截未知的运行时异常 */
-  @ExceptionHandler(RuntimeException.class)
-  public R handleRuntimeException(RuntimeException e, HttpServletRequest request) {
-    String requestURI = request.getRequestURI();
-    log.error("请求地址:{},发生未知异常.", requestURI, e);
-    return R.error(e.getMessage());
-  }
-
-  /** 系统异常 */
-  @ExceptionHandler(Exception.class)
-  public R handleException(Exception e, HttpServletRequest request) {
-    String requestURI = request.getRequestURI();
-    log.error("请求地址:{},发生系统异常.", requestURI, e);
-    return R.error(e.getMessage());
+  /** 业务异常 */
+  @ExceptionHandler(NotLoginException.class)
+  public R handlerNotLoginException(NotLoginException e, HttpServletRequest request) {
+    log.warn("鉴权异常, 异常信息为:{}", e.getMessage(), e);
+    String returnCode = AdminReturnCodeConstant.NOT_TOKEN;
+    if (e.getType().equals(NotLoginException.INVALID_TOKEN)) {
+      returnCode = AdminReturnCodeConstant.INVALID_TOKEN;
+    } else if (e.getType().equals(NotLoginException.TOKEN_TIMEOUT)) {
+      returnCode = AdminReturnCodeConstant.TOKEN_TIMEOUT;
+    } else if (e.getType().equals(NotLoginException.BE_REPLACED)) {
+      returnCode = AdminReturnCodeConstant.BE_REPLACED;
+    } else if (e.getType().equals(NotLoginException.KICK_OUT)) {
+      returnCode = AdminReturnCodeConstant.KICK_OUT;
+    }
+    return R.error(returnCode, sysReturnService.getMessage(returnCode));
   }
 
-  /** 自定义验证异常 */
+  /** 参数异常 */
   @ExceptionHandler(BindException.class)
   public R handleBindException(BindException e) {
-    log.error(e.getMessage(), e);
-    String message = e.getAllErrors().get(0).getDefaultMessage();
-    return R.error(message, message);
+    log.warn("参数校验失败, 异常简介为:{}", e.getMessage(), e);
+    String returnCode = e.getBindingResult().getFieldError().getDefaultMessage();
+    return R.error(
+        CommReturnCodeConstant.CAPTCHA_HAS_EXPIRED, sysReturnService.getMessage(returnCode));
   }
 
+  /** 参数异常 */
   @ExceptionHandler(MethodArgumentNotValidException.class)
   public R handleBindException(MethodArgumentNotValidException e) {
     log.warn("参数校验失败, 异常简介为:{}", e.getMessage(), e);
+    String returnCode = e.getBindingResult().getFieldError().getDefaultMessage();
     return R.error(
-        sysReturnService.getMessage(e.getBindingResult().getFieldError().getDefaultMessage()));
+        CommReturnCodeConstant.CAPTCHA_HAS_EXPIRED, sysReturnService.getMessage(returnCode));
   }
 
+  /** 参数异常 */
   @ExceptionHandler(ConstraintViolationException.class)
   public R handleBindException(ConstraintViolationException e) {
     log.warn("参数校验失败, 异常简介为:{}", e.getMessage(), e);
     for (ConstraintViolation<?> constraintViolation : e.getConstraintViolations()) {
-      return R.error(sysReturnService.getMessage(constraintViolation.getMessage()));
+      return R.error(
+          CommReturnCodeConstant.CAPTCHA_HAS_EXPIRED,
+          sysReturnService.getMessage(constraintViolation.getMessage()));
     }
     return null;
   }
@@ -80,6 +90,22 @@ public R handleHttpRequestMethodNotSupported(
       HttpRequestMethodNotSupportedException e, HttpServletRequest request) {
     String requestURI = request.getRequestURI();
     log.error("请求地址:{},不支持{}请求", requestURI, e.getMethod());
-    return R.error(e.getMessage());
+    return R.error(CommReturnCodeConstant.HTTP_REQUEST_METHOD_NOT_SUPPORTED, e.getMessage());
+  }
+
+  /** 拦截未知的运行时异常 */
+  @ExceptionHandler(RuntimeException.class)
+  public R handleRuntimeException(RuntimeException e, HttpServletRequest request) {
+    String requestURI = request.getRequestURI();
+    log.error("请求地址:{},发生未知异常.", requestURI, e);
+    return R.error(CommReturnCodeConstant.EXCEPTION, e.getMessage());
+  }
+
+  /** 系统异常 */
+  @ExceptionHandler(Exception.class)
+  public R handleException(Exception e, HttpServletRequest request) {
+    String requestURI = request.getRequestURI();
+    log.error("请求地址:{},发生系统异常.", requestURI, e);
+    return R.error(CommReturnCodeConstant.EXCEPTION, e.getMessage());
   }
 }