From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/java/com/java110/web/components/RegisterComponent.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/components/RegisterComponent.java b/WebService/src/main/java/com/java110/web/components/RegisterComponent.java
index 95f8997..c0be7f8 100644
--- a/WebService/src/main/java/com/java110/web/components/RegisterComponent.java
+++ b/WebService/src/main/java/com/java110/web/components/RegisterComponent.java
@@ -2,6 +2,7 @@
import com.java110.core.context.IPageData;
import com.java110.web.smo.IRegisterServiceSMO;
+import com.java110.web.smo.sys.ISysServiceSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -17,22 +18,31 @@
@Autowired
IRegisterServiceSMO registerServiceSMOImpl;
+
+ @Autowired
+ private ISysServiceSMO sysServiceSMOImpl;
+
+
/**
* 鐢ㄦ埛娉ㄥ唽
+ *
* @param pd 椤甸潰灏佽鏁版嵁
* @return
*/
- public ResponseEntity<String> doRegister(IPageData pd){
+ public ResponseEntity<String> doRegister(IPageData pd) {
ResponseEntity<String> responseEntity = null;
- try{
- responseEntity = registerServiceSMOImpl.doRegister(pd);
- }catch (Exception e){
+ try {
+ responseEntity = registerServiceSMOImpl.doRegister(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 IRegisterServiceSMO getRegisterServiceSMOImpl() {
return registerServiceSMOImpl;
@@ -41,4 +51,12 @@
public void setRegisterServiceSMOImpl(IRegisterServiceSMO registerServiceSMOImpl) {
this.registerServiceSMOImpl = registerServiceSMOImpl;
}
+
+ public ISysServiceSMO getSysServiceSMOImpl() {
+ return sysServiceSMOImpl;
+ }
+
+ public void setSysServiceSMOImpl(ISysServiceSMO sysServiceSMOImpl) {
+ this.sysServiceSMOImpl = sysServiceSMOImpl;
+ }
}
--
Gitblit v1.8.0