update version

This commit is contained in:
CaiHQ 2023-06-16 18:55:51 +08:00
parent adcb9d40a5
commit 2e5bea970a
4 changed files with 29 additions and 9 deletions

View File

@ -3,8 +3,8 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath "org.bdware.bdcontract:simple-ypk-packer:0.5.5" classpath "org.bdware.bdcontract:simple-ypk-packer:0.6.0"
classpath "org.bdware.bdcontract:ypk-deploy-tool:0.7.1" classpath "org.bdware.bdcontract:ypk-deploy-tool:0.7.4"
} }
} }
plugins { plugins {
@ -39,7 +39,7 @@ sourceSets {
dependencies { dependencies {
api 'org.apache.logging.log4j:log4j-core:2.17.2' api 'org.apache.logging.log4j:log4j-core:2.17.2'
api 'org.apache.logging.log4j:log4j-api:2.17.2' api 'org.apache.logging.log4j:log4j-api:2.17.2'
implementation 'org.bdware.sc:cp:1.8.0' implementation 'org.bdware.sc:cp:1.9.1'
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
} }
@ -77,10 +77,10 @@ task copyJar(type: Copy, dependsOn: [":backend:jar", ":backend:copyLibs"]) {
} }
def reltivePath = "./backend" def reltivePath = "./backend"
//reltivePath="." //reltivePath="."
def currVersion = "1.3.3" def currVersion = "1.3.4"
task grepCP(dependsOn: ["copyJar"]) { task grepCP(dependsOn: ["copyJar"]) {
doLast { doLast {
org.bdware.datanet.YPKPacker.grepJarByCPVersion("${reltivePath}/build/output/libs", org.bdware.datanet.CPVersion.cp_1_6_8) org.bdware.datanet.YPKPacker.grepJarByCPVersion("${reltivePath}/build/output/libs", org.bdware.datanet.CPVersion.cp_1_8_3)
org.bdware.datanet.YPKPacker.grepJarByListFile("${reltivePath}/build/output/libs", "${reltivePath}/grepcp.list") org.bdware.datanet.YPKPacker.grepJarByListFile("${reltivePath}/build/output/libs", "${reltivePath}/grepcp.list")
} }

View File

@ -1,3 +1,7 @@
common-1.5.9.jar sdk-java-1.0.2.jar
cp-1.6.4.jar common-1.7.5.jar
rocksdbjni-7.3.1.jar cp-1.9.1.jar
delta-crdts-1.1.0.jar
doip-audit-tool-1.2.9.jar
doip-sdk-1.4.6.jar
irp-sdk-1.1.6.jar

View File

@ -1,11 +1,19 @@
package org.bdware.sc.contractexample; package org.bdware.sc.contractexample;
import com.google.gson.JsonObject;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.bdware.sc.ContractProcess; import org.bdware.sc.ContractProcess;
import org.bdware.sc.boundry.JavaScriptEntry; import org.bdware.sc.boundry.JavaScriptEntry;
import org.bdware.sc.engine.JSONTool;
import wrp.jdk.nashorn.api.scripting.ScriptObjectMirror;
public class Hello { public class Hello {
public static String call(ScriptObjectMirror obj) {
JsonObject jo = JSONTool.convertMirrorToJson(obj).getAsJsonObject();
//...
return "0320-hello";
}
private static final Logger LOGGER = LogManager.getLogger(Hello.class); private static final Logger LOGGER = LogManager.getLogger(Hello.class);
public static void main(String[] args) { public static void main(String[] args) {
@ -13,9 +21,11 @@ public class Hello {
} }
public static String call() { public static String call() {
return "hello..dafdskf"; return "0320-hello";
} }
public static String callYJSInSameCP() { public static String callYJSInSameCP() {
return ContractProcess.instance.executeContract("{\"action\":\"getOwner\"\",\"arg\":\"\"}"); return ContractProcess.instance.executeContract("{\"action\":\"getOwner\"\",\"arg\":\"\"}");
} }

6
bdserver-docker-compose/.gitignore vendored Normal file
View File

@ -0,0 +1,6 @@
./bdcontract/BDWareProjectDir
./bdcontract/ContractDB
./bdcontract/ContractManagerDB
./bdcontract/rocksdb
./bdcontract/tls
./bdledger/data