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

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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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