diff --git a/backend/debugconf.json b/backend/debugconf.json index 00500f4..b18317e 100644 --- a/backend/debugconf.json +++ b/backend/debugconf.json @@ -8,7 +8,7 @@ "routerURI": "tcp://39.104.209.178:18041", "auditType": "OnlyHash" }, - "killBeforeStart": "ControlProxy", + "killBeforeStart": "ShanxiControlProxy", "ypkPath": "/Users/huaqiancai/BDWare/ControlProxy/backend/build/ControlProxy-1.3.9.ypk", "publicKey": "04d1924329f72ced148f6f333fb985ccbaa31b1e3aacf10be5f43d4a4ff5ad88899a005e79e37fc06993e1d66ada8cf8b711cb36f59538bb7d3e39e70fa9360ddd", "privateKey": "589d94ee5688358a1c5c18430dd9c75097ddddebf769f139da36a807911d20f8" diff --git a/backend/deployconfig.json b/backend/deployconfig.json index a1a80e6..6944650 100644 --- a/backend/deployconfig.json +++ b/backend/deployconfig.json @@ -3,7 +3,7 @@ "privateKey": "d675782acf011dbc01a73c7967ccff9564486f7c3a9f5d5de151caffaa18936", "publicKey": "04303718771b9323c204e607639f14469f9a94e55b0964a408ad3b3864b0493b645d7070da0d550f0c54b934275a8e88dedc3024467b0566db5c1108b1baeaae27", "ypkPath": "/Users/huaqiancai/BDWare/datanet/ControlProxy/backend/build/ControlProxy-0.9.6.ypk", - "killBeforeStart": "ControlProxy", + "killBeforeStart": "ShanxiControlProxy", "createParam": { "privateKey": "4616ff0e2a4f982364914f9be30b51c6bc6ccb6602114a9ee8792f2ccf67465b", "publicKey": "04f9b9b8f324908464f78a6235e2dd93e4dfdaf045e9b1b5cfd57374516cc61a79a86fc2b42d3321a5b49a0f25381a7bed61901b40b729f72354e716673d551e98", diff --git a/backend/yjs/ControlProxy.yjs b/backend/yjs/ShanxiControlProxy.yjs old mode 100755 new mode 100644 similarity index 99% rename from backend/yjs/ControlProxy.yjs rename to backend/yjs/ShanxiControlProxy.yjs index 17d4236..d845708 --- a/backend/yjs/ControlProxy.yjs +++ b/backend/yjs/ShanxiControlProxy.yjs @@ -3,12 +3,12 @@ import "union.yjs"; import "ShanxiAuditPRoxy.yjs"; import "ShanxiDataRepo.yjs"; import "ShanxiGlobalRouter.yjs"; -import "ShanxiRegistry"; +import "ShanxiRegistry.yjs"; //网关为Gateway //路由器改名为Resolver,中文名为标识解析系统 //搜索引擎改名为为Registry,中文名为注册表系统 //本文接口由李智负责对接。 -contract ControlProxy { +contract ShanxiControlProxy { function convertArgToJson(arg) { if (typeof(arg)=='string' && !arg.startsWith("{")) return arg; if (typeof(arg)=='string') return JSON.parse(arg); diff --git a/backend/yjs/ShanxiDataRepo.yjs b/backend/yjs/ShanxiDataRepo.yjs index 77a0b6b..4be0b68 100644 --- a/backend/yjs/ShanxiDataRepo.yjs +++ b/backend/yjs/ShanxiDataRepo.yjs @@ -1,41 +1,41 @@ module ShanxiDataRepo{ export function getDataDoList() { - return executeContract("DataRepo","getDataDoList",arg).result; + return executeContract("ShanxiDataRepo","getDataDOList",arg).result; } export function deleteDataDO() { - return executeContract("DataRepo","deleteDataDO",arg).result; + return executeContract("ShanxiDataRepo","deleteDataDO",arg).result; } export function createDataDO() { - return executeContract("DataRepo","createDataDO",arg).result; + return executeContract("ShanxiDataRepo","createDataDO",arg).result; } export function retrieveDataDO() { - return executeContract("DataRepo","retrieveDataDO",arg).result; + return executeContract("ShanxiDataRepo","retrieveDataDO",arg).result; } export function createViewDO() { - return executeContract("DataRepo","createViewDO",arg).result; + return executeContract("ShanxiDataRepo","createViewDO",arg).result; } export function updateViewDO() { - return executeContract("DataRepo","updateViewDO",arg).result; + return executeContract("ShanxiDataRepo","updateViewDO",arg).result; } export function getViewDOList() { - return executeContract("DataRepo","getViewDOList",arg).result; + return executeContract("ShanxiDataRepo","getViewDOList",arg).result; } export function deleteViewDO() { - return executeContract("DataRepo","deleteViewDO",arg).result; + return executeContract("ShanxiDataRepo","deleteViewDO",arg).result; } export function retrieveViewDO() { - return executeContract("DataRepo","retrieveViewDO",arg).result; + return executeContract("ShanxiDataRepo","retrieveViewDO",arg).result; } export function addAuthedUser() { - return executeContract("DataRepo","addAuthedUser",arg).result; + return executeContract("ShanxiDataRepo","addAuthedUser",arg).result; } export function deleteAuthedUser() { - return executeContract("DataRepo","deleteAuthedUser",arg).result; + return executeContract("ShanxiDataRepo","deleteAuthedUser",arg).result; } export function addAuthedNode() { - return executeContract("DataRepo","addAuthedNode",arg).result; + return executeContract("ShanxiDataRepo","addAuthedNode",arg).result; } export function deleteAuthedNode() { - return executeContract("DataRepo","deleteAuthedNode",arg).result; + return executeContract("ShanxiDataRepo","deleteAuthedNode",arg).result; } } \ No newline at end of file diff --git a/backend/yjs/ShanxiRegistry.yjs b/backend/yjs/ShanxiRegistry.yjs index 0632a35..bbed096 100644 --- a/backend/yjs/ShanxiRegistry.yjs +++ b/backend/yjs/ShanxiRegistry.yjs @@ -23,23 +23,23 @@ module ShanxiRegistry{ export function deleteRepoList() { return executeContract("ControlProxy","deleteRepoList",arg).result; } - export function listDataRequirements() { - return executeContract("ShanxiRegistry","listDataRequirements",arg).result; + export function listDataRequirement() { + return executeContract("ShanxiRegistry","listDataRequirement",arg).result; } - export function createDataRequirements() { - return executeContract("ShanxiRegistry","createDataRequirements",arg).result; + export function createDataRequirement() { + return executeContract("ShanxiRegistry","createDataRequirement",arg).result; } export function issueDataRequirement() { return executeContract("ShanxiRegistry","issueDataRequirement",arg).result; } - export function updateDataRequirements() { - return executeContract("ShanxiRegistry","updateDataRequirements",arg).result; + export function updateDataRequirement() { + return executeContract("ShanxiRegistry","updateDataRequirement",arg).result; } export function getDataRequirement() { return executeContract("ShanxiRegistry","getDataRequirement",arg).result; } - export function deleteDataRequirements() { - return executeContract("ShanxiRegistry","deleteDataRequirements",arg).result; + export function deleteDataRequirement() { + return executeContract("ShanxiRegistry","deleteDataRequirement",arg).result; } export function getDoCount(arg) { var ret = executeContract("ShanxiRegistry", "getDoCount", arg);