Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
xupei
2023-10-06 15:56:51 +08:00

View File

@@ -885,12 +885,12 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
try { try {
response = client.newCall(request).execute(); response = client.newCall(request).execute();
} catch (IOException ioException) { } catch (IOException ioException) {
log.error("PythonService##design异常###{}", ExceptionUtil.getThrowableList(ioException)); log.error("PythonService##design进度条异常###{}", ExceptionUtil.getThrowableList(ioException));
} }
//去除限流 //去除限流
// AccessLimitUtils.validateOut("design"); // AccessLimitUtils.validateOut("design");
if (Objects.isNull(response)) { if (Objects.isNull(response)) {
log.error("PythonService##design异常###{}", "response or body is empty!"); log.error("PythonService##design进度条异常###{}", "response or body is empty!");
throw new BusinessException("system error!"); throw new BusinessException("system error!");
} }
if (response.isSuccessful()) { if (response.isSuccessful()) {
@@ -903,8 +903,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
//生成失败 return 0;
throw new BusinessException("generate design exception!");
} }
private String converTypeToLevel1(String type) { private String converTypeToLevel1(String type) {