[区块链] 修改

dev-blockcha/pom.xml

@@ -25,6 +25,14 @@
             <artifactId>aws-java-sdk</artifactId>
             <version>1.7.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.tykj.dev</groupId>
+            <artifactId>misc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.tykj.dev</groupId>
+            <artifactId>config</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

dev-blockcha/src/main/java/com/tykj/dev/blockcha/controller/BlockchaController.java

+package com.tykj.dev.blockcha.controller;
+
+import com.google.common.collect.ImmutableMap;
+import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
+import com.tykj.dev.blockcha.subject.service.impl.HexUtil;
+import com.tykj.dev.config.GlobalMap;
+import com.tykj.dev.config.swagger.AutoDocument;
+import com.tykj.dev.misc.base.ResultObj;
+import com.tykj.dev.misc.base.StatusEnum;
+import com.tykj.dev.misc.utils.JacksonUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.function.Function;
+
+import static com.tykj.dev.misc.base.BusinessEnum.CONFIRM_CHECK_DETAIL;
+import static com.tykj.dev.misc.base.BusinessEnum.CONFIRM_CHECK_STAT;
+import static com.tykj.dev.misc.base.StatusEnum.*;
+import static java.util.stream.Collectors.*;
+
+/**
+ * @author dengdiyi
+ */
+@SuppressWarnings("ALL")
+@RestController
+@RequestMapping(value = "/blockcha")
+@AutoDocument
+@Transactional(rollbackFor = Exception.class)
+@Slf4j
+@Api(tags = "区块链", description = "区块链模块", position = 1)
+public class BlockchaController {
+
+    @Autowired
+    BlockChainUtil blockChainUtil;
+
+    @GetMapping(value = "/ststus")
+    public ResponseEntity getststus(){
+        return ResponseEntity.ok(blockChainUtil.getStatus());
+    }
+
+    @GetMapping(value = "/subRegister")
+    @ApiOperation("注册")
+    public ResponseEntity subRegister(){
+        return ResponseEntity.ok(blockChainUtil.subRegister("asdfg"));
+    }
+
+    @ApiOperation(value = "添加")
+    @GetMapping(value = "/sendHash/{code}/{content}")
+    public ResponseEntity sendHash(@PathVariable Integer code,@PathVariable String content){
+//        content= HexUtil.string2HexUTF8(content);
+        return ResponseEntity.ok(blockChainUtil.sendHash(code,"8a4df5a249be4b3890eeea22bd238feb"));
+    }
+
+    @GetMapping(value = "/fetchRecord/{id}")
+    @ApiOperation(value = "查询接口")
+    public ResponseEntity fetchRecord(@PathVariable String id){
+        return ResponseEntity.ok(blockChainUtil.fetchRecord(id));
+    }
+
+}
+
+
+
+

dev-blockcha/src/main/java/com/tykj/dev/blockcha/subject/service/impl/ApiSignatureUtil.java

@@ -24,6 +24,7 @@ class ApiSignatureUtil {
         map.forEach((k, v) -> sb.append(k).append("=").append(v).append("&"));
         String str = sb.toString();
         String message = str.substring(0, str.length() - 1);
+        log.info("[SHA256] 参数：{}", map.toString());
         return sha256_HMAC(message, key);
     }
 

dev-blockcha/src/main/java/com/tykj/dev/blockcha/subject/service/impl/BlockChainUtilImpl.java

@@ -6,6 +6,7 @@ import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
+import sun.applet.Main;
 
 import java.util.Map;
 import java.util.SortedMap;
@@ -70,12 +71,19 @@ public class BlockChainUtilImpl implements BlockChainUtil {
         );
     }
 
+    public static void main(String[] args) {
+        new BlockChainUtilImpl().sendHash(1,"8A4DF5A249BE4B3890EEEA22BD238FEB");
+    }
+
     @Override
     public BcHash sendHash(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));
+        String s = ApiSignatureUtil.getApiSignature(request, SECRET_KEY).toUpperCase();
+        request.put("apiSignature", s);
+
+        log.info("[block] 生成的Signature是:{}", s);
 
         return new RestTemplate().postForObject(
                 BLOCK_CHAIN_URL + BcUrl.SEND_HASH,