From bc55ad61b65b076dc6edcd86a8becd94f03fb5e7 Mon Sep 17 00:00:00 2001 From: orgin Date: Mon, 5 Feb 2024 12:57:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/controller/LoginController.java | 20 +++++-------------- .../modules/feignclient/AlarmService.java | 4 ++++ .../modules/feignclient/AnalysisService.java | 4 ++++ .../modules/feignclient/MessageService.java | 4 ++++ .../modules/feignclient/StationService.java | 4 ++++ .../SystemClient.java} | 5 ++--- .../jeecg/modules/feignclient/WebService.java | 15 ++++++++++++++ .../jeecg/modules/service/AlarmService.java | 4 ---- .../modules/service/AnalysisService.java | 4 ---- .../jeecg/modules/service/MessageService.java | 4 ---- .../jeecg/modules/service/StationService.java | 4 ---- .../org/jeecg/modules/service/WebService.java | 4 ---- 12 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmService.java create mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AnalysisService.java create mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/MessageService.java create mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/StationService.java rename jeecg-module-app/src/main/java/org/jeecg/modules/{service/LoginService.java => feignclient/SystemClient.java} (90%) create mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebService.java delete mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/service/AlarmService.java delete mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/service/AnalysisService.java delete mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/service/MessageService.java delete mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/service/StationService.java delete mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/service/WebService.java diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/LoginController.java b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/LoginController.java index 8cbb320a..0d93fafe 100644 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/LoginController.java +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/LoginController.java @@ -2,31 +2,21 @@ package org.jeecg.modules.controller; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.ApiOperation; -import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; -import org.jeecg.common.constant.CacheConstant; -import org.jeecg.common.constant.CommonConstant; -import org.jeecg.common.system.util.JwtUtil; -import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.PasswordUtil; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.base.entity.postgre.SysDepart; -import org.jeecg.modules.base.entity.postgre.SysUser; import org.jeecg.modules.model.SysLoginModel; -import org.jeecg.modules.service.LoginService; +import org.jeecg.modules.feignclient.SystemClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.List; @RestController @RequestMapping("") public class LoginController { @Autowired - private LoginService loginService; + private SystemClient systemClient; /** * app登录 @@ -36,7 +26,7 @@ public class LoginController { */ @RequestMapping(value = "/mLogin", method = RequestMethod.POST) public Result mLogin(@RequestBody SysLoginModel sysLoginModel) { - return loginService.mLogin(sysLoginModel); + return systemClient.mLogin(sysLoginModel); } /** @@ -48,7 +38,7 @@ public class LoginController { @RequestMapping(value = "/logout") public Result logout(HttpServletRequest request, HttpServletResponse response) { //用户退出逻辑 - return loginService.logout(request, response); + return systemClient.logout(request, response); } /** @@ -59,6 +49,6 @@ public class LoginController { @ApiOperation("获取验证码") @GetMapping(value = "/randomImage/{key}") public Result randomImage(HttpServletResponse response,@PathVariable("key") String key) { - return loginService.randomImage(response, key); + return systemClient.randomImage(response, key); } } diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmService.java new file mode 100644 index 00000000..47cd76a7 --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmService.java @@ -0,0 +1,4 @@ +package org.jeecg.modules.feignclient; + +public interface AlarmService { +} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AnalysisService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AnalysisService.java new file mode 100644 index 00000000..0bd39e0e --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AnalysisService.java @@ -0,0 +1,4 @@ +package org.jeecg.modules.feignclient; + +public interface AnalysisService { +} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/MessageService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/MessageService.java new file mode 100644 index 00000000..04d29c4c --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/MessageService.java @@ -0,0 +1,4 @@ +package org.jeecg.modules.feignclient; + +public interface MessageService { +} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/StationService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/StationService.java new file mode 100644 index 00000000..630b5152 --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/StationService.java @@ -0,0 +1,4 @@ +package org.jeecg.modules.feignclient; + +public interface StationService { +} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/service/LoginService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/SystemClient.java similarity index 90% rename from jeecg-module-app/src/main/java/org/jeecg/modules/service/LoginService.java rename to jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/SystemClient.java index b755cd72..5f87e85e 100644 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/service/LoginService.java +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/SystemClient.java @@ -1,8 +1,7 @@ -package org.jeecg.modules.service; +package org.jeecg.modules.feignclient; import com.alibaba.fastjson.JSONObject; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.postgre.SysEmail; import org.jeecg.modules.model.SysLoginModel; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Component; @@ -15,7 +14,7 @@ import javax.servlet.http.HttpServletResponse; @Component @FeignClient(value = "armd-system", path = "/sys") -public interface LoginService { +public interface SystemClient { /** * 登录 diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebService.java new file mode 100644 index 00000000..94bc614d --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebService.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.feignclient; + +import com.alibaba.fastjson.JSONObject; +import org.jeecg.common.api.vo.Result; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.GetMapping; + +@Component +@FeignClient(value = "armd-web-statistics", path = "/sys") +public interface WebService { + + @GetMapping("/webStatistics/findStationList") + Result findStationList(); +} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/service/AlarmService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/service/AlarmService.java deleted file mode 100644 index 20f719ce..00000000 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/service/AlarmService.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.jeecg.modules.service; - -public interface AlarmService { -} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/service/AnalysisService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/service/AnalysisService.java deleted file mode 100644 index f691ddc8..00000000 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/service/AnalysisService.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.jeecg.modules.service; - -public interface AnalysisService { -} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/service/MessageService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/service/MessageService.java deleted file mode 100644 index 41695aa2..00000000 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/service/MessageService.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.jeecg.modules.service; - -public interface MessageService { -} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/service/StationService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/service/StationService.java deleted file mode 100644 index a0d8afd3..00000000 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/service/StationService.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.jeecg.modules.service; - -public interface StationService { -} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/service/WebService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/service/WebService.java deleted file mode 100644 index 79e1625c..00000000 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/service/WebService.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.jeecg.modules.service; - -public interface WebService { -}