From 7f847c9721ce83ce95c7dfdf7cf3a248547805ca Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Sun, 21 Feb 2021 14:37:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4jeecg-cloud-example=E4=BE=8B?= =?UTF-8?q?=E5=AD=90=E6=A8=A1=E5=9D=97=EF=BC=8C=E6=B5=8B=E8=AF=95=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=E9=87=8D=E6=9E=84=E5=88=B0jeecg-cloud-system-start?= =?UTF-8?q?=E4=B8=AD---?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/JcloudDemoController.java | 48 ++++ .../cloud/provider/JcloudDemoProvider.java} | 10 +- .../cloud/service/JcloudDemoService.java} | 4 +- .../service/impl/JcloudDemoServiceImpl.java | 13 + .../modules/demo/handler/DemoJobHandler.java | 234 ------------------ .../test/controller/JeecgDemoController.java | 48 ---- 6 files changed, 68 insertions(+), 289 deletions(-) create mode 100644 jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoController.java rename jeecg-boot/{jeecg-cloud-module/jeecg-cloud-example/src/main/java/org/jeecg/cloud/demo/test/provider/JeecgDemoProvider.java => jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/provider/JcloudDemoProvider.java} (67%) rename jeecg-boot/{jeecg-cloud-module/jeecg-cloud-example/src/main/java/org/jeecg/cloud/demo/test/service/JeecgDemoService.java => jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java} (51%) create mode 100644 jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java delete mode 100644 jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/handler/DemoJobHandler.java delete mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-example/src/main/java/org/jeecg/cloud/demo/test/controller/JeecgDemoController.java diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoController.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoController.java new file mode 100644 index 00000000..3dc3169e --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoController.java @@ -0,0 +1,48 @@ +//package org.jeecg.modules.demo.cloud.controller; +// +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +//import lombok.extern.slf4j.Slf4j; +//import org.jeecg.common.api.vo.Result; +//import org.jeecg.common.system.api.ISysBaseAPI; +//import org.jeecg.common.system.vo.DictModel; +//import org.springframework.web.bind.annotation.GetMapping; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RestController; +// +//import javax.annotation.Resource; +//import java.util.List; +// +///** +// * +// */ +//@Slf4j +//@Api(tags = "Cloud示例") +//@RestController +//@RequestMapping("/test") +//public class JcloudDemoController { +// +// +// @Resource +// private ISysBaseAPI sysBaseAPI; +// +// /** +// * 测试 +// * +// * @return +// */ +// @GetMapping("/remote") +// @ApiOperation(value = "测试feign", notes = "测试feign") +// public Result remoteDict() { +//// try{ +//// //睡5秒，网关Hystrix3秒超时，会触发熔断降级操作 +//// Thread.sleep(5000); +//// }catch (Exception e){ +//// e.printStackTrace(); +//// } +// List list = sysBaseAPI.queryAllDict(); +// return Result.OK(list); +// } +// +// +//} diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-example/src/main/java/org/jeecg/cloud/demo/test/provider/JeecgDemoProvider.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/provider/JcloudDemoProvider.java similarity index 67% rename from jeecg-boot/jeecg-cloud-module/jeecg-cloud-example/src/main/java/org/jeecg/cloud/demo/test/provider/JeecgDemoProvider.java rename to jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/provider/JcloudDemoProvider.java index beaa9e27..760d710c 100644 --- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-example/src/main/java/org/jeecg/cloud/demo/test/provider/JeecgDemoProvider.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/provider/JcloudDemoProvider.java @@ -1,7 +1,7 @@ -package org.jeecg.cloud.demo.test.provider; +package org.jeecg.modules.demo.cloud.provider; -import org.jeecg.cloud.demo.test.service.JeecgDemoService; import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.demo.cloud.service.JcloudDemoService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -14,14 +14,14 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("/test") -public class JeecgDemoProvider { +public class JcloudDemoProvider { @Resource - private JeecgDemoService jeecgDemoService; + private JcloudDemoService jcloudDemoService; @GetMapping("/getMessage") public Result getMessage(@RequestParam String name) { - return jeecgDemoService.getMessage(name); + return jcloudDemoService.getMessage(name); } } diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-example/src/main/java/org/jeecg/cloud/demo/test/service/JeecgDemoService.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java similarity index 51% rename from jeecg-boot/jeecg-cloud-module/jeecg-cloud-example/src/main/java/org/jeecg/cloud/demo/test/service/JeecgDemoService.java rename to jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java index 43c2140b..cb8227ee 100644 --- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-example/src/main/java/org/jeecg/cloud/demo/test/service/JeecgDemoService.java +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java @@ -1,7 +1,7 @@ -package org.jeecg.cloud.demo.test.service; +package org.jeecg.modules.demo.cloud.service; import org.jeecg.common.api.vo.Result; -public interface JeecgDemoService { +public interface JcloudDemoService { Result getMessage(String name); } diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java new file mode 100644 index 00000000..fd09950b --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java @@ -0,0 +1,13 @@ +package org.jeecg.modules.demo.cloud.service.impl; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.demo.cloud.service.JcloudDemoService; +import org.springframework.stereotype.Service; + +@Service +public class JcloudDemoServiceImpl implements JcloudDemoService { + @Override + public Result getMessage(String name) { + return Result.OK("Hello，" + name); + } +} diff --git a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/handler/DemoJobHandler.java b/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/handler/DemoJobHandler.java deleted file mode 100644 index 1d66f27e..00000000 --- a/jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/handler/DemoJobHandler.java +++ /dev/null @@ -1,234 +0,0 @@ -// -//package org.jeecg.modules.demo.handler; -// -// -//import com.xxl.job.core.biz.model.ReturnT; -//import com.xxl.job.core.handler.IJobHandler; -//import com.xxl.job.core.handler.annotation.XxlJob; -//import com.xxl.job.core.log.XxlJobLogger; -//import com.xxl.job.core.util.ShardingUtil; -//import lombok.extern.slf4j.Slf4j; -//import org.springframework.stereotype.Component; -// -//import java.io.BufferedInputStream; -//import java.io.BufferedReader; -//import java.io.DataOutputStream; -//import java.io.InputStreamReader; -//import java.net.HttpURLConnection; -//import java.net.URL; -//import java.util.Arrays; -// -// -///** -// * xxl-job定时任务测试 -// */ -//@Component -//@Slf4j -//public class DemoJobHandler { -// -// -// /** -// * 简单任务 -// * -// * @param params -// * @return -// */ -// -// @XxlJob(value = "demoJob") -// public ReturnT demoJobHandler(String params) { -// log.info("我是定时任务,我执行了..............................."); -// return ReturnT.SUCCESS; -// } -// -// /** -// * 2、分片广播任务 -// */ -// -// @XxlJob("shardingJobHandler") -// public ReturnT shardingJobHandler(String param) throws Exception { -// -// // 分片参数 -// ShardingUtil.ShardingVO shardingVO = ShardingUtil.getShardingVo(); -// XxlJobLogger.log("分片参数：当前分片序号 = {}, 总分片数 = {}", shardingVO.getIndex(), shardingVO.getTotal()); -// -// // 业务逻辑 -// for (int i = 0; i < shardingVO.getTotal(); i++) { -// if (i == shardingVO.getIndex()) { -// XxlJobLogger.log("第 {} 片, 命中分片开始处理", i); -// } else { -// XxlJobLogger.log("第 {} 片, 忽略", i); -// } -// } -// -// return ReturnT.SUCCESS; -// } -// -// -// /** -// * 3、命令行任务 -// */ -// -// @XxlJob("commandJobHandler") -// public ReturnT commandJobHandler(String param) throws Exception { -// String command = param; -// int exitValue = -1; -// -// BufferedReader bufferedReader = null; -// try { -// // command process -// Process process = Runtime.getRuntime().exec(command); -// BufferedInputStream bufferedInputStream = new BufferedInputStream(process.getInputStream()); -// bufferedReader = new BufferedReader(new InputStreamReader(bufferedInputStream)); -// -// // command log -// String line; -// while ((line = bufferedReader.readLine()) != null) { -// XxlJobLogger.log(line); -// } -// -// // command exit -// process.waitFor(); -// exitValue = process.exitValue(); -// } catch (Exception e) { -// XxlJobLogger.log(e); -// } finally { -// if (bufferedReader != null) { -// bufferedReader.close(); -// } -// } -// -// if (exitValue == 0) { -// return IJobHandler.SUCCESS; -// } else { -// return new ReturnT(IJobHandler.FAIL.getCode(), "command exit value(" + exitValue + ") is failed"); -// } -// } -// -// -// /** -// * 4、跨平台Http任务 -// * 参数示例： -// * "url: http://www.baidu.com\n" + -// * "method: get\n" + -// * "data: content\n"; -// */ -// -// @XxlJob("httpJobHandler") -// public ReturnT httpJobHandler(String param) throws Exception { -// -// // param parse -// if (param == null || param.trim().length() == 0) { -// XxlJobLogger.log("param[" + param + "] invalid."); -// return ReturnT.FAIL; -// } -// String[] httpParams = param.split("\n"); -// String url = null; -// String method = null; -// String data = null; -// for (String httpParam : httpParams) { -// if (httpParam.startsWith("url:")) { -// url = httpParam.substring(httpParam.indexOf("url:") + 4).trim(); -// } -// if (httpParam.startsWith("method:")) { -// method = httpParam.substring(httpParam.indexOf("method:") + 7).trim().toUpperCase(); -// } -// if (httpParam.startsWith("data:")) { -// data = httpParam.substring(httpParam.indexOf("data:") + 5).trim(); -// } -// } -// -// // param valid -// if (url == null || url.trim().length() == 0) { -// XxlJobLogger.log("url[" + url + "] invalid."); -// return ReturnT.FAIL; -// } -// if (method == null || !Arrays.asList("GET", "POST").contains(method)) { -// XxlJobLogger.log("method[" + method + "] invalid."); -// return ReturnT.FAIL; -// } -// -// // request -// HttpURLConnection connection = null; -// BufferedReader bufferedReader = null; -// try { -// // connection -// URL realUrl = new URL(url); -// connection = (HttpURLConnection) realUrl.openConnection(); -// -// // connection setting -// connection.setRequestMethod(method); -// connection.setDoOutput(true); -// connection.setDoInput(true); -// connection.setUseCaches(false); -// connection.setReadTimeout(5 * 1000); -// connection.setConnectTimeout(3 * 1000); -// connection.setRequestProperty("connection", "Keep-Alive"); -// connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8"); -// connection.setRequestProperty("Accept-Charset", "application/json;charset=UTF-8"); -// -// // do connection -// connection.connect(); -// -// // data -// if (data != null && data.trim().length() > 0) { -// DataOutputStream dataOutputStream = new DataOutputStream(connection.getOutputStream()); -// dataOutputStream.write(data.getBytes("UTF-8")); -// dataOutputStream.flush(); -// dataOutputStream.close(); -// } -// -// // valid StatusCode -// int statusCode = connection.getResponseCode(); -// if (statusCode != 200) { -// throw new RuntimeException("Http Request StatusCode(" + statusCode + ") Invalid."); -// } -// -// // result -// bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); -// StringBuilder result = new StringBuilder(); -// String line; -// while ((line = bufferedReader.readLine()) != null) { -// result.append(line); -// } -// String responseMsg = result.toString(); -// -// XxlJobLogger.log(responseMsg); -// return ReturnT.SUCCESS; -// } catch (Exception e) { -// XxlJobLogger.log(e); -// return ReturnT.FAIL; -// } finally { -// try { -// if (bufferedReader != null) { -// bufferedReader.close(); -// } -// if (connection != null) { -// connection.disconnect(); -// } -// } catch (Exception e2) { -// XxlJobLogger.log(e2); -// } -// } -// -// } -// -// -// /** -// * 5、生命周期任务示例：任务初始化与销毁时，支持自定义相关逻辑； -// */ -// -// @XxlJob(value = "demoJobHandler2", init = "init", destroy = "destroy") -// public ReturnT demoJobHandler2(String param) throws Exception { -// XxlJobLogger.log("XXL-JOB, Hello World."); -// return ReturnT.SUCCESS; -// } -// -// public void init() { -// log.info("init"); -// } -// -// public void destroy() { -// log.info("destory"); -// } -//} -// diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-example/src/main/java/org/jeecg/cloud/demo/test/controller/JeecgDemoController.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-example/src/main/java/org/jeecg/cloud/demo/test/controller/JeecgDemoController.java deleted file mode 100644 index 3373325d..00000000 --- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-example/src/main/java/org/jeecg/cloud/demo/test/controller/JeecgDemoController.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.jeecg.cloud.demo.test.controller; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.api.ISysBaseAPI; -import org.jeecg.common.system.vo.DictModel; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -/** - * - */ -@Slf4j -@Api(tags = "jeecg-demo") -@RestController -@RequestMapping("/test") -public class JeecgDemoController { - - - @Resource - private ISysBaseAPI sysBaseAPI; - - /** - * 测试 - * - * @return - */ - @GetMapping("/demo") - @ApiOperation(value = "测试方法", notes = "测试方法") - public Result mockChange2() { -// try{ -// //睡5秒，网关Hystrix3秒超时，会触发熔断降级操作 -// Thread.sleep(5000); -// }catch (Exception e){ -// e.printStackTrace(); -// } - List list = sysBaseAPI.queryAllDict(); - return Result.OK(list); - } - - -} -- GitLab