From 415e89fbc82dd35e980f7c19dae546ed89d5c012 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 28 May 2022 11:13:32 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/dapp/chain/EthService.java      |   18 +++++++++---------
 src/main/java/cc/mrbird/febs/common/utils/LoginUserUtil.java |   10 +++++++++-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/common/utils/LoginUserUtil.java b/src/main/java/cc/mrbird/febs/common/utils/LoginUserUtil.java
index 69a29e6..6fc3971 100644
--- a/src/main/java/cc/mrbird/febs/common/utils/LoginUserUtil.java
+++ b/src/main/java/cc/mrbird/febs/common/utils/LoginUserUtil.java
@@ -2,11 +2,14 @@
 
 import cc.mrbird.febs.dapp.entity.DappMemberEntity;
 import lombok.extern.slf4j.Slf4j;
+import org.bouncycastle.jcajce.provider.digest.Keccak;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.web3j.crypto.Hash;
+import org.web3j.utils.Numeric;
 
 import javax.servlet.http.HttpServletRequest;
+import java.nio.charset.StandardCharsets;
 
 /**
  * @author 
@@ -20,11 +23,16 @@
         return (DappMemberEntity) request.getSession().getAttribute("member");
     }
 
+    // address:0x971c09aa9735eb98459b17ec8b48932d24cbb931
+    // nonce:0x1d5f7444107bc02e980deda39d0fce21b06c9da4233a19cb11124cb5bfefc9ec
+    // sign:0x8f92cee24906122e26c3cc6cbd72f851cfe2c9574aa03bf3371e5d506fbec68b2ad22bbbc19b00ed21d26ab5a6871507831e2c902d8ed8c33301addc2b57a7731b
     public static String getLoginKey(String address, String nonce, String sign) {
         log.info("address:{}, nonce:{}, sign:{}", address, nonce, sign);
         StringBuilder sb = new StringBuilder();
         StringBuilder append = sb.append(address).append(":").append(nonce).append(":").append(sign);
 
-        return Hash.sha3(append.toString());
+        Keccak.DigestKeccak kecc = new Keccak.Digest256();
+        kecc.update(append.toString().getBytes(StandardCharsets.UTF_8));
+        return Numeric.toHexString(kecc.digest());
     }
 }
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java b/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
index c3ef26a..9eda396 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
@@ -64,17 +64,17 @@
 //        BigInteger bigInteger = Numeric.decodeQuantity(send.getResult());
 //        System.out.println("0x113d6d0");
 
-        String s1 = Hash.sha3("0xf6b06a30196aa5e318232a3b61319eab0fd4a3bf_llE4");
 
-        System.out.println(s1);
-        String str = "0xc2cd497cbbbc8bd0eb00a1b7340af86eb8f40f4fd1ee8f8660831d3841cb84be306dd15ceda42acf5d1f1add31793f17d2123c8e321f855dc41e6f44318841e71b_" + s1;
-//        Web3Sha3 send = web3j.web3Sha3("0x0d694bf4095e1dd854f7ba365db340308c4b4e5c990df0cd2e91465dd080935b").send();
+        String address = "0x971c09aa9735eb98459b17ec8b48932d24cbb931";
+        String nonce = "0x1d5f7444107bc02e980deda39d0fce21b06c9da4233a19cb11124cb5bfefc9ec";
+        String sign = "0x8f92cee24906122e26c3cc6cbd72f851cfe2c9574aa03bf3371e5d506fbec68b2ad22bbbc19b00ed21d26ab5a6871507831e2c902d8ed8c33301addc2b57a7731b";
 
-        String s = Hash.sha3(str);
-        // 0x515415edb1d3ae67a97f995b71bd09feaed27319722e55c4817f88273679a9e2
-        // 0x64296f548bf487d8e1fa8548572d316ffab08f92fe7d4438e747e9948778f802
-        // 0xb3b7c4bb00a80a646ecb803139a4e81eb5857dad30b299520fbd30f6eeeafd81
-        System.out.println(s);
+        String result = address + ":" + nonce + ":" + sign;
+        System.out.println(Hash.sha3(result));
+
+
+//        Web3Sha3 send = web3j.web3Sha3(result).send();
+//        System.out.println(1);
     }
 
     @Override

--
Gitblit v1.9.1