bdware/ypk-deploy-tool
2
0
Fork 0
mirror of https://gitee.com/BDWare/ypk-deploy-tool synced 2025-01-10 01:44:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
CaiHQ 2022-06-30 10:58:59 +08:00
parent c322a981a9
commit 815fb41e00
5 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
deployconfig.json deployconfig.json
.DS_Store .DS_Store
/build/ /build/
testinput

4
build.gradle
View File

@ -5,7 +5,7 @@ plugins {
id 'signing' id 'signing'
} }
group "org.bdware.bdcontract" group "org.bdware.bdcontract"
version "0.5.5" version "0.6.0"
sourceCompatibility = 1.8 sourceCompatibility = 1.8
repositories { repositories {
mavenCentral() mavenCentral()
@ -32,7 +32,7 @@ task copyScript(type: Copy) {
from "./docker/docker-compose/deployentry.json" from "./docker/docker-compose/deployentry.json"
into "./build/output/" into "./build/output/"
} }
task copyJar(type: Copy, dependsOn: [":ypk-deploy-tool:copyLibs",":ypk-deploy-tool:copyScript"]) { task copyJar(type: Copy, dependsOn: [":ypk-deploy-tool:copyLibs", ":ypk-deploy-tool:copyScript"]) {
from "./build/libs/$project.name-${project.version}.jar" from "./build/libs/$project.name-${project.version}.jar"
into "./build/output" into "./build/output"
rename { String fileName -> "${project.name}.jar" } rename { String fileName -> "${project.name}.jar" }

7
src/main/java/org/bdware/ypkdeploy/SmartContractClientExt.java
View File

@ -92,6 +92,7 @@ public class SmartContractClientExt extends SmartContractClient {
} }
this.sendMsg(new Gson().toJson(ret)); this.sendMsg(new Gson().toJson(ret));
} }
public void startContractAsDebug(String project, JsonElement createParam, ResultCallback rc) { public void startContractAsDebug(String project, JsonElement createParam, ResultCallback rc) {
String reqID = System.currentTimeMillis() + ""; String reqID = System.currentTimeMillis() + "";
Map<String, Object> ret = new HashMap<>(); Map<String, Object> ret = new HashMap<>();
@ -291,6 +292,11 @@ public class SmartContractClientExt extends SmartContractClient {
if (cb != null) cb.onResult(jo); if (cb != null) cb.onResult(jo);
} }
@Action
public void onStartContractAsDebug(JsonObject obj) {
invokeCallback(obj);
}
public void listProjects(boolean isPrivate, ResultCallback resultCallback) { public void listProjects(boolean isPrivate, ResultCallback resultCallback) {
JsonObject request = new JsonObject(); JsonObject request = new JsonObject();
request.addProperty("action", "listProjects"); request.addProperty("action", "listProjects");
@ -308,6 +314,7 @@ public class SmartContractClientExt extends SmartContractClient {
if (cb != null) cb.onResult(jo); if (cb != null) cb.onResult(jo);
} }
@Action @Action
public void onKillContractProcess(JsonObject jo) { public void onKillContractProcess(JsonObject jo) {
if (!jo.has("responseID")) { if (!jo.has("responseID")) {

5
src/test/java/EntryTest.java
View File

@ -27,4 +27,9 @@ public class EntryTest {
public void deployBDTest() { public void deployBDTest() {
HTTPTool.deploy("./testinput/deploy/router/GlobalRouter-023.json"); HTTPTool.deploy("./testinput/deploy/router/GlobalRouter-023.json");
} }
@Test
public void deployShanxiProxy() {
HTTPTool.deploy("./testinput/debugconf-shanxiproxy.json");
}
} }

16
testinput/debugconf-shanxiproxy.json Normal file
View File

@ -0,0 +1,16 @@
{
"agentAddress": "39.104.208.223:18010",
"ypkPath": "/Users/huaqiancai/BDWare/datanet/shanxiproxy/backend/build/ShanxiProxy-1.5.5.ypk",
"publicKey": "04303718771b9323c204e607639f14469f9a94e55b0964a408ad3b3864b0493b645d7070da0d550f0c54b934275a8e88dedc3024467b0566db5c1108b1baeaae27",
"privateKey": "d675782acf011dbc01a73c7967ccff9564486f7c3a9f5d5de151caffaa18936",
"killBeforeStart": "ShanxiProxy",
"cpHost": "192.168.0.3",
"asDebug": true,
"createParam": {
"routerURI": "tcp://39.104.208.223:18041",
"repoId": "shanxi.taiyuan.xiaodian/XDMK",
"repoName": "XD煤矿",
"privateKey": "42b21cdc001943c74e78dc3af2d66f4c857ab682fcd31c802d57d98e31670d95",
"publicKey": "040548bba7741e091129400ce355c4d706d0072fa51e414b05302a9a93fbcae78fd1d2d15b9e0ab1239b14b7ab9c1178991f8597e515cd0c41faaed5d017be1be8"
}
}