租户激活码功能

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -9,6 +9,7 @@ import com.ruoyi.system.service.IDataSourceService;
 import com.ruoyi.system.service.impl.SysTenantServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,6 +26,7 @@ import com.ruoyi.system.service.ISysMenuService;
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 
 /**
  * 登录验证
@@ -76,13 +78,16 @@ public class SysLoginController {
      * @return 结果
      */
     @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody) {
-        //校验租户状态?生成token
+    public AjaxResult login(@Valid @RequestBody LoginBody loginBody,BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+        // 校验租户状态?生成token
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid());
-        //校验租户是否过期
+        // 校验租户是否过期
         String  checkTenantExpirationTimeMsg= loginService.checkTenantExpirationTime(loginBody);
         if(!checkTenantExpirationTimeMsg.isEmpty()){
             return AjaxResult.error(checkTenantExpirationTimeMsg);

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java

@@ -1,5 +1,8 @@
 package com.ruoyi.common.core.domain.model;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * 用户登录对象
  * 
@@ -10,16 +13,22 @@ public class LoginBody
     /**
      * 用户名
      */
+    @NotNull(message = "用户名不能为空")
+    @NotBlank(message = "用户名不能为空")
     private String username;
 
     /**
      * 用户密码
      */
+    @NotNull(message = "用户密码不能为空")
+    @NotBlank(message = "用户名密码不能为空")
     private String password;
 
     /**
      * 验证码
      */
+    @NotBlank(message = "验证码不能为空")
+    @NotNull(message = "验证码不能为空")
     private String code;
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -148,7 +148,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 计算时间差
      *
-     * @param endTime 最后时间
+     * @param endDate 最后时间
      * @param startTime 开始时间
      * @return 时间差（天/小时/分钟）
      */

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java

@@ -334,12 +334,11 @@ public class SysTenantServiceImpl implements ISysTenantService
         //校验充值天数是否正确
         SymmetricCrypto symmetricCrypto = new SymmetricCrypto(SymmetricAlgorithm.DES, "sgEsnN6QWq8W7j5H01020304".getBytes());
         String a = symmetricCrypto.decryptStr("facb3dad9a590c24584416fd0e9690e6ad8116cefdd53d5f");
-        System.out.println(a);
         //判断如果用户过期了
         LocalDateTime activeDateTime = LocalDateTimeUtil.offset(LocalDateTime.now(), -100, ChronoUnit.DAYS);
         String activeDateTimeStr = DateUtils.toLocalDateTimeStr(activeDateTime);
         String newActiveDateTimeStr= symmetricCrypto.encryptHex(activeDateTimeStr);
-        System.out.println(newActiveDateTimeStr);
+        //System.out.println(newActiveDateTimeStr);
     }
 
 }