兼容历史渠道前端未兼容的问题

src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java

@@ -178,7 +178,7 @@ public class UserController implements IBaseController {
             @RequestParam(required = false, defaultValue = "") String userId,
             @RequestParam(required = false, defaultValue = "xyqb") String key,
             @RequestParam(required = false) String dimension,
-            @RequestParam Long geetestLogId,
+            @RequestParam(required = false) Long geetestLogId,
             HttpServletRequest request) {
         log.info("login -> channelId:{},appChannel:{},createdFrom:{},userId:{},key:{},dimension:{}", channelId, appChannel, createdFrom, userId, key, dimension);
         Merchant merchant = merchantService.findMerchantByName(key);

src/main/java/cn/quantgroup/xyqb/service/captcha/impl/GeetestLogServiceImpl.java

@@ -8,7 +8,6 @@ import cn.quantgroup.xyqb.service.captcha.IGeetestLogService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.sql.Timestamp;
@@ -33,8 +32,8 @@ public class GeetestLogServiceImpl implements IGeetestLogService {
         geetestLogEntity.setPhoneNo(phoneNo);
         geetestLogEntity.setDataSource(ClientType.valueByName(clientType).ordinal());
         geetestLogEntity.setSetting(SettingType.valueByName(settingType).ordinal());
-        geetestLogEntity.setChallenge(imgMap.get("reChallenge"));
-        geetestLogEntity.setCaptchaId(imgMap.get("gt"));
+        geetestLogEntity.setChallenge(imgMap.getOrDefault("reChallenge", ""));
+        geetestLogEntity.setCaptchaId(imgMap.getOrDefault("gt", ""));
         geetestLogEntity = geetestLogRepository.saveAndFlush(geetestLogEntity);
         return geetestLogEntity.getId();
     }