From ff12037c6aae90d3ca7d4154c9e243f380cc8001 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Thu, 29 Jun 2023 10:47:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iflytop/nuclear/filter/JWTAuthenticationFilter.java   |  1 +
 src/main/java/com/iflytop/nuclear/model/Account.java      |  5 ++---
 src/main/java/com/iflytop/nuclear/model/Task.java         | 15 +++++++++------
 .../iflytop/nuclear/service/impl/AccountServiceImpl.java  |  2 ++
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/iflytop/nuclear/filter/JWTAuthenticationFilter.java b/src/main/java/com/iflytop/nuclear/filter/JWTAuthenticationFilter.java
index 6a7cfea..00300db 100644
--- a/src/main/java/com/iflytop/nuclear/filter/JWTAuthenticationFilter.java
+++ b/src/main/java/com/iflytop/nuclear/filter/JWTAuthenticationFilter.java
@@ -73,6 +73,7 @@ public class JWTAuthenticationFilter extends UsernamePasswordAuthenticationFilte
         JSONObject res = new JSONObject();
         res.put("token", JwtTokenUtils.TOKEN_PREFIX + token);
         res.put("username", jwtUser.getUsername());
+        res.put("authorities", jwtUser.getAuthorities());
         response.getWriter().write(JSONObject.toJSONString(ResponseData.success(res)));
     }
 
diff --git a/src/main/java/com/iflytop/nuclear/model/Account.java b/src/main/java/com/iflytop/nuclear/model/Account.java
index dda318e..09ed56d 100755
--- a/src/main/java/com/iflytop/nuclear/model/Account.java
+++ b/src/main/java/com/iflytop/nuclear/model/Account.java
@@ -1,5 +1,6 @@
 package com.iflytop.nuclear.model;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -27,9 +28,7 @@ public class Account {
     private String role;
     private String nickname;
 
-    @TableField("create_time")
+    @TableField(value = "create_time")
     private Date createTime;
 
-    @TableField("create_id")
-    private Long createId;
 }
diff --git a/src/main/java/com/iflytop/nuclear/model/Task.java b/src/main/java/com/iflytop/nuclear/model/Task.java
index 7422d49..8dd7e3f 100644
--- a/src/main/java/com/iflytop/nuclear/model/Task.java
+++ b/src/main/java/com/iflytop/nuclear/model/Task.java
@@ -32,14 +32,17 @@ public class Task {
     @TableField("nuclear_core_id")
     private Long nuclearCoreId;
 
-    private int status;
-
-    @TableField("start_time")
-    private Date startTime;
+    @TableField("nuclear_station_id")
+    private Long nuclearStationId;
 
-    @TableField("end_time")
-    private Date endTime;
+    private int status;
 
     @TableField("publish_time")
     private Date publishTime;
+
+    @TableField("task_name")
+    private Date taskName;
+
+    @TableField("check_order")
+    private Date checkOrder;
 }
diff --git a/src/main/java/com/iflytop/nuclear/service/impl/AccountServiceImpl.java b/src/main/java/com/iflytop/nuclear/service/impl/AccountServiceImpl.java
index 7a5bfb8..a42fda8 100755
--- a/src/main/java/com/iflytop/nuclear/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/iflytop/nuclear/service/impl/AccountServiceImpl.java
@@ -10,6 +10,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -41,6 +42,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
                 .password(bCryptPasswordEncoder.encode(password))
                 .role(role)
                 .nickname(nickname)
+                .createTime(new Date())
                 .build();
         return this.save(account);
     }