From cf8a22f50b81fa30abaa518bdce660cd65deabea Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 15 一月 2021 15:33:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/web/AuthController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/AuthController.java b/src/main/java/com/genersoft/iot/vmp/web/AuthController.java
index 50e4da1..8fd66ca 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/AuthController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/AuthController.java
@@ -19,12 +19,12 @@
private String password;
@RequestMapping("/login")
- public Object devices(String username, String password){
- if (!StringUtils.isEmpty(username) && username.equals(username)
- && !StringUtils.isEmpty(password) && password.equals(password)) {
+ public String devices(String name, String passwd){
+ if (!StringUtils.isEmpty(name) && name.equals(username)
+ && !StringUtils.isEmpty(passwd) && passwd.equals(password)) {
return "success";
}else {
- return "fait";
+ return "fail";
}
}
}
--
Gitblit v1.8.0