diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AgvTaskServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AgvTaskServiceImpl.java index 51402a9..568f4bd 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AgvTaskServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/AgvTaskServiceImpl.java @@ -354,7 +354,7 @@ public class AgvTaskServiceImpl implements AgvTaskService { } private void sendAgvTask(AgvTask agvTask, String json) { - /*String resultJson = HttpPostUtil.sendPostReq(UrlApi.submitMission(), json); + String resultJson = HttpPostUtil.sendPostReq(UrlApi.submitMission(), json); if (StringUtils.isEmpty(resultJson)) { throw new RuntimeException("AGV返回信息:下发任务接口调用失败!"); } @@ -364,10 +364,7 @@ public class AgvTaskServiceImpl implements AgvTaskService { } String code = resulObject.getString("code"); - String message = resulObject.getString("message");*/ - String resultJson = null; - String code = "0"; - String message = ""; + String message = resulObject.getString("message"); if (!"0".equals(code)) { throw new RuntimeException("AGV返回信息:" + message); } else { diff --git a/youchain-system/src/main/resources/config/application.yml b/youchain-system/src/main/resources/config/application.yml index aee462d..b97f608 100644 --- a/youchain-system/src/main/resources/config/application.yml +++ b/youchain-system/src/main/resources/config/application.yml @@ -6,8 +6,8 @@ spring: freemarker: check-template-location: false profiles: - #active: prod - active: dev + active: prod + #active: dev jackson: time-zone: GMT+8 data: @@ -36,11 +36,11 @@ spring: redis: #数据库索引 database: ${REDIS_DB:2} - #host: ${REDIS_HOST:192.168.100.102} - #password: ${REDIS_PWD:123456} + host: ${REDIS_HOST:192.168.100.102} + password: ${REDIS_PWD:123456} - host: ${REDIS_HOST:localhost} - password: ${REDIS_PWD:} + #host: ${REDIS_HOST:localhost} + #password: ${REDIS_PWD:} port: ${REDIS_PORT:6379} #连接超时时间 timeout: 5000