diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/interceptor/FactoryAccountsInterceptor.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/interceptor/FactoryAccountsInterceptor.java index e3351d28b..31740be1b 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/interceptor/FactoryAccountsInterceptor.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/interceptor/FactoryAccountsInterceptor.java @@ -134,12 +134,14 @@ public class FactoryAccountsInterceptor implements HandlerInterceptor { request = wrappedRequest; RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request)); return true; + } else { + returnJson(response, JSONObject.toJSONString(R.fail(1, "认证不通过,配置缺失"))); + return false; } - }else{ + } else { returnJson(response, JSONObject.toJSONString(R.fail(1, "缺少参数 companyCode"))); return false; } - return false; } catch (Exception e) { e.printStackTrace(); returnJson(response, JSONObject.toJSONString(R.fail(5, "服务异常,请联系管理员"))); diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/pros/FactoryDataSuoFeiYaProperties.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/pros/FactoryDataSuoFeiYaProperties.java index 45cdf1d01..184147872 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/pros/FactoryDataSuoFeiYaProperties.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/pros/FactoryDataSuoFeiYaProperties.java @@ -18,7 +18,7 @@ public class FactoryDataSuoFeiYaProperties { private String auth; /** auth过期时间 */ - private Long authTime; + private Long authTime = 5L; /** 回传配置 */ private PushProperties push; diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java index e5b1bcc02..f78dd87fb 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java @@ -254,13 +254,13 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl factoryAuth = baseMapper.findFactoryAuth(companyCode); - if(CollUtil.isNotEmpty(factoryAuth)){ + if (CollUtil.isNotEmpty(factoryAuth)) { FactoryAuthVO authVO = factoryAuth.get(0); bladeRedis.setEx(key, JSONUtil.toJsonStr(authVO), Duration.ofDays(1)); return authVO; @@ -274,7 +274,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl