登录修改基础修改

js_sdk/zww-md5/w_md5.js

@@ -0,0 +1,204 @@
+let w_md5 = {}
+function hex_md5(string,bit) {
+    function md5_RotateLeft(lValue, iShiftBits) {
+        return (lValue << iShiftBits) | (lValue >>> (32 - iShiftBits));
+    }
+    function md5_AddUnsigned(lX, lY) {
+        var lX4, lY4, lX8, lY8, lResult;
+        lX8 = (lX & 0x80000000);
+        lY8 = (lY & 0x80000000);
+        lX4 = (lX & 0x40000000);
+        lY4 = (lY & 0x40000000);
+        lResult = (lX & 0x3FFFFFFF) + (lY & 0x3FFFFFFF);
+        if (lX4 & lY4) {
+            return (lResult ^ 0x80000000 ^ lX8 ^ lY8);
+        }
+        if (lX4 | lY4) {
+            if (lResult & 0x40000000) {
+                return (lResult ^ 0xC0000000 ^ lX8 ^ lY8);
+            } else {
+                return (lResult ^ 0x40000000 ^ lX8 ^ lY8);
+            }
+        } else {
+            return (lResult ^ lX8 ^ lY8);
+        }
+    }
+    function md5_F(x, y, z) {
+        return (x & y) | ((~x) & z);
+    }
+    function md5_G(x, y, z) {
+        return (x & z) | (y & (~z));
+    }
+    function md5_H(x, y, z) {
+        return (x ^ y ^ z);
+    }
+    function md5_I(x, y, z) {
+        return (y ^ (x | (~z)));
+    }
+    function md5_FF(a, b, c, d, x, s, ac) {
+        a = md5_AddUnsigned(a, md5_AddUnsigned(md5_AddUnsigned(md5_F(b, c, d), x), ac));
+        return md5_AddUnsigned(md5_RotateLeft(a, s), b);
+    };
+    function md5_GG(a, b, c, d, x, s, ac) {
+        a = md5_AddUnsigned(a, md5_AddUnsigned(md5_AddUnsigned(md5_G(b, c, d), x), ac));
+        return md5_AddUnsigned(md5_RotateLeft(a, s), b);
+    };
+    function md5_HH(a, b, c, d, x, s, ac) {
+        a = md5_AddUnsigned(a, md5_AddUnsigned(md5_AddUnsigned(md5_H(b, c, d), x), ac));
+        return md5_AddUnsigned(md5_RotateLeft(a, s), b);
+    };
+    function md5_II(a, b, c, d, x, s, ac) {
+        a = md5_AddUnsigned(a, md5_AddUnsigned(md5_AddUnsigned(md5_I(b, c, d), x), ac));
+        return md5_AddUnsigned(md5_RotateLeft(a, s), b);
+    };
+    function md5_ConvertToWordArray(string) {
+        var lWordCount;
+        var lMessageLength = string.length;
+        var lNumberOfWords_temp1 = lMessageLength + 8;
+        var lNumberOfWords_temp2 = (lNumberOfWords_temp1 - (lNumberOfWords_temp1 % 64)) / 64;
+        var lNumberOfWords = (lNumberOfWords_temp2 + 1) * 16;
+        var lWordArray = Array(lNumberOfWords - 1);
+        var lBytePosition = 0;
+        var lByteCount = 0;
+        while (lByteCount < lMessageLength) {
+            lWordCount = (lByteCount - (lByteCount % 4)) / 4;
+            lBytePosition = (lByteCount % 4) * 8;
+            lWordArray[lWordCount] = (lWordArray[lWordCount] | (string.charCodeAt(lByteCount) << lBytePosition));
+            lByteCount++;
+        }
+        lWordCount = (lByteCount - (lByteCount % 4)) / 4;
+        lBytePosition = (lByteCount % 4) * 8;
+        lWordArray[lWordCount] = lWordArray[lWordCount] | (0x80 << lBytePosition);
+        lWordArray[lNumberOfWords - 2] = lMessageLength << 3;
+        lWordArray[lNumberOfWords - 1] = lMessageLength >>> 29;
+        return lWordArray;
+    };
+    function md5_WordToHex(lValue) {
+        var WordToHexValue = "", WordToHexValue_temp = "", lByte, lCount;
+        for (lCount = 0; lCount <= 3; lCount++) {
+            lByte = (lValue >>> (lCount * 8)) & 255;
+            WordToHexValue_temp = "0" + lByte.toString(16);
+            WordToHexValue = WordToHexValue + WordToHexValue_temp.substr(WordToHexValue_temp.length - 2, 2);
+        }
+        return WordToHexValue;
+    };
+    function md5_Utf8Encode(string) {
+        string = string.replace(/\r\n/g, "\n");
+        var utftext = "";
+        for (var n = 0; n < string.length; n++) {
+            var c = string.charCodeAt(n);
+            if (c < 128) {
+                utftext += String.fromCharCode(c);
+            } else if ((c > 127) && (c < 2048)) {
+                utftext += String.fromCharCode((c >> 6) | 192);
+                utftext += String.fromCharCode((c & 63) | 128);
+            } else {
+                utftext += String.fromCharCode((c >> 12) | 224);
+                utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+                utftext += String.fromCharCode((c & 63) | 128);
+            }
+        }
+        return utftext;
+    };
+    var x = Array();
+    var k, AA, BB, CC, DD, a, b, c, d;
+    var S11 = 7, S12 = 12, S13 = 17, S14 = 22;
+    var S21 = 5, S22 = 9, S23 = 14, S24 = 20;
+    var S31 = 4, S32 = 11, S33 = 16, S34 = 23;
+    var S41 = 6, S42 = 10, S43 = 15, S44 = 21;
+    string = md5_Utf8Encode(string);
+    x = md5_ConvertToWordArray(string);
+    a = 0x67452301; b = 0xEFCDAB89; c = 0x98BADCFE; d = 0x10325476;
+    for (k = 0; k < x.length; k += 16) {
+        AA = a; BB = b; CC = c; DD = d;
+        a = md5_FF(a, b, c, d, x[k + 0], S11, 0xD76AA478);
+        d = md5_FF(d, a, b, c, x[k + 1], S12, 0xE8C7B756);
+        c = md5_FF(c, d, a, b, x[k + 2], S13, 0x242070DB);
+        b = md5_FF(b, c, d, a, x[k + 3], S14, 0xC1BDCEEE);
+        a = md5_FF(a, b, c, d, x[k + 4], S11, 0xF57C0FAF);
+        d = md5_FF(d, a, b, c, x[k + 5], S12, 0x4787C62A);
+        c = md5_FF(c, d, a, b, x[k + 6], S13, 0xA8304613);
+        b = md5_FF(b, c, d, a, x[k + 7], S14, 0xFD469501);
+        a = md5_FF(a, b, c, d, x[k + 8], S11, 0x698098D8);
+        d = md5_FF(d, a, b, c, x[k + 9], S12, 0x8B44F7AF);
+        c = md5_FF(c, d, a, b, x[k + 10], S13, 0xFFFF5BB1);
+        b = md5_FF(b, c, d, a, x[k + 11], S14, 0x895CD7BE);
+        a = md5_FF(a, b, c, d, x[k + 12], S11, 0x6B901122);
+        d = md5_FF(d, a, b, c, x[k + 13], S12, 0xFD987193);
+        c = md5_FF(c, d, a, b, x[k + 14], S13, 0xA679438E);
+        b = md5_FF(b, c, d, a, x[k + 15], S14, 0x49B40821);
+        a = md5_GG(a, b, c, d, x[k + 1], S21, 0xF61E2562);
+        d = md5_GG(d, a, b, c, x[k + 6], S22, 0xC040B340);
+        c = md5_GG(c, d, a, b, x[k + 11], S23, 0x265E5A51);
+        b = md5_GG(b, c, d, a, x[k + 0], S24, 0xE9B6C7AA);
+        a = md5_GG(a, b, c, d, x[k + 5], S21, 0xD62F105D);
+        d = md5_GG(d, a, b, c, x[k + 10], S22, 0x2441453);
+        c = md5_GG(c, d, a, b, x[k + 15], S23, 0xD8A1E681);
+        b = md5_GG(b, c, d, a, x[k + 4], S24, 0xE7D3FBC8);
+        a = md5_GG(a, b, c, d, x[k + 9], S21, 0x21E1CDE6);
+        d = md5_GG(d, a, b, c, x[k + 14], S22, 0xC33707D6);
+        c = md5_GG(c, d, a, b, x[k + 3], S23, 0xF4D50D87);
+        b = md5_GG(b, c, d, a, x[k + 8], S24, 0x455A14ED);
+        a = md5_GG(a, b, c, d, x[k + 13], S21, 0xA9E3E905);
+        d = md5_GG(d, a, b, c, x[k + 2], S22, 0xFCEFA3F8);
+        c = md5_GG(c, d, a, b, x[k + 7], S23, 0x676F02D9);
+        b = md5_GG(b, c, d, a, x[k + 12], S24, 0x8D2A4C8A);
+        a = md5_HH(a, b, c, d, x[k + 5], S31, 0xFFFA3942);
+        d = md5_HH(d, a, b, c, x[k + 8], S32, 0x8771F681);
+        c = md5_HH(c, d, a, b, x[k + 11], S33, 0x6D9D6122);
+        b = md5_HH(b, c, d, a, x[k + 14], S34, 0xFDE5380C);
+        a = md5_HH(a, b, c, d, x[k + 1], S31, 0xA4BEEA44);
+        d = md5_HH(d, a, b, c, x[k + 4], S32, 0x4BDECFA9);
+        c = md5_HH(c, d, a, b, x[k + 7], S33, 0xF6BB4B60);
+        b = md5_HH(b, c, d, a, x[k + 10], S34, 0xBEBFBC70);
+        a = md5_HH(a, b, c, d, x[k + 13], S31, 0x289B7EC6);
+        d = md5_HH(d, a, b, c, x[k + 0], S32, 0xEAA127FA);
+        c = md5_HH(c, d, a, b, x[k + 3], S33, 0xD4EF3085);
+        b = md5_HH(b, c, d, a, x[k + 6], S34, 0x4881D05);
+        a = md5_HH(a, b, c, d, x[k + 9], S31, 0xD9D4D039);
+        d = md5_HH(d, a, b, c, x[k + 12], S32, 0xE6DB99E5);
+        c = md5_HH(c, d, a, b, x[k + 15], S33, 0x1FA27CF8);
+        b = md5_HH(b, c, d, a, x[k + 2], S34, 0xC4AC5665);
+        a = md5_II(a, b, c, d, x[k + 0], S41, 0xF4292244);
+        d = md5_II(d, a, b, c, x[k + 7], S42, 0x432AFF97);
+        c = md5_II(c, d, a, b, x[k + 14], S43, 0xAB9423A7);
+        b = md5_II(b, c, d, a, x[k + 5], S44, 0xFC93A039);
+        a = md5_II(a, b, c, d, x[k + 12], S41, 0x655B59C3);
+        d = md5_II(d, a, b, c, x[k + 3], S42, 0x8F0CCC92);
+        c = md5_II(c, d, a, b, x[k + 10], S43, 0xFFEFF47D);
+        b = md5_II(b, c, d, a, x[k + 1], S44, 0x85845DD1);
+        a = md5_II(a, b, c, d, x[k + 8], S41, 0x6FA87E4F);
+        d = md5_II(d, a, b, c, x[k + 15], S42, 0xFE2CE6E0);
+        c = md5_II(c, d, a, b, x[k + 6], S43, 0xA3014314);
+        b = md5_II(b, c, d, a, x[k + 13], S44, 0x4E0811A1);
+        a = md5_II(a, b, c, d, x[k + 4], S41, 0xF7537E82);
+        d = md5_II(d, a, b, c, x[k + 11], S42, 0xBD3AF235);
+        c = md5_II(c, d, a, b, x[k + 2], S43, 0x2AD7D2BB);
+        b = md5_II(b, c, d, a, x[k + 9], S44, 0xEB86D391);
+        a = md5_AddUnsigned(a, AA);
+        b = md5_AddUnsigned(b, BB);
+        c = md5_AddUnsigned(c, CC);
+        d = md5_AddUnsigned(d, DD);
+    }
+    if(bit==32){
+        return (md5_WordToHex(a) + md5_WordToHex(b) + md5_WordToHex(c) + md5_WordToHex(d)).toLowerCase();
+    }
+    return (md5_WordToHex(b) + md5_WordToHex(c)).toLowerCase();
+}
+//16位小写
+w_md5.hex_md5_16 = function (string) { 
+	return hex_md5(string,16); 
+}
+//16位大写
+w_md5.hex_md5_16Upper = function (string) { 
+	return  hex_md5(string,16).toUpperCase(); 
+}
+//32位小写
+w_md5.hex_md5_32 = function (string) { 
+	return hex_md5(string,32); 
+}
+//32位大写
+w_md5.hex_md5_32Upper = function (string) { 
+	return hex_md5(string,32).toUpperCase(); 
+}
+export default w_md5

