diff --git a/VERSION b/VERSION index dc4447d4eb53da076a0f5fffd08dc8f64da9926f..321816a02d1206b735831c65bd4ae483d5aa619c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.24-rc.7-SNAPSHOT \ No newline at end of file +1.0.24 \ No newline at end of file diff --git a/build.gradle b/build.gradle index 56e8599b51e07a29b0d519615fa6063a55719525..25e24e9bca3c13fe6d2b61f5cc7756ccdcaa5fd3 100644 --- a/build.gradle +++ b/build.gradle @@ -93,7 +93,7 @@ List http_proxy = [ ] List redis_driver = [ - "org.redisson:redisson:3.13.1" + "org.redisson:redisson:3.15.0" ] def spring_version = "5.3.2" diff --git a/src/main/java/com/webank/weid/command/RegisterSpecificIssuer.java b/src/main/java/com/webank/weid/command/RegisterSpecificIssuer.java index 160de1a13d68dca0f660383adfe9a42ac8c69bc9..122870e43fa012981bc896657095a52004ee1ae5 100644 --- a/src/main/java/com/webank/weid/command/RegisterSpecificIssuer.java +++ b/src/main/java/com/webank/weid/command/RegisterSpecificIssuer.java @@ -80,12 +80,6 @@ public class RegisterSpecificIssuer extends StaticConfig { // Register this issuer type anyway log.info("[RegisterIssuer] Registering issuer type with best effort: " + type); ResponseData responseData = weIdSdkService.registerIssuerType(type, DataFrom.COMMAND); - if (responseData.getErrorCode() != ErrorCode.SUCCESS.getCode()) { - System.out.println("[registerIssuerType] register issuer type failed. Abort."); - log.error("[registerIssuerType] register issuer type failed. Abort."); - System.exit(1); - } - if (!StringUtils.isEmpty(weid)) { // Add the DIDs into this type List weIdList = Arrays.asList(weid.split(",")); diff --git a/src/main/resources/static/weid/weid-build-tools/index.html b/src/main/resources/static/weid/weid-build-tools/index.html index c95b1af2e877fb47f3b4359f88560e764ca48ae2..d9ffe6d66e75b8b815d47e439df93647792d7fb9 100644 --- a/src/main/resources/static/weid/weid-build-tools/index.html +++ b/src/main/resources/static/weid/weid-build-tools/index.html @@ -1 +1 @@ -WeIdentity 网页管理工具
\ No newline at end of file +WeIdentity 网页管理工具
\ No newline at end of file diff --git a/src/main/resources/static/weid/weid-build-tools/static/js/11.280e9c6e073faeeab77a.js b/src/main/resources/static/weid/weid-build-tools/static/js/11.59d7f6a8e9a761981bee.js similarity index 99% rename from src/main/resources/static/weid/weid-build-tools/static/js/11.280e9c6e073faeeab77a.js rename to src/main/resources/static/weid/weid-build-tools/static/js/11.59d7f6a8e9a761981bee.js index 04976a0dee82ab24d63ff294790e7099eb71dae8..31d6d89d544891e6f754575e2825f904fad0bf07 100644 --- a/src/main/resources/static/weid/weid-build-tools/static/js/11.280e9c6e073faeeab77a.js +++ b/src/main/resources/static/weid/weid-build-tools/static/js/11.59d7f6a8e9a761981bee.js @@ -1 +1 @@ -webpackJsonp([11],{pnpQ:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var l=a("lC5x"),s=a.n(l),i=a("J0Oq"),o=a.n(i),n=a("/p82"),d=a("gej+"),r={data:function(){return{page:{deployList:[],pageSize:5,total:0,pageIndex:1},roleType:localStorage.getItem("roleType"),dialog:{dialogFormVisible:!1,dialogDetailVisible:!1,dialogDepolyDetailVisible:!1,deployMessages:[],deployForm:{chainId:"",applyName:""},hash:"",deployBtn:null,deployDetail:{}}}},methods:{showAll:function(t){this.$alert(t,"温馨提示",{closeOnClickModal:"true"}).catch(function(){})},showDeployForm:function(){d.a.data.nodeStatus?(this.dialog.deployForm.chainId="",this.dialog.deployForm.applyName="",this.dialog.dialogFormVisible=!0):d.a.checkNodeState(!1)},showDeployDetail:function(t,e){var a=this;n.a.doGet("getDeployInfo/"+t).then(function(t){0===t.data.errorCode?(a.dialog.dialogDetailVisible=!0,a.dialog.deployDetail=t.data.result,a.dialog.deployDetail.owner=e):a.$alert("部署详细查询失败！","温馨提示",{}).catch(function(){})})},changeRoleType:function(){this.roleType=localStorage.getItem("roleType")},deleteRow:function(t,e){var a=this,l=e.currentTarget,s=this;this.$confirm("确认删除吗？","温馨提示",{closeOnClickModal:!1,cancelButtonClass:"el-button--primary"}).then(function(e){s.disableBtn(l),a.removeHash(t,l)}).catch(function(){})},removeHash:function(t,e){var a=this;n.a.doGet("removeHash/"+t+"/1").then(function(t){0===t.data.errorCode?(a.$alert("删除成功!","温馨提示").catch(function(){}),a.init()):a.$alert(t.data.errorMessage,"温馨提示",{}).catch(function(){}),a.enableBtn(e)})},checkInput:function(){return""===this.dialog.deployForm.chainId?(this.$alert("请输入ChainId!","温馨提示",{}).catch(function(){}),!1):""!==this.dialog.deployForm.applyName||(this.$alert("请输入应用名!","温馨提示",{}).catch(function(){}),!1)},comfirmBtn:function(){this.dialog.dialogDepolyDetailVisible=!1,this.dialog.dialogFormVisible=!1},deploy:function(t){var e=this;this.dialog.deployBtn=t.currentTarget,this.checkInput()&&(this.disableBtn(this.dialog.deployBtn),this.dialog.dialogDepolyDetailVisible=!0,this.dialog.deployMessages=[],this.dialog.deployMessages.push("合约部署中..."),n.a.doPost("deploy",this.dialog.deployForm,15).then(function(t){e.dialog.dialogDepolyDetailVisible=!0,0===t.data.errorCode?(e.dialog.hash=t.data.result,e.isEnableMasterCns()):(e.dialog.deployMessages.push("合约部署失败! 请查看日志。"),e.enableBtn(e.dialog.deployBtn))}))},isEnableMasterCns:function(){var t=this;n.a.doGet("isEnableMasterCns").then(function(e){t.dialog.dialogDepolyDetailVisible=!0,e.data.result?t.enableHash(!0):(t.dialog.deployMessages.push("合约部署成功。"),t.dialog.deployMessages.push("请继续操作。"),t.enableBtn(t.dialog.deployBtn),t.init())})},enableHash:function(t){var e=this;this.dialog.deployMessages.push("合约启用中..."),n.a.doGet("enableHash/"+this.dialog.hash,null,10).then(function(a){e.dialog.dialogDepolyDetailVisible=!0,0===a.data.errorCode?(e.dialog.deployMessages.push("合约启用成功。"),t?e.deploySystemCpt():(e.dialog.deployMessages.push("请继续操作。"),e.enableBtn(e.dialog.deployBtn),e.init())):(e.dialog.deployMessages.push("合约启用失败！请查看日志。"),e.enableBtn(e.dialog.deployBtn))})},deploySystemCptBtn:function(t){this.dialog.hash=t,this.deploySystemCpt()},deploySystemCpt:function(){var t=this;this.dialog.deployMessages.push("系统CPT部署中..."),this.dialog.dialogDepolyDetailVisible=!0,n.a.doGet("deploySystemCpt/"+this.dialog.hash,null,10).then(function(e){0===e.data.errorCode?(t.dialog.deployMessages.push("系统CPT部署成功。"),t.dialog.deployMessages.push("系统CPT部署成功! 请继续操作。"),t.init()):t.dialog.deployMessages.push("系统CPT部署失败！请查看日志。"),t.dialog.dialogDepolyDetailVisible=!0,t.enableBtn(t.dialog.deployBtn)})},enable:function(t,e,a){var l=this;this.dialog.deployBtn=a.currentTarget,this.$confirm("是否确定启用该主合约？","温馨提示",{closeOnClickModal:!1,cancelButtonClass:"el-button--primary"}).then(function(a){l.dialog.hash=t,l.dialog.deployMessages=[],l.dialog.dialogDepolyDetailVisible=!0,l.disableBtn(l.dialog.deployBtn),l.enableHash(e)}).catch(function(){})},handleCurrentChange:function(t){t<1&&(t=1),this.page.pageIndex=t},init:function(){var t=this;n.a.doGet("getDeployList").then(function(e){0===e.data.errorCode&&(t.page.deployList=e.data.result,t.page.total=t.page.deployList.length,t.page.total===t.page.pageSize*(t.page.pageIndex-1)&&t.handleCurrentChange(t.page.pageIndex-1))})},check:function(){var t=this;return o()(s.a.mark(function e(){return s.a.wrap(function(e){for(;;)switch(e.prev=e.next){case 0:return e.next=2,d.a.checkNodeState(!1);case 2:d.a.data.nodeStatus&&t.init();case 3:case"end":return e.stop()}},e,t)}))()}},mounted:function(){var t=this;window.addEventListener("setItem",function(){t.changeRoleType()}),this.check()}},c={render:function(){var t=this,e=t.$createElement,l=t._self._c||e;return l("section",{staticClass:"content app_main"},["1"===t.roleType?l("el-row",{staticClass:"app_main_header_row"},[l("el-col",{attrs:{span:5}},[l("el-button",{staticClass:"btn",staticStyle:{width:"250px"},attrs:{type:"primary"},on:{click:t.showDeployForm}},[t._v("主群组部署 WeIdentity 智能合约")])],1),t._v(" "),l("el-col",{staticClass:"head-icon",attrs:{span:19}},[l("a",{attrs:{href:"https://weid-doc-xml.readthedocs.io/zh/test/docs/weidentity-quick-tools-web.html?highlight=部署 WeIdentity 智能合约#id2",target:"blank_"}},[l("img",{staticClass:"icon_question",attrs:{src:a("JaJV"),alt:""}}),t._v(" "),l("span",{staticClass:"icon_question"},[t._v("多次部署合约")])])])],1):t._e(),t._v(" "),l("div",{staticClass:"app_view"},[l("el-table",{staticStyle:{width:"100%"},attrs:{data:t.page.deployList.slice((t.page.pageIndex-1)*t.page.pageSize,t.page.pageIndex*t.page.pageSize),border:"true",align:"center",cellpadding:"0",cellspacing:"0"}},[l("el-table-column",{attrs:{prop:"applyName",label:"应用名字",align:"center"},scopedSlots:t._u([{key:"default",fn:function(e){return[l("span",{staticClass:"long_words",attrs:{title:e.row.applyName}},[t._v(t._s(e.row.applyName))])]}}])}),t._v(" "),l("el-table-column",{attrs:{label:"智能合约部署ID",align:"center",width:"160"},scopedSlots:t._u([{key:"default",fn:function(e){return[l("span",{staticClass:"long_words link",attrs:{title:e.row.hash},on:{click:function(a){return t.showAll(e.row.hash)}}},[t._v(t._s(e.row.hashShow))])]}}])}),t._v(" "),l("el-table-column",{attrs:{label:"部署的机构名称",align:"center",width:"250"},scopedSlots:t._u([{key:"default",fn:function(e){return null!==e.row.issuer?[l("span",{staticClass:"icon_question",attrs:{title:e.row.issuer.name}},[t._v(t._s(e.row.issuer.name))]),t._v(" "),!0===e.row.issuer.recognized?l("img",{staticClass:"icon_question",attrs:{src:a("MeCv"),widht:"50",height:"50",alt:""}}):t._e(),t._v(" "),!1===e.row.issuer.recognized?l("img",{staticClass:"icon_question",attrs:{src:a("B7UN"),widht:"50",height:"50",alt:""}}):t._e()]:void 0}}],null,!0)}),t._v(" "),l("el-table-column",{attrs:{prop:"groupId",label:"所在群组",align:"center",width:"100"}}),t._v(" "),l("el-table-column",{attrs:{prop:"createTime",label:"创建时间",align:"center",width:"170"}}),t._v(" "),l("el-table-column",{attrs:{label:"操作",align:"center",width:"300"},scopedSlots:t._u([{key:"default",fn:function(e){return[e.row.enable?l("el-button",{staticClass:"btn",attrs:{type:"primary",disabled:""}},[t._v("已启用")]):l("el-button",{staticClass:"btn",attrs:{type:"primary"},on:{click:function(a){return t.enable(e.row.hash,e.row.needDeployCpt,a)}}},[t._v("启用")]),t._v(" "),l("el-button",{staticClass:"btn",attrs:{type:"primary"},on:{click:function(a){return t.deleteRow(e.row.hash,a)}}},[t._v("删除")]),t._v(" "),0==e.row.enable||0==e.row.needDeployCpt?l("el-button",{staticClass:"btn",staticStyle:{width:"90px"},attrs:{type:"primary"},on:{click:function(a){return t.showDeployDetail(e.row.hash,e.row.weId)}}},[t._v("详细信息")]):t._e(),t._v(" "),e.row.enable&&e.row.needDeployCpt?l("el-button",{staticClass:"btn",staticStyle:{width:"120px"},attrs:{type:"primary"},on:{click:function(a){return t.deploySystemCptBtn(e.row.hash)}}},[t._v("部署系统CPT")]):t._e()]}}])})],1),t._v(" "),"1"===t.roleType?l("el-pagination",{attrs:{"current-page":t.page.pageIndex,"page-size":t.page.pageSize,layout:"total, prev, pager, next, jumper",total:t.page.total},on:{"current-change":t.handleCurrentChange}}):t._e()],1),t._v(" "),l("el-dialog",{staticClass:"dialog-view",attrs:{title:"主群组部署 WeIdentity 智能合约",width:"29%",visible:t.dialog.dialogFormVisible,"close-on-click-modal":!1},on:{"update:visible":function(e){return t.$set(t.dialog,"dialogFormVisible",e)}}},[l("div",{staticClass:"dialog-body"},[l("el-form",{attrs:{model:t.dialog.deployForm}},[l("el-form-item",{attrs:{label:"链ID(chain_id)","label-width":t.formLabelWidth}},[l("div",{staticClass:"mark-icon"},[l("a",{attrs:{href:"https://weidentity.readthedocs.io/zh_CN/latest/docs/weidentity-spec.html?highlight=chain-id#id4",target:"blank_"}},[l("img",{staticClass:"icon_question",attrs:{src:a("JaJV"),alt:""}}),t._v(" "),l("span",{staticClass:"icon_question"},[t._v("什么是chain id?")])])]),t._v(" "),l("el-input",{attrs:{placeholder:"Enter chainId",onKeyUp:"this.value=this.value.replace(/\\D/g,'')"},on:{blur:function(e){t.dialog.deployForm.chainId=e.target.value}},model:{value:t.dialog.deployForm.chainId,callback:function(e){t.$set(t.dialog.deployForm,"chainId",e)},expression:"dialog.deployForm.chainId"}})],1),t._v(" "),l("el-form-item",{attrs:{label:"应用名字","label-width":t.formLabelWidth}},[l("div",{staticClass:"mark-text"},[l("span",{},[t._v("给自己的WeIdentity区块链应用起一个名字吧，用于在同一条链上区别不同的 WeIdentity 应用，例如“学历证书应用”，“区块链证件应用”。")])]),t._v(" "),l("el-input",{attrs:{placeholder:"Enter applyName"},model:{value:t.dialog.deployForm.applyName,callback:function(e){t.$set(t.dialog.deployForm,"applyName",e)},expression:"dialog.deployForm.applyName"}})],1)],1)],1),t._v(" "),l("div",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[l("el-button",{staticClass:"width_100",attrs:{type:"primary"},on:{click:function(e){return t.deploy(e)}}},[t._v("部 署")])],1)]),t._v(" "),l("el-dialog",{staticClass:"dialog-view",attrs:{title:"部署信息",width:"620px",visible:t.dialog.dialogDetailVisible,"close-on-click-modal":!0},on:{"update:visible":function(e){return t.$set(t.dialog,"dialogDetailVisible",e)}}},[l("div",{staticClass:"dialog-body deployDetail"},[l("el-row",[l("el-col",{staticClass:"title",attrs:{span:4}},[t._v("智能合约部署ID")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:20}},[t._v(t._s(t.dialog.deployDetail.hash))])],1),t._v(" "),l("el-row",[l("el-col",{staticClass:"title",attrs:{span:4}},[t._v("部署账户")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:20}},[t._v(t._s(t.dialog.deployDetail.owner))])],1),t._v(" "),t.dialog.deployDetail.local?l("el-row",[l("el-col",{staticClass:"title",attrs:{span:4}},[t._v("WeID SDK版本")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:7}},[t._v(t._s(t.dialog.deployDetail.weIdSdkVersion))]),t._v(" "),l("el-col",{staticClass:"title",attrs:{span:4}},[t._v("WeID合约版本")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:9}},[t._v(t._s(t.dialog.deployDetail.contractVersion))])],1):t._e(),t._v(" "),t.dialog.deployDetail.local?l("el-row",[l("el-col",{staticClass:"title",attrs:{span:4}},[t._v("部署来源")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:7}},[t._v(t._s(t.dialog.deployDetail.from))]),t._v(" "),l("el-col",{staticClass:"title",attrs:{span:4}},[t._v("区块链节点版本")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:9}},[t._v(t._s(t.dialog.deployDetail.nodeVerion))])],1):t._e(),t._v(" "),t.dialog.deployDetail.local?l("el-row",[l("el-col",{staticClass:"title",attrs:{span:4}},[t._v("区块链节点")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:20}},[t._v(t._s(t.dialog.deployDetail.nodeAddress))])],1):t._e(),t._v(" "),l("el-row",[l("el-col",{staticClass:"title",attrs:{span:8}},[t._v("WeID智能合约地址")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:16}},[t._v(t._s(t.dialog.deployDetail.weIdAddress))])],1),t._v(" "),l("el-row",[l("el-col",{staticClass:"title",attrs:{span:8}},[t._v("CPT智能合约地址")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:16}},[t._v(t._s(t.dialog.deployDetail.cptAddress))])],1),t._v(" "),l("el-row",[l("el-col",{staticClass:"title",attrs:{span:8}},[t._v("Authority Issuer 智能合约地址")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:16}},[t._v(t._s(t.dialog.deployDetail.authorityAddress))])],1),t._v(" "),l("el-row",[l("el-col",{staticClass:"title",attrs:{span:8}},[t._v("Evidence 智能合约地址")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:16}},[t._v(t._s(t.dialog.deployDetail.evidenceAddress))])],1),t._v(" "),l("el-row",[l("el-col",{staticClass:"title",attrs:{span:8}},[t._v("Specific Issuer 智能合约地址")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:16}},[t._v(t._s(t.dialog.deployDetail.specificAddress))])],1),t._v(" "),l("el-row",{staticClass:"none-border"},[l("el-col",{staticClass:"title",attrs:{span:8}},[t._v("Chain Id")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:16}},[t._v(t._s(t.dialog.deployDetail.chainId))])],1)],1),t._v(" "),l("br")]),t._v(" "),l("el-dialog",{staticClass:"dialog-view",attrs:{title:"合约部署",width:"400px",visible:t.dialog.dialogDepolyDetailVisible,"close-on-click-modal":!1},on:{"update:visible":function(e){return t.$set(t.dialog,"dialogDepolyDetailVisible",e)}}},[l("div",{staticClass:"dialog-body deployMessage"},t._l(t.dialog.deployMessages,function(e){return l("p",{key:e.value},[t._v(t._s(e))])}),0),t._v(" "),l("div",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[l("el-button",{staticClass:"width_100",attrs:{type:"primary"},on:{click:t.comfirmBtn}},[t._v("确 定")])],1)])],1)},staticRenderFns:[]},p=a("C7Lr")(r,c,!1,null,null,null);e.default=p.exports}}); \ No newline at end of file +webpackJsonp([11],{pnpQ:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var l=a("lC5x"),s=a.n(l),i=a("J0Oq"),o=a.n(i),n=a("/p82"),d=a("gej+"),r={data:function(){return{page:{deployList:[],pageSize:5,total:0,pageIndex:1},roleType:localStorage.getItem("roleType"),dialog:{dialogFormVisible:!1,dialogDetailVisible:!1,dialogDepolyDetailVisible:!1,deployMessages:[],deployForm:{chainId:"",applyName:""},hash:"",deployBtn:null,deployDetail:{}}}},methods:{showAll:function(t){this.$alert(t,"温馨提示",{closeOnClickModal:"true"}).catch(function(){})},showDeployForm:function(){d.a.data.nodeStatus?(this.dialog.deployForm.chainId="",this.dialog.deployForm.applyName="",this.dialog.dialogFormVisible=!0):d.a.checkNodeState(!1)},showDeployDetail:function(t,e){var a=this;n.a.doGet("getDeployInfo/"+t).then(function(t){0===t.data.errorCode?(a.dialog.dialogDetailVisible=!0,a.dialog.deployDetail=t.data.result,a.dialog.deployDetail.owner=e):a.$alert("部署详细查询失败！","温馨提示",{}).catch(function(){})})},changeRoleType:function(){this.roleType=localStorage.getItem("roleType")},deleteRow:function(t,e){var a=this,l=e.currentTarget,s=this;this.$confirm("确认删除吗？","温馨提示",{closeOnClickModal:!1,cancelButtonClass:"el-button--primary"}).then(function(e){s.disableBtn(l),a.removeHash(t,l)}).catch(function(){})},removeHash:function(t,e){var a=this;n.a.doGet("removeHash/"+t+"/1").then(function(t){0===t.data.errorCode?(a.$alert("删除成功!","温馨提示").catch(function(){}),a.init()):a.$alert(t.data.errorMessage,"温馨提示",{}).catch(function(){}),a.enableBtn(e)})},checkInput:function(){return""===this.dialog.deployForm.chainId?(this.$alert("请输入ChainId!","温馨提示",{}).catch(function(){}),!1):""!==this.dialog.deployForm.applyName||(this.$alert("请输入应用名!","温馨提示",{}).catch(function(){}),!1)},comfirmBtn:function(){this.dialog.dialogDepolyDetailVisible=!1,this.dialog.dialogFormVisible=!1},deploy:function(t){var e=this;this.dialog.deployBtn=t.currentTarget,this.checkInput()&&(this.disableBtn(this.dialog.deployBtn),this.dialog.dialogDepolyDetailVisible=!0,this.dialog.deployMessages=[],this.dialog.deployMessages.push("合约部署中..."),n.a.doPost("deploy",this.dialog.deployForm,30).then(function(t){e.dialog.dialogDepolyDetailVisible=!0,0===t.data.errorCode?(e.dialog.hash=t.data.result,e.isEnableMasterCns()):(e.dialog.deployMessages.push("合约部署失败! 请查看日志。"),e.enableBtn(e.dialog.deployBtn))}))},isEnableMasterCns:function(){var t=this;n.a.doGet("isEnableMasterCns").then(function(e){t.dialog.dialogDepolyDetailVisible=!0,e.data.result?t.enableHash(!0):(t.dialog.deployMessages.push("合约部署成功。"),t.dialog.deployMessages.push("请继续操作。"),t.enableBtn(t.dialog.deployBtn),t.init())})},enableHash:function(t){var e=this;this.dialog.deployMessages.push("合约启用中..."),n.a.doGet("enableHash/"+this.dialog.hash,null,10).then(function(a){e.dialog.dialogDepolyDetailVisible=!0,0===a.data.errorCode?(e.dialog.deployMessages.push("合约启用成功。"),t?e.deploySystemCpt():(e.dialog.deployMessages.push("请继续操作。"),e.enableBtn(e.dialog.deployBtn),e.init())):(e.dialog.deployMessages.push("合约启用失败！请查看日志。"),e.enableBtn(e.dialog.deployBtn))})},deploySystemCptBtn:function(t){this.dialog.hash=t,this.deploySystemCpt()},deploySystemCpt:function(){var t=this;this.dialog.deployMessages.push("系统CPT部署中..."),this.dialog.dialogDepolyDetailVisible=!0,n.a.doGet("deploySystemCpt/"+this.dialog.hash,null,10).then(function(e){0===e.data.errorCode?(t.dialog.deployMessages.push("系统CPT部署成功。"),t.dialog.deployMessages.push("系统CPT部署成功! 请继续操作。"),t.init()):t.dialog.deployMessages.push("系统CPT部署失败！请查看日志。"),t.dialog.dialogDepolyDetailVisible=!0,t.enableBtn(t.dialog.deployBtn)})},enable:function(t,e,a){var l=this;this.dialog.deployBtn=a.currentTarget,this.$confirm("是否确定启用该主合约？","温馨提示",{closeOnClickModal:!1,cancelButtonClass:"el-button--primary"}).then(function(a){l.dialog.hash=t,l.dialog.deployMessages=[],l.dialog.dialogDepolyDetailVisible=!0,l.disableBtn(l.dialog.deployBtn),l.enableHash(e)}).catch(function(){})},handleCurrentChange:function(t){t<1&&(t=1),this.page.pageIndex=t},init:function(){var t=this;n.a.doGet("getDeployList").then(function(e){0===e.data.errorCode&&(t.page.deployList=e.data.result,t.page.total=t.page.deployList.length,t.page.total===t.page.pageSize*(t.page.pageIndex-1)&&t.handleCurrentChange(t.page.pageIndex-1))})},check:function(){var t=this;return o()(s.a.mark(function e(){return s.a.wrap(function(e){for(;;)switch(e.prev=e.next){case 0:return e.next=2,d.a.checkNodeState(!1);case 2:d.a.data.nodeStatus&&t.init();case 3:case"end":return e.stop()}},e,t)}))()}},mounted:function(){var t=this;window.addEventListener("setItem",function(){t.changeRoleType()}),this.check()}},c={render:function(){var t=this,e=t.$createElement,l=t._self._c||e;return l("section",{staticClass:"content app_main"},["1"===t.roleType?l("el-row",{staticClass:"app_main_header_row"},[l("el-col",{attrs:{span:5}},[l("el-button",{staticClass:"btn",staticStyle:{width:"250px"},attrs:{type:"primary"},on:{click:t.showDeployForm}},[t._v("主群组部署 WeIdentity 智能合约")])],1),t._v(" "),l("el-col",{staticClass:"head-icon",attrs:{span:19}},[l("a",{attrs:{href:"https://weid-doc-xml.readthedocs.io/zh/test/docs/weidentity-quick-tools-web.html?highlight=部署 WeIdentity 智能合约#id2",target:"blank_"}},[l("img",{staticClass:"icon_question",attrs:{src:a("JaJV"),alt:""}}),t._v(" "),l("span",{staticClass:"icon_question"},[t._v("多次部署合约")])])])],1):t._e(),t._v(" "),l("div",{staticClass:"app_view"},[l("el-table",{staticStyle:{width:"100%"},attrs:{data:t.page.deployList.slice((t.page.pageIndex-1)*t.page.pageSize,t.page.pageIndex*t.page.pageSize),border:"true",align:"center",cellpadding:"0",cellspacing:"0"}},[l("el-table-column",{attrs:{prop:"applyName",label:"应用名字",align:"center"},scopedSlots:t._u([{key:"default",fn:function(e){return[l("span",{staticClass:"long_words",attrs:{title:e.row.applyName}},[t._v(t._s(e.row.applyName))])]}}])}),t._v(" "),l("el-table-column",{attrs:{label:"智能合约部署ID",align:"center",width:"160"},scopedSlots:t._u([{key:"default",fn:function(e){return[l("span",{staticClass:"long_words link",attrs:{title:e.row.hash},on:{click:function(a){return t.showAll(e.row.hash)}}},[t._v(t._s(e.row.hashShow))])]}}])}),t._v(" "),l("el-table-column",{attrs:{label:"部署的机构名称",align:"center",width:"250"},scopedSlots:t._u([{key:"default",fn:function(e){return null!==e.row.issuer?[l("span",{staticClass:"icon_question",attrs:{title:e.row.issuer.name}},[t._v(t._s(e.row.issuer.name))]),t._v(" "),!0===e.row.issuer.recognized?l("img",{staticClass:"icon_question",attrs:{src:a("MeCv"),widht:"50",height:"50",alt:""}}):t._e(),t._v(" "),!1===e.row.issuer.recognized?l("img",{staticClass:"icon_question",attrs:{src:a("B7UN"),widht:"50",height:"50",alt:""}}):t._e()]:void 0}}],null,!0)}),t._v(" "),l("el-table-column",{attrs:{prop:"groupId",label:"所在群组",align:"center",width:"100"}}),t._v(" "),l("el-table-column",{attrs:{prop:"createTime",label:"创建时间",align:"center",width:"170"}}),t._v(" "),l("el-table-column",{attrs:{label:"操作",align:"center",width:"300"},scopedSlots:t._u([{key:"default",fn:function(e){return[e.row.enable?l("el-button",{staticClass:"btn",attrs:{type:"primary",disabled:""}},[t._v("已启用")]):l("el-button",{staticClass:"btn",attrs:{type:"primary"},on:{click:function(a){return t.enable(e.row.hash,e.row.needDeployCpt,a)}}},[t._v("启用")]),t._v(" "),l("el-button",{staticClass:"btn",attrs:{type:"primary"},on:{click:function(a){return t.deleteRow(e.row.hash,a)}}},[t._v("删除")]),t._v(" "),0==e.row.enable||0==e.row.needDeployCpt?l("el-button",{staticClass:"btn",staticStyle:{width:"90px"},attrs:{type:"primary"},on:{click:function(a){return t.showDeployDetail(e.row.hash,e.row.weId)}}},[t._v("详细信息")]):t._e(),t._v(" "),e.row.enable&&e.row.needDeployCpt?l("el-button",{staticClass:"btn",staticStyle:{width:"120px"},attrs:{type:"primary"},on:{click:function(a){return t.deploySystemCptBtn(e.row.hash)}}},[t._v("部署系统CPT")]):t._e()]}}])})],1),t._v(" "),"1"===t.roleType?l("el-pagination",{attrs:{"current-page":t.page.pageIndex,"page-size":t.page.pageSize,layout:"total, prev, pager, next, jumper",total:t.page.total},on:{"current-change":t.handleCurrentChange}}):t._e()],1),t._v(" "),l("el-dialog",{staticClass:"dialog-view",attrs:{title:"主群组部署 WeIdentity 智能合约",width:"29%",visible:t.dialog.dialogFormVisible,"close-on-click-modal":!1},on:{"update:visible":function(e){return t.$set(t.dialog,"dialogFormVisible",e)}}},[l("div",{staticClass:"dialog-body"},[l("el-form",{attrs:{model:t.dialog.deployForm}},[l("el-form-item",{attrs:{label:"链ID(chain_id)","label-width":t.formLabelWidth}},[l("div",{staticClass:"mark-icon"},[l("a",{attrs:{href:"https://weidentity.readthedocs.io/zh_CN/latest/docs/weidentity-spec.html?highlight=chain-id#id4",target:"blank_"}},[l("img",{staticClass:"icon_question",attrs:{src:a("JaJV"),alt:""}}),t._v(" "),l("span",{staticClass:"icon_question"},[t._v("什么是chain id?")])])]),t._v(" "),l("el-input",{attrs:{placeholder:"Enter chainId",onKeyUp:"this.value=this.value.replace(/\\D/g,'')"},on:{blur:function(e){t.dialog.deployForm.chainId=e.target.value}},model:{value:t.dialog.deployForm.chainId,callback:function(e){t.$set(t.dialog.deployForm,"chainId",e)},expression:"dialog.deployForm.chainId"}})],1),t._v(" "),l("el-form-item",{attrs:{label:"应用名字","label-width":t.formLabelWidth}},[l("div",{staticClass:"mark-text"},[l("span",{},[t._v("给自己的WeIdentity区块链应用起一个名字吧，用于在同一条链上区别不同的 WeIdentity 应用，例如“学历证书应用”，“区块链证件应用”。")])]),t._v(" "),l("el-input",{attrs:{placeholder:"Enter applyName"},model:{value:t.dialog.deployForm.applyName,callback:function(e){t.$set(t.dialog.deployForm,"applyName",e)},expression:"dialog.deployForm.applyName"}})],1)],1)],1),t._v(" "),l("div",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[l("el-button",{staticClass:"width_100",attrs:{type:"primary"},on:{click:function(e){return t.deploy(e)}}},[t._v("部 署")])],1)]),t._v(" "),l("el-dialog",{staticClass:"dialog-view",attrs:{title:"部署信息",width:"620px",visible:t.dialog.dialogDetailVisible,"close-on-click-modal":!0},on:{"update:visible":function(e){return t.$set(t.dialog,"dialogDetailVisible",e)}}},[l("div",{staticClass:"dialog-body deployDetail"},[l("el-row",[l("el-col",{staticClass:"title",attrs:{span:4}},[t._v("智能合约部署ID")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:20}},[t._v(t._s(t.dialog.deployDetail.hash))])],1),t._v(" "),l("el-row",[l("el-col",{staticClass:"title",attrs:{span:4}},[t._v("部署账户")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:20}},[t._v(t._s(t.dialog.deployDetail.owner))])],1),t._v(" "),t.dialog.deployDetail.local?l("el-row",[l("el-col",{staticClass:"title",attrs:{span:4}},[t._v("WeID SDK版本")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:7}},[t._v(t._s(t.dialog.deployDetail.weIdSdkVersion))]),t._v(" "),l("el-col",{staticClass:"title",attrs:{span:4}},[t._v("WeID合约版本")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:9}},[t._v(t._s(t.dialog.deployDetail.contractVersion))])],1):t._e(),t._v(" "),t.dialog.deployDetail.local?l("el-row",[l("el-col",{staticClass:"title",attrs:{span:4}},[t._v("部署来源")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:7}},[t._v(t._s(t.dialog.deployDetail.from))]),t._v(" "),l("el-col",{staticClass:"title",attrs:{span:4}},[t._v("区块链节点版本")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:9}},[t._v(t._s(t.dialog.deployDetail.nodeVerion))])],1):t._e(),t._v(" "),t.dialog.deployDetail.local?l("el-row",[l("el-col",{staticClass:"title",attrs:{span:4}},[t._v("区块链节点")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:20}},[t._v(t._s(t.dialog.deployDetail.nodeAddress))])],1):t._e(),t._v(" "),l("el-row",[l("el-col",{staticClass:"title",attrs:{span:8}},[t._v("WeID智能合约地址")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:16}},[t._v(t._s(t.dialog.deployDetail.weIdAddress))])],1),t._v(" "),l("el-row",[l("el-col",{staticClass:"title",attrs:{span:8}},[t._v("CPT智能合约地址")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:16}},[t._v(t._s(t.dialog.deployDetail.cptAddress))])],1),t._v(" "),l("el-row",[l("el-col",{staticClass:"title",attrs:{span:8}},[t._v("Authority Issuer 智能合约地址")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:16}},[t._v(t._s(t.dialog.deployDetail.authorityAddress))])],1),t._v(" "),l("el-row",[l("el-col",{staticClass:"title",attrs:{span:8}},[t._v("Evidence 智能合约地址")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:16}},[t._v(t._s(t.dialog.deployDetail.evidenceAddress))])],1),t._v(" "),l("el-row",[l("el-col",{staticClass:"title",attrs:{span:8}},[t._v("Specific Issuer 智能合约地址")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:16}},[t._v(t._s(t.dialog.deployDetail.specificAddress))])],1),t._v(" "),l("el-row",{staticClass:"none-border"},[l("el-col",{staticClass:"title",attrs:{span:8}},[t._v("Chain Id")]),t._v(" "),l("el-col",{staticClass:"value",attrs:{span:16}},[t._v(t._s(t.dialog.deployDetail.chainId))])],1)],1),t._v(" "),l("br")]),t._v(" "),l("el-dialog",{staticClass:"dialog-view",attrs:{title:"合约部署",width:"400px",visible:t.dialog.dialogDepolyDetailVisible,"close-on-click-modal":!1},on:{"update:visible":function(e){return t.$set(t.dialog,"dialogDepolyDetailVisible",e)}}},[l("div",{staticClass:"dialog-body deployMessage"},t._l(t.dialog.deployMessages,function(e){return l("p",{key:e.value},[t._v(t._s(e))])}),0),t._v(" "),l("div",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[l("el-button",{staticClass:"width_100",attrs:{type:"primary"},on:{click:t.comfirmBtn}},[t._v("确 定")])],1)])],1)},staticRenderFns:[]},p=a("C7Lr")(r,c,!1,null,null,null);e.default=p.exports}}); \ No newline at end of file diff --git a/src/main/resources/static/weid/weid-build-tools/static/js/13.a38afcc8a8bea4418cd7.js b/src/main/resources/static/weid/weid-build-tools/static/js/13.b36a6f7b1a6985daa52d.js similarity index 40% rename from src/main/resources/static/weid/weid-build-tools/static/js/13.a38afcc8a8bea4418cd7.js rename to src/main/resources/static/weid/weid-build-tools/static/js/13.b36a6f7b1a6985daa52d.js index f0fdd78714208cf01105ba08b5692d25277e6e5e..668d12a2ad1eed4f6a30c718f07dd9c430744a84 100644 --- a/src/main/resources/static/weid/weid-build-tools/static/js/13.a38afcc8a8bea4418cd7.js +++ b/src/main/resources/static/weid/weid-build-tools/static/js/13.b36a6f7b1a6985daa52d.js @@ -1 +1 @@ -webpackJsonp([13],{"CgC/":function(e,t,i){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var a=i("aA9S"),l=i.n(a),r=i("/p82"),o={data:function(){return{useWeBase:!1,form:{caCrtFileName:"",nodeKeyFile:"",nodeCrtFileName:"",nodeCrtFile:"",nodeKeyFileName:"",caCrtFile:"",gmCaCrtFileName:"",gmCaCrtFile:"",gmSdkCrtFileName:"",gmSdkCrtFile:"",gmSdkKeyFileName:"",gmSdkKeyFile:"",gmenSdkCrtFileName:"",gmenSdkCrtFile:"",gmenSdkKeyFileName:"",gmenSdkKeyFile:"",encrypt_type:0,org_id:"",amop_id:"",blockchain_address:"",blockchain_fiscobcos_version:""},dialog:{checkDetailVisible:!1,checkMessages:[],nextBtn:null,dialogNodeListVisible:!1,nodeListPage:{nodeList:[],selectedRows:[]}}}},methods:{getkey:function(e){return e.frontId},chooseNode:function(){var e=this;if(0!==this.dialog.nodeListPage.selectedRows.length){var t="";this.dialog.nodeListPage.selectedRows.forEach(function(i,a){t=t+i.frontIp+":"+i.channelPort,a+1=3&&(this.dataForm.address=e[0],this.dataForm.appKey=e[1],this.dataForm.appSecret=e[2],t=!1,sessionStorage.setItem("weBaseText",this.dataForm.text))}t&&(this.dataForm.address="",this.dataForm.appKey="",this.dataForm.appSecret="")},next:function(t){1===this.configMode?this.setNoWeBaseMode():this.setWeBaseMode(t)},setNoWeBaseMode:function(){var t=this;s.a.doPost("webase/setNoWeBaseMode").then(function(e){0===e.data.errorCode&&(localStorage.setItem("step",0),t.$router.push({name:"step0"}))})},setWeBaseMode:function(t){var e=this,a={};if(a.weBaseHost=this.dataForm.address,a.appKey=this.dataForm.appKey,a.appSecret=this.dataForm.appSecret,a.weIdHost=window.location.host,""!==a.weBaseHost)if(""!==a.appKey)if(""!==a.appSecret){var i=t.currentTarget;this.disableBtn(i),s.a.doPostByJson("webase/registerApp",a).then(function(t){e.enableBtn(i),0===t.data.errorCode?(localStorage.setItem("step",0),e.$router.push({name:"step0"})):e.$alert("请求发生异常，请查看后台日志!","温馨提示",{}).catch(function(){})})}else this.$alert("请输入appSecret!","温馨提示",{}).catch(function(){});else this.$alert("请输入appKey!","温馨提示",{}).catch(function(){});else this.$alert("请输入WeBase服务地址!","温馨提示",{}).catch(function(){})},init:function(){var t=localStorage.getItem("configMode");this.configMode=""===t||null===t?1:parseInt(t),this.dataForm.text=sessionStorage.getItem("weBaseText"),this.inputChange()}},mounted:function(){this.init()}},r={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"app_view_content"},[a("div",{staticClass:"app_view_register"},[a("section",{staticClass:"content"},[a("div",{staticClass:"container-fluid guild-step",staticStyle:{"padding-top":"10px"}},[a("div",{staticClass:"box"},[a("div",{staticClass:"card card-primary warning_box",attrs:{id:"AccountDiv"}},[t._m(0),t._v(" "),t._m(1),t._v(" "),a("el-form",{ref:"dataForm",staticStyle:{"margin-top":"15px"},attrs:{model:t.dataForm,"label-position":"right","label-width":"150px"}},[a("div",{staticClass:"form-group",attrs:{id:"createDiv"}},[a("div",{class:{"key_item active_key":1===t.configMode,key_item:1!==t.configMode},attrs:{type:"1"},on:{click:function(e){return t.active(1)}}},[a("span",{staticClass:"item_out_role"},[a("span")]),t._v(" "),a("p",[t._v("WeID原始模式")])]),t._v(" "),a("div",{class:{"key_item active_key":2===t.configMode,key_item:2!==t.configMode},attrs:{type:"1"},on:{click:function(e){return t.active(2)}}},[a("span",{staticClass:"item_out_role"},[a("span")]),t._v(" "),a("p",[t._v("WeID + WeBase集成模式")])])]),t._v(" "),2===t.configMode?a("div",{staticStyle:{"margin-top":"30px"}},[a("div",{staticClass:"card-header card-title"},[a("h3",[t._v("WeBase配置")])]),t._v(" "),a("el-form-item",{attrs:{label:"粘贴区:",prop:"org_id"}},[a("el-input",{staticStyle:{width:"72%"},attrs:{placeholder:"Your can copy data from WeBase",resize:"none",type:"textarea"},nativeOn:{keyup:function(e){return t.inputChange()}},model:{value:t.dataForm.text,callback:function(e){t.$set(t.dataForm,"text",e)},expression:"dataForm.text"}}),t._v(" "),a("div",{staticClass:"mark-bottom"},[a("div",[t._v("请从WeBase管理台复制此应用的配置内容，然后粘贴此处。")])])],1),t._v(" "),a("el-form-item",{attrs:{label:"WeBase服务地址:",prop:"org_id"}},[a("el-input",{staticStyle:{width:"72%"},attrs:{placeholder:"Enter IP:PORT",maxlength:"30",onKeyUp:"value=value=value.replace(/[^0-9：:。.]/g,'');value=value.replace(/[。]/g,'.');value=value.replace(/[：]/g,':');value=value.replace(/\\s+/g,'');"},on:{blur:function(e){t.dataForm.address=e.target.value}},model:{value:t.dataForm.address,callback:function(e){t.$set(t.dataForm,"address",e)},expression:"dataForm.address"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"appKey:",prop:"org_id"}},[a("el-input",{staticStyle:{width:"72%"},attrs:{placeholder:"Enter appKey",maxlength:"30"},model:{value:t.dataForm.appKey,callback:function(e){t.$set(t.dataForm,"appKey",e)},expression:"dataForm.appKey"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"appSecret:",prop:"org_id"}},[a("el-input",{staticStyle:{width:"72%"},attrs:{placeholder:"Enter appSecret",maxlength:"30"},model:{value:t.dataForm.appSecret,callback:function(e){t.$set(t.dataForm,"appSecret",e)},expression:"dataForm.appSecret"}})],1)],1):t._e()]),t._v(" "),a("div",{staticClass:"card-footer bt-part",attrs:{id:"role-next"}},[a("el-button",{staticClass:"btn btn_150",attrs:{type:"primary"},on:{click:function(e){return t.next(e)}}},[t._v("下一步")])],1)],1)])])])])])},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"card-header"},[e("h6",[this._v("请选择配置模式")])])},function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"card-mark"},[e("div",{staticClass:"card-mark-text"},[e("div",[this._v("1. WeID原始模式: 原WeID的引导配置步骤。")]),this._v(" "),e("div",[this._v("2. WeID+WeBase集成模式: 原WeID的引导配置过程中可选择WeBase同步的数据,如: 节点，账户等数据，且合约部署会同步到WeBase。")])])])}]},o=a("C7Lr")(i,r,!1,null,null,null);e.default=o.exports}}); \ No newline at end of file diff --git a/src/main/resources/static/weid/weid-build-tools/static/js/25.6a2ea151ac3743ee4ba5.js b/src/main/resources/static/weid/weid-build-tools/static/js/25.6a2ea151ac3743ee4ba5.js deleted file mode 100644 index d2fca148a578771382062b0d13aca9cfd7979a4c..0000000000000000000000000000000000000000 --- a/src/main/resources/static/weid/weid-build-tools/static/js/25.6a2ea151ac3743ee4ba5.js +++ /dev/null @@ -1 +0,0 @@ -webpackJsonp([25],{hKyz:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=a("/p82"),r={data:function(){return{dataForm:{address:"",appKey:"",appSecret:"",text:""},configMode:1}},methods:{active:function(t){localStorage.setItem("configMode",t),this.configMode=t},inputChange:function(){var t=!0;if(""!==this.dataForm.text){var e=this.dataForm.text.split(",");e.length>=3&&(this.dataForm.address=e[0],this.dataForm.appKey=e[1],this.dataForm.appSecret=e[2],t=!1)}t&&(this.dataForm.address="",this.dataForm.appKey="",this.dataForm.appSecret="")},next:function(t){1===this.configMode?this.setNoWeBaseMode():this.setWeBaseMode(t)},setNoWeBaseMode:function(){var t=this;s.a.doPost("webase/setNoWeBaseMode").then(function(e){0===e.data.errorCode&&(localStorage.setItem("step",0),t.$router.push({name:"step0"}))})},setWeBaseMode:function(t){var e=this,a={};if(a.weBaseHost=this.dataForm.address,a.appKey=this.dataForm.appKey,a.appSecret=this.dataForm.appSecret,a.weIdHost=window.location.host,""!==a.weBaseHost)if(""!==a.appKey)if(""!==a.appSecret){var r=t.currentTarget;this.disableBtn(r),s.a.doPostByJson("webase/registerApp",a).then(function(t){e.enableBtn(r),0===t.data.errorCode?(localStorage.setItem("step",0),e.$router.push({name:"step0"})):e.$alert("请求发生异常，请查看后台日志!","温馨提示",{}).catch(function(){})})}else this.$alert("请输入appSecret!","温馨提示",{}).catch(function(){});else this.$alert("请输入appKey!","温馨提示",{}).catch(function(){});else this.$alert("请输入WeBase服务地址!","温馨提示",{}).catch(function(){})},init:function(){var t=localStorage.getItem("configMode");this.configMode=""===t||null===t?1:parseInt(t)}},mounted:function(){this.init()}},i={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"app_view_content"},[a("div",{staticClass:"app_view_register"},[a("section",{staticClass:"content"},[a("div",{staticClass:"container-fluid guild-step",staticStyle:{"padding-top":"10px"}},[a("div",{staticClass:"box"},[a("div",{staticClass:"card card-primary warning_box",attrs:{id:"AccountDiv"}},[t._m(0),t._v(" "),t._m(1),t._v(" "),a("el-form",{ref:"dataForm",staticStyle:{"margin-top":"15px"},attrs:{model:t.dataForm,"label-position":"right","label-width":"150px"}},[a("div",{staticClass:"form-group",attrs:{id:"createDiv"}},[a("div",{class:{"key_item active_key":1===t.configMode,key_item:1!==t.configMode},attrs:{type:"1"},on:{click:function(e){return t.active(1)}}},[a("span",{staticClass:"item_out_role"},[a("span")]),t._v(" "),a("p",[t._v("WeID原始模式")])]),t._v(" "),a("div",{class:{"key_item active_key":2===t.configMode,key_item:2!==t.configMode},attrs:{type:"1"},on:{click:function(e){return t.active(2)}}},[a("span",{staticClass:"item_out_role"},[a("span")]),t._v(" "),a("p",[t._v("WeID + WeBase集成模式")])])]),t._v(" "),2===t.configMode?a("div",{staticStyle:{"margin-top":"30px"}},[a("div",{staticClass:"card-header card-title"},[a("h3",[t._v("WeBase配置")])]),t._v(" "),a("el-form-item",{attrs:{label:"粘贴区:",prop:"org_id"}},[a("el-input",{staticStyle:{width:"72%"},attrs:{placeholder:"Your can copy data from WeBase",resize:"none",type:"textarea"},nativeOn:{keyup:function(e){return t.inputChange()}},model:{value:t.dataForm.text,callback:function(e){t.$set(t.dataForm,"text",e)},expression:"dataForm.text"}}),t._v(" "),a("div",{staticClass:"mark-bottom"},[a("div",[t._v("请从WeBase管理台复制此应用的配置内容，然后粘贴此处。")])])],1),t._v(" "),a("el-form-item",{attrs:{label:"WeBase服务地址:",prop:"org_id"}},[a("el-input",{staticStyle:{width:"72%"},attrs:{placeholder:"Enter IP:PORT",maxlength:"30",onKeyUp:"value=value=value.replace(/[^0-9：:。.]/g,'');value=value.replace(/[。]/g,'.');value=value.replace(/[：]/g,':');value=value.replace(/\\s+/g,'');"},on:{blur:function(e){t.dataForm.address=e.target.value}},model:{value:t.dataForm.address,callback:function(e){t.$set(t.dataForm,"address",e)},expression:"dataForm.address"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"appKey:",prop:"org_id"}},[a("el-input",{staticStyle:{width:"72%"},attrs:{placeholder:"Enter appKey",maxlength:"30"},model:{value:t.dataForm.appKey,callback:function(e){t.$set(t.dataForm,"appKey",e)},expression:"dataForm.appKey"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"appSecret:",prop:"org_id"}},[a("el-input",{staticStyle:{width:"72%"},attrs:{placeholder:"Enter appSecret",maxlength:"30"},model:{value:t.dataForm.appSecret,callback:function(e){t.$set(t.dataForm,"appSecret",e)},expression:"dataForm.appSecret"}})],1)],1):t._e()]),t._v(" "),a("div",{staticClass:"card-footer bt-part",attrs:{id:"role-next"}},[a("el-button",{staticClass:"btn btn_150",attrs:{type:"primary"},on:{click:function(e){return t.next(e)}}},[t._v("下一步")])],1)],1)])])])])])},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"card-header"},[e("h6",[this._v("请选择配置模式")])])},function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"card-mark"},[e("div",{staticClass:"card-mark-text"},[e("div",[this._v("1. WeID原始模式: 原WeID的引导配置步骤。")]),this._v(" "),e("div",[this._v("2. WeID+WeBase集成模式: 原WeID的引导配置过程中可选择WeBase同步的数据,如: 节点，账户等数据，且合约部署会同步到WeBase。")])])])}]},o=a("C7Lr")(r,i,!1,null,null,null);e.default=o.exports}}); \ No newline at end of file diff --git a/src/main/resources/static/weid/weid-build-tools/static/js/manifest.7873cd434d142de6bd39.js b/src/main/resources/static/weid/weid-build-tools/static/js/manifest.803448f59c829bada2c3.js similarity index 81% rename from src/main/resources/static/weid/weid-build-tools/static/js/manifest.7873cd434d142de6bd39.js rename to src/main/resources/static/weid/weid-build-tools/static/js/manifest.803448f59c829bada2c3.js index 6e5a38bbf40aa2d70afaed7c9cb46dee4f9c1db8..7ca7548e9514a9253fd8587fea9d7a55e34f14aa 100644 --- a/src/main/resources/static/weid/weid-build-tools/static/js/manifest.7873cd434d142de6bd39.js +++ b/src/main/resources/static/weid/weid-build-tools/static/js/manifest.803448f59c829bada2c3.js @@ -1 +1 @@ -!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(n,c,o){for(var f,d,b,i=0,u=[];i +
+
国密链采用SSL通讯，非国密链采用非SSL通讯。
+
diff --git a/web/src/module/guide/step5.vue b/web/src/module/guide/step5.vue index a8bf40e6ca22149b84a6ae3c27e540b94396b7f0..02d74307b3f9b06f228d6be529fde808d9169da9 100644 --- a/web/src/module/guide/step5.vue +++ b/web/src/module/guide/step5.vue @@ -137,7 +137,7 @@ export default { this.dialog.dialogDetailVisible = true this.dialog.deployMessages = [] this.dialog.deployMessages.push('合约部署中...') - API.doPost('deploy', this.deployForm, 15).then(res => { // 保存选择的角色 + API.doPost('deploy', this.deployForm, 30).then(res => { // 保存选择的角色 this.dialog.dialogDetailVisible = true if (res.data.errorCode === 0) { this.hash = res.data.result diff --git a/web/src/module/page/conf/nodePage.vue b/web/src/module/page/conf/nodePage.vue index a1b1e03f5fdc0faa20a7e73700425702931412af..3ec1d1710db53229cf02202493d49df2be13b5d1 100644 --- a/web/src/module/page/conf/nodePage.vue +++ b/web/src/module/page/conf/nodePage.vue @@ -17,6 +17,9 @@ +
+
国密链采用SSL通讯，非国密链采用非SSL通讯。
+
diff --git a/web/src/module/page/deploy/deployWeIdPage.vue b/web/src/module/page/deploy/deployWeIdPage.vue index 71018c723522cc73f93d4623a0b700c8c3103080..ead42584ea6987df61e707564bf15f97c53327b7 100644 --- a/web/src/module/page/deploy/deployWeIdPage.vue +++ b/web/src/module/page/deploy/deployWeIdPage.vue @@ -251,7 +251,7 @@ export default { this.dialog.dialogDepolyDetailVisible = true this.dialog.deployMessages = [] this.dialog.deployMessages.push('合约部署中...') - API.doPost('deploy', this.dialog.deployForm, 15).then(res => { + API.doPost('deploy', this.dialog.deployForm, 30).then(res => { this.dialog.dialogDepolyDetailVisible = true if (res.data.errorCode === 0) { this.dialog.hash = res.data.result