夏文涛 преди 1 година
родител
ревизия
a0965538aa
променени са 2 файла, в които са добавени 8 реда и са изтрити 1 реда
  1. 4 1
      src/main/java/com/template/controller/LoginController.java
  2. 4 0
      src/main/java/com/template/model/pojo/WelcomeStudent.java

+ 4 - 1
src/main/java/com/template/controller/LoginController.java

@@ -306,8 +306,11 @@ public class LoginController implements LoginControllerAPI {
 
         WelcomeStudent student = welcomeStudentService.getDataByIdcardOrNum(mlr.getAdmissNum(), mlr.getCardId());
         if(student == null){
-            student = new WelcomeStudent();
+            return CommonResult.fail("录取号或身份证错误,登录失败!");
         }
+        long expired = 1000 * 60 * 60 * 24 * 365;
+        TokenDateVo token = JWTUtil.getToken(student.getCardId(),student.getId(), expired);
+        student.setToken(token.getToken());
         return CommonResult.ok(student);
     }
 

+ 4 - 0
src/main/java/com/template/model/pojo/WelcomeStudent.java

@@ -170,6 +170,10 @@ public class WelcomeStudent implements Serializable {
     @ApiModelProperty(value = "车牌号")
     private String carNumber;
 
+    @ApiModelProperty(value = "车牌号")
+    @TableField(exist = false)
+    private String token;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;