Skip to content

D
device-back
提交 6248dba4 authored 作者: zjm's avatar zjm
浏览文件
操作

fix(区块链): 修改了根据不同环境是否使用区块

修改了根据不同环境是否使用区块
上级 f6cf91ea
隐藏空白字符变更
内嵌 并排
正在显示 包含 264 行增加 和 230 行删除
dev-blockcha/src/main/java/com/tykj/dev/blockcha/subject/service/impl/BlockChainUtilImpl.java
浏览文件 @ 6248dba4
......@@ -4,6 +4,7 @@ import com.tykj.dev.blockcha.conf.BcUrl;
import com.tykj.dev.blockcha.subject.entity.*;
import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
......@@ -16,7 +17,7 @@ import java.util.UUID;
* 步骤：
* 1.构建请求参数
* 2.通过rest_template获取数据
* 测试
*
* @author LJJ cnljj1995@gmail.com
* on 2020-08-13
*/
......@@ -24,6 +25,9 @@ import java.util.UUID;
@Component
public class BlockChainUtilImpl implements BlockChainUtil {
@Value("${block.flag}")
public boolean flag;
private String SECRET_KEY = "3mdeM1dw2FfHrd5h6WAuhB3WYdDG6ZAgz96CcM1nzxbiYA8QaaZHW75Je9xKixTTD2rwujyb1gVUNPYm5W6FPZQ8";
private String SECRET_ID = "3yXRRiL9xsLfbt2kv7qRH2so6ChJX3rFkay7Njcsxfbp";
......@@ -72,119 +76,132 @@ public class BlockChainUtilImpl implements BlockChainUtil {
@Override
public BcText sendText(Integer index,Integer subCode, String content) {
SortedMap<Object, Object> request = getRequest();
request.put("content", content);
request.put("subCode", subCode);
request.put("apiSignature", ApiSignatureUtil.getApiSignature(request, SECRET_KEY));
switch (index){
case 1:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.SEND_TEXT,
request,
BcText.class
);
case 2:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL2 + BcUrl.SEND_TEXT,
request,
BcText.class
);
case 3:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL3 + BcUrl.SEND_TEXT,
request,
BcText.class
);
case 4:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL4 + BcUrl.SEND_TEXT,
request,
BcText.class
);
case 5:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL5 + BcUrl.SEND_TEXT,
request,
BcText.class
);
if (flag) {
SortedMap<Object, Object> request = getRequest();
request.put("content", content);
request.put("subCode", subCode);
request.put("apiSignature", ApiSignatureUtil.getApiSignature(request, SECRET_KEY));
switch (index) {
case 1:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.SEND_TEXT,
request,
BcText.class
);
case 2:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL2 + BcUrl.SEND_TEXT,
request,
BcText.class
);
case 3:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL3 + BcUrl.SEND_TEXT,
request,
BcText.class
);
case 4:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL4 + BcUrl.SEND_TEXT,
request,
BcText.class
);
case 5:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL5 + BcUrl.SEND_TEXT,
request,
BcText.class
);
}
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.SEND_TEXT,
request,
BcText.class
);
}else {
return new BcText().toData();
}
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.SEND_TEXT,
request,
BcText.class
);
// return new BcText().toData();
}
@Override
public BcText sendText(Integer subCode, String content) {
SortedMap<Object, Object> request = getRequest();
request.put("content", content);
request.put("subCode", subCode);
request.put("apiSignature", ApiSignatureUtil.getApiSignature(request, SECRET_KEY));
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.SEND_TEXT,
request,
BcText.class
);
if (flag) {
SortedMap<Object, Object> request = getRequest();
request.put("content", content);
request.put("subCode", subCode);
request.put("apiSignature", ApiSignatureUtil.getApiSignature(request, SECRET_KEY));
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.SEND_TEXT,
request,
BcText.class
);
}else {
return new BcText().toData();
}
}
// public static void main(String[] args) {
// new BlockChainUtilImpl().sendHash(1,"阿斯顿好看");
// }
@Override
public BcHash sendHash(Integer index,Integer subCode, String content) {
SortedMap<Object, Object> request = getRequest();
request.put("content", HexUtil.hex64(content));
request.put("subCode", subCode);
String s = ApiSignatureUtil.getApiSignature(request, SECRET_KEY);
log.info("apiSignature:{}",s);
request.put("apiSignature", s);
switch (index){
case 1:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.SEND_HASH,
request,
BcHash.class
);
case 2:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL2 + BcUrl.SEND_HASH,
request,
BcHash.class
);
case 3:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL3 + BcUrl.SEND_HASH,
request,
BcHash.class
);
case 4:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL4 + BcUrl.SEND_HASH,
request,
BcHash.class
);
case 5:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL5 + BcUrl.SEND_HASH,
request,
BcHash.class
);
if (flag) {
SortedMap<Object, Object> request = getRequest();
request.put("content", HexUtil.hex64(content));
request.put("subCode", subCode);
String s = ApiSignatureUtil.getApiSignature(request, SECRET_KEY);
log.info("apiSignature:{}", s);
request.put("apiSignature", s);
switch (index) {
case 1:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.SEND_HASH,
request,
BcHash.class
);
case 2:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL2 + BcUrl.SEND_HASH,
request,
BcHash.class
);
case 3:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL3 + BcUrl.SEND_HASH,
request,
BcHash.class
);
case 4:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL4 + BcUrl.SEND_HASH,
request,
BcHash.class
);
case 5:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL5 + BcUrl.SEND_HASH,
request,
BcHash.class
);
}
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.SEND_HASH,
request,
BcHash.class
);
}else {
return new BcHash().toDate();
}
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.SEND_HASH,
request,
BcHash.class
);
}
@Override
public BcHash sendHash(Integer subCode, String content) {
// if ("true".equals(this.useBlockcha)) {
if (flag) {
SortedMap<Object, Object> request = getRequest();
request.put("content", HexUtil.hex64(content));
request.put("subCode", subCode);
......@@ -197,6 +214,10 @@ public class BlockChainUtilImpl implements BlockChainUtil {
request,
BcHash.class
);
}
else {
return new BcHash().toDate();
}
}
@Override
......@@ -217,7 +238,6 @@ public class BlockChainUtilImpl implements BlockChainUtil {
SortedMap<Object, Object> request = getRequest();
map.forEach(request::put);
request.put("apiSignature", ApiSignatureUtil.getApiSignature(request, SECRET_KEY));
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.FETCH_HISTORY,
request,
......@@ -227,128 +247,141 @@ public class BlockChainUtilImpl implements BlockChainUtil {
@Override
public BcText appendText(Integer index,String content, String recordId) {
SortedMap<Object, Object> request = getRequest();
request.put("content", content);
request.put("recordID", recordId);
String s = ApiSignatureUtil.getApiSignature(request, SECRET_KEY);
request.put("apiSignature", s);
switch (index){
case 1:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.APPEND_TEXT,
request,
BcText.class);
case 2:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL2 + BcUrl.APPEND_TEXT,
request,
BcText.class);
case 3:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL3 + BcUrl.APPEND_TEXT,
request,
BcText.class);
case 4:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL4 + BcUrl.APPEND_TEXT,
request,
BcText.class);
case 5:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL5 + BcUrl.APPEND_TEXT,
request,
BcText.class);
if (flag) {
SortedMap<Object, Object> request = getRequest();
request.put("content", content);
request.put("recordID", recordId);
String s = ApiSignatureUtil.getApiSignature(request, SECRET_KEY);
request.put("apiSignature", s);
switch (index) {
case 1:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.APPEND_TEXT,
request,
BcText.class);
case 2:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL2 + BcUrl.APPEND_TEXT,
request,
BcText.class);
case 3:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL3 + BcUrl.APPEND_TEXT,
request,
BcText.class);
case 4:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL4 + BcUrl.APPEND_TEXT,
request,
BcText.class);
case 5:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL5 + BcUrl.APPEND_TEXT,
request,
BcText.class);
}
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.APPEND_TEXT,
request,
BcText.class);
}else {
return new BcText().toData();
}
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.APPEND_TEXT,
request,
BcText.class);
// return new BcText().toData();
}
@Override
public BcText appendText(String content, String recordId) {
SortedMap<Object, Object> request = getRequest();
request.put("content", content);
request.put("recordID", recordId);
String s = ApiSignatureUtil.getApiSignature(request, SECRET_KEY);
request.put("apiSignature", s);
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.APPEND_TEXT,
request,
BcText.class);
if (flag) {
SortedMap<Object, Object> request = getRequest();
request.put("content", content);
request.put("recordID", recordId);
String s = ApiSignatureUtil.getApiSignature(request, SECRET_KEY);
request.put("apiSignature", s);
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.APPEND_TEXT,
request,
BcText.class);
}else {
return new BcText().toData();
}
}
@Override
public BcHash appendHash(Integer index,String content, String recordId) {
SortedMap<Object, Object> request = getRequest();
request.put("content", HexUtil.hex64(content));
request.put("recordID", recordId);
String s = ApiSignatureUtil.getApiSignature(request, SECRET_KEY);
request.put("apiSignature", s);
switch (index){
case 1:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.APPEND_HASH,
request,
BcHash.class
);
case 2:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL2 + BcUrl.APPEND_HASH,
request,
BcHash.class
);
case 3:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL3 + BcUrl.APPEND_HASH,
request,
BcHash.class
);
case 4:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL4 + BcUrl.APPEND_HASH,
request,
BcHash.class
);
case 5:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL5 + BcUrl.APPEND_HASH,
request,
BcHash.class
);
}
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.APPEND_HASH,
request,
BcHash.class
);
// return new BcHash().toDate();
if (flag) {
SortedMap<Object, Object> request = getRequest();
request.put("content", HexUtil.hex64(content));
request.put("recordID", recordId);
String s = ApiSignatureUtil.getApiSignature(request, SECRET_KEY);
request.put("apiSignature", s);
switch (index) {
case 1:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.APPEND_HASH,
request,
BcHash.class
);
case 2:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL2 + BcUrl.APPEND_HASH,
request,
BcHash.class
);
case 3:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL3 + BcUrl.APPEND_HASH,
request,
BcHash.class
);
case 4:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL4 + BcUrl.APPEND_HASH,
request,
BcHash.class
);
case 5:
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL5 + BcUrl.APPEND_HASH,
request,
BcHash.class
);
}
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.APPEND_HASH,
request,
BcHash.class
);
}else {
return new BcHash().toDate();
}
}
@Override
public BcHash appendHash(String content, String recordId) {
SortedMap<Object, Object> request = getRequest();
request.put("content", HexUtil.hex64(content));
request.put("recordID", recordId);
String s = ApiSignatureUtil.getApiSignature(request, SECRET_KEY);
request.put("apiSignature", s);
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.APPEND_HASH,
request,
BcHash.class
);
// return new BcHash().toDate();
if (flag) {
SortedMap<Object, Object> request = getRequest();
request.put("content", HexUtil.hex64(content));
request.put("recordID", recordId);
String s = ApiSignatureUtil.getApiSignature(request, SECRET_KEY);
request.put("apiSignature", s);
return new RestTemplate().postForObject(
BLOCK_CHAIN_URL + BcUrl.APPEND_HASH,
request,
BcHash.class
);
}else {
return new BcHash().toDate();
}
}
@Override
......
dev-blockcha/src/main/java/com/tykj/dev/blockcha/subject/service/impl/BlockChainUtilImplLocal.java → dev-blockcha/src/main/java/com/tykj/dev/blockcha/subject/service/impl/BlockChainUtilImpl1.java
浏览文件 @ 6248dba4
......@@ -16,16 +16,13 @@
// * 步骤：
// * 1.构建请求参数
// * 2.通过rest_template获取数据
// *
// * 测试
// * @author LJJ cnljj1995@gmail.com
// * on 2020-08-13
// */
//@Slf4j
//@Component
//public class BlockChainUtilImplLocal implements BlockChainUtil {
//
//
//
//public class BlockChainUtilImpl1 implements BlockChainUtil {
//
//
// private String SECRET_KEY = "3mdeM1dw2FfHrd5h6WAuhB3WYdDG6ZAgz96CcM1nzxbiYA8QaaZHW75Je9xKixTTD2rwujyb1gVUNPYm5W6FPZQ8";
......@@ -118,6 +115,7 @@
// request,
// BcText.class
// );
//// return new BcText().toData();
// }
//
// @Override
......@@ -126,6 +124,7 @@
// request.put("content", content);
// request.put("subCode", subCode);
// request.put("apiSignature", ApiSignatureUtil.getApiSignature(request, SECRET_KEY));
//
// return new RestTemplate().postForObject(
// BLOCK_CHAIN_URL + BcUrl.SEND_TEXT,
// request,
......@@ -133,10 +132,6 @@
// );
// }
//
//// public static void main(String[] args) {
//// new BlockChainUtilImpl().sendHash(1,"阿斯顿好看");
//// }
//
//
// @Override
// public BcHash sendHash(Integer index,Integer subCode, String content) {
......@@ -202,10 +197,6 @@
// request,
// BcHash.class
// );
//// }
//// else {
//// return new BcHash(0, "", new BcHashData("000"));
//// }
// }
//
// @Override
......@@ -226,6 +217,7 @@
// SortedMap<Object, Object> request = getRequest();
// map.forEach(request::put);
// request.put("apiSignature", ApiSignatureUtil.getApiSignature(request, SECRET_KEY));
//
// return new RestTemplate().postForObject(
// BLOCK_CHAIN_URL + BcUrl.FETCH_HISTORY,
// request,
......@@ -275,6 +267,7 @@
// BLOCK_CHAIN_URL + BcUrl.APPEND_TEXT,
// request,
// BcText.class);
//// return new BcText().toData();
// }
//
// @Override
......@@ -285,7 +278,7 @@
// String s = ApiSignatureUtil.getApiSignature(request, SECRET_KEY);
// request.put("apiSignature", s);
//
// return new RestTemplate().postForObject(
// return new RestTemplate().postForObject(
// BLOCK_CHAIN_URL + BcUrl.APPEND_TEXT,
// request,
// BcText.class);
......@@ -338,6 +331,7 @@
// request,
// BcHash.class
// );
//// return new BcHash().toDate();
//
// }
//
......@@ -354,6 +348,7 @@
// request,
// BcHash.class
// );
//// return new BcHash().toDate();
// }
//
// @Override
......
dev-union/src/main/resources/application-dev.properties
浏览文件 @ 6248dba4
......@@ -8,3 +8,4 @@ spring.jpa.hibernate.ddl-auto=update
# spring boot admin
spring.boot.admin.client.url=http://localhost:8769
spring.boot.admin.client.instance.serviceBaseUrl=http://localhost:8087w
block.flag=true
dev-union/src/main/resources/application-local.properties
浏览文件 @ 6248dba4
......@@ -6,4 +6,5 @@ file.path=C:/Users/dengdiyi/Documents/file/
logging.file=./log/equip.log
preview.path=http://124.70.145.101:8087/equip/file/
# spring boot admin
spring.boot.admin.client.url=http://localhost:8769
\ No newline at end of file
spring.boot.admin.client.url=http://localhost:8769
block.flag=true
\ No newline at end of file
dev-union/src/main/resources/application-prod.properties
浏览文件 @ 6248dba4
......@@ -6,4 +6,5 @@ spring.datasource.password=szoscar55
spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
#file.path=/opt/zb/
#preview.path=http://10.153.4.11:8088/equip/file/
#preview.path=http://192.168.0.80:8088/equip/file/
\ No newline at end of file
#preview.path=http://192.168.0.80:8088/equip/file/
block.flag=true
\ No newline at end of file
dev-union/src/main/resources/application-prodM.properties
浏览文件 @ 6248dba4
......@@ -6,4 +6,5 @@ spring.datasource.password=szoscar55
spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
file.path=/opt/zb/
preview.path=http://10.153.4.11:8088/equip/file/
#preview.path=http://192.168.0.80:8088/equip/file/
\ No newline at end of file
#preview.path=http://192.168.0.80:8088/equip/file/
block.flag=true
\ No newline at end of file
dev-union/src/main/resources/application-prodT.properties
浏览文件 @ 6248dba4
......@@ -7,3 +7,4 @@ spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
file.path=/opt/zb/
preview.path=http://10.153.4.11:8088/equipTest/file/
spring.jmx.enabled=false
block.flag=false
dev-union/src/main/resources/application-test.properties
浏览文件 @ 6248dba4
......@@ -8,4 +8,5 @@ file.path=/opt/zb/
#preview.path=http://10.153.4.11:8088/equip/file/
preview.path=http://192.168.0.80:8088/equip/file/
spring.boot.admin.client.url=http://localhost:8769
spring.boot.admin.client.instance.serviceBaseUrl=http://localhost:8087
\ No newline at end of file
spring.boot.admin.client.instance.serviceBaseUrl=http://localhost:8087
block.flag=true
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论