From e2b18735bc0effb64a2d44ee3d518843f92fc0ec Mon Sep 17 00:00:00 2001
From: zhaoxing <zhaoxing@shsening.com>
Date: 星期一, 31 十月 2022 11:30:52 +0800
Subject: [PATCH] 更改userid，修复黑地图，天地图电子层级
---
js/index.js | 64 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/js/index.js b/js/index.js
index 59789c3..3f518de 100644
--- a/js/index.js
+++ b/js/index.js
@@ -19,39 +19,41 @@
request = $.extend(request, haoutil.system.getRequest(window.top));
}
- // try {
- // var jwtstr = request.JWT;
- // var strs_ = jwtstr.split('.');
- // var jwt_header_ = new buffer.Buffer(strs_[0].toString('base64'), 'base64').toString();
- // var jwt_payload_ = new buffer.Buffer(strs_[1].toString('base64'), 'base64').toString();
- // var payload_ = JSON.parse(jwt_payload_);
- // mars3d.global_variables.userid = payload_.userid;
- // mars3d.global_variables.regionCode = payload_.divcode;
- // var hash = CryptoJS.HmacSHA256(strs_[0] + '.' + strs_[1], "sxyd");
- // var hashInBase64 = base64UrlEncode(hash);
+ try {
+ var jwtstr = request.JWT;
+ var strs_ = jwtstr.split('.');
+ var jwt_header_ = new buffer.Buffer(strs_[0].toString('base64'), 'base64').toString();
+ var jwt_payload_ = new buffer.Buffer(strs_[1].toString('base64'), 'base64').toString();
+ var payload_ = JSON.parse(jwt_payload_);
+ mars3d.global_variables.userid = payload_.userid;
+ mars3d.global_variables.regionCode = payload_.divcode;
+ var hash = CryptoJS.HmacSHA256(strs_[0] + '.' + strs_[1], "sxyd");
+ var hashInBase64 = base64UrlEncode(hash);
- // var reg = RegExp(strs_[2]);
- // if (!reg.exec(hashInBase64)) {
- // // verification failed, go back
- // window.top.location = mars3d.global_variables.un_authorization_url;
- // }
- // payload_ = JSON.parse(jwt_payload_);
- // if (!payload_ || !payload_.expires) {
- // // verification error ,go back
- // window.top.location = mars3d.global_variables.un_authorization_url;
- // }
- // var date1 = new Date(payload_.expires);
- // var date2 = new Date();
- // if (date1 < date2) {
- // // expire, go back
- // window.top.location = mars3d.global_variables.un_authorization_url;
- // }
- // }
- // catch (err) {
- // window.top.location = mars3d.global_variables.un_authorization_url;
- // }
+ var reg = RegExp(strs_[2]);
+ if (!reg.exec(hashInBase64)) {
+ // verification failed, go back
+ window.top.location = mars3d.global_variables.un_authorization_url;
+ }
+ payload_ = JSON.parse(jwt_payload_);
+ if (!payload_ || !payload_.expires) {
+ // verification error ,go back
+ window.top.location = mars3d.global_variables.un_authorization_url;
+ }
+ var date1 = new Date(payload_.expires);
+ var date2 = new Date();
+ if (date1 < date2) {
+ // expire, go back
+ window.top.location = mars3d.global_variables.un_authorization_url;
+ }
+ }
+ catch (err) {
+ window.top.location = mars3d.global_variables.un_authorization_url;
+ }
- mars3d.global_variables.userid = request?.userid || 2;
+ if(!mars3d.global_variables.userid) {
+ mars3d.global_variables.userid = 2;
+ }
regionCode = mars3d.global_variables.regionCode
var configfile = "config/config.json"; //榛樿鍦板潃
--
Gitblit v1.9.1