From fdc8b22740924b634162bcced4d014846a64c0a6 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期四, 27 二月 2020 13:04:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/java/com/java110/web/components/LoginComponent.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/components/LoginComponent.java b/WebService/src/main/java/com/java110/web/components/LoginComponent.java
index 4a9748b..5f5700a 100644
--- a/WebService/src/main/java/com/java110/web/components/LoginComponent.java
+++ b/WebService/src/main/java/com/java110/web/components/LoginComponent.java
@@ -3,6 +3,7 @@
import com.java110.core.context.IPageData;
import com.java110.web.smo.ILoginServiceSMO;
+import com.java110.web.smo.sys.ISysServiceSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
import org.springframework.stereotype.Component;
@@ -11,25 +12,32 @@
public class LoginComponent {
-
@Autowired
private ILoginServiceSMO loginServiceSMOImpl;
+
+ @Autowired
+ private ISysServiceSMO sysServiceSMOImpl;
+
/**
* 鐢ㄦ埛鐧诲綍
+ *
* @param pd
* @return
*/
- public ResponseEntity<String> doLogin(IPageData pd){
+ public ResponseEntity<String> doLogin(IPageData pd) {
ResponseEntity<String> responseEntity = null;
- try{
- responseEntity = loginServiceSMOImpl.doLogin(pd);
- }catch (Exception e){
+ try {
+ responseEntity = loginServiceSMOImpl.doLogin(pd);
+ } catch (Exception e) {
responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
- }finally {
+ } finally {
return responseEntity;
}
}
+ public ResponseEntity<String> getSysInfo(IPageData pd) {
+ return sysServiceSMOImpl.getSysInfo(pd);
+ }
public ILoginServiceSMO getLoginServiceSMOImpl() {
@@ -39,4 +47,12 @@
public void setLoginServiceSMOImpl(ILoginServiceSMO loginServiceSMOImpl) {
this.loginServiceSMOImpl = loginServiceSMOImpl;
}
+
+ public ISysServiceSMO getSysServiceSMOImpl() {
+ return sysServiceSMOImpl;
+ }
+
+ public void setSysServiceSMOImpl(ISysServiceSMO sysServiceSMOImpl) {
+ this.sysServiceSMOImpl = sysServiceSMOImpl;
+ }
}
--
Gitblit v1.8.0