pages/login/login.vue

@@ -12,18 +12,21 @@
 				</view>
 				<view class="form">
 					<u-form :model="form" ref="uForm">
-						<u-form-item :border-bottom="false" prop="account">
-							<u-input style="font-size: 30rpx;" :accountIcon="true" height="72" :border="true" placeholder="请输入账号" v-model="form.account" />
+						<u-form-item :border-bottom="false" prop="username">
+							<u-input style="font-size: 30rpx;" :accountIcon="true" height="72" :border="true"
+								placeholder="请输入账号" v-model="form.username" />
 						</u-form-item>
 						<u-form-item :border-bottom="false" style="position: relative;" prop="password">
-							<u-input @confirm="handleSubmit" style="font-size: 30rpx;" type="password" :border="true" placeholder="请输入密码" height="72" v-model="form.password"/>
+							<u-input @confirm="handleSubmit" style="font-size: 30rpx;" type="password" :border="true"
+								placeholder="请输入密码" height="72" v-model="form.password" />
 							<!-- <span class="forget my-fontsize-Small" @tap="toggleForget">忘记密码</span> -->
 						</u-form-item>
 						<!-- <u-form-item :border-bottom="false" v-if="isDev">
 							<u-input style="font-size: 24rpx;" height="72" :border="true" placeholder="请输入IP" v-model="ip" />
 						</u-form-item> -->
 						<u-form-item :border-bottom="false">
