页面成功加载

JobService/pom.xml

@@ -42,6 +42,11 @@
             <artifactId>quartz</artifactId>
             <version>2.3.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

JobService/src/main/java/com/java110/job/Java110JobserviceApplication.java

@@ -18,7 +18,11 @@ import org.springframework.web.client.RestTemplate;
 import java.nio.charset.Charset;
 
 @SpringBootApplication(
-        scanBasePackages = {"com.java110.service", "com.java110.job", "com.java110.core", "com.java110.cache", "com.java110.db"},
+        scanBasePackages = {"com.java110.service",
+                "com.java110.job",
+                "com.java110.core",
+                "com.java110.cache",
+                "com.java110.db"},
         excludeName = {"com.java110.core.smo.jobservice"}
 )
 @EnableDiscoveryClient

JobService/src/main/java/com/java110/job/controller/JobController.java

@@ -1,14 +1,13 @@
 package com.java110.job.controller;
 
 import com.java110.core.base.controller.BaseController;
-import com.java110.core.context.IPageData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 
 /**
@@ -25,24 +24,12 @@ public class JobController extends BaseController {
     /**
      * 首页处理方法
      *
-     * @param JobCode 编码
-     * @param request  请求对象
      * @return 页面名称
      */
-    @RequestMapping(path = "/Job/{JobCode}")
-    public String flow(@PathVariable String JobCode,
-                       HttpServletRequest request) {
-        logger.debug("请求流程 {},{}", JobCode, new Date());
-        /*try {
-            IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
-            validateFlowData(flowCode, pd);
-
-        } catch (Throwable e) {
-            flowCode = "error";
-        }*/
-        System.out.println(JobCode);
-
-        return "prvncFtpToFileSystemConfigList";
+    @RequestMapping(path = "/FtpToFileSystemConfigList")
+    public ModelAndView flow() {
+        logger.debug("请求流程 {},{}", new StringBuffer("prvncFtpToFileSystem"), new Date());
+        return new ModelAndView("prvncFtpToFileSystemConfigList");
     }
 
 

JobService/src/main/resources/application-dev.yml

@@ -60,10 +60,17 @@ spring:
     driverClassName: com.mysql.jdbc.Driver
     maxActive: 20
     username: TT
-  mvc:
-    view:
-      prefix: classpath:/view/
-      suffix: .html
+  thymeleaf:
+    mode: LEGACYHTML5
+    cache: false
+    prefix: classpath:/templates/
+    encoding: UTF-8
+    suffix: .html
+    content-type: text/html
+#  mvc:
+#    view:
+#      prefix: classpath:/templates/
+#      suffix: .html
 
 #============== kafka ===================
 kafka:
@@ -97,23 +104,23 @@ kafka:
     buffer:
       memory: 40960
 
-  quartz:
-    properties:
-      org:
-        quartz:
-          scheduler:
-            instanceName: clusteredScheduler
-            instanceId: AUTO
-          jobStore:
-            class: org.quartz.impl.jdbcjobstore.JobStoreTX
-            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-            tablePrefix: HC_
-            isClustered: false
-            clusterCheckinInterval: 10000
-            useProperties: false
-          threadPool:
-            class: org.quartz.simpl.SimpleThreadPool
-            threadCount: 10
-            threadPriority: 5
-            threadsInheritContextClassLoaderOfInitializingThread: true
-    job-store-type: jdbc
+quartz:
+  properties:
+    org:
+      quartz:
+        scheduler:
+          instanceName: clusteredScheduler
+          instanceId: AUTO
+        jobStore:
+          class: org.quartz.impl.jdbcjobstore.JobStoreTX
+          driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+          tablePrefix: HC_
+          isClustered: false
+          clusterCheckinInterval: 10000
+          useProperties: false
+        threadPool:
+          class: org.quartz.simpl.SimpleThreadPool
+          threadCount: 10
+          threadPriority: 5
+          threadsInheritContextClassLoaderOfInitializingThread: true
+  job-store-type: jdbc

JobService/src/main/resources/application.yml

@@ -1,3 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: dev
+server:
+  servlet:
+    context-path: /

JobService/src/main/resources/static/js/prvncFtpToFileSystemConfigList.js

@@ -1,6 +1,6 @@
 $(document).ready(function(){
 　　// 开始加载数据（任务数据）
-    loadTaskData();
+    //loadTaskData();
 });
 /**
  * 加载任务数据（分页查询）

JobService/src/main/resources/view/prvncFtpToFileSystemConfigList.html

@@ -1,12 +1,10 @@
-<!DOCTYPE html>
 <html>
 	<head>
 		<meta charset="UTF-8">
-		<title>能力开放平台-通用FTP数据文件与TFS传接</title>
+		<title>通用FTP数据文件与TFS传接</title>
 		<!--    <link rel="stylesheet" href="../ftpcss/bootstrap-combined.min.css"/>-->
-		<link rel="stylesheet" href="../css/bootstrap.min.css" />
-		<link rel="stylesheet"
-			href="../css/prvncFtpToFileSystemConfigList.css" />
+		<link rel="stylesheet" type="text/css" href="../css/bootstrap.min.css" />
+		<link rel="stylesheet" type="text/css" href="../css/prvncFtpToFileSystemConfigList.css" />
 	</head>
 	<body>
 		<nav class="navbar navbar-default" role="navigation">
@@ -15,7 +13,7 @@
 				<div class="col-md-4">
 					<p class="navbar-text">
 						<span>位置：</span>
-						<a href="../">能力开放平台</a>
+						<a href="https://demo.java110.com">HC平台</a>
 						<span class="glyphicon glyphicon-menu-right "
 							style="font-size: 6px;"></span>
 						<span>通用FTP数据文件与TFS传接</span>