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 97883e0e..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 @@ -1,11 +1,54 @@ package org.jeecg.modules.controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.model.SysLoginModel; +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; @RestController @RequestMapping("") public class LoginController { + @Autowired + private SystemClient systemClient; + /** + * app登录 + * @param sysLoginModel + * @return + * @throws Exception + */ + @RequestMapping(value = "/mLogin", method = RequestMethod.POST) + public Result mLogin(@RequestBody SysLoginModel sysLoginModel) { + return systemClient.mLogin(sysLoginModel); + } + + /** + * 退出登录 + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/logout") + public Result logout(HttpServletRequest request, HttpServletResponse response) { + //用户退出逻辑 + return systemClient.logout(request, response); + } + + /** + * 后台生成图形验证码 ：有效 + * @param response + * @param key + */ + @ApiOperation("获取验证码") + @GetMapping(value = "/randomImage/{key}") + public Result randomImage(HttpServletResponse response,@PathVariable("key") String 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/feignclient/SystemClient.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/SystemClient.java new file mode 100644 index 00000000..5f87e85e --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/SystemClient.java @@ -0,0 +1,45 @@ +package org.jeecg.modules.feignclient; + +import com.alibaba.fastjson.JSONObject; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.model.SysLoginModel; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@Component +@FeignClient(value = "armd-system", path = "/sys") +public interface SystemClient { + + /** + * 登录 + * @return + */ + @GetMapping("/mLogin") + Result mLogin(SysLoginModel sysLoginModel); + + /** + * 登出 + * @return + */ + @GetMapping("/logout") + Result logout(HttpServletRequest request, HttpServletResponse response); + + /** + * 图形验证码 + */ + @GetMapping("/randomImage/{key}") + Result randomImage(HttpServletResponse response,@PathVariable("key") String key); + + /** + * 图形验证码 + * @return + */ + @PostMapping("/checkCaptcha") + Result checkCaptcha(); +} 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/model/SysLoginModel.java b/jeecg-module-app/src/main/java/org/jeecg/modules/model/SysLoginModel.java new file mode 100644 index 00000000..859a71dc --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/model/SysLoginModel.java @@ -0,0 +1,55 @@ +package org.jeecg.modules.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * 登录表单 + * + * @Author scott + * @since 2019-01-18 + */ +@ApiModel(value="登录对象", description="登录对象") +public class SysLoginModel { + @ApiModelProperty(value = "账号") + private String username; + @ApiModelProperty(value = "密码") + private String password; + @ApiModelProperty(value = "验证码") + private String captcha; + @ApiModelProperty(value = "验证码key") + private String checkKey; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getCaptcha() { + return captcha; + } + + public void setCaptcha(String captcha) { + this.captcha = captcha; + } + + public String getCheckKey() { + return checkKey; + } + + public void setCheckKey(String checkKey) { + this.checkKey = checkKey; + } + +} 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/LoginService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/service/LoginService.java deleted file mode 100644 index aa56963f..00000000 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/service/LoginService.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.jeecg.modules.service; - -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.stereotype.Component; - -@Component -@FeignClient("armd-system") -public interface LoginService { - - -} 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 { -}