-							<u-button throttleTime="300" type="primary" style="width: 100%;margin-top: 30rpx;" @click="login">立即登录</u-button>
+							<u-button throttleTime="300" type="primary" style="width: 100%;margin-top: 30rpx;"
+								@click="login">立即登录</u-button>
 						</u-form-item>
 						<u-form-item :border-bottom="false" style="margin-top: 70rpx;">
 							<u-checkbox-group @change="checkboxGroupChange">
@@ -46,9 +49,12 @@
 </template>
 
 <script>
-import loginBg from '@/static/images/login-bg.png'
-import { mapActions } from 'vuex'
-import config from '@/libs/config/config.js'
+	import loginBg from '@/static/images/login-bg.png'
+	import {
+		mapActions
+	} from 'vuex'
+	import config from '@/libs/config/config.js'
+	import w_md5 from "../../js_sdk/zww-md5/w_md5.js"
 	export default {
 		data() {
 			return {
@@ -56,15 +62,21 @@ import config from '@/libs/config/config.js'
 				ip: '',
 				remember: true,
 				form: {
-					account: '',
-					password: 'fjhx2012',
-					mobileId: '_mobileId'
+					tenantId: '000000',
+					username: 'admin',
+					password: 'admin',
+					//账号类型
+					type: 'loginWithoutVerificationCode',
+					//验证码的值
+					code: '',
+					//验证码的索引
+					key: '',
+					grant_type: 'captcha',
 				},
 				rules: {
-					account: [
-						{ 
-							required: true, 
-							message: '账号不能为空', 
+					account: [{
+							required: true,
+							message: '账号不能为空',
 							// 可以单个或者同时写两个触发验证方式 
 							trigger: ['blur']
 						},
@@ -78,14 +90,12 @@ import config from '@/libs/config/config.js'
 							trigger: ['change']
 						}
 					],
-					password: [
-						{
-							required: true, 
-							message: '密码不能为空', 
-							// 可以单个或者同时写两个触发验证方式 
-							trigger: ['blur']
-						}
-					]
+					password: [{
+						required: true,
+						message: '密码不能为空',
+						// 可以单个或者同时写两个触发验证方式 
+						trigger: ['blur']
+					}]
 				}
 			};
 		},
@@ -98,21 +108,64 @@ import config from '@/libs/config/config.js'
 				this.login()
 			},
 			login() {
+				function filter(str) { // 特殊字符转义
+					str += ''; // 隐式转换
+					str = str.replace(/%/g, '%25');
+					str = str.replace(/\+/g, '%2B');
+					str = str.replace(/ /g, '%20');
+					str = str.replace(/\//g, '%2F');
+					str = str.replace(/\?/g, '%3F');
+					str = str.replace(/&/g, '%26');
+					str = str.replace(/\=/g, '%3D');
+					str = str.replace(/#/g, '%23');
+					return str;
+				}
+				
+				function formateObjToParamStr(paramObj) {
+					const sdata = [];
+					for (let attr in paramObj) {
+						sdata.push(`${attr}=${filter(paramObj[attr])}`);
+					}
+					return sdata.join('&');
+				}
+				const loginForm = {...this.form}
+				loginForm.password = w_md5.hex_md5_32(loginForm.password)
+				console.log(this.form)
 				this.$utils.formValidate(this.$refs.uForm).then(() => {
-					this.$http.Login(this.form).then(res => {
-						console.log(res)
-						if(res.code === 0) {
-							this.$storage.setStorageSync('token',res.result.token)
-							this.saveUserInfo()
-						}
-					})
+					uni.request({
+						url: 'http://36.134.91.96:10001/api' + '/blade-auth/oauth/token?' + formateObjToParamStr(loginForm),
+						method: 'POST',
+						header: {
+							'Content-Type': 'application/json',
+							'Captcha-Key': loginForm.key,
+							'Captcha-Code': loginForm.code,
+							'Tenant-Id': loginForm.tenantId,
+							'Authorization':'Basic c2FiZXI6c2FiZXJfc2VjcmV0',
+							'Blade-Auth': undefined
+						},
+						success: res => {
+							if(res.statusCode == 200){
+								this.$storage.setStorageSync('token', res.data.access_token)
+								this.$storage.setStorageSync('userInfo', res.data)
+								this.$utils.openNew('/pages/index/index')
+							}
+							console.log(res) 
+						},
+					});
+					// this.$http.Login(this.form).then(res => {
+					// 	console.log(res)
+					// 	if (res.code === 0) {
+					// 		this.$storage.setStorageSync('token', res.result.token)
+					// 		this.saveUserInfo()
+					// 	}
+					// })
 				})
 			},
 			// 获取并保存用户信息到本地
 			saveUserInfo() {
 				this.$http.GetUserInfo().then(res => {
 					console.log(res)
-					if(res.code == 0){
+					if (res.code == 0) {
 						this.setUserInfo(res.result)
 						this.$storage.setStorageSync('userInfo', res.result)
 						this.$utils.openNew('/pages/index/index')
@@ -124,7 +177,7 @@ import config from '@/libs/config/config.js'
 		},
 		onLoad() {
 			this.form.account = this.userInfo.account
-			
+
 			this.$utils.updateVersion()
 		},
 		onReady() {
@@ -133,10 +186,10 @@ import config from '@/libs/config/config.js'
 		computed: {
 			// 测试环境下显示ip输入
 			isDev() {
-				if(process.env.NODE_ENV === 'development') {
+				if (process.env.NODE_ENV === 'development') {
 					return true
-				}else {
-					return false 
+				} else {
+					return false
 				}
 			}
 		}
@@ -144,102 +197,122 @@ import config from '@/libs/config/config.js'
 </script>
 
 <style lang="scss" scoped>
-@import '../../static/css/mycss.scss';
-@import '../../static/css/animate.css';
-/deep/ .u-select__body__picker-view__item {
-	.u-line-1 {
+	@import '../../static/css/mycss.scss';
+	@import '../../static/css/animate.css';
+
+	/deep/ .u-select__body__picker-view__item {
+		.u-line-1 {
+			font-size: 46rpx;
+		}
+	}
+
+	/deep/ .u-select__header__btn {
 		font-size: 46rpx;
 	}
-}
-/deep/ .u-select__header__btn {
-	font-size: 46rpx;
-}
-/deep/ .u-drawer-content {
-	border-radius: 20rpx 20rpx 0 0;
-}
-.container-wrap {
-	width: 750rpx;
-	.container {
-		height: calc(100vh - var(--status-bar-height));
-		.form-wrap {
-			position: relative;
-			width: 620rpx;
-			height: 85vh;
-			border-radius: 20rpx;
-			background: #FFFFFF;
-			box-shadow:0 5px 10px #383838;
-			.logo-wrap {
-				flex: 1;
-				width: 100%;
-				.logo {
-					width: 250rpx;
-					min-width: 250rpx;
-					height: 100rpx;
+
+	/deep/ .u-drawer-content {
+		border-radius: 20rpx 20rpx 0 0;
+	}
+
+	.container-wrap {
+		width: 750rpx;
+
+		.container {
+			height: calc(100vh - var(--status-bar-height));
+
+			.form-wrap {
+				position: relative;
+				width: 620rpx;
+				height: 85vh;
+				border-radius: 20rpx;
+				background: #FFFFFF;
+				box-shadow: 0 5px 10px #383838;
+
+				.logo-wrap {
+					flex: 1;
+					width: 100%;
+
+					.logo {
+						width: 250rpx;
+						min-width: 250rpx;
+						height: 100rpx;
+					}
 				}
-			}
-			.form {
-				flex: 1;
-				padding: 0 50rpx;
-				width: 100%;
-				.forget {
-					position: absolute;
-					bottom: -30rpx;
-					right: 0;
-					color: #666666;
+
+				.form {
+					flex: 1;
+					padding: 0 50rpx;
+					width: 100%;
+
+					.forget {
+						position: absolute;
+						bottom: -30rpx;
+						right: 0;
+						color: #666666;
+					}
 				}
-			}
-			.bottom-pic-wrap {
-				flex: 1;
-				width: 100%;
-				.bottom-pic {
-					height: 80%;
-					min-height: 250rpx;
-					// width: 311rpx;
-					// height: 315rpx;
+
+				.bottom-pic-wrap {
+					flex: 1;
+					width: 100%;
+
+					.bottom-pic {
+						height: 80%;
+						min-height: 250rpx;
+						// width: 311rpx;
+						// height: 315rpx;
+					}
 				}
 			}
-		}
-		.forget-wrap {
-			position: relative;
-			width: 580rpx;
-			height: 620rpx;
-			box-shadow:0 5px 10px #383838;
-			border-radius: 20rpx;
-			background: #fff;
-			.close-icon-wrap {
-				position: absolute;
-				top: 18rpx;
-				right: 18rpx;
-				.close-icon {
-					width: 50rpx;
-					height: 50rpx;
+
+			.forget-wrap {
+				position: relative;
+				width: 580rpx;
+				height: 620rpx;
+				box-shadow: 0 5px 10px #383838;
+				border-radius: 20rpx;
+				background: #fff;
+
+				.close-icon-wrap {
+					position: absolute;
+					top: 18rpx;
+					right: 18rpx;
+
+					.close-icon {
+						width: 50rpx;
+						height: 50rpx;
+					}
 				}
-			}
-			.gantanhao-wrap {
-				padding-top: 120rpx;
-				.gantanhao {
-					width: 200rpx;
-					height: 160rpx;
+
+				.gantanhao-wrap {
+					padding-top: 120rpx;
+
+					.gantanhao {
+						width: 200rpx;
+						height: 160rpx;
+					}
 				}
-			}
-			.text {
-				padding-top: 75rpx;
-				text-align: center;
-				color: #333;
-				.phone {
-					color: rgb(200, 60, 160);
-					font-weight: bold;
+
+				.text {
+					padding-top: 75rpx;
+					text-align: center;
+					color: #333;
+
+					.phone {
+						color: rgb(200, 60, 160);
+						font-weight: bold;
+					}
 				}
 			}
 		}
+
+		.version {
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			padding: 10rpx 0;
+			text-align: center;
+		}
 	}
-	.version {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-		padding: 10rpx 0;
-		text-align: center;
-	}
-}
 </style>