瀏覽代碼

修复一些细节上的问题

wukai 1 年之前
父節點
當前提交
5308b66858

+ 1 - 1
sync-admin/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://192.168.188.88:3306/xjsync?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://localhost:3306/xjsync?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: 123456
       # 从库数据源

+ 0 - 26
sync-in/src/main/java/com/jjt/in/task/InEsTask.java

@@ -1,26 +0,0 @@
-package com.jjt.in.task;
-
-import com.jjt.in.service.IInEsService;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-
-/**
- * Es定时任务
- *
- * @author ruoyi
- */
-@Component("inEsTask")
-public class InEsTask {
-    @Resource
-    private IInEsService inEsService;
-
-    public void parseSyncFile() {
-//        inEsService.parseSyncFile();
-    }
-
-    public void esImport() {
-        System.out.println("执行有参方法:");
-    }
-
-}

+ 2 - 5
sync-in/src/main/java/com/jjt/in/task/InProcessTask.java

@@ -17,11 +17,8 @@ public class InProcessTask {
     private IInProcessService processService;
 
     public void sync() {
+        processService.downloadFtpFile();
+        processService.deleteFtpFile();
         processService.unzip();
     }
-
-    public void esImport() {
-        System.out.println("执行有参方法:");
-    }
-
 }

+ 2 - 2
sync-quartz/src/main/resources/templates/monitor/job/job.html

@@ -77,8 +77,8 @@
 		        updateUrl: prefix + "/edit/{id}",
 		        removeUrl: prefix + "/remove",
 		        exportUrl: prefix + "/export",
-		        sortName: "createTime",
-		        sortOrder: "desc",
+		        sortName: "jobName",
+		        sortOrder: "asc",
 		        modalName: "任务",
 		        columns: [{
 		            checkbox: true