Merge branch 'fu-dev' of uskycloud/usky-modules into master

service-iot/service-iot-api/src/main/java/com/usky/iot/RemoteIotService.java

@@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 @FeignClient(contextId = "remoteIotService", value = "service-iot" , fallbackFactory = RemoteIotFactory.class)
 public interface RemoteIotService {
 
-    @GetMapping("/executeTimedSending")
-    void executeTimedSending();
+    @GetMapping("/executeTimedSendingOld")
+    void executeTimedSendingOld();
 
-    @GetMapping("/reportSubmissionReminder")
-    void reportSubmissionReminder();
+    @GetMapping("/reportSubmissionReminderOld")
+    void reportSubmissionReminderOld();
 }

service-iot/service-iot-api/src/main/java/com/usky/iot/factory/RemoteIotFactory.java

@@ -24,13 +24,13 @@ public class RemoteIotFactory implements FallbackFactory<RemoteIotService>
         return new RemoteIotService()
         {
             @Override
-            public void executeTimedSending() {
+            public void executeTimedSendingOld() {
                 log.error("工作报告定时发送异常:{}", throwable.getMessage());
                 throw new FeignBadRequestException(500,"工作报告定时发送异常"+throwable.getMessage());
             }
 
             @Override
-            public void reportSubmissionReminder() {
+            public void reportSubmissionReminderOld() {
                 log.error("工作报告提交提醒发送异常:{}", throwable.getMessage());
                 throw new FeignBadRequestException(500,"工作报告提交提醒发送异常"+throwable.getMessage());
             }

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/api/PmTimedSendingApi.java

@@ -21,13 +21,13 @@ public class PmTimedSendingApi implements RemoteIotService {
     private PmWorkReportService pmWorkReportService;
 
     @Override
-    public void executeTimedSending() {
+    public void executeTimedSendingOld() {
         LocalDateTime now = LocalDateTime.now();
         pmWorkReportService.timedSending(now);
     }
 
     @Override
-    public void reportSubmissionReminder() {
+    public void reportSubmissionReminderOld() {
         pmWorkReportService.reportSubmissionReminder();
     }
 

service-iot/service-iot-biz/src/main/resources/logback.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="/var/log/uskycloud/service-pm" />
+    <property name="log.path" value="/var/log/uskycloud/service-iot" />
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{26}:%line: %msg%n" />
     <!--    	<property name="log.pattern" value="%gray(%d{MM-dd HH:mm:ss.SSS}) %highlight(%-5level) &#45;&#45; [%gray(%thread)] %cyan(%logger{26}:%line): %msg%n" />-->
 
 
-    <property name="SQL_PACKAGE" value="com.usky.pm.mapper"/>
+    <property name="SQL_PACKAGE" value="com.usky.iot.mapper"/>
 
     <!-- 控制台输出 -->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">