From 0290db1914e71a7ead4e5c2f0958c908d1f74bdd Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 11 Jun 2024 16:53:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jsowell/service/MemberService.java      | 3 ++-
 jsowell-admin/src/test/java/SpringBootTestController.java     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
index ee84a99fb..d1b844c28 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
@@ -139,12 +139,13 @@ public class MemberService {
 	}
 
 	/**
-	 * 公共登陆注册方法
+	 * 公共登录注册方法
 	 * @param phoneNumber 手机号
 	 * @param firstLevelMerchantId 商户id
 	 * @return token返给前端
 	 */
 	protected String memberRegisterAndLogin(String phoneNumber, String firstLevelMerchantId, String openId) {
+		log.info("公共登录注册方法, phoneNumber:{}, firstLevelMerchantId:{}, openId:{}", phoneNumber, firstLevelMerchantId, openId);
 		if (StringUtils.isBlank(phoneNumber)) {
 			throw new BusinessException(ReturnCodeEnum.CODE_GET_MOBILE_NUMBER_BY_CODE_ERROR);
 		}
diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java
index 19ce3fee2..f532b34af 100644
--- a/jsowell-admin/src/test/java/SpringBootTestController.java
+++ b/jsowell-admin/src/test/java/SpringBootTestController.java
@@ -265,12 +265,12 @@ public class SpringBootTestController {
     @Test
     public void decryptPhoneNum(){
         // 前端接口返回的加密信息
-        String response ="{\"response\":\"CunEGSbDxsQaKllc35Q+4lJdLiprZhrHFt9erZriETVHv2IrtZsmC8cA6DE5l8GgzvgHCPdGp1iUJQhNyKog==\",\"sign\":\"BlmgjdRvvifS1d9LGcVzq66P7vYrpRHrSCY1SX8zDfU4vEiN4Kz9otxGA4Hz6vG0SoBdlg+Nc58JVUP1IXzQUIFrvAYLC2Uty9J60RmvyWjUf+1Njt7ifX5JgqhMPGOoz3H1OQ1NiqjT6L93KTHYjLt8q37U1aTBO72lQQRgSk0Yf+z1RbalBgRLXHYrgQNORoqJZNN4emQ0a63B30FAFbbko1JbR5eToLK2EcT7vG5rN7wH+3XGTeQ0em81ryNXYUjf7sKLDTsPu7Irk3okOiWMVUr83d3wkST9JWjnO5H7Advh0DaHA1aQnT9oKm82lcUA0r9eE8kqfTmuQ==\"}";
+        String response ="CunEGSbDxsQaKllc35Q+4lJdLiprZhrHFt9er/ZriETVHv2IrtZsmC8cA6DE5l8GgzvgHCPdGp1iUJQhNyKog==";
         //1. 获取解密所需要的参数
         Map<String, String> openapiResult = com.alibaba.fastjson.JSON.parseObject(response, new TypeReference<Map<String, String>>() {}, Feature.OrderedField);
         String charset = "UTF-8";
         String encryptType = "AES";
-        String content = openapiResult.get("response");
+        String content = "CunEGSbDxsQaKllc35Q+4lJdLiprZhrHFt9er/ZriETVHv2IrtZsmC8cA6DE5l8GgzvgHCPdGp1iUJQhNyKog==";
         // 判断是否为加密内容
         boolean isDataEncrypted = !content.startsWith("{");
         String decryptKey = "B_AES_KEY"; // 商家小程序 AES 密钥