diff --git a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/DateTimeUtils.java b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/DateTimeUtils.java index 4dc5f06..9e123fd 100644 --- a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/DateTimeUtils.java +++ b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/DateTimeUtils.java @@ -11,6 +11,6 @@ public class DateTimeUtils { public static LocalDateTime getNowLocalDateTime(String zoneId) { ZoneId id = ZoneId.of(zoneId); - return LocalDateTime.now().atZone(id).toLocalDateTime(); + return LocalDateTime.now(id); } } diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/ActionTime.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/ActionTime.java index 17d6c57..9ea4807 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/ActionTime.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/ActionTime.java @@ -5,8 +5,10 @@ import com.qiuguo.iot.base.utils.DateTimeUtils; import com.qiuguo.iot.base.utils.StringUtils; import lombok.Data; +import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; +import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.util.TimeZone; @@ -39,15 +41,6 @@ public class ActionTime { time = t; localDateTime = DateTimeUtils.getNowLocalDateTime(); } - //解析生成其他时间 - //现在,今天,明天,后天,昨天,前天,*天后,*天, - // 下周*, *周后,*周, - // 下个月*, *个月 *月后 - // 今年,明年,后年,去年,前年,*年 *年后 - //*分钟 - //*小时 - //*秒 - //*号 DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter df1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); diff --git a/iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml b/iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml index 303ef87..0809ece 100644 --- a/iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml +++ b/iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: 8080 + port: 8081 spring: application: name: qiuguo-iot-box-user-api \ No newline at end of file diff --git a/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-dev.yml b/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-dev.yml index 030f013..e32187f 100644 --- a/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-dev.yml +++ b/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-dev.yml @@ -49,7 +49,7 @@ tts: #max: # text: 30 #当发送给前端文字超过改值时,分批发送给前端 suanfa: true #nacos控制变化 - url: http://192.168.8.211:18000/run/predict #算法语音合成 + url: http://47.110.40.30:18000/run/predict #http://192.168.8.211:18000/run/predict #算法语音合成 lac: #type: suanfa #nacos控制变化 huburl: http://192.168.8.175:8866/predict/lac