monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit f846f568d37f881591dcbe5478737c5ed30be314 1 parent bdc8250e

fix: 修改common中获取token得方式

Inline Side-by-side
Showing 2 changed files with 25 additions and 23 deletions
@@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
4 @Author：贤心 4 @Author：贤心
5 @Site：http://www.layui.com/admin/ 5 @Site：http://www.layui.com/admin/
6 @License：LPPL 6 @License：LPPL
7 -  
8 */ 7 */
9 8
10 layui.define(['xmSelect', 'md5'], function (exports) { 9 layui.define(['xmSelect', 'md5'], function (exports) {
@@ -17,6 +16,8 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -17,6 +16,8 @@ layui.define(['xmSelect', 'md5'], function (exports) {
17 , form = layui.form 16 , form = layui.form
18 , commonDetail = layui.commonDetail 17 , commonDetail = layui.commonDetail
19 , admin = layui.admin; 18 , admin = layui.admin;
  19 +
  20 + var accessToken = '';
20 //公共业务的逻辑处理可以写在此处，切换任何页面都会执行 21 //公共业务的逻辑处理可以写在此处，切换任何页面都会执行
21 var obj = { 22 var obj = {
22 domainName: sessionStorage.getItem('domainName'), // gateway地址 23 domainName: sessionStorage.getItem('domainName'), // gateway地址
@@ -260,7 +261,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -260,7 +261,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
260 var accessToken = ''; 261 var accessToken = '';
261 layui.use(['sessions', 'common'], function () { 262 layui.use(['sessions', 'common'], function () {
262 var sessions = layui.sessions; 263 var sessions = layui.sessions;
263 - accessToken = common.getMjToken(); 264 + accessToken = layui.common.getMjToken();
264 }); 265 });
265 var url = obj.domainName + '/api-web/home/priviewOfiice/' + id + '?document=' + document + '&accessToken=' + accessToken; 266 var url = obj.domainName + '/api-web/home/priviewOfiice/' + id + '?document=' + document + '&accessToken=' + accessToken;
266 var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'}); 267 var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'});
@@ -280,7 +281,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -280,7 +281,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
280 var accessToken = ''; 281 var accessToken = '';
281 layui.use(['sessions', 'common'], function () { 282 layui.use(['sessions', 'common'], function () {
282 var sessions = layui.sessions; 283 var sessions = layui.sessions;
283 - accessToken = common.getMjToken(); 284 + accessToken = layui.common.getMjToken();
284 }); 285 });
285 var url = obj.domainName + `/api-web/openoffice/convertPdf/?path=${encodeURIComponent(filepath)}` + '&accessToken=' + accessToken; 286 var url = obj.domainName + `/api-web/openoffice/convertPdf/?path=${encodeURIComponent(filepath)}` + '&accessToken=' + accessToken;
286 var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'}); 287 var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'});
@@ -378,7 +379,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -378,7 +379,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
378 */ 379 */
379 providerSelect: function (targtetId, callback) { 380 providerSelect: function (targtetId, callback) {
380 var sessions = layui.sessions; 381 var sessions = layui.sessions;
381 - var accessToken = common.getMjToken(); 382 + var accessToken = layui.common.getMjToken();
382 var options = "<option value=''>=所属厂商=</option>"; 383 var options = "<option value=''>=所属厂商=</option>";
383 admin.req({ 384 admin.req({
384 url: `${obj.domainName}/api-web/manage/ddic/findSucDdics/provider?accessToken=` + accessToken, 385 url: `${obj.domainName}/api-web/manage/ddic/findSucDdics/provider?accessToken=` + accessToken,
@@ -411,7 +412,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -411,7 +412,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
411 emptyText = "=请选择="; 412 emptyText = "=请选择=";
412 } 413 }
413 var sessions = layui.sessions; 414 var sessions = layui.sessions;
414 - var accessToken = common.getMjToken(); 415 + var accessToken = layui.common.getMjToken();
415 var options = `<option value=''>${emptyText}</option>`; 416 var options = `<option value=''>${emptyText}</option>`;
416 admin.req({ 417 admin.req({
417 url: `${obj.domainName}/api-web/manage/ddic/findSucDdics/${ddocCode}?accessToken=` + accessToken, 418 url: `${obj.domainName}/api-web/manage/ddic/findSucDdics/${ddocCode}?accessToken=` + accessToken,
@@ -441,7 +442,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -441,7 +442,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
441 */ 442 */
442 renderCollProtocolSelect(targtetId) { 443 renderCollProtocolSelect(targtetId) {
443 var sessions = layui.sessions; 444 var sessions = layui.sessions;
444 - var accessToken = common.getMjToken(); 445 + var accessToken = layui.common.getMjToken();
445 admin.req({ 446 admin.req({
446 url: obj.domainName + '/api-web/manage/protocol/page?page=1&limit=10000', 447 url: obj.domainName + '/api-web/manage/protocol/page?page=1&limit=10000',
447 async: false, 448 async: false,
@@ -605,7 +606,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -605,7 +606,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
605 ddicSelect: function (targtetId, ddicCategory, callback) { 606 ddicSelect: function (targtetId, ddicCategory, callback) {
606 layui.use(['sessions', 'common'], function () { 607 layui.use(['sessions', 'common'], function () {
607 var sessions = layui.sessions; 608 var sessions = layui.sessions;
608 - accessToken = common.getMjToken(); 609 + accessToken = layui.common.getMjToken();
609 }); 610 });
610 var options = "<option value=''>=请选择=</option>"; 611 var options = "<option value=''>=请选择=</option>";
611 admin.req({ 612 admin.req({
@@ -1049,7 +1050,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1049,7 +1050,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1049 var accessToken = ''; 1050 var accessToken = '';
1050 layui.use(['sessions', 'common'], function () { 1051 layui.use(['sessions', 'common'], function () {
1051 var sessions = layui.sessions; 1052 var sessions = layui.sessions;
1052 - accessToken = common.getMjToken(); 1053 + accessToken = layui.common.getMjToken();
1053 }); 1054 });
1054 var cols = data['cols'][0]; 1055 var cols = data['cols'][0];
1055 if (sign === 0) { 1056 if (sign === 0) {
@@ -1870,7 +1871,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1870,7 +1871,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1870 var accessToken = ''; 1871 var accessToken = '';
1871 layui.use(['sessions', 'common'], function () { 1872 layui.use(['sessions', 'common'], function () {
1872 var sessions = layui.sessions; 1873 var sessions = layui.sessions;
1873 - accessToken = common.getMjToken(); 1874 + accessToken = layui.common.getMjToken();
1874 }); 1875 });
1875 var url = obj.domainInspectionURI + "/start/index.html#/accessToken=" + accessToken; 1876 var url = obj.domainInspectionURI + "/start/index.html#/accessToken=" + accessToken;
1876 window.open(url); 1877 window.open(url);
@@ -1880,7 +1881,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1880,7 +1881,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1880 var accessToken = ''; 1881 var accessToken = '';
1881 layui.use(['sessions', 'common'], function () { 1882 layui.use(['sessions', 'common'], function () {
1882 var sessions = layui.sessions; 1883 var sessions = layui.sessions;
1883 - accessToken = common.getMjToken(); 1884 + accessToken = layui.common.getMjToken();
1884 }); 1885 });
1885 var url = obj.domainAssetsManage + "/ITAM/index.jsp?accessToken=" + accessToken; 1886 var url = obj.domainAssetsManage + "/ITAM/index.jsp?accessToken=" + accessToken;
1886 window.open(url); 1887 window.open(url);
@@ -1908,7 +1909,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1908,7 +1909,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1908 var accessToken = ''; 1909 var accessToken = '';
1909 layui.use(['sessions', 'common'], function () { 1910 layui.use(['sessions', 'common'], function () {
1910 var sessions = layui.sessions; 1911 var sessions = layui.sessions;
1911 - accessToken = common.getMjToken(); 1912 + accessToken = layui.common.getMjToken();
1912 }); 1913 });
1913 window.open(`${code}?accessToken=${accessToken}`); 1914 window.open(`${code}?accessToken=${accessToken}`);
1914 } 1915 }
@@ -284,7 +284,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -284,7 +284,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
284 var accessToken = ''; 284 var accessToken = '';
285 layui.use(['sessions', 'common'], function () { 285 layui.use(['sessions', 'common'], function () {
286 var sessions = layui.sessions; 286 var sessions = layui.sessions;
287 - accessToken = common.getMjToken(); 287 + accessToken = layui.common.getMjToken();
288 }); 288 });
289 var url = obj.domainName + '/api-web/home/priviewOfiice/' + id + '?document=' + document + '&accessToken=' + accessToken; 289 var url = obj.domainName + '/api-web/home/priviewOfiice/' + id + '?document=' + document + '&accessToken=' + accessToken;
290 var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'}); 290 var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'});
@@ -304,7 +304,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -304,7 +304,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
304 var accessToken = ''; 304 var accessToken = '';
305 layui.use(['sessions', 'common'], function () { 305 layui.use(['sessions', 'common'], function () {
306 var sessions = layui.sessions; 306 var sessions = layui.sessions;
307 - accessToken = common.getMjToken(); 307 + accessToken = layui.common.getMjToken();
308 }); 308 });
309 var url = obj.domainName + `/api-web/openoffice/convertPdf/?path=${encodeURIComponent(filepath)}` + '&accessToken=' + accessToken; 309 var url = obj.domainName + `/api-web/openoffice/convertPdf/?path=${encodeURIComponent(filepath)}` + '&accessToken=' + accessToken;
310 var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'}); 310 var loadIndex = layer.load(1, {shade: [0.3], content: '文件正在转换...'});
@@ -401,7 +401,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -401,7 +401,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
401 */ 401 */
402 providerSelect: function (targtetId, callback) { 402 providerSelect: function (targtetId, callback) {
403 var sessions = layui.sessions; 403 var sessions = layui.sessions;
404 - var accessToken = common.getMjToken(); 404 + var accessToken = layui.common.getMjToken();
405 var options = "<option value=''>=所属厂商=</option>"; 405 var options = "<option value=''>=所属厂商=</option>";
406 admin.req({ 406 admin.req({
407 url: `${obj.domainName}/api-web/manage/ddic/findSucDdics/provider?accessToken=` + accessToken, 407 url: `${obj.domainName}/api-web/manage/ddic/findSucDdics/provider?accessToken=` + accessToken,
@@ -434,7 +434,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -434,7 +434,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
434 emptyText = "=请选择="; 434 emptyText = "=请选择=";
435 } 435 }
436 var sessions = layui.sessions; 436 var sessions = layui.sessions;
437 - var accessToken = common.getMjToken(); 437 + var accessToken = layui.common.getMjToken();
438 var options = `<option value=''>${emptyText}</option>`; 438 var options = `<option value=''>${emptyText}</option>`;
439 admin.req({ 439 admin.req({
440 url: `${obj.domainName}/api-web/manage/ddic/findSucDdics/${ddocCode}?accessToken=` + accessToken, 440 url: `${obj.domainName}/api-web/manage/ddic/findSucDdics/${ddocCode}?accessToken=` + accessToken,
@@ -464,7 +464,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -464,7 +464,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
464 */ 464 */
465 renderCollProtocolSelect(targtetId, callback) { 465 renderCollProtocolSelect(targtetId, callback) {
466 var sessions = layui.sessions; 466 var sessions = layui.sessions;
467 - var accessToken = common.getMjToken(); 467 + var accessToken = layui.common.getMjToken();
468 admin.req({ 468 admin.req({
469 url: obj.domainName + '/api-web/manage/protocol/page?page=1&limit=10000', 469 url: obj.domainName + '/api-web/manage/protocol/page?page=1&limit=10000',
470 async: false, 470 async: false,
@@ -628,9 +628,10 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -628,9 +628,10 @@ layui.define(['xmSelect', 'md5'], function (exports) {
628 * @param callback 回调函数 628 * @param callback 回调函数
629 */ 629 */
630 ddicSelect: function (targtetId, ddicCategory, callback) { 630 ddicSelect: function (targtetId, ddicCategory, callback) {
  631 + var accessToken = '';
631 layui.use(['sessions', 'common'], function () { 632 layui.use(['sessions', 'common'], function () {
632 var sessions = layui.sessions; 633 var sessions = layui.sessions;
633 - accessToken = common.getMjToken(); 634 + accessToken = layui.common.getMjToken();
634 }); 635 });
635 var options = "<option value=''>=请选择=</option>"; 636 var options = "<option value=''>=请选择=</option>";
636 admin.req({ 637 admin.req({
@@ -1088,7 +1089,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1088,7 +1089,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1088 var accessToken = ''; 1089 var accessToken = '';
1089 layui.use(['sessions', 'common'], function () { 1090 layui.use(['sessions', 'common'], function () {
1090 var sessions = layui.sessions; 1091 var sessions = layui.sessions;
1091 - accessToken = common.getMjToken(); 1092 + accessToken = layui.common.getMjToken();
1092 }); 1093 });
1093 var cols = data['cols'][0]; 1094 var cols = data['cols'][0];
1094 if (sign === 0) { 1095 if (sign === 0) {
@@ -1940,7 +1941,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1940,7 +1941,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1940 var accessToken = ''; 1941 var accessToken = '';
1941 layui.use(['sessions', 'common'], function () { 1942 layui.use(['sessions', 'common'], function () {
1942 var sessions = layui.sessions; 1943 var sessions = layui.sessions;
1943 - accessToken = common.getMjToken(); 1944 + accessToken = layui.common.getMjToken();
1944 }); 1945 });
1945 var url = obj.domainInspectionURI + "/start/index.html#/accessToken=" + accessToken; 1946 var url = obj.domainInspectionURI + "/start/index.html#/accessToken=" + accessToken;
1946 window.open(url); 1947 window.open(url);
@@ -1950,7 +1951,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1950,7 +1951,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1950 var accessToken = ''; 1951 var accessToken = '';
1951 layui.use(['sessions', 'common'], function () { 1952 layui.use(['sessions', 'common'], function () {
1952 var sessions = layui.sessions; 1953 var sessions = layui.sessions;
1953 - accessToken = common.getMjToken(); 1954 + accessToken = layui.common.getMjToken();
1954 }); 1955 });
1955 var url = obj.domainAssetsManage + "/ITAM/index.jsp?accessToken=" + accessToken; 1956 var url = obj.domainAssetsManage + "/ITAM/index.jsp?accessToken=" + accessToken;
1956 window.open(url); 1957 window.open(url);
@@ -1961,7 +1962,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1961,7 +1962,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1961 var accessToken = ''; 1962 var accessToken = '';
1962 layui.use(['sessions', 'common'], function () { 1963 layui.use(['sessions', 'common'], function () {
1963 var sessions = layui.sessions; 1964 var sessions = layui.sessions;
1964 - accessToken = common.getMjToken(); 1965 + accessToken = layui.common.getMjToken();
1965 }); 1966 });
1966 var url = obj.domainIpManage + "?accessToken=" + accessToken; 1967 var url = obj.domainIpManage + "?accessToken=" + accessToken;
1967 window.open(url); 1968 window.open(url);
@@ -1972,7 +1973,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1972,7 +1973,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1972 var accessToken = ''; 1973 var accessToken = '';
1973 layui.use(['sessions', 'common'], function () { 1974 layui.use(['sessions', 'common'], function () {
1974 var sessions = layui.sessions; 1975 var sessions = layui.sessions;
1975 - accessToken = common.getMjToken(); 1976 + accessToken = layui.common.getMjToken();
1976 }); 1977 });
1977 //查询科来系统账号及密码 1978 //查询科来系统账号及密码
1978 admin.req({ 1979 admin.req({
@@ -2030,7 +2031,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -2030,7 +2031,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
2030 var accessToken = ''; 2031 var accessToken = '';
2031 layui.use(['sessions', 'common'], function () { 2032 layui.use(['sessions', 'common'], function () {
2032 var sessions = layui.sessions; 2033 var sessions = layui.sessions;
2033 - accessToken = common.getMjToken(); 2034 + accessToken = layui.common.getMjToken();
2034 }); 2035 });
2035 window.open(`${code}?accessToken=${accessToken}`); 2036 window.open(`${code}?accessToken=${accessToken}`);
2036 } 2037 }