front api

java110-core/src/main/java/com/java110/core/base/AppBase.java

@@ -115,15 +115,15 @@ public class AppBase extends BaseCache {
     public Map<String, Object> createReturnMap(String resultCode, String resultMsg, String info) {
         return null;
     }
-
-    /**
-     * 调用中心服务
-     *
-     * @return
-     */
-    protected ResponseEntity<String> callCenterService(RestTemplate restTemplate, IPageData pd, String param, String url, HttpMethod httpMethod) {
-        return CallApiServiceFactory.callCenterService(restTemplate, pd, param, url, httpMethod);
-
-    }
+//
+//    /**
+//     * 调用中心服务
+//     *
+//     * @return
+//     */
+//    protected ResponseEntity<String> callCenterService(RestTemplate restTemplate, IPageData pd, String param, String url, HttpMethod httpMethod) {
+//        return CallApiServiceFactory.callCenterService(restTemplate, pd, param, url, httpMethod);
+//
+//    }
 
 }

java110-core/src/main/java/com/java110/core/component/AbstractComponentSMO.java

@@ -3,12 +3,22 @@ package com.java110.core.component;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
+import com.java110.utils.util.UrlParamToJsonUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.HttpStatusCodeException;
+import org.springframework.web.client.RestTemplate;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 组件抽象类
@@ -46,6 +56,10 @@ public abstract class AbstractComponentSMO extends BaseComponentSMO {
 
     }
 
+
+
+
+
     /**
      * 页面数据校验 方法
      *

java110-core/src/main/java/com/java110/core/component/BaseComponentSMO.java

@@ -73,86 +73,7 @@ public class BaseComponentSMO extends BaseServiceSMO {
     }
 
 
-    /**
-     * 获取用户信息
-     *
-     * @param pd
-     * @param restTemplate
-     * @return
-     */
-    protected ResponseEntity<String> getUserInfo(IPageData pd, RestTemplate restTemplate) {
-        Assert.hasLength(pd.getUserId(), "用户未登录请先登录");
-        ResponseEntity<String> responseEntity = null;
-        responseEntity = this.callCenterService(restTemplate, pd, "", ServiceConstant.SERVICE_API_URL + "/api/query.user.userInfo?userId=" + pd.getUserId(), HttpMethod.GET);
-        // 过滤返回报文中的字段，只返回name字段
-        //{"address":"","orderTypeCd":"Q","serviceCode":"","responseTime":"20190401194712","sex":"","localtionCd":"","userId":"302019033054910001","levelCd":"00","transactionId":"-1","dataFlowId":"-1","response":{"code":"0000","message":"成功"},"name":"996icu","tel":"18909780341","bId":"-1","businessType":"","email":""}
-
-        return responseEntity;
-
-    }
-
-    /**
-     * 获取用户信息
-     *
-     * @param pd
-     * @param restTemplate
-     * @return
-     */
-    protected ResponseEntity<String> getUserInfoByOpenId(IPageData pd, RestTemplate restTemplate, String openId) {
-        //Assert.hasLength(pd.getUserId(), "用户未登录请先登录");
-        ResponseEntity<String> responseEntity = null;
-        responseEntity = this.callCenterService(restTemplate, pd, "",
-                ServiceConstant.SERVICE_API_URL + "/api/user.listUsers?openId=" + openId + "&page=1&row=1", HttpMethod.GET);
-        // 过滤返回报文中的字段，只返回name字段
-        //{"address":"","orderTypeCd":"Q","serviceCode":"","responseTime":"20190401194712","sex":"","localtionCd":"","userId":"302019033054910001","levelCd":"00","transactionId":"-1","dataFlowId":"-1","response":{"code":"0000","message":"成功"},"name":"996icu","tel":"18909780341","bId":"-1","businessType":"","email":""}
-
-        return responseEntity;
-
-    }
-
-    /**
-     * 获取用户信息
-     *
-     * @param pd
-     * @param restTemplate
-     * @return
-     */
-    protected ResponseEntity<String> getUserAndAttr(IPageData pd, RestTemplate restTemplate, Map paramIn) {
-        //Assert.hasLength(pd.getUserId(), "用户未登录请先登录");
-        ResponseEntity<String> responseEntity = null;
-        if (paramIn != null) {
-            paramIn.put("page", "1");
-            paramIn.put("row", "1");
-        }
-        responseEntity = this.callCenterService(restTemplate, pd, "",
-                ServiceConstant.SERVICE_API_URL + "/api/user.listUsers" + mapToUrlParam(paramIn), HttpMethod.GET);
-        // 过滤返回报文中的字段，只返回name字段
-        //{"address":"","orderTypeCd":"Q","serviceCode":"","responseTime":"20190401194712","sex":"","localtionCd":"","userId":"302019033054910001","levelCd":"00","transactionId":"-1","dataFlowId":"-1","response":{"code":"0000","message":"成功"},"name":"996icu","tel":"18909780341","bId":"-1","businessType":"","email":""}
-        return responseEntity;
-
-    }
-
-    /**
-     * 获取用户信息
-     *
-     * @param pd
-     * @param restTemplate
-     * @return
-     */
-    protected ResponseEntity<String> getOwnerAppUser(IPageData pd, RestTemplate restTemplate, Map paramIn) {
-        //Assert.hasLength(pd.getUserId(), "用户未登录请先登录");
-        ResponseEntity<String> responseEntity = null;
-        if (paramIn != null) {
-            paramIn.put("page", "1");
-            paramIn.put("row", "1");
-        }
-        responseEntity = this.callCenterService(restTemplate, pd, "",
-                ServiceConstant.SERVICE_API_URL + "/api/" + ServiceCodeConstant.LIST_APPUSERBINDINGOWNERS + mapToUrlParam(paramIn), HttpMethod.GET);
-        // 过滤返回报文中的字段，只返回name字段
-        //{"address":"","orderTypeCd":"Q","serviceCode":"","responseTime":"20190401194712","sex":"","localtionCd":"","userId":"302019033054910001","levelCd":"00","transactionId":"-1","dataFlowId":"-1","response":{"code":"0000","message":"成功"},"name":"996icu","tel":"18909780341","bId":"-1","businessType":"","email":""}
-        return responseEntity;
 
-    }
 
 
     /**
@@ -214,30 +135,18 @@ public class BaseComponentSMO extends BaseServiceSMO {
         return null;
     }
 
+
+
     /**
-     * 检查用户是否有权限
+     * 根据 请求路径 判断用户是否有权限操作
      *
      * @param pd
      * @param restTemplate
-     * @param privilegeCodes
      */
