bdware/cm
2
0
Fork 0
mirror of https://gitee.com/BDWare/cm synced 2025-01-10 09:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

optimize: use jquery 2.1.4.min

Browse Source 
refactor: DOA Contract
update: use doip sdk 1.0.2
This commit is contained in:
CaiHQ 2021-12-22 22:07:51 +08:00
parent 7d04d48f50
commit ec21fc9500
4 changed files with 7 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
libs/DOIPSDK-1.0.2-SNAPSHOT.jar Normal file
View File

Binary file not shown.

3
src/main/java/org/bdware/sc/ChainOpener.java
View File

@ -4,6 +4,9 @@ import org.bdware.sc.bean.ContractRequest;
import org.bdware.sc.conn.OnHashCallback; import org.bdware.sc.conn.OnHashCallback;
public interface ChainOpener { public interface ChainOpener {
void reRegister(String doid);
String register(String arg);
void writeContractResultToLocalAndLedger( void writeContractResultToLocalAndLedger(
String result, String result,
ContractClient client, ContractClient client,

25
src/main/java/org/bdware/sc/ContractManager.java
View File

@ -7,9 +7,6 @@ import io.prometheus.client.Counter;
import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.DigestUtils;
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.doip.core.model.handleRecord.DoHandleRecord;
import org.bdware.doip.core.utils.GlobalConfigurations;
import org.bdware.doip.endpoint.irpClient.GlobalIrpClient;
import org.bdware.sc.ContractResult.Status; import org.bdware.sc.ContractResult.Status;
import org.bdware.sc.bean.*; import org.bdware.sc.bean.*;
import org.bdware.sc.conn.OnHashCallback; import org.bdware.sc.conn.OnHashCallback;
@ -77,7 +74,7 @@ public class ContractManager {
public static ScheduledExecutorService scheduledThreadPool = public static ScheduledExecutorService scheduledThreadPool =
Executors.newScheduledThreadPool(10); Executors.newScheduledThreadPool(10);
public static DoipServiceInfoConfigurer doipConfigurer;
public static int logStage = 0; public static int logStage = 0;
public static Sigar sigar = null; // 获取network等资源什么 public static Sigar sigar = null; // 获取network等资源什么
@ -459,6 +456,7 @@ public class ContractManager {
} }
public ContractClient getContractClientByDoi(String doi) { public ContractClient getContractClientByDoi(String doi) {
ContractMeta meta = statusRecorder.getContractMeta(doi); ContractMeta meta = statusRecorder.getContractMeta(doi);
return statusRecorder.getContractClient(meta.id); return statusRecorder.getContractClient(meta.id);
} }
@ -1033,26 +1031,11 @@ public class ContractManager {
if (cm != null && cm.doi != null) { if (cm != null && cm.doi != null) {
if (!cm.doi.equals("") if (!cm.doi.equals("")
&& !cm.doi.equals("null") && !cm.doi.equals("null")
&& c.getType() == ContractExecType.Sole) { && c.getType() == ContractExecType.Sole && chainOpener != null) {
c.setDOI(cm.doi); c.setDOI(cm.doi);
c.setBuildTime(cm.buildTime); c.setBuildTime(cm.buildTime);
c.setDoipFlag(true); c.setDoipFlag(true);
chainOpener.reRegister(cm.doi);
DoHandleRecord dohr =
new DoHandleRecord(
GlobalConfigurations.User_Handle,
GlobalConfigurations.DoipServiceID);
dohr.handle = cm.doi;
threadPool.execute(
() -> {
try {
GlobalIrpClient.getGlobalClient().reRegister(dohr);
} catch (Exception e) {
LOGGER.warn("unable to connect LHS: " + e.getMessage());
}
});
} }
} }
} else { } else {

14
src/main/java/org/bdware/sc/DoipServiceInfoConfigurer.java
View File

@ -1,14 +0,0 @@
package org.bdware.sc;
import org.bdware.doip.application.DoipServiceConfig;
import org.bdware.doip.endpoint.doipServer.DoipServiceInfo;
public interface DoipServiceInfoConfigurer {
String getServiceHandle();
String resetServiceConfig(String configJson);
DoipServiceConfig getDoipServiceConfig();
DoipServiceInfo getDoipServiceInfo();
}