Merge remote-tracking branch 'origin/v7.0_small_version_fix_20231120' into test

performance-web/src/main/java/com/clx/performance/aspect/ResetPasswordAnnotationAop.java

@@ -104,12 +104,15 @@ public class ResetPasswordAnnotationAop {
         Object returnVal = null;
 
         returnVal = jp.proceed();
-        Result result = JSONUtil.toBean(JSONUtil.parse(returnVal).toString(), Result.class);
+        if (!StringUtils.equals(aspectAnnotation.name(), "resetPassword")) {
+            Result result = JSONUtil.toBean(JSONUtil.parse(returnVal).toString(), Result.class);
 
-        redisTemplate.opsForValue().set(RedisConstants.MESSAGE_RESET_PASSWORD_TOKEN + mobile, result.getData().toString());
-        redisTemplate.expire(RedisConstants.MESSAGE_RESET_PASSWORD_TOKEN + mobile, 60, TimeUnit.SECONDS);
+            redisTemplate.opsForValue().set(RedisConstants.MESSAGE_RESET_PASSWORD_TOKEN + mobile, result.getData().toString());
+            redisTemplate.expire(RedisConstants.MESSAGE_RESET_PASSWORD_TOKEN + mobile, 60, TimeUnit.SECONDS);
+        }
 
         return returnVal;
+
     }
 
 }