修复登陆的bug
parent
ff427e6dcb
commit
ac45e4f6c8
|
@ -0,0 +1,35 @@
|
||||||
|
package com.genersoft.iot.vmp.vmanager.user;
|
||||||
|
|
||||||
|
import com.genersoft.iot.vmp.vmanager.play.PlayController;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.util.StringUtils;
|
||||||
|
import org.springframework.web.bind.annotation.CrossOrigin;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
@CrossOrigin
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api")
|
||||||
|
public class UserController {
|
||||||
|
|
||||||
|
private final static Logger logger = LoggerFactory.getLogger(UserController.class);
|
||||||
|
|
||||||
|
|
||||||
|
@Value("${auth.username}")
|
||||||
|
private String usernameConfig;
|
||||||
|
|
||||||
|
@Value("${auth.password}")
|
||||||
|
private String passwordConfig;
|
||||||
|
|
||||||
|
@RequestMapping("/user/login")
|
||||||
|
public String login(String username, String password){
|
||||||
|
if (!StringUtils.isEmpty(username) && username.equals(usernameConfig)
|
||||||
|
&& !StringUtils.isEmpty(password) && password.equals(passwordConfig)) {
|
||||||
|
return "success";
|
||||||
|
}else {
|
||||||
|
return "fail";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -19,12 +19,12 @@ public class AuthController {
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
@RequestMapping("/login")
|
@RequestMapping("/login")
|
||||||
public Object devices(String username, String password){
|
public String devices(String name, String passwd){
|
||||||
if (!StringUtils.isEmpty(username) && username.equals(username)
|
if (!StringUtils.isEmpty(name) && name.equals(username)
|
||||||
&& !StringUtils.isEmpty(password) && password.equals(password)) {
|
&& !StringUtils.isEmpty(passwd) && passwd.equals(password)) {
|
||||||
return "success";
|
return "success";
|
||||||
}else {
|
}else {
|
||||||
return "fait";
|
return "fail";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5175,6 +5175,11 @@
|
||||||
"integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
|
"integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"js-md5": {
|
||||||
|
"version": "0.7.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
|
||||||
|
"integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ=="
|
||||||
|
},
|
||||||
"js-tokens": {
|
"js-tokens": {
|
||||||
"version": "3.0.2",
|
"version": "3.0.2",
|
||||||
"resolved": "https://registry.npm.taobao.org/js-tokens/download/js-tokens-3.0.2.tgz",
|
"resolved": "https://registry.npm.taobao.org/js-tokens/download/js-tokens-3.0.2.tgz",
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
"core-js": "^2.6.5",
|
"core-js": "^2.6.5",
|
||||||
"echarts": "^4.7.0",
|
"echarts": "^4.7.0",
|
||||||
"element-ui": "2.10.1",
|
"element-ui": "2.10.1",
|
||||||
|
"js-md5": "^0.7.3",
|
||||||
"moment": "^2.29.1",
|
"moment": "^2.29.1",
|
||||||
"vue": "^2.6.11",
|
"vue": "^2.6.11",
|
||||||
"vue-clipboard2": "^0.3.1",
|
"vue-clipboard2": "^0.3.1",
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import crypto from 'crypto'
|
|
||||||
export default {
|
export default {
|
||||||
name: 'Login',
|
name: 'Login',
|
||||||
data(){
|
data(){
|
||||||
|
@ -56,13 +55,13 @@ export default {
|
||||||
//需要想后端发送的登录参数
|
//需要想后端发送的登录参数
|
||||||
let loginParam = {
|
let loginParam = {
|
||||||
username: this.username,
|
username: this.username,
|
||||||
password: crypto.createHash('md5').update(this.password, "utf8").digest('hex')
|
password: this.$md5(this.password)
|
||||||
}
|
}
|
||||||
var that = this;
|
var that = this;
|
||||||
//设置在登录状态
|
//设置在登录状态
|
||||||
this.isLoging = true;
|
this.isLoging = true;
|
||||||
|
|
||||||
this.$axios.get("/auth/login",{
|
this.$axios.get("/api/user/login",{
|
||||||
params: loginParam
|
params: loginParam
|
||||||
} )
|
} )
|
||||||
.then(function (res) {
|
.then(function (res) {
|
||||||
|
@ -71,6 +70,13 @@ export default {
|
||||||
that.$cookies.set("session", {"username": that.username}) ;
|
that.$cookies.set("session", {"username": that.username}) ;
|
||||||
//登录成功后
|
//登录成功后
|
||||||
that.$router.push('/');
|
that.$router.push('/');
|
||||||
|
}else{
|
||||||
|
that.isLoging = false;
|
||||||
|
that.$message({
|
||||||
|
showClose: true,
|
||||||
|
message: '登录失败,用户名或密码错误',
|
||||||
|
type: 'error'
|
||||||
|
});
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(function (error) {
|
.catch(function (error) {
|
||||||
|
|
|
@ -9,6 +9,10 @@ import VueCookies from 'vue-cookies';
|
||||||
import echarts from 'echarts';
|
import echarts from 'echarts';
|
||||||
|
|
||||||
import VueClipboard from 'vue-clipboard2'
|
import VueClipboard from 'vue-clipboard2'
|
||||||
|
|
||||||
|
import md5 from 'js-md5'
|
||||||
|
Vue.prototype.$md5 = md5
|
||||||
|
|
||||||
Vue.use(VueClipboard)
|
Vue.use(VueClipboard)
|
||||||
Vue.use(ElementUI);
|
Vue.use(ElementUI);
|
||||||
Vue.use(VueCookies);
|
Vue.use(VueCookies);
|
||||||
|
|
Loading…
Reference in New Issue