Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

web_src/package-lock.json

@@ -5175,11 +5175,6 @@
       "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",

web_src/package.json

@@ -15,7 +15,6 @@
     "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",

web_src/src/components/Login.vue

@@ -18,6 +18,7 @@
 </template>
 
 <script>
+import crypto from 'crypto'
 export default {
   name: 'Login',
   data(){
@@ -55,7 +56,7 @@ export default {
   		//需要想后端发送的登录参数
   		let loginParam = {
   			username: this.username,
-  			password: this.$md5(this.password)
+  			password: crypto.createHash('md5').update(this.password, "utf8").digest('hex')
   		}
       var that = this;
       //设置在登录状态

web_src/src/main.js

@@ -9,10 +9,6 @@ import VueCookies from 'vue-cookies';
 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);