diff --git a/mystyle-cloud-admin-manager/pom.xml b/mystyle-cloud-admin-manager/pom.xml
index 2d0d9a7..5431f30 100644
--- a/mystyle-cloud-admin-manager/pom.xml
+++ b/mystyle-cloud-admin-manager/pom.xml
@@ -31,12 +31,6 @@
1.0-SNAPSHOT
-
- com.zhangmeng
- mystyle-cloud-model
- 1.0-SNAPSHOT
-
-
org.springframework.boot
spring-boot-starter-web
diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java
index f8a1dfd..75433ee 100644
--- a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java
+++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/controller/UrlRequestController.java
@@ -3,6 +3,7 @@ package com.zhangmeng.admin.manager.controller;
import com.alibaba.fastjson.JSONObject;
import com.zhangmeng.admin.manager.feign.ArticleFeign;
import com.zhangmeng.admin.manager.feign.CategoryFeign;
+import com.zhangmeng.admin.manager.feign.QuartzFeign;
import com.zhangmeng.admin.manager.service.PermissionService;
import com.zhangmeng.admin.manager.service.RoleService;
import com.zhangmeng.admin.manager.service.SysLogService;
@@ -22,6 +23,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import springfox.documentation.annotations.ApiIgnore;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.util.*;
/**
@@ -53,6 +56,9 @@ public class UrlRequestController extends BaseController {
@Autowired
private CategoryFeign categoryFeign;
+ @Autowired
+ private QuartzFeign quartzFeign;
+
//跳转首页
@GetMapping({"/login","/"})
public ModelAndView login (){
@@ -302,4 +308,31 @@ public class UrlRequestController extends BaseController {
public ModelAndView file_upload(){
return this.jumpPage("admin/file/upload");
}
+
+
+ @ApiIgnore
+ @GetMapping("/quartz/index")
+ public ModelAndView quartz_index(){
+ return this.jumpPage("admin/job/job-list");
+ }
+
+ @ApiIgnore
+ @GetMapping("/quartz/add")
+ public ModelAndView quartz_add(Model model){
+ Set names = this.quartzFeign.spring_bean_list();
+ model.addAttribute("spring_bean_list",names);
+ return this.jumpPage("admin/job/job-add");
+ }
+
+ @ApiIgnore
+ @GetMapping("/quartz/edit")
+ public ModelAndView quartz_edit(Model model,String jobId){
+ Set names = this.quartzFeign.spring_bean_list();
+ model.addAttribute("spring_bean_list",names);
+ if (CommonUtil.isNotNull(jobId)){
+ QuartzJob job = this.quartzFeign.findById(Long.parseLong(jobId));
+ model.addAttribute("job",job);
+ }
+ return this.jumpPage("admin/job/job-edit");
+ }
}
diff --git a/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/QuartzFeign.java b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/QuartzFeign.java
new file mode 100644
index 0000000..d98a035
--- /dev/null
+++ b/mystyle-cloud-admin-manager/src/main/java/com/zhangmeng/admin/manager/feign/QuartzFeign.java
@@ -0,0 +1,19 @@
+package com.zhangmeng.admin.manager.feign;
+
+import com.zhangmeng.model.dto.SysConstant;
+import com.zhangmeng.model.entity.QuartzJob;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Set;
+
+@FeignClient(SysConstant.mystyle_cloud_quartz)
+public interface QuartzFeign {
+
+ @GetMapping("/quartz/spring_bean_list")
+ public Set spring_bean_list();
+
+ @GetMapping("/quartz/findById")
+ public QuartzJob findById(@RequestParam("jobId") Long jobId);
+}
diff --git a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/file/list.ftl b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/file/list.ftl
index 645b3fa..352cb29 100644
--- a/mystyle-cloud-admin-manager/src/main/resources/templates/admin/file/list.ftl
+++ b/mystyle-cloud-admin-manager/src/main/resources/templates/admin/file/list.ftl
@@ -79,6 +79,17 @@
{{# } }}
+
+