-    protected void checkUserHasPrivilege(IPageData pd, RestTemplate restTemplate, String... privilegeCodes) {
-        ResponseEntity<String> responseEntity = null;
-        if (true) {
-            return;
-        }
-        for (String privilegeCode : privilegeCodes) {
-            responseEntity = this.callCenterService(restTemplate, pd, "", ServiceConstant.SERVICE_API_URL
-                    + "/api/check.user.hasPrivilege?userId=" + pd.getUserId() + "&pId=" + privilegeCode, HttpMethod.GET);
-            if (responseEntity.getStatusCode() == HttpStatus.OK) {
-                //throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "用户没有权限操作权限" + privilegeCodes);
-                break;
-            }
-        }
+    protected void checkUserHasPrivilege(IPageData pd, RestTemplate restTemplate) {
+
+        //pd.get
 
-        if (responseEntity.getStatusCode() != HttpStatus.OK) {
-            throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "用户没有权限操作权限" + privilegeCodes);
-        }
     }
 
     /**
@@ -246,7 +155,7 @@ public class BaseComponentSMO extends BaseServiceSMO {
      * @param pd
      * @param restTemplate
      */
-    protected void checkUserHasPrivilege(IPageData pd, RestTemplate restTemplate) {
+    protected void checkUserHasPrivilege(IPageData pd, RestTemplate restTemplate,String privilege) {
 
         //pd.get
 

java110-generator/src/main/java/com/java110/code/GeneratorServiceApplicationStart.java

@@ -35,7 +35,7 @@ import java.nio.charset.Charset;
         "com.java110.core.kafka","com.java110.core.log","com.java110.core.proxy",
         "com.java110.service", "com.java110.user",
         "com.java110.job","com.java110.store","com.java110.fee","com.java110.community",
-        "com.java110.common","com.java110.order","com.java110.api","com.java110.front",
+        "com.java110.common","com.java110.order","com.java110.api",
          "com.java110.config.properties.code", "com.java110.db"})
 @Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
         basePackages = {"com.java110.user.listener","com.java110.job.listener",

java110-generator/src/main/resources/relationship/binding/BindingComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.@@templateCode@@;
+package com.java110.api.components.@@templateCode@@;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.complaint.IAdd@@TemplateCode@@SMO;
+import com.java110.api.smo.complaint.IAdd@@TemplateCode@@SMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

java110-generator/src/main/resources/relationship/binding/BindingSMOImpl.java

@@ -1,11 +1,11 @@
-package com.java110.front.smo.@@templateCode@@.impl;
+package com.java110.api.smo.@@templateCode@@.impl;
 
 import com.java110.utils.constant.PrivilegeCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
 import com.java110.core.context.IPageData;
-import com.java110.front.core.AbstractComponentSMO;
-import com.java110.front.smo.@@templateCode@@
+import com.java110.api.core.AbstractComponentSMO;
+import com.java110.api.smo.@@templateCode@@
 import org.springframework.stereotype.Service;.IAdd@@TemplateCode@@SMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
@@ -16,7 +16,7 @@ import org.springframework.http.ResponseEntity;
  * add by wuxw 2019-06-30
  */
 @Service("@@templateCode@@BindingSMOImpl")
-public class @@TemplateCode@@BindingSMOImpl extends AbstractComponentSMO implements I@@TemplateCode@@BindingSMO {
+public class @@TemplateCode@@BindingSMOImpl extends DefaultAbstractComponentSMO implements I@@TemplateCode@@BindingSMO {
 
     @Autowired
     private RestTemplate restTemplate;

java110-generator/src/main/resources/relationship/binding/IBindingSMO.java

@@ -1,4 +1,4 @@
-package com.java110.front.smo.community;
+package com.java110.api.smo.community;
 
 import com.java110.core.context.IPageData;
 

java110-generator/src/main/resources/web/add/AddComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.@@templateCode@@;
+package com.java110.api.components.@@templateCode@@;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.@@templateCode@@.IAdd@@TemplateCode@@SMO;
+import com.java110.api.smo.@@templateCode@@.IAdd@@TemplateCode@@SMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

java110-generator/src/main/resources/web/add/AddSMOImpl.java

@@ -1,4 +1,4 @@
-package com.java110.front.smo.@@templateCode@@.impl;
+package com.java110.api.smo.@@templateCode@@.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.component.AbstractComponentSMO;
@@ -7,7 +7,7 @@ import com.java110.entity.component.ComponentValidateResult;
 import com.java110.utils.constant.PrivilegeCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
-import com.java110.front.smo.@@templateCode@@.IAdd@@TemplateCode@@SMO;
+import com.java110.api.smo.@@templateCode@@.IAdd@@TemplateCode@@SMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
@@ -18,7 +18,7 @@ import org.springframework.web.client.RestTemplate;
  * add by wuxw 2019-06-30
  */
 @Service("add@@TemplateCode@@SMOImpl")
-public class Add@@TemplateCode@@SMOImpl extends AbstractComponentSMO implements IAdd@@TemplateCode@@SMO {
+public class Add@@TemplateCode@@SMOImpl extends DefaultAbstractComponentSMO implements IAdd@@TemplateCode@@SMO {
 
     @Autowired
     private RestTemplate restTemplate;

java110-generator/src/main/resources/web/add/IAddSMO.java

@@ -1,4 +1,4 @@
-package com.java110.front.smo.@@templateCode@@;
+package com.java110.api.smo.@@templateCode@@;
 
 import com.java110.core.context.IPageData;
 import org.springframework.http.ResponseEntity;

java110-generator/src/main/resources/web/choose/ChooseComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.@@templateCode@@;
+package com.java110.api.components.@@templateCode@@;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.@@templateCode@@.IList@@TemplateCode@@sSMO;
+import com.java110.api.smo.@@templateCode@@.IList@@TemplateCode@@sSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

java110-generator/src/main/resources/web/delete/DeleteComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.@@templateCode@@;
+package com.java110.api.components.@@templateCode@@;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.@@templateCode@@.IDelete@@TemplateCode@@SMO;
+import com.java110.api.smo.@@templateCode@@.IDelete@@TemplateCode@@SMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

java110-generator/src/main/resources/web/delete/DeleteSMOImpl.java

@@ -1,4 +1,4 @@
-package com.java110.front.smo.@@templateCode@@.impl;
+package com.java110.api.smo.@@templateCode@@.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.component.AbstractComponentSMO;
@@ -6,7 +6,7 @@ import com.java110.core.context.IPageData;
 import com.java110.utils.constant.PrivilegeCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
-import com.java110.front.smo.@@templateCode@@.IDelete@@TemplateCode@@SMO;
+import com.java110.api.smo.@@templateCode@@.IDelete@@TemplateCode@@SMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
@@ -18,7 +18,7 @@ import org.springframework.web.client.RestTemplate;
  * delete by wuxw 2019-06-30
  */
 @Service("delete@@TemplateCode@@SMOImpl")
-public class Delete@@TemplateCode@@SMOImpl extends AbstractComponentSMO implements IDelete@@TemplateCode@@SMO {
+public class Delete@@TemplateCode@@SMOImpl extends DefaultAbstractComponentSMO implements IDelete@@TemplateCode@@SMO {
 
     @Autowired
     private RestTemplate restTemplate;

java110-generator/src/main/resources/web/delete/IDeleteSMO.java

@@ -1,4 +1,4 @@
-package com.java110.front.smo.@@templateCode@@;
+package com.java110.api.smo.@@templateCode@@;
 
 import com.java110.core.context.IPageData;
 import org.springframework.http.ResponseEntity;

java110-generator/src/main/resources/web/edit/EditComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.@@templateCode@@;
+package com.java110.api.components.@@templateCode@@;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.@@templateCode@@.IEdit@@TemplateCode@@SMO;
+import com.java110.api.smo.@@templateCode@@.IEdit@@TemplateCode@@SMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

java110-generator/src/main/resources/web/edit/EditSMOImpl.java

@@ -1,4 +1,4 @@
-package com.java110.front.smo.@@templateCode@@.impl;
+package com.java110.api.smo.@@templateCode@@.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.component.AbstractComponentSMO;
@@ -7,7 +7,7 @@ import com.java110.entity.component.ComponentValidateResult;
 import com.java110.utils.constant.PrivilegeCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
-import com.java110.front.smo.@@templateCode@@.IEdit@@TemplateCode@@SMO;
+import com.java110.api.smo.@@templateCode@@.IEdit@@TemplateCode@@SMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
@@ -19,7 +19,7 @@ import org.springframework.web.client.RestTemplate;
  * add by wuxw 2019-06-30
  */
 @Service("eidt@@TemplateCode@@SMOImpl")
-public class Edit@@TemplateCode@@SMOImpl extends AbstractComponentSMO implements IEdit@@TemplateCode@@SMO {
+public class Edit@@TemplateCode@@SMOImpl extends DefaultAbstractComponentSMO implements IEdit@@TemplateCode@@SMO {
 
     @Autowired
     private RestTemplate restTemplate;

java110-generator/src/main/resources/web/edit/IEditSMO.java

@@ -1,4 +1,4 @@
-package com.java110.front.smo.@@templateCode@@;
+package com.java110.api.smo.@@templateCode@@;
 
 import com.java110.core.context.IPageData;
 import org.springframework.http.ResponseEntity;

java110-generator/src/main/resources/web/manage/IListSMO.java

@@ -1,4 +1,4 @@
-package com.java110.front.smo.@@templateCode@@;
+package com.java110.api.smo.@@templateCode@@;
 
 import com.java110.core.context.IPageData;
 import com.java110.utils.exception.SMOException;

java110-generator/src/main/resources/web/manage/ListSMOImpl.java

@@ -1,4 +1,4 @@
-package com.java110.front.smo.@@templateCode@@.impl;
+package com.java110.api.smo.@@templateCode@@.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.component.AbstractComponentSMO;
@@ -9,7 +9,7 @@ import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.exception.SMOException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
-import com.java110.front.smo.@@templateCode@@.IList@@TemplateCode@@sSMO;
+import com.java110.api.smo.@@templateCode@@.IList@@TemplateCode@@sSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
@@ -21,7 +21,7 @@ import java.util.Map;
  * 查询@@templateCode@@服务类
  */
 @Service("list@@TemplateCode@@sSMOImpl")
-public class List@@TemplateCode@@sSMOImpl extends AbstractComponentSMO implements IList@@TemplateCode@@sSMO {
+public class List@@TemplateCode@@sSMOImpl extends DefaultAbstractComponentSMO implements IList@@TemplateCode@@sSMO {
 
     @Autowired
     private RestTemplate restTemplate;

java110-generator/src/main/resources/web/manage/ManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.@@templateCode@@;
+package com.java110.api.components.@@templateCode@@;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.@@templateCode@@.IList@@TemplateCode@@sSMO;
+import com.java110.api.smo.@@templateCode@@.IList@@TemplateCode@@sSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

java110-utils/src/main/java/com/java110/utils/constant/CommonConstant.java

@@ -1,5 +1,7 @@
 package com.java110.utils.constant;
 
+import org.springframework.http.HttpMethod;
+
 /**
  * 公共常量定义
  * Created by wuxw on 2016/12/28.
@@ -205,4 +207,17 @@ public class CommonConstant {
 
 
 
+    public static String getHttpMethodStr(HttpMethod httpMethod) {
+        if (HttpMethod.GET == httpMethod) {
+            return HTTP_METHOD_GET;
+        } else if (HttpMethod.POST == httpMethod) {
+            return HTTP_METHOD_POST;
+        } else if (HttpMethod.PUT == httpMethod) {
+            return HTTP_METHOD_PUT;
+        } else if (HttpMethod.DELETE == httpMethod) {
+            return HTTP_METHOD_DELETE;
+        } else {
+            return HTTP_METHOD_POST;
+        }
+    }
 }

java110-utils/src/main/java/com/java110/utils/util/UrlParamToJsonUtil.java

@@ -0,0 +1,33 @@
+package com.java110.utils.util;
+
+import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.JSONObject;
+
+public class UrlParamToJsonUtil {
+
+    public static JSONObject getJson(String paramStr) {
+
+        if (StringUtil.isEmpty(paramStr) || paramStr.indexOf("?") < 0) {
+            return new JSONObject();
+        }
+        paramStr = paramStr.substring(paramStr.indexOf("?") + 1);
+        String[] params = paramStr.split("&");
+        JSONObject obj = new JSONObject();
+        for (int i = 0; i < params.length; i++) {
+            String[] param = params[i].split("=");
+            if (param.length >= 2) {
+                String key = param[0];
+                String value = param[1];
+                for (int j = 2; j < param.length; j++) {
+                    value += "=" + param[j];
+                }
+                try {
+                    obj.put(key, value);
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return obj;
+    }
+}

pom.xml

@@ -25,7 +25,6 @@
         <module>service-job</module>
         <module>service-common</module>
         <module>service-report</module>
-        <module>service-front</module>
         <module>java110-generator</module>
         <module>service-acct</module>
         <module>service-oa</module>

service-api/pom.xml

@@ -52,6 +52,10 @@
             <version>0.0.20131108.vaadin1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

service-front/src/main/java/com/java110/front/aop/PageProcessAspect.java

@@ -1,4 +1,4 @@
-package com.java110.front.aop;
+package com.java110.api.aop;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
@@ -39,7 +39,7 @@ public class PageProcessAspect {
 
     private static Logger logger = LoggerFactory.getLogger(PageProcessAspect.class);
 
-    @Pointcut("execution(public * com.java110..*.*Controller.*(..)) || execution(public * com.java110..*.*Rest.*(..))")
+    @Pointcut("execution(public * com.java110..*.*Controller.*(..)) ")
     public void dataProcess() {
     }
 

service-front/src/main/java/com/java110/front/components/AddPrivilegeGroupComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.IPrivilegeServiceSMO;
+import com.java110.api.smo.IPrivilegeServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/AddStaffComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.IStaffServiceSMO;
+import com.java110.api.smo.IStaffServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/CompanyComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.ICompanyServiceSMO;
+import com.java110.api.smo.ICompanyServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/CoreComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.dict.IDictServiceSMO;
+import com.java110.api.smo.dict.IDictServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/DeletePrivilegeGroupComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.IPrivilegeServiceSMO;
+import com.java110.api.smo.IPrivilegeServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/DeleteStaffComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.IStaffServiceSMO;
+import com.java110.api.smo.IStaffServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/EditPrivilegeGroupComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.IPrivilegeServiceSMO;
+import com.java110.api.smo.IPrivilegeServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/EditStaffComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.IStaffServiceSMO;
+import com.java110.api.smo.IStaffServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/ItemOutBindingComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.itemOut.IItemOutBindingSMO;
+import com.java110.api.smo.itemOut.IItemOutBindingSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/LoginComponent.java

@@ -1,9 +1,9 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.login.ILoginServiceSMO;
-import com.java110.front.smo.sys.ISysServiceSMO;
+import com.java110.api.smo.login.ILoginServiceSMO;
+import com.java110.api.smo.sys.ISysServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/MenuComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.IMenuServiceSMO;
+import com.java110.api.smo.IMenuServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/NavComponent.java

@@ -1,11 +1,11 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.INavServiceSMO;
-import com.java110.front.smo.community.IListMyEnteredCommunitysSMO;
-import com.java110.front.smo.msg.IListMsgSMO;
-import com.java110.front.smo.msg.IReadMsgSMO;
-import com.java110.front.smo.notice.IListNoticesSMO;
+import com.java110.api.smo.INavServiceSMO;
+import com.java110.api.smo.community.IListMyEnteredCommunitysSMO;
+import com.java110.api.smo.msg.IListMsgSMO;
+import com.java110.api.smo.msg.IReadMsgSMO;
+import com.java110.api.smo.notice.IListNoticesSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/PrivilegeComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.IPrivilegeServiceSMO;
+import com.java110.api.smo.IPrivilegeServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/PrivilegeGroupComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.IPrivilegeServiceSMO;
+import com.java110.api.smo.IPrivilegeServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/RegisterComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.IRegisterServiceSMO;
-import com.java110.front.smo.sys.ISysServiceSMO;
+import com.java110.api.smo.IRegisterServiceSMO;
+import com.java110.api.smo.sys.ISysServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/StaffComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.IStaffServiceSMO;
-import com.java110.front.smo.org.IListOrgsSMO;
+import com.java110.api.smo.IStaffServiceSMO;
+import com.java110.api.smo.org.IListOrgsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/ValidateCodeComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.login.ILoginServiceSMO;
+import com.java110.api.smo.login.ILoginServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/ValidateTelComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.IRegisterServiceSMO;
+import com.java110.api.smo.IRegisterServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/VueTestComponent.java

@@ -1,4 +1,4 @@
-package com.java110.front.components;
+package com.java110.api.components;
 
 
 import com.java110.core.context.IPageData;

service-front/src/main/java/com/java110/front/components/activities/ActivitiesManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.activities;
+package com.java110.api.components.activities;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.common.ICommonGetSMO;
+import com.java110.api.smo.common.ICommonGetSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/activities/AddActivitiesViewComponent.java

@@ -1,10 +1,10 @@
-package com.java110.front.components.activities;
+package com.java110.api.components.activities;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
-import com.java110.front.smo.activities.IAddActivitiesSMO;
-import com.java110.front.smo.file.IAddFileSMO;
+import com.java110.api.smo.activities.IAddActivitiesSMO;
+import com.java110.api.smo.file.IAddFileSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/activities/ChooseActivitiesComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.activities;
+package com.java110.api.components.activities;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.common.ICommonGetSMO;
+import com.java110.api.smo.common.ICommonGetSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/activities/DeleteActivitiesComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.activities;
+package com.java110.api.components.activities;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.common.ICommonPostSMO;
+import com.java110.api.smo.common.ICommonPostSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/activities/EditActivitiesViewComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.activities;
+package com.java110.api.components.activities;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.activities.IEditActivitiesSMO;
+import com.java110.api.smo.activities.IEditActivitiesSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/advert/AddAdvertComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.advert;
+package com.java110.api.components.advert;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.advert.IAddAdvertSMO;
+import com.java110.api.smo.advert.IAddAdvertSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/advert/AdvertManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.advert;
+package com.java110.api.components.advert;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.advert.IListAdvertsSMO;
+import com.java110.api.smo.advert.IListAdvertsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/advert/AdvertVedioViewComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.advert;
+package com.java110.api.components.advert;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.advert.IListAdvertPhotoAndVediosSMO;
+import com.java110.api.smo.advert.IListAdvertPhotoAndVediosSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/advert/ChooseAdvertComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.advert;
+package com.java110.api.components.advert;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.advert.IListAdvertsSMO;
+import com.java110.api.smo.advert.IListAdvertsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/advert/DeleteAdvertComponent.java

@@ -1,10 +1,10 @@
-package com.java110.front.components.advert;
+package com.java110.api.components.advert;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.advert.IDeleteAdvertSMO;
+import com.java110.api.smo.advert.IDeleteAdvertSMO;
 import org.springframework.beans.factory.annotation.Autowired;
-        import org.springframework.http.ResponseEntity;
-        import org.springframework.stereotype.Component;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
 
 /**
  * 添加发布广告组件

service-front/src/main/java/com/java110/front/components/advert/EditAdvertComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.advert;
+package com.java110.api.components.advert;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.advert.IEditAdvertSMO;
-import com.java110.front.smo.advert.IListAdvertItemSMO;
+import com.java110.api.smo.advert.IEditAdvertSMO;
+import com.java110.api.smo.advert.IListAdvertItemSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/allocationUserStorehouse/AddAllocationUserStorehouseComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.allocationUserStorehouse;
+package com.java110.api.components.allocationUserStorehouse;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.allocationUserStorehouse.IAddAllocationUserStorehouseSMO;
+import com.java110.api.smo.allocationUserStorehouse.IAddAllocationUserStorehouseSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/api/ApiComponent.java

@@ -1,9 +1,9 @@
-package com.java110.front.components.api;
+package com.java110.api.components.api;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.common.ICommonGetSMO;
-import com.java110.front.smo.common.ICommonPostSMO;
+import com.java110.api.smo.common.ICommonGetSMO;
+import com.java110.api.smo.common.ICommonPostSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/app/AddAppComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.app;
+package com.java110.api.components.app;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.app.IAddAppSMO;
+import com.java110.api.smo.app.IAddAppSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/app/AppManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.app;
+package com.java110.api.components.app;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.app.IListAppsSMO;
+import com.java110.api.smo.app.IListAppsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/app/ChooseAppComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.app;
+package com.java110.api.components.app;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.app.IListAppsSMO;
+import com.java110.api.smo.app.IListAppsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/app/DeleteAppComponent.java

@@ -1,10 +1,10 @@
-package com.java110.front.components.app;
+package com.java110.api.components.app;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.app.IDeleteAppSMO;
+import com.java110.api.smo.app.IDeleteAppSMO;
 import org.springframework.beans.factory.annotation.Autowired;
-        import org.springframework.http.ResponseEntity;
-        import org.springframework.stereotype.Component;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
 
 /**
  * 添加应用组件

service-front/src/main/java/com/java110/front/components/app/EditAppComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.app;
+package com.java110.api.components.app;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.app.IEditAppSMO;
+import com.java110.api.smo.app.IEditAppSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/applicationKey/AddApplicationKeyComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.applicationKey;
+package com.java110.api.components.applicationKey;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.applicationKey.IAddApplicationKeySMO;
+import com.java110.api.smo.applicationKey.IAddApplicationKeySMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/applicationKey/ApplicationKeyManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.applicationKey;
+package com.java110.api.components.applicationKey;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.applicationKey.IListApplicationKeysSMO;
+import com.java110.api.smo.applicationKey.IListApplicationKeysSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/applicationKey/AuditApplicationKeyManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.applicationKey;
+package com.java110.api.components.applicationKey;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.applicationKey.IAuditApplicationKeySMO;
-import com.java110.front.smo.applicationKey.IListApplicationKeysSMO;
+import com.java110.api.smo.applicationKey.IAuditApplicationKeySMO;
+import com.java110.api.smo.applicationKey.IListApplicationKeysSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/applicationKey/ChooseApplicationKeyComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.applicationKey;
+package com.java110.api.components.applicationKey;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.applicationKey.IListApplicationKeysSMO;
+import com.java110.api.smo.applicationKey.IListApplicationKeysSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/applicationKey/DeleteApplicationKeyComponent.java

@@ -1,10 +1,10 @@
-package com.java110.front.components.applicationKey;
+package com.java110.api.components.applicationKey;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.applicationKey.IDeleteApplicationKeySMO;
+import com.java110.api.smo.applicationKey.IDeleteApplicationKeySMO;
 import org.springframework.beans.factory.annotation.Autowired;
-        import org.springframework.http.ResponseEntity;
-        import org.springframework.stereotype.Component;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
 
 /**
  * 添加钥匙申请组件

service-front/src/main/java/com/java110/front/components/applicationKey/EditApplicationKeyComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.applicationKey;
+package com.java110.api.components.applicationKey;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.applicationKey.IEditApplicationKeySMO;
+import com.java110.api.smo.applicationKey.IEditApplicationKeySMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/assetImport/AssetImportComponent.java

@@ -1,9 +1,9 @@
-package com.java110.front.components.assetImport;
+package com.java110.api.components.assetImport;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.controller.CallComponentController;
-import com.java110.front.smo.assetExport.IAssetExportSMO;
-import com.java110.front.smo.assetImport.IAssetImportSMO;
+import com.java110.api.controller.CallComponentController;
+import com.java110.api.smo.assetExport.IAssetExportSMO;
+import com.java110.api.smo.assetImport.IAssetImportSMO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

service-front/src/main/java/com/java110/front/components/assetImport/ExportReportFeeComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.assetImport;
+package com.java110.api.components.assetImport;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.assetExport.IExportReportFeeSMO;
+import com.java110.api.smo.assetExport.IExportReportFeeSMO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

service-front/src/main/java/com/java110/front/components/assetImport/FeeManualCollectionComponent.java

@@ -1,16 +1,12 @@
-package com.java110.front.components.assetImport;
+package com.java110.api.components.assetImport;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.controller.CallComponentController;
-import com.java110.front.smo.assetExport.IExportFeeManualCollectionSMO;
-import com.java110.front.smo.assetExport.IExportRoomSMO;
-import com.java110.front.smo.assetImport.IImportRoomFeeSMO;
+import com.java110.api.smo.assetExport.IExportFeeManualCollectionSMO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 添加应用组件

service-front/src/main/java/com/java110/front/components/assetImport/ImportFeeDetailComponent.java

@@ -1,10 +1,8 @@
-package com.java110.front.components.assetImport;
+package com.java110.api.components.assetImport;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.controller.CallComponentController;
-import com.java110.front.smo.assetExport.IExportRoomSMO;
-import com.java110.front.smo.assetImport.IImportFeeDetailSMO;
-import com.java110.front.smo.assetImport.IImportRoomFeeSMO;
+import com.java110.api.controller.CallComponentController;
+import com.java110.api.smo.assetImport.IImportFeeDetailSMO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

service-front/src/main/java/com/java110/front/components/assetImport/ImportMeterWaterFeeComponent.java

@@ -1,11 +1,9 @@
-package com.java110.front.components.assetImport;
+package com.java110.api.components.assetImport;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.controller.CallComponentController;
-import com.java110.front.smo.assetExport.IExportMeterWaterSMO;
-import com.java110.front.smo.assetExport.IExportRoomSMO;
-import com.java110.front.smo.assetImport.IImportMeterWaterFeeSMO;
-import com.java110.front.smo.assetImport.IImportRoomFeeSMO;
+import com.java110.api.controller.CallComponentController;
+import com.java110.api.smo.assetExport.IExportMeterWaterSMO;
+import com.java110.api.smo.assetImport.IImportMeterWaterFeeSMO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

service-front/src/main/java/com/java110/front/components/assetImport/ImportRoomFeeComponent.java

@@ -1,9 +1,9 @@
-package com.java110.front.components.assetImport;
+package com.java110.api.components.assetImport;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.controller.CallComponentController;
-import com.java110.front.smo.assetExport.IExportRoomSMO;
-import com.java110.front.smo.assetImport.IImportRoomFeeSMO;
+import com.java110.api.controller.CallComponentController;
+import com.java110.api.smo.assetExport.IExportRoomSMO;
+import com.java110.api.smo.assetImport.IImportRoomFeeSMO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

service-front/src/main/java/com/java110/front/components/auditUser/AddAuditUserStepBindingComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.auditUser;
+package com.java110.api.components.auditUser;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.auditUser.IAddAuditUserSMO;
+import com.java110.api.smo.auditUser.IAddAuditUserSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/auditUser/AuditUserManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.auditUser;
+package com.java110.api.components.auditUser;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.auditUser.IListAuditUsersSMO;
+import com.java110.api.smo.auditUser.IListAuditUsersSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/auditUser/ChooseAuditUserComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.auditUser;
+package com.java110.api.components.auditUser;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.auditUser.IListAuditUsersSMO;
+import com.java110.api.smo.auditUser.IListAuditUsersSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/auditUser/DeleteAuditUserComponent.java

@@ -1,10 +1,10 @@
-package com.java110.front.components.auditUser;
+package com.java110.api.components.auditUser;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.auditUser.IDeleteAuditUserSMO;
+import com.java110.api.smo.auditUser.IDeleteAuditUserSMO;
 import org.springframework.beans.factory.annotation.Autowired;
-        import org.springframework.http.ResponseEntity;
-        import org.springframework.stereotype.Component;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
 
 /**
  * 添加审核人员组件

service-front/src/main/java/com/java110/front/components/auditUser/MyAuditComplaintsComponent.java

@@ -1,9 +1,9 @@
-package com.java110.front.components.auditUser;
+package com.java110.api.components.auditUser;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.auditUser.IListAuditComplaintsSMO;
-import com.java110.front.smo.complaint.IAuditComplaintSMO;
+import com.java110.api.smo.auditUser.IListAuditComplaintsSMO;
+import com.java110.api.smo.complaint.IAuditComplaintSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/auditUser/MyAuditHistoryComplaintsComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.auditUser;
+package com.java110.api.components.auditUser;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.auditUser.IListAuditHistoryComplaintsSMO;
+import com.java110.api.smo.auditUser.IListAuditHistoryComplaintsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/auditUser/MyAuditOrdersComponent.java

@@ -1,10 +1,9 @@
-package com.java110.front.components.auditUser;
+package com.java110.api.components.auditUser;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.auditUser.IAuditOrdersSMO;
-import com.java110.front.smo.auditUser.IListAuditOrdersSMO;
-import com.java110.front.smo.complaint.IAuditComplaintSMO;
+import com.java110.api.smo.auditUser.IAuditOrdersSMO;
+import com.java110.api.smo.auditUser.IListAuditOrdersSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/basePrivilege/AddBasePrivilegeComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.basePrivilege;
+package com.java110.api.components.basePrivilege;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.basePrivilege.IAddBasePrivilegeSMO;
+import com.java110.api.smo.basePrivilege.IAddBasePrivilegeSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/basePrivilege/BasePrivilegeManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.basePrivilege;
+package com.java110.api.components.basePrivilege;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.basePrivilege.IListBasePrivilegesSMO;
+import com.java110.api.smo.basePrivilege.IListBasePrivilegesSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/basePrivilege/ChooseBasePrivilegeComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.basePrivilege;
+package com.java110.api.components.basePrivilege;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.basePrivilege.IListBasePrivilegesSMO;
+import com.java110.api.smo.basePrivilege.IListBasePrivilegesSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/basePrivilege/DeleteBasePrivilegeComponent.java

@@ -1,10 +1,10 @@
-package com.java110.front.components.basePrivilege;
+package com.java110.api.components.basePrivilege;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.basePrivilege.IDeleteBasePrivilegeSMO;
+import com.java110.api.smo.basePrivilege.IDeleteBasePrivilegeSMO;
 import org.springframework.beans.factory.annotation.Autowired;
-        import org.springframework.http.ResponseEntity;
-        import org.springframework.stereotype.Component;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
 
 /**
  * 添加权限组件

service-front/src/main/java/com/java110/front/components/basePrivilege/EditBasePrivilegeComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.basePrivilege;
+package com.java110.api.components.basePrivilege;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.basePrivilege.IEditBasePrivilegeSMO;
+import com.java110.api.smo.basePrivilege.IEditBasePrivilegeSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/businesstype/ListBusinessTypeComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.businesstype;
+package com.java110.api.components.businesstype;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.ICbusinessTypeServiceSMO;
+import com.java110.api.smo.ICbusinessTypeServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/cache/CacheManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.cache;
+package com.java110.api.components.cache;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.cache.IListCachesSMO;
+import com.java110.api.smo.cache.IListCachesSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/car/SellParkingSpaceComponent.java

@@ -1,9 +1,9 @@
-package com.java110.front.components.car;
+package com.java110.api.components.car;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.ICarServiceSMO;
-import com.java110.front.smo.IFeeServiceSMO;
+import com.java110.api.smo.ICarServiceSMO;
+import com.java110.api.smo.IFeeServiceSMO;
 import com.java110.utils.constant.FeeTypeConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/carBlackWhite/AddCarBlackWhiteComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.carBlackWhite;
+package com.java110.api.components.carBlackWhite;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.carBlackWhite.IAddCarBlackWhiteSMO;
+import com.java110.api.smo.carBlackWhite.IAddCarBlackWhiteSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/carBlackWhite/CarBlackWhiteManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.carBlackWhite;
+package com.java110.api.components.carBlackWhite;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.carBlackWhite.IListCarBlackWhitesSMO;
+import com.java110.api.smo.carBlackWhite.IListCarBlackWhitesSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/carBlackWhite/ChooseCarBlackWhiteComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.carBlackWhite;
+package com.java110.api.components.carBlackWhite;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.carBlackWhite.IListCarBlackWhitesSMO;
+import com.java110.api.smo.carBlackWhite.IListCarBlackWhitesSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/carBlackWhite/DeleteCarBlackWhiteComponent.java

@@ -1,10 +1,10 @@
-package com.java110.front.components.carBlackWhite;
+package com.java110.api.components.carBlackWhite;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.carBlackWhite.IDeleteCarBlackWhiteSMO;
+import com.java110.api.smo.carBlackWhite.IDeleteCarBlackWhiteSMO;
 import org.springframework.beans.factory.annotation.Autowired;
-        import org.springframework.http.ResponseEntity;
-        import org.springframework.stereotype.Component;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
 
 /**
  * 添加黑白名单组件

service-front/src/main/java/com/java110/front/components/carBlackWhite/EditCarBlackWhiteComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.carBlackWhite;
+package com.java110.api.components.carBlackWhite;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.carBlackWhite.IEditCarBlackWhiteSMO;
+import com.java110.api.smo.carBlackWhite.IEditCarBlackWhiteSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/carInout/CarInManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.carInout;
+package com.java110.api.components.carInout;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.carBlackWhite.IListCarInoutsSMO;
+import com.java110.api.smo.carBlackWhite.IListCarInoutsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/carInout/CarInoutManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.carInout;
+package com.java110.api.components.carInout;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.carBlackWhite.IListCarInoutsSMO;
+import com.java110.api.smo.carBlackWhite.IListCarInoutsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

service-front/src/main/java/com/java110/front/components/community/AddCommunityComponent.java

@@ -1,8 +1,8 @@
-package com.java110.front.components.community;
+package com.java110.api.components.community;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.ICompanyServiceSMO;
-import com.java110.front.smo.community.IAddCommunitySMO;
+import com.java110.api.smo.ICompanyServiceSMO;
+import com.java110.api.smo.community.IAddCommunitySMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/community/AreaSelectComponent.java

@@ -1,7 +1,7 @@
-package com.java110.front.components.community;
+package com.java110.api.components.community;
 
 import com.java110.core.context.IPageData;
-import com.java110.front.smo.ICompanyServiceSMO;
+import com.java110.api.smo.ICompanyServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

service-front/src/main/java/com/java110/front/components/community/AuditCommunityManageComponent.java

@@ -1,12 +1,12 @@
-package com.java110.front.components.community;
+package com.java110.api.components.community;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.StateConstant;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
-import com.java110.front.smo.community.IAuditCommunitySMO;
-import com.java110.front.smo.community.IListCommunitysSMO;
+import com.java110.api.smo.community.IAuditCommunitySMO;
+import com.java110.api.smo.community.IListCommunitysSMO;
+import com.java110.utils.constant.StateConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;