From 04a93b22edf35e27cd84b7ac55a9f3d8f09b98e5 Mon Sep 17 00:00:00 2001 From: AhnSinYong Date: Sat, 24 Mar 2018 02:16:58 +0900 Subject: [PATCH 1/4] - split ajax into get and post - change ajaxRequest to ajaxGet or ajaxPost --- src/main/resources/static/js/index.js | 2 +- src/main/resources/static/js/lib/ajax.js | 30 ++++++++----------- .../resources/static/js/utils/accountQuery.js | 2 +- src/main/resources/static/js/utils/block.js | 2 +- src/main/resources/static/js/utils/login.js | 2 +- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/main/resources/static/js/index.js b/src/main/resources/static/js/index.js index 31733a521..3a1031c7d 100644 --- a/src/main/resources/static/js/index.js +++ b/src/main/resources/static/js/index.js @@ -45,7 +45,7 @@ $(document).ready(function(){ $('#text').load('html/count.html'); }); $('#a_witness').on('click',function () { - ajaxRequest( "GET",witelist,data,TransSuccessCallback,TransFailureCallback) + ajaxGet(witelist, data, TransSuccessCallback, TransFailureCallback); }) TransSuccessCallback = function (data) { diff --git a/src/main/resources/static/js/lib/ajax.js b/src/main/resources/static/js/lib/ajax.js index 9a58e29ca..d2c72e5ec 100644 --- a/src/main/resources/static/js/lib/ajax.js +++ b/src/main/resources/static/js/lib/ajax.js @@ -1,20 +1,16 @@ -/** @brief 封装ajax请求 create by zsj 2018-03-19 - * @param targetUrl 请求接口 - * @param requestData 请求接口传参 - * @param successCallback 回调方法 - * @param failureCallback 失败方法 - */ -ajaxRequest = function (typeIn, targetUrl, requestData, successCallback, failureCallback) { - $.ajax({ - type: typeIn, - url: targetUrl, - data: requestData, - success: function (msg) { - successCallback(msg); - }, - error: function (msg) { - failureCallback(msg); - } +var ajaxGet = function (targetUrl, requestData, successCallback, failureCallback) { + $.get(targetUrl, requestData, function (msg) { + successCallback(msg); + }).error(function (msg) { + failureCallback(msg); + }); +}; + +var ajaxPost = function (targetUrl, requestData, successCallback, failureCallback) { + $.post(targetUrl, requestData, function (msg) { + successCallback(msg); + }).error(function (msg) { + failureCallback(msg); }); }; diff --git a/src/main/resources/static/js/utils/accountQuery.js b/src/main/resources/static/js/utils/accountQuery.js index ba0e7a16d..5dfc8a83b 100644 --- a/src/main/resources/static/js/utils/accountQuery.js +++ b/src/main/resources/static/js/utils/accountQuery.js @@ -61,7 +61,7 @@ function QueryAccountFail(data) { */ function getAccountList( ) { - ajaxRequest( "get",accountList,{},QueryAccountSuccess,QueryAccountFail) + ajaxGet(accountList, {}, QueryAccountSuccess, QueryAccountFail); } diff --git a/src/main/resources/static/js/utils/block.js b/src/main/resources/static/js/utils/block.js index 5bbd06b32..42f846ffc 100644 --- a/src/main/resources/static/js/utils/block.js +++ b/src/main/resources/static/js/utils/block.js @@ -5,7 +5,7 @@ $(function () { }); -ajaxRequest( "GET",getBlockToView,data,TransSuccessCallback,TransFailureCallback); +ajaxGet(getBlockToView, data, TransSuccessCallback, TransFailureCallback); var data ={ diff --git a/src/main/resources/static/js/utils/login.js b/src/main/resources/static/js/utils/login.js index 8adbdd7cb..f65603625 100644 --- a/src/main/resources/static/js/utils/login.js +++ b/src/main/resources/static/js/utils/login.js @@ -119,7 +119,7 @@ $('#change').on('click',function () { $('.num_warn').css('display','block'); return; }; - ajaxRequest( "POST",trans,data,TransSuccessCallback,TransFailureCallback) + ajaxPost(trans, data, TransSuccessCallback, TransFailureCallback); }) var data ={ "Address":com_text, From 83b286aa4b5d26820808d4ef2dc5b3db22fbd7c1 Mon Sep 17 00:00:00 2001 From: AhnSinYong Date: Sat, 31 Mar 2018 00:09:42 +0900 Subject: [PATCH 2/4] rollback --- src/main/resources/static/js/lib/ajax.js | 30 +++++++++++-------- .../resources/static/js/utils/accountQuery.js | 2 +- src/main/resources/static/js/utils/login.js | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/main/resources/static/js/lib/ajax.js b/src/main/resources/static/js/lib/ajax.js index d2c72e5ec..9a58e29ca 100644 --- a/src/main/resources/static/js/lib/ajax.js +++ b/src/main/resources/static/js/lib/ajax.js @@ -1,16 +1,20 @@ -var ajaxGet = function (targetUrl, requestData, successCallback, failureCallback) { - $.get(targetUrl, requestData, function (msg) { - successCallback(msg); - }).error(function (msg) { - failureCallback(msg); - }); -}; - -var ajaxPost = function (targetUrl, requestData, successCallback, failureCallback) { - $.post(targetUrl, requestData, function (msg) { - successCallback(msg); - }).error(function (msg) { - failureCallback(msg); +/** @brief 封装ajax请求 create by zsj 2018-03-19 + * @param targetUrl 请求接口 + * @param requestData 请求接口传参 + * @param successCallback 回调方法 + * @param failureCallback 失败方法 + */ +ajaxRequest = function (typeIn, targetUrl, requestData, successCallback, failureCallback) { + $.ajax({ + type: typeIn, + url: targetUrl, + data: requestData, + success: function (msg) { + successCallback(msg); + }, + error: function (msg) { + failureCallback(msg); + } }); }; diff --git a/src/main/resources/static/js/utils/accountQuery.js b/src/main/resources/static/js/utils/accountQuery.js index 7eb3e4ff0..6f1f33888 100644 --- a/src/main/resources/static/js/utils/accountQuery.js +++ b/src/main/resources/static/js/utils/accountQuery.js @@ -72,7 +72,7 @@ function QueryAccountFail(data) { */ function getAccountList( ) { - ajaxGet(accountList, {}, QueryAccountSuccess, QueryAccountFail); + ajaxRequest( "get",accountList,{},QueryAccountSuccess,QueryAccountFail) } diff --git a/src/main/resources/static/js/utils/login.js b/src/main/resources/static/js/utils/login.js index 5f4230d35..630d5fc52 100644 --- a/src/main/resources/static/js/utils/login.js +++ b/src/main/resources/static/js/utils/login.js @@ -127,7 +127,7 @@ $('#change').on('click',function () { $('.num_warn').css('display','block'); return; }; - ajaxPost(trans, data, TransSuccessCallback, TransFailureCallback); + ajaxRequest( "POST",trans,data,TransSuccessCallback,TransFailureCallback) }) var data ={ "Address":com_text, From 7a6bac3d0baf3439274ef39e6c9a35a56a3cff8e Mon Sep 17 00:00:00 2001 From: AhnSinYong Date: Sat, 31 Mar 2018 18:33:28 +0900 Subject: [PATCH 3/4] split ajax function --- src/main/resources/static/js/lib/ajax.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/resources/static/js/lib/ajax.js b/src/main/resources/static/js/lib/ajax.js index 9a58e29ca..8b600e178 100644 --- a/src/main/resources/static/js/lib/ajax.js +++ b/src/main/resources/static/js/lib/ajax.js @@ -18,6 +18,22 @@ ajaxRequest = function (typeIn, targetUrl, requestData, successCallback, failure }); }; +var ajaxGet = function (targetUrl, requestData, successCallback, failureCallback) { + $.get(targetUrl, requestData, function (msg) { + successCallback(msg); + }).error(function (msg) { + failureCallback(msg); + }); +}; + +var ajaxPost = function (targetUrl, requestData, successCallback, failureCallback) { + $.post(targetUrl, requestData, function (msg) { + successCallback(msg); + }).error(function (msg) { + failureCallback(msg); + }); +}; + /** * subStrData 处理时间 * @param str 传入的时间字段 string From 74f34066f0323e352f8133d764bd9d7eb434900c Mon Sep 17 00:00:00 2001 From: AhnSinYong Date: Sat, 31 Mar 2018 18:34:52 +0900 Subject: [PATCH 4/4] define consts --- src/main/resources/static/js/api/interface.js | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/main/resources/static/js/api/interface.js b/src/main/resources/static/js/api/interface.js index 84a5a84e7..fbc78a905 100644 --- a/src/main/resources/static/js/api/interface.js +++ b/src/main/resources/static/js/api/interface.js @@ -27,3 +27,34 @@ var getAssetByNameView = baseUrl + 'getAssetIssueByName'; //根据资产名字 var nodeMapDots = baseUrl + 'nodeList'; //节点地图里的位置 +var interfaces = (function () { + var baseUrl = 'http://47.95.14.107:8088/'; + //var baseUrl = 'http://192.168.10.195:8088/'; + //var baseUrl = 'http://192.168.10.55:8088/'; + //var baseUrl = 'http://localhost:8088/'; + + var urls = { + transTrx: 'sendCoinToView', //转账接口 + transOther: 'TransferAssetToView', //资产转让 + anintran: 'transactionFromView', // 签名接口 + getAccountInfo: 'queryAccount', //查询账户详情 + accountList: 'accountList', //查询账户列表 + witnessList: 'witnessList', //查询出块人列表 + getBlockToView: 'getBlockToView', //current block + getBlockByNumToView: 'getBlockByNumToView', //recent block + createAssetView: 'createAssetIssueToView', //发行资产 + signView: 'transactionFromView', //签名接口 + assetIssueListView: 'getAssetIssueList', //资产列表 + createWitness: 'createWitnessToView', //申请成为出块人 + participateAssetView: 'ParticipateAssetIssueToView', //参与资产发行接口 + voteWitnessView: 'createVoteWitnessToView', //投票接口 + getAssetByNameView: 'getAssetIssueByName', //根据资产名字获取资产信息 + nodeMapDots: 'nodeList' //节点地图里的位置 + }; + + return { + get: function (name) { + return baseUrl + urls[name]; + } + } +})(); \ No newline at end of file