From 9e09755ef054d6455e94ed4a68d60f231d8e944a Mon Sep 17 00:00:00 2001 From: panlinlin <648540858@qq.com> Date: 星期三, 13 一月 2021 17:56:01 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 --- web_src/src/components/Login.vue | 12 ++++- web_src/src/main.js | 4 ++ src/main/java/com/genersoft/iot/vmp/web/AuthController.java | 8 ++-- src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 35 +++++++++++++++++ web_src/package.json | 1 web_src/package-lock.json | 5 ++ 6 files changed, 58 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java new file mode 100644 index 0000000..12ade38 --- /dev/null +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java @@ -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"; + } + } +} 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"; } } } diff --git a/web_src/package-lock.json b/web_src/package-lock.json index 334f488..f4cd2be 100644 --- a/web_src/package-lock.json +++ b/web_src/package-lock.json @@ -5175,6 +5175,11 @@ "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=", "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": { "version": "3.0.2", "resolved": "https://registry.npm.taobao.org/js-tokens/download/js-tokens-3.0.2.tgz", diff --git a/web_src/package.json b/web_src/package.json index c949393..9f21ee9 100644 --- a/web_src/package.json +++ b/web_src/package.json @@ -15,6 +15,7 @@ "core-js": "^2.6.5", "echarts": "^4.7.0", "element-ui": "2.10.1", + "js-md5": "^0.7.3", "moment": "^2.29.1", "vue": "^2.6.11", "vue-clipboard2": "^0.3.1", diff --git a/web_src/src/components/Login.vue b/web_src/src/components/Login.vue index f047c5d..acf286e 100644 --- a/web_src/src/components/Login.vue +++ b/web_src/src/components/Login.vue @@ -18,7 +18,6 @@ </template> <script> -import crypto from 'crypto' export default { name: 'Login', data(){ @@ -56,13 +55,13 @@ //闇�瑕佹兂鍚庣鍙戦�佺殑鐧诲綍鍙傛暟 let loginParam = { username: this.username, - password: crypto.createHash('md5').update(this.password, "utf8").digest('hex') + password: this.$md5(this.password) } var that = this; //璁剧疆鍦ㄧ櫥褰曠姸鎬� this.isLoging = true; - this.$axios.get("/auth/login",{ + this.$axios.get("/api/user/login",{ params: loginParam } ) .then(function (res) { @@ -71,6 +70,13 @@ that.$cookies.set("session", {"username": that.username}) ; //鐧诲綍鎴愬姛鍚� that.$router.push('/'); + }else{ + that.isLoging = false; + that.$message({ + showClose: true, + message: '鐧诲綍澶辫触锛岀敤鎴峰悕鎴栧瘑鐮侀敊璇�', + type: 'error' + }); } }) .catch(function (error) { diff --git a/web_src/src/main.js b/web_src/src/main.js index 6f88c2a..8298a81 100644 --- a/web_src/src/main.js +++ b/web_src/src/main.js @@ -9,6 +9,10 @@ import echarts from 'echarts'; import VueClipboard from 'vue-clipboard2' + +import md5 from 'js-md5' +Vue.prototype.$md5 = md5 + Vue.use(VueClipboard) Vue.use(ElementUI); Vue.use(VueCookies); -- Gitblit v1.8.0