Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

mitao

2025-03-17 10a8ecffd260989369763e8f507039c7c1be9134

Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java

@@ -139,7 +139,7 @@
            identityInformationVO.setIdentity(identity);
        }

        identityInformationVO.setIsPartymember(partyMember != null);
        identityInformationVO.setIsPartymember(partyMember != null && partyMember.getAuditStatus().equals(1));
        identityInformationVO.setIsConfirm(partyMember != null && partyMember.getIsConfirm() == 1);
        identityInformationVO.setAuditStatus(partyMember == null ? null : partyMember.getAuditStatus());
        if (partyMember !=null){

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/utils/SignatureUtil.java

@@ -4,6 +4,7 @@
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.Arrays;
import java.util.HashMap;
@@ -82,7 +83,7 @@
        sb.deleteCharAt(sb.length() - 1); // Remove the last '&'

        MessageDigest md = MessageDigest.getInstance("SHA-1");
        byte[] hashBytes = md.digest(sb.toString().getBytes("UTF-8"));
        byte[] hashBytes = md.digest(sb.toString().getBytes(StandardCharsets.UTF_8));

        StringBuilder hexString = new StringBuilder();
        for (byte b : hashBytes) {