Merge branch 'develop/v0.0.1' of http://git.kdan.cc:8865/Server_Service/java_compdf_background into develop/v0.0.1

background-common/src/main/java/cn/kdan/compdf/config/JwtConfig.java

@@ -32,8 +32,8 @@ public class JwtConfig {
         String token = Jwts.builder()
                 .setHeaderParam("typ", "JWT") //令牌类型
                 .setIssuedAt(new Date()) //签发时间
-                .setExpiration(new Date(System.currentTimeMillis() + AuthEnum.EXPIRE * 1000 * 60)) //过期时间
-                .claim(JwtTokenEnum.ID,user.getId())
+                .setExpiration(new Date(System.currentTimeMillis() + AuthEnum.EXPIRE * 1000 * 60 * 60)) //过期时间
+                .claim(JwtTokenEnum.ID, user.getId())
                 .claim(JwtTokenEnum.USERNAME, user.getUsername())
                 .claim(JwtTokenEnum.FULL_NAME, user.getFullName())
                 .claim(JwtTokenEnum.TENANT_ID, user.getTenantId())

background-common/src/main/java/cn/kdan/compdf/enums/AuthEnum.java

@@ -11,9 +11,9 @@ public interface AuthEnum {
     String SECRET = "wwwcompdfkitsaascom-wwwcompdfkitsaascom";
 
     /**
-     * 令牌生存时间（分钟）
+     * 令牌生存时间（小时）
      */
-    long EXPIRE = 60;
+    long EXPIRE = 3;
 
     /**
      * Authorization

background-user/src/main/java/cn/kdan/compdf/controller/v1/BackgroundUserController.java

@@ -6,15 +6,18 @@ import cn.kdan.compdf.dto.LoginDTO;
 import cn.kdan.compdf.enums.AuthEnum;
 import cn.kdan.compdf.service.BackgroundUserService;
 import cn.kdan.compdf.vo.LoginVO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.Enumeration;
 
 /**
  * @author comPDF-Kit WPH 2022-10-09
  */
+@Slf4j
 @RestController
 @RequestMapping("/v1/user")
 public class BackgroundUserController {
@@ -36,14 +39,15 @@ public class BackgroundUserController {
     @PostMapping("/logout")
     public R<Void> logout(HttpServletRequest request) {
         String token = request.getHeader(AuthEnum.AUTHORIZATION);
-        backgroundUserService.logout(token);
+        log.info("登出token：{}，time：{}", token, new Date());
+        backgroundUserService.logout(token.replaceFirst("Bearer ",""));
         return R.ok();
     }
 
     @PutMapping("/changePassword")
     public R<Void> changePassword(@Validated @RequestBody ChangePasswordDTO changePasswordDTO, HttpServletRequest request) {
         String token = request.getHeader(AuthEnum.AUTHORIZATION);
-        backgroundUserService.changePassword(changePasswordDTO, token);
+        backgroundUserService.changePassword(changePasswordDTO, token.replaceFirst("Bearer ",""));
         return R.ok();
     }
 

background-user/src/main/java/cn/kdan/compdf/service/impl/BackgroundUserServiceImpl.java

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.http.server.reactive.ServerHttpRequest;
@@ -29,6 +30,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * @author comPDF-Kit WPH 2022-10-09
  */
+@Slf4j
 @Service
 public class BackgroundUserServiceImpl extends ServiceImpl<BackgroundUserMapper, BackgroundUser> implements BackgroundUserService {
 
@@ -58,8 +60,9 @@ public class BackgroundUserServiceImpl extends ServiceImpl<BackgroundUserMapper,
                 .fullName(backgroundUser.getFullName())
                 .tenantId(backgroundUser.getTenantId())
                 .build());
+        log.info("用户登录成功：username：{}，time：{}", loginDTO.getUsername(), new Date());
 
-        redisTemplate.opsForValue().set(AuthEnum.USER_TOKEN_REDIS + token, token,3, TimeUnit.HOURS);
+        redisTemplate.opsForValue().set(AuthEnum.USER_TOKEN_REDIS + token, token, AuthEnum.EXPIRE, TimeUnit.HOURS);
 
         //更新登录用户的登陆时间
         if (backgroundUser.getFirstLoginTime() == null) {