【3.2.0 版本发布】微服务测试示例调整

zhangdaiscott
1 parent 04c243f8
Showing 5 changed files with 25 additions and 20 deletions
jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java
jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java
@@ -18,10 +18,10 @@
 // *
 // */
 //@Slf4j
-//@Api(tags = "Cloud示例")
+//@Api(tags = "【微服务】单元测试")
 //@RestController
 //@RequestMapping("/test")
-//public class JcloudDemoController {
+//public class JcloudDemoFeignController {
 //    @Resource
 //    private ISysBaseAPI sysBaseApi;
 ////    @Autowired
@@ -32,10 +32,10 @@
 //     *
 //     * @return
 //     */
-//    @GetMapping("/remote")
-//    @SentinelResource(value = "remoteDict",fallback = "getDefaultHandler")
-//    @ApiOperation(value = "测试feign", notes = "测试feign")
-//    public Result remoteDict() {
+//    @GetMapping("/callSystem")
+//    //@SentinelResource(value = "remoteDict",fallback = "getDefaultHandler")
+//    @ApiOperation(value = "通过feign调用system服务", notes = "测试jeecg-demo服务，是否通过fegin调用system服务接口")
+//    public Result getRemoteDict() {
 //        List<DictModel> list = sysBaseApi.queryAllDict();
 //        return Result.OK(list);
 //    }
@@ -47,9 +47,9 @@
 ////     *  http://doc.jeecg.com/2194069
 ////     * @return
 ////     */
-////    @GetMapping("/remoteErp")
+////    @GetMapping("/callErp")
 ////    @ApiOperation(value = "测试feign erp", notes = "测试feign erp")
-////    public Result remoteCrm() {
+////    public Result callErp() {
 ////        log.info("call erp 服务");
 ////        String res = erpHelloApi.callHello();
 ////        return Result.OK(res);
@@ -62,8 +62,7 @@
 //     */
 //    public Result<Object> getDefaultHandler() {
 //        log.info("测试JcloudDemoController-remoteDict 熔断降级");
-//        return Result.OK("测试JcloudDemoController-remoteDict 熔断降级");
+//        return Result.error("测试JcloudDemoController-remoteDict 熔断降级");
 //    }
 //
-//
 //}
-package org.jeecg.modules.demo.cloud.provider;
+package org.jeecg.modules.demo.cloud.controller;
  
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.demo.cloud.service.JcloudDemoService;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -10,19 +11,23 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
  
 /**
- * feign服务端接口
+ * 服务端提供方——feign接口
+ * 【提供给system-start调用测试，看feign是否畅通】
  * @author: jeecg-boot
  */
+@Slf4j
 @RestController
 @RequestMapping("/test")
-public class JcloudDemoProvider {
+public class JcloudDemoProviderController {
  
     @Resource
     private JcloudDemoService jcloudDemoService;
  
     @GetMapping("/getMessage")
-    public Result<String> getMessage(@RequestParam String name) {
-        return jcloudDemoService.getMessage(name);
+    public String getMessage(@RequestParam String name) {
+        String msg = jcloudDemoService.getMessage(name);
+        log.info(" 微服务被调用：{} ",msg);
+        return msg;
     }
  
 }
@@ -13,5 +13,5 @@ public interface JcloudDemoService {
      * @param name 姓名
      * @return "Hello，" + name
      */
-    Result<String> getMessage(String name);
+    String getMessage(String name);
 }
@@ -11,7 +11,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class JcloudDemoServiceImpl implements JcloudDemoService {
     @Override
-    public Result<String> getMessage(String name) {
-        return Result.OK("Hello，" + name);
+    public String getMessage(String name) {
+        String resMsg = "Hello，我是jeecg-demo服务节点，收到你的消息：【 "+ name +" 】";
+        return resMsg;
     }
 }
 //
-//package org.jeecg.modules.demo.xxljob;
+//package org.jeecg.modules.demo.cloud.xxljob;
 //
 //import com.xxl.job.core.biz.model.ReturnT;
 //import com.xxl.job.core.handler.annotation.XxlJob;
@@ -17,8 +17,8 @@
 ///**
 // * xxl-job定时任务测试
 // */
-//@Component
 //@Slf4j
+//@Component
 //public class TestJobHandler {
 //    @Autowired
 //    ISysBaseAPI sysBaseApi;