diff --git a/backend/.gitignore b/backend/.gitignore index 2643730..cb46321 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -1,5 +1,7 @@ /.DS_Store/ /build/ +/ContractDB/ +debugconf.json /cplibs/ cplibs # Compiled class file @@ -25,3 +27,4 @@ cplibs # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +deployconfig.json \ No newline at end of file diff --git a/backend/build.gradle b/backend/build.gradle index 291af35..4b46368 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -6,6 +6,8 @@ buildscript { dependencies { classpath "org.bdware.bdcontract:simple-ypk-packer:0.3.0" classpath "org.bdware.bdcontract:ypk-deploy-tool:0.4.0" + classpath 'org.apache.logging.log4j:log4j-core:2.17.2' + classpath 'org.apache.logging.log4j:log4j-api:2.17.2' } } @@ -39,15 +41,24 @@ sourceSets { } dependencies { -// api 'org.apache.logging.log4j:log4j-core:2.14.1' -// api 'org.apache.logging.log4j:log4j-api:2.14.1' implementation fileTree(dir: 'cplibs', include: '*.jar') -// implementation fileTree(dir: 'cplibs/lib/', include: '*.jar') + implementation fileTree(dir: 'cplibs/libs/', include: '*.jar') testImplementation 'junit:junit:4.13.2' // api project(":datanet-search-engine-backend") implementation 'org.postgresql:postgresql:42.3.1' } +//task copyLibs(type: Copy) { +// from configurations.runtimeClasspath +// into "./build/output/libs/" +//} +def reltivePath = "./backend" +task grepCP(dependsOn: ["copyLibs"]) { + doLast { + org.bdware.datanet.YPKPacker.grepCPLibWithFilter("${reltivePath}/cplibs/libs", "${reltivePath}/build/output/libs", "${reltivePath}/grepcp.list") + } +} + //task copyLibs(type: Copy) { // from configurations.runtimeClasspath // into "./build/output/libs/" @@ -74,37 +85,32 @@ task copyAssets(type: Copy) { from "../front" into "./build/output/assets/" } -task mergeJar(dependsOn: ["sourcesJar", "jar"]) { - doLast { - org.bdware.datanet.YPKPacker.mergeJar("./backend/build/libs/$project.name-${project.version}.jar", - "./backend/build/libs/$project.name-${project.version}-sources.jar", - "./backend/build/libs/$project.name-${project.version}-all.jar") - } -} -task copyJar(type: Copy, dependsOn: ["mergeJar", ":backend:copyLibs"]) { - from "./build/libs/$project.name-${project.version}-all.jar" - into "./build/output" - rename { String fileName -> "sc-example.jar" } +def currVersion = "0.0.4" +task copyJar(type: Copy, dependsOn: [":backend:copyLibs",":backend:jar"]) { + from "./build/libs/$project.name-${project.version}.jar" + into "./build/output/libs" + rename { String fileName -> "registry-${currVersion}.jar" } doFirst { println "copyJar start" } } -task buildZip(type: Zip, dependsOn: ["copyAssets", "copyJar", "copyYJS"]) { +task buildZip(type: Zip, dependsOn: ["copyAssets", "copyJar", "copyYJS", "grepCP"]) { from './build/output/' duplicatesStrategy = DuplicatesStrategy.INCLUDE archiveFileName = 'registry.zip' destinationDirectory = file('build/') } -def currVersion = "0.0.1" + task buildYPK(dependsOn: ["buildZip"]) { doLast { - org.bdware.datanet.YPKPacker.staticPack("./backend/build/registry.zip", "./backend/build/registry${currVersion}.ypk") + org.bdware.datanet.YPKPacker.staticPack("./backend/build/registry.zip", "./backend/build/registry-${currVersion}.ypk") } } -task deploy(dependsOn: ["buildYPK"]){ + +task deploy(dependsOn: ["buildYPK"]) { doLast { org.bdware.ypkdeploy.HTTPTool.batchRun("./backend/deployconfig.json", true) } diff --git a/backend/debugconf.json b/backend/debugconf.json new file mode 100755 index 0000000..30417e7 --- /dev/null +++ b/backend/debugconf.json @@ -0,0 +1,16 @@ +{ + "agentHttpAddr": "127.0.0.1:18000", + "privKey": "589d94ee5688358a1c5c18430dd9c75097ddddebf769f139da36a807911d20f8", + "pubKey": "04d1924329f72ced148f6f333fb985ccbaa31b1e3aacf10be5f43d4a4ff5ad88899a005e79e37fc06993e1d66ada8cf8b711cb36f59538bb7d3e39e70fa9360ddd", + "script": "./build/registry-0.0.1.ypk", + "killContract": "Registry", + "createParam": { + "privateKey": "4616ff0e2a4f982364914f9be30b51c6bc6ccb6602114a9ee8792f2ccf67465b", + "publicKey": "04f9b9b8f324908464f78a6235e2dd93e4dfdaf045e9b1b5cfd57374516cc61a79a86fc2b42d3321a5b49a0f25381a7bed61901b40b729f72354e716673d551e98", + "registerID": "DBTest.test.test/registry", + "auditURI": "tcp://127.0.0.1:2051", + "DBUrl": "jdbc:postgresql://iodlog.demo.internetapi.cn:5432/iodlog?useServerPrepStmts=true", + "username": "iodlog", + "password": "iodlog1107" + } + } \ No newline at end of file diff --git a/backend/grepcp.list b/backend/grepcp.list new file mode 100755 index 0000000..a481ccb --- /dev/null +++ b/backend/grepcp.list @@ -0,0 +1 @@ +yjs.jar \ No newline at end of file diff --git a/backend/src/main/java/org/bdware/sc/registry/Hello.java b/backend/src/main/java/org/bdware/sc/registry/Hello.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/org/bdware/sc/registry/RegistryDB.java b/backend/src/main/java/org/bdware/sc/registry/RegistryDB.java index 7f071c2..f0b644a 100644 --- a/backend/src/main/java/org/bdware/sc/registry/RegistryDB.java +++ b/backend/src/main/java/org/bdware/sc/registry/RegistryDB.java @@ -4,7 +4,6 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import org.bdware.sc.engine.JSONTool; import wrp.jdk.nashorn.api.scripting.ScriptObjectMirror; - import java.sql.SQLException; import java.util.HashMap; import java.util.Map; @@ -17,12 +16,13 @@ public class RegistryDB { DBConnector.url = jsonData.get("DBUrl").getAsString(); DBConnector.password = jsonData.get("password").getAsString(); DBConnector.userName = jsonData.get("username").getAsString(); + DBConnector.init(); DBConnector.connect(); Map item = new HashMap<>(); item.put("pubkey", requester); item.put("type", "admin"); - item.put("username", "admin"); + item.put("username", jsonData.get("adminName").getAsString()); DBConnector.insert("registry", "user", item); } catch (Exception e) { e.printStackTrace(); diff --git a/backend/src/test/java/StartRegistry.java b/backend/src/test/java/StartRegistry.java new file mode 100644 index 0000000..4e373e9 --- /dev/null +++ b/backend/src/test/java/StartRegistry.java @@ -0,0 +1,7 @@ +import org.bdware.sc.debugger.DebugMain; + +public class StartRegistry { + public static void main(String[] args){ + DebugMain.main(args); + } +} diff --git a/backend/yjs/main.yjs b/backend/yjs/main.yjs old mode 100644 new mode 100755 diff --git a/backend/yjs/manifest.json b/backend/yjs/manifest.json old mode 100644 new mode 100755