fix:修改包名

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<JSONObject> mLogin(@RequestBody SysLoginModel sysLoginModel) {
-        return loginService.mLogin(sysLoginModel);
+        return systemClient.mLogin(sysLoginModel);
     }
 
     /**
@@ -48,7 +38,7 @@ public class LoginController {
     @RequestMapping(value = "/logout")
     public Result<Object> 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<String> randomImage(HttpServletResponse response,@PathVariable("key") String key) {
-        return loginService.randomImage(response, key);
+        return systemClient.randomImage(response, key);
     }
 }

jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmService.java

@@ -0,0 +1,4 @@
+package org.jeecg.modules.feignclient;
+
+public interface AlarmService {
+}

jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AnalysisService.java

@@ -0,0 +1,4 @@
+package org.jeecg.modules.feignclient;
+
+public interface AnalysisService {
+}

jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/MessageService.java

@@ -0,0 +1,4 @@
+package org.jeecg.modules.feignclient;
+
+public interface MessageService {
+}

jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/StationService.java

@@ -0,0 +1,4 @@
+package org.jeecg.modules.feignclient;
+
+public interface StationService {
+}

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 {
 
     /**
      * 登录

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<JSONObject> findStationList();
+}

jeecg-module-app/src/main/java/org/jeecg/modules/service/AlarmService.java

@@ -1,4 +0,0 @@
-package org.jeecg.modules.service;
-
-public interface AlarmService {
-}

jeecg-module-app/src/main/java/org/jeecg/modules/service/AnalysisService.java

@@ -1,4 +0,0 @@
-package org.jeecg.modules.service;
-
-public interface AnalysisService {
-}

jeecg-module-app/src/main/java/org/jeecg/modules/service/MessageService.java

@@ -1,4 +0,0 @@
-package org.jeecg.modules.service;
-
-public interface MessageService {
-}

jeecg-module-app/src/main/java/org/jeecg/modules/service/StationService.java

@@ -1,4 +0,0 @@
-package org.jeecg.modules.service;
-
-public interface StationService {
-}

jeecg-module-app/src/main/java/org/jeecg/modules/service/WebService.java

@@ -1,4 +0,0 @@
-package org.jeecg.modules.service;
-
-public interface WebService {
-}