From f8c25d1fab78aa4e0a6bdb10f91e61698af434c4 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 01 七月 2022 14:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/Test.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/Test.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/Test.java
index 821dc7c..d26310d 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/Test.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/Test.java
@@ -1,9 +1,11 @@
package com.gkhy.safePlatform.emergency.controller;
-import com.gkhy.safePlatform.account.rpc.apimodel.NameService;
+import com.gkhy.safePlatform.account.rpc.apimodel.UserAccountService;
+import com.gkhy.safePlatform.emergency.service.DemoService;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -13,14 +15,19 @@
public class Test {
@DubboReference(check = false)
- private NameService nameService;
+ private UserAccountService userAccountService;
-// private Logger logger = LogManager.getLogger(Test.class);
-
+ @Autowired
+ private DemoService demoService;
@RequestMapping(value = "/t/rpc",method = RequestMethod.GET)
public Object testRpc(String id){
- String resp = nameService.sayName(id);
+ String resp = userAccountService.sayName(id);
return resp;
}
+
+ @RequestMapping(value = "/t/get",method = RequestMethod.GET)
+ public Object testEmergencyGetById(Long id){
+ return demoService.getById(id);
+ }
}
--
Gitblit v1.9.2