aa51513
2021-05-15 d06fbb7626ca5c9e4e7a91ac06a6f2ae186c0f27
解决warnings,统一处理finally中return的问题
96个文件已修改
1064 ■■■■ 已修改文件
java110-bean/src/main/java/com/java110/entity/center/Business.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/entity/merchant/BoMerchant.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/entity/merchant/BoMerchantAttr.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/entity/order/Business.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/entity/product/BoProduct.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/entity/product/BoProductAttr.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/entity/user/BoCust.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/entity/user/BoCustAttr.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-core/src/main/java/com/java110/core/base/service/AbstractBaseService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-core/src/main/java/com/java110/core/base/smo/front/BaseFrontServiceSMO.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-core/src/main/java/com/java110/core/component/BaseComponentSMO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-core/src/main/java/com/java110/core/event/app/AppEventPublishing.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-core/src/main/java/com/java110/core/event/init/SystemStartUpInit.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-core/src/main/java/com/java110/core/event/listener/common/CommonDispatchListener.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-core/src/main/java/com/java110/core/factory/CallApiServiceFactory.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-service/pom.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-service/src/main/java/com/java110/service/develop/notice/GetNoticesByJava.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-service/src/main/java/com/java110/service/develop/user/GetUserByJava.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-service/src/test/java/com/java110/service/smo/impl/QueryServiceSMOImplTest.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-utils/src/main/java/com/java110/utils/factory/ApplicationContextFactory.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-utils/src/main/java/com/java110/utils/util/ApacheBeanConvertUtil.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-utils/src/main/java/com/java110/utils/util/Java110StringConvert.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-utils/src/main/java/com/java110/utils/util/RuleUtil.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/pom.xml 108 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/listener/inspectionPlan/ListInspectionPlansListener.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/rest/CreatePluginsConfig.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-common/pom.xml 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-common/src/main/java/com/java110/common/api/CommonApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-common/src/main/java/com/java110/common/thread/UpdateApplicationKeyPwd.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-community/pom.xml 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-community/src/main/java/com/java110/community/api/CommunityApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-community/src/main/java/com/java110/community/listener/notice/AbstractNoticeBusinessServiceDataFlowListener.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-fee/pom.xml 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-fee/src/main/java/com/java110/fee/api/FeeApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/pom.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/AddPrivilegeGroupComponent.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/AddStaffComponent.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/CompanyComponent.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/DeletePrivilegeGroupComponent.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/DeleteStaffComponent.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/EditPrivilegeGroupComponent.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/EditStaffComponent.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/LoginComponent.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/MenuComponent.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/NavComponent.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/PrivilegeComponent.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/PrivilegeGroupComponent.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/RegisterComponent.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/StaffComponent.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/ValidateCodeComponent.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/ValidateTelComponent.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/community/AddCommunityComponent.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/community/AreaSelectComponent.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/community/EnterCommunityComponent.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/community/StoreEnterCommunityComponent.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/community/storeExitCommunityComponent.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/privilege/AddPrivilegeComponent.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/privilege/DeletePrivilegeComponent.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/privilege/StaffPrivilegeComponent.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/staff/AddStaffPrivilegeComponent.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/staff/DeleteStaffPrivilegeComponent.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/components/staff/SearchStaffComponent.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/controller/CallComponentController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouOweFeeToNotifyAdapt.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouPayNotifyAdapt.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouRentingToNotifyAdapt.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatOweFeeToNotifyAdapt.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatPayNotifyAdapt.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatRentingToNotifyAdapt.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-front/src/main/java/com/java110/front/smo/payment/impl/GoodsToNotifySMOImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-goods/pom.xml 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-job/pom.xml 75 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-job/src/main/java/com/java110/job/Api/JobApi.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-job/src/main/java/com/java110/job/smo/DownloadFileFromFtpToTable.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-order/pom.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-order/src/main/java/com/java110/order/api/HttpApi.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-order/src/main/java/com/java110/order/api/OrderApi.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-order/src/main/java/com/java110/order/api/PrivilegeApi.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-order/src/main/java/com/java110/order/dao/impl/SnowflakeIdWorkerImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-order/src/main/java/com/java110/order/smo/impl/CenterServiceSMOImpl.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-order/src/main/java/com/java110/order/smo/impl/OrderProcessServiceSMOImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-order/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-report/pom.xml 74 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-store/pom.xml 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/api/StoreApi.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-user/pom.xml 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-user/src/main/java/com/java110/user/api/UserApi.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-user/src/main/java/com/java110/user/dao/IOwnerRoomRelServiceDao.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-user/src/main/java/com/java110/user/dao/impl/OwnerRoomRelServiceDaoImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-user/src/main/java/com/java110/user/dao/impl/UserServiceDaoImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-user/src/main/java/com/java110/user/listener/ownerRoomRel/AbstractOwnerRoomRelBusinessServiceDataFlowListener.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/entity/center/Business.java
@@ -7,7 +7,7 @@
 * 业务数据
 * Created by wuxw on 2018/4/13.
 */
public class Business implements Comparable{
public class Business implements Comparable<Business>{
    private String bId;
@@ -167,8 +167,7 @@
    }
    @Override
    public int compareTo(Object o) {
        Business otherBusiness = (Business)o;
    public int compareTo(Business otherBusiness) {
        if(this.getSeq() > otherBusiness.getSeq()) {
            return -1;
        }
java110-bean/src/main/java/com/java110/entity/merchant/BoMerchant.java
@@ -10,7 +10,7 @@
 * 对应商户 过程表 bo_merchant
 * Created by wuxw on 2017/5/20.
 */
public class BoMerchant extends DefaultBoEntity implements Comparable{
public class BoMerchant extends DefaultBoEntity implements Comparable<BoMerchant>{
    private String boId;
@@ -149,9 +149,8 @@
     * @return
     */
    @Override
    public int compareTo(Object o) {
    public int compareTo(BoMerchant otherBoMerchant) {
        BoMerchant otherBoMerchant = (BoMerchant)o;
        if("DEL".equals(this.getState()) && "ADD".equals(otherBoMerchant.getState())) {
            return -1;
        }
java110-bean/src/main/java/com/java110/entity/merchant/BoMerchantAttr.java
@@ -9,7 +9,7 @@
 * 商户属性表 bo_merchant_type
 * Created by wuxw on 2017/5/20.
 */
public class BoMerchantAttr extends DefaultBoAttrEntity implements Comparable {
public class BoMerchantAttr extends DefaultBoAttrEntity implements Comparable<BoMerchantAttr> {
    private String boId;
@@ -86,8 +86,7 @@
    }
    @Override
    public int compareTo(Object o) {
        BoMerchantAttr otherBoMerchant = (BoMerchantAttr)o;
    public int compareTo(BoMerchantAttr otherBoMerchant) {
        if("DEL".equals(this.getState()) && "ADD".equals(otherBoMerchant.getState())) {
            return -1;
        }
java110-bean/src/main/java/com/java110/entity/order/Business.java
@@ -9,7 +9,7 @@
 * @create 2019-02-05 上午11:27
 * @desc 订单项 对应表c_business
 **/
public class Business extends BusinessPlus implements Comparable{
public class Business extends BusinessPlus implements Comparable<Business>{
    /**
@@ -76,8 +76,7 @@
    }
    @Override
    public int compareTo(Object o) {
        Business otherBusiness = (Business)o;
    public int compareTo(Business otherBusiness) {
        if(this.getSeq() < otherBusiness.getSeq()) {
            return -1;
        }
java110-bean/src/main/java/com/java110/entity/product/BoProduct.java
@@ -6,7 +6,7 @@
/**
 * Created by wuxw on 2017/5/20.
 */
public class BoProduct extends Product implements Comparable{
public class BoProduct extends Product implements Comparable<BoProduct>{
    private String boId;
@@ -56,9 +56,8 @@
     * @return
     */
    @Override
    public int compareTo(Object o) {
    public int compareTo(BoProduct otherBoProduct) {
        BoProduct otherBoProduct = (BoProduct)o;
        if("DEL".equals(this.getState()) && "ADD".equals(otherBoProduct.getState())) {
            return -1;
        }
java110-bean/src/main/java/com/java110/entity/product/BoProductAttr.java
@@ -1,7 +1,6 @@
package com.java110.entity.product;
import com.java110.entity.product.BoProductAttr;
import com.java110.entity.product.ProductAttr;
/**
 *
@@ -9,7 +8,7 @@
 *
 * Created by wuxw on 2017/5/20.
 */
public class BoProductAttr extends ProductAttr implements Comparable{
public class BoProductAttr extends ProductAttr implements Comparable<BoProductAttr>{
    private String boId;
@@ -41,8 +40,7 @@
    }
    @Override
    public int compareTo(Object o) {
        BoProductAttr otherBoProduct = (BoProductAttr)o;
    public int compareTo(BoProductAttr otherBoProduct) {
        if("DEL".equals(this.getState()) && "ADD".equals(otherBoProduct.getState())) {
            return -1;
        }
java110-bean/src/main/java/com/java110/entity/user/BoCust.java
@@ -9,7 +9,7 @@
 * 主要用于新建客户,更新客户,删除客户时,保存到以bo开头的过程表 实体
 * Created by wuxw on 2016/12/27.
 */
public class BoCust extends DefaultBoEntity implements Comparable {
public class BoCust extends DefaultBoEntity implements Comparable<BoCust> {
    private final static String CUST_TYPE_GENERAL= "1";// 普通客户
@@ -178,9 +178,8 @@
     * @return
     */
    @Override
    public int compareTo(Object o) {
    public int compareTo(BoCust otherBoCust) {
        BoCust otherBoCust = (BoCust)o;
        if("DEL".equals(this.getState()) && "ADD".equals(otherBoCust.getState())) {
            return -1;
        }
java110-bean/src/main/java/com/java110/entity/user/BoCustAttr.java
@@ -8,7 +8,7 @@
 * 客户属性表(过程表)
 * Created by wuxw on 2016/12/27.
 */
public class BoCustAttr extends DefaultBoAttrEntity implements Comparable{
public class BoCustAttr extends DefaultBoAttrEntity implements Comparable<BoCustAttr>{
    private String custId;
@@ -35,8 +35,7 @@
    }
    @Override
    public int compareTo(Object o) {
        BoCustAttr otherBoCust = (BoCustAttr)o;
    public int compareTo(BoCustAttr otherBoCust) {
        if("DEL".equals(this.getState()) && "ADD".equals(otherBoCust.getState())) {
            return -1;
        }
java110-core/src/main/java/com/java110/core/base/service/AbstractBaseService.java
@@ -13,7 +13,7 @@
     * @param t 对象分装
     * @return ResponseEntity对象
     */
    public final <T> T businessProcess(T t, Class clazz) {
    public final <T> T businessProcess(T t, Class<?> clazz) {
        return null;
java110-core/src/main/java/com/java110/core/base/smo/front/BaseFrontServiceSMO.java
@@ -182,9 +182,8 @@
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            logger.debug("请求地址为,{} 请求中心服务信息,{},中心服务返回信息,{}", url, httpEntity, responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
java110-core/src/main/java/com/java110/core/component/BaseComponentSMO.java
@@ -68,8 +68,8 @@
            responseEntity = new ResponseEntity<String>("调用组件" + componentCode + ",组件方法" + componentMethod + "失败:" + e.getMessage(),
                    HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
java110-core/src/main/java/com/java110/core/event/app/AppEventPublishing.java
@@ -144,9 +144,9 @@
    public static void multicastEvent(String actionTypeCd,String orderInfo,String data,String asyn) throws  Exception{
        Class<AppEvent> appEvent = getEvent(actionTypeCd);
        Class[] parameterTypes={Object.class,String.class};
        Class<?>[] parameterTypes={Object.class,String.class};
        Constructor constructor = appEvent.getClass().getConstructor(parameterTypes);
        Constructor<?> constructor = appEvent.getClass().getConstructor(parameterTypes);
        Object[] parameters={orderInfo,data};
        AppEvent targetAppEvent = (AppEvent)constructor.newInstance(parameters);
        multicastEvent(targetAppEvent,asyn);
@@ -167,9 +167,9 @@
       for(String key : keys){
           Class<AppEvent> appEvent = getEvent(key);
           Class[] parameterTypes={Object.class,AppContext.class,JSONArray.class};
           Class<?>[] parameterTypes={Object.class,AppContext.class,JSONArray.class};
           Constructor constructor = appEvent.getClass().getConstructor(parameterTypes);
           Constructor<?> constructor = appEvent.getClass().getConstructor(parameterTypes);
           context.setBo_action_type(key);
           Object[] parameters={null,context,data.get(key)};
           AppEvent targetAppEvent = (AppEvent)constructor.newInstance(parameters);
@@ -264,9 +264,9 @@
        Class<AppEvent> appEvent = getEvent(busiOrder.getActionTypeCd());
        Class[] parameterTypes={Object.class,AppContext.class};
        Class<?>[] parameterTypes={Object.class,AppContext.class};
        Constructor constructor = appEvent.getClass().getConstructor(parameterTypes);
        Constructor<?> constructor = appEvent.getClass().getConstructor(parameterTypes);
        Object[] parameters={null,context};
@@ -290,9 +290,9 @@
        Class<AppEvent> appEvent = getEvent(busiOrder.getActionTypeCd());
        Class[] parameterTypes={Object.class,AppContext.class};
        Class<?>[] parameterTypes={Object.class,AppContext.class};
        Constructor constructor = appEvent.getClass().getConstructor(parameterTypes);
        Constructor<?> constructor = appEvent.getClass().getConstructor(parameterTypes);
        Object[] parameters={null,context};
java110-core/src/main/java/com/java110/core/event/init/SystemStartUpInit.java
@@ -1,6 +1,7 @@
package com.java110.core.event.init;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.core.event.app.AppEvent;
import com.java110.core.event.app.AppEventPublishing;
import com.java110.core.event.app.AppListener;
import com.java110.core.event.listener.common.CommonDispatchListener;
@@ -150,7 +151,7 @@
                throw new ConfigurationException("配置错误,["+DISPATCH_EVENT+"= "+events+"] 当前 [event = "+event+"],只能有一个 :: ,配置格式为 A::B");
            }
            Class clazz = Class.forName(tmpEvent[1]);
            Class<AppEvent> clazz = (Class<AppEvent>) Class.forName(tmpEvent[1]);
            AppEventPublishing.addEvent(tmpEvent[0],clazz);
        }
java110-core/src/main/java/com/java110/core/event/listener/common/CommonDispatchListener.java
@@ -99,7 +99,7 @@
        if(!"0".equals(after_method) && !StringUtil.isEmpty(after_method)){
            try {
                Class clazz = commonDispatchAfterMethod.getClass();
                Class<?> clazz = commonDispatchAfterMethod.getClass();
                Method method = clazz.getDeclaredMethod(after_method,new Class[]{AppContext.class,JSONArray.class,JSONObject.class});
java110-core/src/main/java/com/java110/core/factory/CallApiServiceFactory.java
@@ -221,10 +221,8 @@
        } finally {
            logger.debug("请求地址为,{} 请求中心服务信息,{},中心服务返回信息,{}", url, httpEntity, responseEntity);
            logger.debug(url + "调用api耗时:" + (DateUtil.getCurrentDate().getTime() - startTime));
            return responseEntity;
        }
        return responseEntity;
    }
java110-service/pom.xml
@@ -87,7 +87,6 @@
        <dependency>
            <groupId>org.apache.activemq</groupId>
            <artifactId>activemq-core</artifactId>
            <version>5.7.0</version>
        </dependency>
        <dependency>
java110-service/src/main/java/com/java110/service/develop/notice/GetNoticesByJava.java
@@ -7,6 +7,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * @ClassName GetNoticesByJava
@@ -20,7 +21,7 @@
    @Override
    public JSONObject execute(DataQuery dataQuery) {
        JSONObject params = dataQuery.getRequestParams();
        List sqlParams = new ArrayList();
        List<Object> sqlParams = new ArrayList<Object>();
        String sql = "SELECT nn.`notice_id` noticeId," +
                "nn.`title`," +
@@ -48,7 +49,7 @@
            sqlParams.add(params.get("title"));
        }
        List outParam = dataQuery.queryDataBySql(sql,sqlParams);
        List<Map<String, Object>> outParam = dataQuery.queryDataBySql(sql,sqlParams);
        JSONObject outObj = new JSONObject();
        outObj.put("notices", outParam);
java110-service/src/main/java/com/java110/service/develop/user/GetUserByJava.java
@@ -7,6 +7,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * @ClassName GetNoticesByJava
@@ -20,7 +21,7 @@
    @Override
    public JSONObject execute(DataQuery dataQuery) {
        JSONObject params = dataQuery.getRequestParams();
        List sqlParams = new ArrayList();
        List<Object> sqlParams = new ArrayList<Object>();
        String sql = "SELECT nn.`notice_id` noticeId," +
                "nn.`title`," +
@@ -48,7 +49,7 @@
            sqlParams.add(params.get("title"));
        }
        List outParam = dataQuery.queryDataBySql(sql,sqlParams);
        List<Map<String, Object>> outParam = dataQuery.queryDataBySql(sql,sqlParams);
        JSONObject outObj = new JSONObject();
        outObj.put("notices", outParam);
java110-service/src/test/java/com/java110/service/smo/impl/QueryServiceSMOImplTest.java
@@ -30,7 +30,7 @@
        CtMethod helloM1 = CtNewMethod.make(javaCode2, ctClass);
        ctClass.addMethod(helloM1);
        Class pc=ctClass.toClass();
        Class<?> pc=ctClass.toClass();
        //ctClass.writeFile("./1111");
        Method move= pc.getMethod("testJava1",new Class[]{});
java110-utils/src/main/java/com/java110/utils/factory/ApplicationContextFactory.java
@@ -17,7 +17,7 @@
        ApplicationContextFactory.applicationContext = applicationContext;
    }
    public static Object getBean(Class className){
    public static Object getBean(Class<?> className){
        return applicationContext.getBean(className);
    }
java110-utils/src/main/java/com/java110/utils/util/ApacheBeanConvertUtil.java
@@ -29,7 +29,7 @@
    static {
        ConvertUtils.register(new Converter() { //注册一个日期转换器
            public Object convert(Class type, Object value) {
            public <T> T convert(Class<T> type, Object value) {
                Date date1 = null;
                if (value instanceof String) {
                    String date = (String) value;
@@ -44,9 +44,9 @@
                    } catch (ParseException e) {
                        e.printStackTrace();
                    }
                    return date1;
                    return (T) date1;
                }
                return value;
                return (T) value;
            }
        }, Date.class);
java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java
@@ -35,9 +35,9 @@
    static {
        ConvertUtils.register(new Converter() { //注册一个日期转换器
            public Object convert(Class type, Object value) {
            public <T> T convert(Class<T> type, Object value) {
                Date date1 = null;
                if (value instanceof String) {
                if (value instanceof String && type.getClass().equals(Date.class)) {
                    String date = (String) value;
                    SimpleDateFormat sdf = null;
                    if (date.contains(":")) {
@@ -50,10 +50,11 @@
                    } catch (ParseException e) {
                        e.printStackTrace();
                    }
                    return date1;
                    return type.cast(date1);
                }
                return value;
                return null;
            }
        }, Date.class);
@@ -90,14 +91,14 @@
        return dstBean;
    }
    private static void objectFieldsPutMap(Object dstBean, BeanMap beanMap, Map orgMap) {
    private static void objectFieldsPutMap(Object dstBean, BeanMap beanMap, Map<String,Object> orgMap) {
        //Field[] fields = dstBean.getClass().getDeclaredFields();
        Field[] fields = FieldUtils.getAllFields(dstBean.getClass());
        for (Field field : fields) {
            if (!orgMap.containsKey(field.getName())) {
                continue;
            }
            Class dstClass = field.getType();
            Class<?> dstClass = field.getType();
            //System.out.println("字段类型" + dstClass);
            Object value = orgMap.get(field.getName());
java110-utils/src/main/java/com/java110/utils/util/Java110StringConvert.java
@@ -45,19 +45,23 @@
    }
    @Override
    protected Object convertToType(Class type, Object value) throws Throwable {
    protected <T> T convertToType(Class<T> type, Object value) throws Throwable {
        //System.out.printf("12313");
        logger.debug("convertToType当前对象类型start" + value.getClass());
        if (value instanceof Date) {
            return DateUtil.getFormatTimeString((Date) value, DateUtil.DATE_FORMATE_STRING_A);
        if(type.getClass().equals(String.class)) {
            if (value instanceof Date) {
                return type.cast(DateUtil.getFormatTimeString(Date.class.cast(value), DateUtil.DATE_FORMATE_STRING_A));
            }
            logger.debug("convertToType当前对象类型" + value.getClass());
            return type.cast(value.toString());
        }else {
            return null;
        }
        logger.debug("convertToType当前对象类型" + value.getClass());
        return value.toString();
    }
    @Override
    protected Class getDefaultType() {
    protected Class<?> getDefaultType() {
        return String.class;
    }
}
java110-utils/src/main/java/com/java110/utils/util/RuleUtil.java
@@ -20,13 +20,13 @@
     * @param reqJson
     * @return   如果获取不到则会返回new ArrayList(),不会为null
     */
    public static List getRuleIdsInGroupByJson(String reqJson,List saopRuleGroupInfoList)
    public static List<Object> getRuleIdsInGroupByJson(String reqJson,List<Object> saopRuleGroupInfoList)
    {
        //获取缓存中规则分组集合
        //List saopRuleGroupInfoList = RuleUtil.getRuleGroupRelaList();
        //当前分组下的规则编码集合
        List ruleIdsInCurGroupList = new ArrayList();
        List<Object> ruleIdsInCurGroupList = new ArrayList<Object>();
        try
        {
service-api/pom.xml
@@ -59,58 +59,60 @@
    <build>
        <finalName>service-api</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
                <version>2.10</version>
                <executions>
                    <execution>
                        <id>unpack</id>
                        <phase>generate-resources</phase>
                        <goals>
                            <goal>unpack</goal>
                        </goals>
                        <configuration>
                            <artifactItems>
                                <artifactItem>
                                    <groupId>com.java110</groupId>
                                    <artifactId>java110-interface</artifactId>
                                    <version>${microcommunity.version}</version>
                                    <type>jar</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                </artifactItem>
                            </artifactItems>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <mainClass>com.java110.api.ApiApplicationStart</mainClass>
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-javadoc-plugin</artifactId>
                <version>2.10.4</version>
                <configuration>
                    <aggregate>true</aggregate>
                    <reportOutputDirectory>../javadocs</reportOutputDirectory>
                    <destDir>security-javadoc</destDir>
                    <javadocExecutable>${java.home}bin/javadoc</javadocExecutable>
                    <tags>
                        <tag>
                            <name>Description</name>
                            <placement>a</placement>
                            <head>功能描述:</head>
                        </tag>
                    </tags>
                </configuration>
            </plugin>
        </plugins>
        <pluginManagement>
            <plugins>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-dependency-plugin</artifactId>
                    <version>2.10</version>
                    <executions>
                        <execution>
                            <id>unpack</id>
                            <phase>generate-resources</phase>
                            <goals>
                                <goal>unpack</goal>
                            </goals>
                            <configuration>
                                <artifactItems>
                                    <artifactItem>
                                        <groupId>com.java110</groupId>
                                        <artifactId>java110-interface</artifactId>
                                        <version>${microcommunity.version}</version>
                                        <type>jar</type>
                                        <overWrite>true</overWrite>
                                        <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                    </artifactItem>
                                </artifactItems>
                            </configuration>
                        </execution>
                    </executions>
                </plugin>
                <plugin>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-maven-plugin</artifactId>
                    <configuration>
                        <mainClass>com.java110.api.ApiApplicationStart</mainClass>
                    </configuration>
                </plugin>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-javadoc-plugin</artifactId>
                    <version>2.10.4</version>
                    <configuration>
                        <aggregate>true</aggregate>
                        <reportOutputDirectory>../javadocs</reportOutputDirectory>
                        <destDir>security-javadoc</destDir>
                        <javadocExecutable>${java.home}bin/javadoc</javadocExecutable>
                        <tags>
                            <tag>
                                <name>Description</name>
                                <placement>a</placement>
                                <head>功能描述:</head>
                            </tag>
                        </tags>
                    </configuration>
                </plugin>
            </plugins>
        </pluginManagement>
    </build>
</project>
service-api/src/main/java/com/java110/api/listener/inspectionPlan/ListInspectionPlansListener.java
@@ -82,8 +82,8 @@
        if (count > 0) {
            inspectionPlans = BeanConvertUtil.covertBeanList(inspectionPlanInnerServiceSMOImpl.queryInspectionPlans(inspectionPlanDto), ApiInspectionPlanDataVo.class);
            ArrayList staffIds = new ArrayList<>();
            ArrayList inspectionRouteIds = new ArrayList<>();
            List<Object> staffIds = new ArrayList<Object>();
            List<Object> inspectionRouteIds = new ArrayList<Object>();
            for (ApiInspectionPlanDataVo Plans : inspectionPlans) {
                staffIds.add(Plans.getStaffId());
                String[] ids = Plans.getInspectionRouteId().split(",");
service-api/src/main/java/com/java110/api/rest/CreatePluginsConfig.java
@@ -17,7 +17,7 @@
    }
    public void print() {
        List list = getFileList(path);
        List<String> list = getFileList(path);
        if (list == null) {
            return;
        }
@@ -54,7 +54,7 @@
        }
    }
    public List getFileList(String path) {
    public List<String> getFileList(String path) {
        path = getFormatPath(path);
        path = path + "/";
        File filePath = new File(path);
@@ -62,7 +62,7 @@
            return null;
        }
        String[] filelist = filePath.list();
        List filelistFilter = new ArrayList();
        List<String> filelistFilter = new ArrayList<String>();
        for (int i = 0; i < filelist.length; i++) {
            String tempfilename = getFormatPath(path + filelist[i]);
service-api/src/main/java/com/java110/api/smo/impl/ApiServiceSMOImpl.java
@@ -132,10 +132,8 @@
            //添加耗时
            saveLog(dataFlow, startDate, endDate, reqJson, responseEntity);
            //这里保存耗时,以及日志
            return responseEntity;
        }
        return responseEntity;
    }
    /**
service-common/pom.xml
@@ -42,40 +42,42 @@
    <build>
        <finalName>service-common</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
                <version>2.10</version>
                <executions>
                    <execution>
                        <id>unpack</id>
                        <phase>generate-resources</phase>
                        <goals>
                            <goal>unpack</goal>
                        </goals>
                        <configuration>
                            <artifactItems>
                                <artifactItem>
                                    <groupId>com.java110</groupId>
                                    <artifactId>java110-interface</artifactId>
                                    <version>${microcommunity.version}</version>
                                    <type>jar</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                </artifactItem>
                            </artifactItems>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <mainClass>com.java110.common.CommonServiceApplicationStart</mainClass>
                </configuration>
            </plugin>
        </plugins>
        <pluginManagement>
            <plugins>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-dependency-plugin</artifactId>
                    <version>2.10</version>
                    <executions>
                        <execution>
                            <id>unpack</id>
                            <phase>generate-resources</phase>
                            <goals>
                                <goal>unpack</goal>
                            </goals>
                            <configuration>
                                <artifactItems>
                                    <artifactItem>
                                        <groupId>com.java110</groupId>
                                        <artifactId>java110-interface</artifactId>
                                        <version>${microcommunity.version}</version>
                                        <type>jar</type>
                                        <overWrite>true</overWrite>
                                        <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                    </artifactItem>
                                </artifactItems>
                            </configuration>
                        </execution>
                    </executions>
                </plugin>
                <plugin>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-maven-plugin</artifactId>
                    <configuration>
                        <mainClass>com.java110.common.CommonServiceApplicationStart</mainClass>
                    </configuration>
                </plugin>
            </plugins>
        </pluginManagement>
    </build>
</project>
service-common/src/main/java/com/java110/common/api/CommonApi.java
@@ -66,8 +66,8 @@
                    null);
        } finally {
            logger.debug("common服务请求报文:" + orderInfo + " 返回报文:" + responseJson.toJSONString());
            return responseJson.toJSONString();
        }
        return responseJson.toJSONString();
    }
    /**
service-common/src/main/java/com/java110/common/thread/UpdateApplicationKeyPwd.java
@@ -106,8 +106,9 @@
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            logger.debug("请求地址为,{} 请求中心服务信息,{},中心服务返回信息,{}", url, httpEntity, responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
    /**
service-community/pom.xml
@@ -35,40 +35,42 @@
    <build>
        <finalName>service-community</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
                <version>2.10</version>
                <executions>
                    <execution>
                        <id>unpack</id>
                        <phase>generate-resources</phase>
                        <goals>
                            <goal>unpack</goal>
                        </goals>
                        <configuration>
                            <artifactItems>
                                <artifactItem>
                                    <groupId>com.java110</groupId>
                                    <artifactId>java110-interface</artifactId>
                                    <version>${microcommunity.version}</version>
                                    <type>jar</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                </artifactItem>
                            </artifactItems>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <mainClass>com.java110.community.CommunityServiceApplicationStart</mainClass>
                </configuration>
            </plugin>
        </plugins>
        <pluginManagement>
            <plugins>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-dependency-plugin</artifactId>
                    <version>2.10</version>
                    <executions>
                        <execution>
                            <id>unpack</id>
                            <phase>generate-resources</phase>
                            <goals>
                                <goal>unpack</goal>
                            </goals>
                            <configuration>
                                <artifactItems>
                                    <artifactItem>
                                        <groupId>com.java110</groupId>
                                        <artifactId>java110-interface</artifactId>
                                        <version>${microcommunity.version}</version>
                                        <type>jar</type>
                                        <overWrite>true</overWrite>
                                        <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                    </artifactItem>
                                </artifactItems>
                            </configuration>
                        </execution>
                    </executions>
                </plugin>
                <plugin>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-maven-plugin</artifactId>
                    <configuration>
                        <mainClass>com.java110.community.CommunityServiceApplicationStart</mainClass>
                    </configuration>
                </plugin>
            </plugins>
        </pluginManagement>
    </build>
</project>
service-community/src/main/java/com/java110/community/api/CommunityApi.java
@@ -64,8 +64,8 @@
            responseJson = DataTransactionFactory.createBusinessResponseJson(businessServiceDataFlow,ResponseConstant.RESULT_CODE_ERROR,e.getMessage()+e,
                    null);
        }finally {
            return responseJson.toJSONString();
        }
        return responseJson.toJSONString();
    }
    /**
service-community/src/main/java/com/java110/community/listener/notice/AbstractNoticeBusinessServiceDataFlowListener.java
@@ -60,7 +60,7 @@
     */
    protected void autoSaveDelBusinessNotice(Business business, JSONObject businessNotice) {
//自动插入DEL
        Map info = new HashMap();
        Map<String,String> info = new HashMap<String,String>();
        info.put("noticeId", businessNotice.getString("noticeId"));
        info.put("statusCd", StatusConstant.STATUS_CD_VALID);
        List<Map> currentNoticeInfos = getNoticeServiceDaoImpl().getNoticeInfo(info);
service-fee/pom.xml
@@ -33,40 +33,42 @@
    <build>
        <finalName>service-fee</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
                <version>2.10</version>
                <executions>
                    <execution>
                        <id>unpack</id>
                        <phase>generate-resources</phase>
                        <goals>
                            <goal>unpack</goal>
                        </goals>
                        <configuration>
                            <artifactItems>
                                <artifactItem>
                                    <groupId>com.java110</groupId>
                                    <artifactId>java110-interface</artifactId>
                                    <version>${microcommunity.version}</version>
                                    <type>jar</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                </artifactItem>
                            </artifactItems>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <mainClass>com.java110.fee.FeeServiceApplicationStart</mainClass>
                </configuration>
            </plugin>
        </plugins>
        <pluginManagement>
            <plugins>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-dependency-plugin</artifactId>
                    <version>2.10</version>
                    <executions>
                        <execution>
                            <id>unpack</id>
                            <phase>generate-resources</phase>
                            <goals>
                                <goal>unpack</goal>
                            </goals>
                            <configuration>
                                <artifactItems>
                                    <artifactItem>
                                        <groupId>com.java110</groupId>
                                        <artifactId>java110-interface</artifactId>
                                        <version>${microcommunity.version}</version>
                                        <type>jar</type>
                                        <overWrite>true</overWrite>
                                        <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                    </artifactItem>
                                </artifactItems>
                            </configuration>
                        </execution>
                    </executions>
                </plugin>
                <plugin>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-maven-plugin</artifactId>
                    <configuration>
                        <mainClass>com.java110.fee.FeeServiceApplicationStart</mainClass>
                    </configuration>
                </plugin>
            </plugins>
        </pluginManagement>
    </build>
</project>
service-fee/src/main/java/com/java110/fee/api/FeeApi.java
@@ -83,8 +83,8 @@
            responseJson = DataTransactionFactory.createBusinessResponseJson(businessServiceDataFlow, ResponseConstant.RESULT_CODE_ERROR, e.getMessage() + e,
                    null);
        } finally {
            return responseJson.toJSONString();
        }
        return responseJson.toJSONString();
    }
    /**
service-front/pom.xml
@@ -74,6 +74,7 @@
    <build>
        <finalName>service-front</finalName>
        <pluginManagement>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
@@ -109,5 +110,6 @@
                </configuration>
            </plugin>
        </plugins>
        </pluginManagement>
    </build>
</project>
service-front/src/main/java/com/java110/front/components/AddPrivilegeGroupComponent.java
@@ -34,8 +34,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/components/AddStaffComponent.java
@@ -31,8 +31,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    public IStaffServiceSMO getStaffServiceSMOImpl() {
service-front/src/main/java/com/java110/front/components/CompanyComponent.java
@@ -31,8 +31,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    /**
@@ -48,8 +48,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    /**
@@ -65,8 +65,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    public ICompanyServiceSMO getCompanyServiceSMOImpl() {
service-front/src/main/java/com/java110/front/components/DeletePrivilegeGroupComponent.java
@@ -26,8 +26,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    public IPrivilegeServiceSMO getPrivilegeServiceSMOImpl() {
service-front/src/main/java/com/java110/front/components/DeleteStaffComponent.java
@@ -25,8 +25,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    public IStaffServiceSMO getStaffServiceSMOImpl() {
service-front/src/main/java/com/java110/front/components/EditPrivilegeGroupComponent.java
@@ -34,8 +34,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/components/EditStaffComponent.java
@@ -31,8 +31,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/components/LoginComponent.java
@@ -31,9 +31,9 @@
            responseEntity = loginServiceSMOImpl.doLogin(pd);
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    public ResponseEntity<String> getSysInfo(IPageData pd) {
service-front/src/main/java/com/java110/front/components/MenuComponent.java
@@ -40,9 +40,8 @@
            responseEntity = menuServiceSMOImpl.queryMenusByUserId(pd);
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    public IMenuServiceSMO getMenuServiceSMOImpl() {
service-front/src/main/java/com/java110/front/components/NavComponent.java
@@ -69,9 +69,8 @@
            responseEntity = navServiceSMOImpl.doExit(pd);
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    /**
@@ -86,9 +85,8 @@
            responseEntity = navServiceSMOImpl.getUserInfo(pd);
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    /**
service-front/src/main/java/com/java110/front/components/PrivilegeComponent.java
@@ -27,9 +27,9 @@
            responseEntity = privilegeServiceSMOImpl.loadListPrivilege(pd);
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/components/PrivilegeGroupComponent.java
@@ -30,9 +30,9 @@
            responseEntity = privilegeServiceSMOImpl.listPrivilegeGroup(pd);
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/components/RegisterComponent.java
@@ -36,8 +36,9 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    /**
@@ -53,8 +54,9 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    public ResponseEntity<String> getSysInfo(IPageData pd) {
service-front/src/main/java/com/java110/front/components/StaffComponent.java
@@ -40,8 +40,9 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/components/ValidateCodeComponent.java
@@ -31,8 +31,9 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    /**
@@ -48,8 +49,9 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/components/ValidateTelComponent.java
@@ -32,8 +32,9 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    /**
@@ -49,8 +50,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/components/community/AddCommunityComponent.java
@@ -43,8 +43,9 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    public IAddCommunitySMO getAddCommunitySMOImpl() {
service-front/src/main/java/com/java110/front/components/community/AreaSelectComponent.java
@@ -30,8 +30,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    public ICompanyServiceSMO getCompanyServiceSMOImpl() {
service-front/src/main/java/com/java110/front/components/community/EnterCommunityComponent.java
@@ -32,9 +32,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/components/community/StoreEnterCommunityComponent.java
@@ -29,8 +29,9 @@
            }catch (Exception e){
                responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
            }finally {
                return responseEntity;
            }
            return responseEntity;
    }
    /**
@@ -45,8 +46,9 @@
        }catch (Exception e){
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        }finally {
            return responseEntity;
        }
        return responseEntity;
    }
    public ICommunityServiceSMO getCommunityServiceSMOImpl() {
service-front/src/main/java/com/java110/front/components/community/storeExitCommunityComponent.java
@@ -30,8 +30,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/components/privilege/AddPrivilegeComponent.java
@@ -30,9 +30,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    public ResponseEntity<String> addPrivilegeToPrivilegeGroup(IPageData pd) {
@@ -42,8 +41,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    public IPrivilegeServiceSMO getPrivilegeServiceSMOImpl() {
service-front/src/main/java/com/java110/front/components/privilege/DeletePrivilegeComponent.java
@@ -24,8 +24,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    public IPrivilegeServiceSMO getPrivilegeServiceSMOImpl() {
service-front/src/main/java/com/java110/front/components/privilege/StaffPrivilegeComponent.java
@@ -24,8 +24,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/components/staff/AddStaffPrivilegeComponent.java
@@ -28,8 +28,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    /**
@@ -45,8 +45,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    /**
@@ -63,8 +63,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    public IStaffServiceSMO getStaffServiceSMOImpl() {
service-front/src/main/java/com/java110/front/components/staff/DeleteStaffPrivilegeComponent.java
@@ -23,8 +23,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/components/staff/SearchStaffComponent.java
@@ -24,9 +24,8 @@
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
        return responseEntity;
    }
    public IStaffServiceSMO getStaffServiceSMOImpl() {
service-front/src/main/java/com/java110/front/controller/CallComponentController.java
@@ -125,8 +125,8 @@
            if (!StringUtil.isEmpty(version) && VERSION_2.equals(version)) {
                return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, responseEntity.getBody());
            }
            return responseEntity;
        }
        return responseEntity;
    }
    /**
@@ -195,8 +195,8 @@
            if (!StringUtil.isEmpty(version) && VERSION_2.equals(version)) {
                return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, responseEntity.getBody());
            }
            return responseEntity;
        }
        return responseEntity;
    }
    //组件上传文件处理/callComponent/upload/
@@ -266,8 +266,8 @@
            if (!StringUtil.isEmpty(version) && VERSION_2.equals(version)) {
                return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, responseEntity.getBody());
            }
            return responseEntity;
        }
        return responseEntity;
    }
    /**
@@ -320,8 +320,8 @@
            responseEntity = new ResponseEntity<Object>(msg, HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            logger.debug("组件调用返回信息为{}", responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
    /**
service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java
@@ -71,9 +71,8 @@
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            logger.debug("请求地址为,{} 请求中心服务信息,{},中心服务返回信息,{}", url, httpEntity, responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/smo/api/impl/ApiSMOImpl.java
@@ -112,8 +112,8 @@
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            logger.debug("api返回信息" + responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java
@@ -186,7 +186,7 @@
        int line = 0;
        double totalPageHeight = 0;
        for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
            Map info = generatorRoomOweFee(sheet, workbook, rooms.getJSONObject(roomIndex), line, totalPageHeight, patriarch, feePrint);
            Map<String, Object> info = generatorRoomOweFee(sheet, workbook, rooms.getJSONObject(roomIndex), line, totalPageHeight, patriarch, feePrint);
            line = Integer.parseInt(info.get("line").toString()) + 1;
            totalPageHeight = Double.parseDouble(info.get("totalPageHeight").toString());
        }
service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouOweFeeToNotifyAdapt.java
@@ -187,9 +187,8 @@
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            logger.debug("请求地址为,{} 请求中心服务信息,{},中心服务返回信息,{}", url, httpEntity, responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouPayNotifyAdapt.java
@@ -160,9 +160,8 @@
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            logger.debug("请求地址为,{} 请求中心服务信息,{},中心服务返回信息,{}", url, httpEntity, responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/smo/payment/adapt/fuiouPay/FuiouRentingToNotifyAdapt.java
@@ -158,9 +158,8 @@
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            logger.debug("请求地址为,{} 请求中心服务信息,{},中心服务返回信息,{}", url, httpEntity, responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
    /**
service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatOweFeeToNotifyAdapt.java
@@ -193,9 +193,9 @@
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            logger.debug("请求地址为,{} 请求中心服务信息,{},中心服务返回信息,{}", url, httpEntity, responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatPayNotifyAdapt.java
@@ -203,9 +203,9 @@
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            logger.debug("请求地址为,{} 请求中心服务信息,{},中心服务返回信息,{}", url, httpEntity, responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
service-front/src/main/java/com/java110/front/smo/payment/adapt/wechatPay/WechatRentingToNotifyAdapt.java
@@ -166,9 +166,8 @@
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            logger.debug("请求地址为,{} 请求中心服务信息,{},中心服务返回信息,{}", url, httpEntity, responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
}
service-front/src/main/java/com/java110/front/smo/payment/impl/GoodsToNotifySMOImpl.java
@@ -181,9 +181,8 @@
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            logger.debug("请求地址为,{} 请求中心服务信息,{},中心服务返回信息,{}", url, httpEntity, responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
service-goods/pom.xml
@@ -30,40 +30,42 @@
    <build>
        <finalName>service-goods</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
                <version>2.10</version>
                <executions>
                    <execution>
                        <id>unpack</id>
                        <phase>generate-resources</phase>
                        <goals>
                            <goal>unpack</goal>
                        </goals>
                        <configuration>
                            <artifactItems>
                                <artifactItem>
                                    <groupId>com.java110</groupId>
                                    <artifactId>java110-interface</artifactId>
                                    <version>${microcommunity.version}</version>
                                    <type>jar</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                </artifactItem>
                            </artifactItems>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <mainClass>com.java110.goods.GoodsServiceApplicationStart</mainClass>
                </configuration>
            </plugin>
        </plugins>
        <pluginManagement>
            <plugins>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-dependency-plugin</artifactId>
                    <version>2.10</version>
                    <executions>
                        <execution>
                            <id>unpack</id>
                            <phase>generate-resources</phase>
                            <goals>
                                <goal>unpack</goal>
                            </goals>
                            <configuration>
                                <artifactItems>
                                    <artifactItem>
                                        <groupId>com.java110</groupId>
                                        <artifactId>java110-interface</artifactId>
                                        <version>${microcommunity.version}</version>
                                        <type>jar</type>
                                        <overWrite>true</overWrite>
                                        <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                    </artifactItem>
                                </artifactItems>
                            </configuration>
                        </execution>
                    </executions>
                </plugin>
                <plugin>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-maven-plugin</artifactId>
                    <configuration>
                        <mainClass>com.java110.goods.GoodsServiceApplicationStart</mainClass>
                    </configuration>
                </plugin>
            </plugins>
        </pluginManagement>
    </build>
</project>
service-job/pom.xml
@@ -7,7 +7,6 @@
        <version>1.0-SNAPSHOT</version>
    </parent>
    <groupId>com.java110</groupId>
    <artifactId>service-job</artifactId>
    <packaging>jar</packaging>
@@ -47,42 +46,44 @@
    <build>
        <finalName>service-job</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
                <version>2.10</version>
                <executions>
                    <execution>
                        <id>unpack</id>
                        <phase>generate-resources</phase>
                        <goals>
                            <goal>unpack</goal>
                        </goals>
                        <configuration>
                            <artifactItems>
                                <artifactItem>
                                    <groupId>com.java110</groupId>
                                    <artifactId>java110-interface</artifactId>
                                    <!--<testFailureIgnore>true</testFailureIgnore>-->
                                    <version>${microcommunity.version}</version>
                                    <type>jar</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                </artifactItem>
                            </artifactItems>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <mainClass>com.java110.job.JobServiceApplication</mainClass>
                </configuration>
            </plugin>
        </plugins>
        <pluginManagement>
            <plugins>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-dependency-plugin</artifactId>
                    <version>2.10</version>
                    <executions>
                        <execution>
                            <id>unpack</id>
                            <phase>generate-resources</phase>
                            <goals>
                                <goal>unpack</goal>
                            </goals>
                            <configuration>
                                <artifactItems>
                                    <artifactItem>
                                        <groupId>com.java110</groupId>
                                        <artifactId>java110-interface</artifactId>
                                        <!--<testFailureIgnore>true</testFailureIgnore>-->
                                        <version>${microcommunity.version}</version>
                                        <type>jar</type>
                                        <overWrite>true</overWrite>
                                        <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                    </artifactItem>
                                </artifactItems>
                            </configuration>
                        </execution>
                    </executions>
                </plugin>
                <plugin>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-maven-plugin</artifactId>
                    <configuration>
                        <mainClass>com.java110.job.JobServiceApplication</mainClass>
                    </configuration>
                </plugin>
            </plugins>
        </pluginManagement>
    </build>
</project>
service-job/src/main/java/com/java110/job/Api/JobApi.java
@@ -69,9 +69,8 @@
            logger.error("请求订单异常", e);
            responseJson = DataTransactionFactory.createBusinessResponseJson(businessServiceDataFlow, ResponseConstant.RESULT_CODE_ERROR, e.getMessage() + e,
                    null);
        } finally {
            return responseJson.toJSONString();
        }
        return responseJson.toJSONString();
    }
service-job/src/main/java/com/java110/job/smo/DownloadFileFromFtpToTable.java
@@ -377,8 +377,8 @@
    /**
     * 分配每个线程处理的起止位置
     */
    public static List contSaveThreadContInfo(Map taskInfo) {
        List contlist = new ArrayList();
    public static List<Map<String,Long>> contSaveThreadContInfo(Map taskInfo) {
        List<Map<String,Long>> contlist = new ArrayList<Map<String,Long>>();
        try {
            RandomAccessFile raf = new RandomAccessFile(taskInfo.get("localfilename").toString(), "r");
            int tnum = Integer.valueOf(taskInfo.get("TNUM").toString());
@@ -398,7 +398,7 @@
                }
                for (int i = 0; i < tnum; i++) {
                    if (i == tnum - 1) {
                        Map tmp = new HashMap();
                        Map<String,Long> tmp = new HashMap<String,Long>();
                        tmp.put("begin", begin);
                        tmp.put("end", filelen - 1);
                        contlist.add(tmp);
@@ -409,7 +409,7 @@
                    if (end < begin) {
                        begin = 0;
                        end = begin;
                        Map tmp = new HashMap();
                        Map<String,Long> tmp = new HashMap<String,Long>();
                        tmp.put("begin", begin);
                        tmp.put("end", end);
                        contlist.add(tmp);
@@ -419,7 +419,7 @@
                    while (end > 0) {
                        raf.seek(end);
                        if (raf.readByte() == '\n') {
                            Map tmp = new HashMap();
                            Map<String,Long> tmp = new HashMap<String,Long>();
                            tmp.put("begin", begin);
                            tmp.put("end", end);
                            contlist.add(tmp);
service-order/pom.xml
@@ -48,6 +48,7 @@
    <build>
        <finalName>service-order</finalName>
        <pluginManagement>
            <plugins>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
@@ -101,6 +102,7 @@
                    </configuration>
                </plugin>
            </plugins>
        </pluginManagement>
    </build>
service-order/src/main/java/com/java110/order/api/HttpApi.java
@@ -82,12 +82,11 @@
            logger.error("请求订单异常",e);
            resData = DataTransactionFactory.createOrderResponseJson(ResponseConstant.NO_TRANSACTION_ID,
                    ResponseConstant.RESULT_CODE_ERROR,e.getMessage()+e).toJSONString();
        }finally {
            for(String key : headers.keySet()) {
                response.addHeader(key,headers.get(key));
            }
            return resData;
        }
        for(String key : headers.keySet()) {
            response.addHeader(key,headers.get(key));
        }
        return resData;
    }
    /**
service-order/src/main/java/com/java110/order/api/OrderApi.java
@@ -79,10 +79,9 @@
            logger.error("请求订单异常", e);
            responseEntity = new ResponseEntity<String>("请求中心服务发生异常," + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            logger.debug("订单服务返回报文为: {}", responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
    /**
service-order/src/main/java/com/java110/order/api/PrivilegeApi.java
@@ -43,9 +43,8 @@
            responseEntity =  new ResponseEntity<String>("请求中心服务发生异常,"+e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        }finally {
            logger.debug("订单服务返回报文为: {}",responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
    @RequestMapping(path = "/deleteUserAllPrivilege",method= RequestMethod.POST)
@@ -61,8 +60,8 @@
            responseEntity =  new ResponseEntity<String>("请求中心服务发生异常,"+e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        }finally {
            logger.debug("订单服务返回报文为: {}",responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
@@ -79,8 +78,8 @@
            responseEntity =  new ResponseEntity<String>("请求中心服务发生异常,"+e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        }finally {
            logger.debug("订单服务返回报文为: {}",responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
    @RequestMapping(path = "/editPrivilegeGroup",method= RequestMethod.POST)
@@ -96,8 +95,8 @@
            responseEntity =  new ResponseEntity<String>("请求中心服务发生异常,"+e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        }finally {
            logger.debug("订单服务返回报文为: {}",responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
    @RequestMapping(path = "/deletePrivilegeGroup",method= RequestMethod.POST)
@@ -113,8 +112,8 @@
            responseEntity =  new ResponseEntity<String>("请求中心服务发生异常,"+e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        }finally {
            logger.debug("订单服务返回报文为: {}",responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
    @RequestMapping(path = "/addPrivilegeToPrivilegeGroup",method= RequestMethod.POST)
@@ -130,8 +129,8 @@
            responseEntity =  new ResponseEntity<String>("请求中心服务发生异常,"+e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        }finally {
            logger.debug("订单服务返回报文为: {}",responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
@@ -148,8 +147,8 @@
            responseEntity =  new ResponseEntity<String>("请求中心服务发生异常,"+e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        }finally {
            logger.debug("订单服务返回报文为: {}",responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
@@ -166,8 +165,8 @@
            responseEntity =  new ResponseEntity<String>("请求中心服务发生异常,"+e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        }finally {
            logger.debug("订单服务返回报文为: {}",responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
@@ -184,8 +183,8 @@
            responseEntity =  new ResponseEntity<String>("请求中心服务发生异常,"+e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        }finally {
            logger.debug("订单服务返回报文为: {}",responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }
service-order/src/main/java/com/java110/order/dao/impl/SnowflakeIdWorkerImpl.java
@@ -205,8 +205,9 @@
            logger.error("生成主键ID异常" + prefix, e);
            throw new DAOException(ResponseConstant.RESULT_CODE_INNER_ERROR, "生成主键ID异常" + prefix + e);
        } finally {
            return id;
        }
        return id;
    }
service-order/src/main/java/com/java110/order/smo/impl/CenterServiceSMOImpl.java
@@ -153,10 +153,8 @@
            }
            resJson = encrypt(responseJson.toJSONString(),headers);
            //这里保存耗时,以及日志
            return resJson;
        }
        return resJson;
    }
    /**
@@ -247,11 +245,9 @@
                        LogAgent.createLogMessage(dataFlow.getResponseHeaders(),responseEntity.getBody()),endDate.getTime()-dataFlow.getStartDate().getTime());
                //DataFlowEventPublishing.dataResponse(dataFlow,reqJson,headers);
            }
            //这里保存耗时,以及日志
            return responseEntity ;
        }
        return responseEntity ;
    }
    /**
@@ -328,9 +324,8 @@
                AuthenticationFactory.putSign(dataFlow, headers);
            }
            resJson = encrypt(responseData,headers);
            return resJson;
        }
        return resJson;
    }
    /**
service-order/src/main/java/com/java110/order/smo/impl/OrderProcessServiceSMOImpl.java
@@ -116,9 +116,8 @@
            responseEntity = new ResponseEntity<String>("内部异常了:" + e.getMessage() + e.getLocalizedMessage(), OrderDataFlowContextFactory.hashMap2MultiValueMap(dataFlow.getResHeaders()), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            //这里保存耗时,以及日志
            return responseEntity;
        }
        return responseEntity;
    }
    /**
@@ -288,9 +287,8 @@
        } finally {
            responseEntity = new ResponseEntity<>("成功", HttpStatus.OK);
            return responseEntity;
        }
        return responseEntity;
    }
    /**
service-order/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java
@@ -120,12 +120,10 @@
//                        LogAgent.createLogMessage(dataFlow.getResponseHeaders(),responseEntity.getBody()),endDate.getTime()-dataFlow.getStartDate().getTime());
//                DataFlowEventPublishing.dataResponse(dataFlow,reqJson,headers);
            }
            //这里保存耗时,以及日志
            return responseEntity;
        }
        return responseEntity;
    }
service-report/pom.xml
@@ -32,40 +32,42 @@
  <build>
    <finalName>service-report</finalName>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-dependency-plugin</artifactId>
        <version>2.10</version>
        <executions>
          <execution>
            <id>unpack</id>
            <phase>generate-resources</phase>
            <goals>
              <goal>unpack</goal>
            </goals>
            <configuration>
              <artifactItems>
                <artifactItem>
                  <groupId>com.java110</groupId>
                  <artifactId>java110-interface</artifactId>
                  <version>${microcommunity.version}</version>
                  <type>jar</type>
                  <overWrite>true</overWrite>
                  <outputDirectory>${project.build.directory}/classes</outputDirectory>
                </artifactItem>
              </artifactItems>
            </configuration>
          </execution>
        </executions>
      </plugin>
      <plugin>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-maven-plugin</artifactId>
        <configuration>
          <mainClass>com.java110.report.ReportServiceApplicationStart</mainClass>
        </configuration>
      </plugin>
    </plugins>
    <pluginManagement>
        <plugins>
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-dependency-plugin</artifactId>
            <version>2.10</version>
            <executions>
              <execution>
                <id>unpack</id>
                <phase>generate-resources</phase>
                <goals>
                  <goal>unpack</goal>
                </goals>
                <configuration>
                  <artifactItems>
                    <artifactItem>
                      <groupId>com.java110</groupId>
                      <artifactId>java110-interface</artifactId>
                      <version>${microcommunity.version}</version>
                      <type>jar</type>
                      <overWrite>true</overWrite>
                      <outputDirectory>${project.build.directory}/classes</outputDirectory>
                    </artifactItem>
                  </artifactItems>
                </configuration>
              </execution>
            </executions>
          </plugin>
          <plugin>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-maven-plugin</artifactId>
            <configuration>
              <mainClass>com.java110.report.ReportServiceApplicationStart</mainClass>
            </configuration>
          </plugin>
        </plugins>
    </pluginManagement>
  </build>
</project>
</project>
service-store/pom.xml
@@ -33,40 +33,42 @@
    <build>
        <finalName>service-store</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
                <version>2.10</version>
                <executions>
                    <execution>
                        <id>unpack</id>
                        <phase>generate-resources</phase>
                        <goals>
                            <goal>unpack</goal>
                        </goals>
                        <configuration>
                            <artifactItems>
                                <artifactItem>
                                    <groupId>com.java110</groupId>
                                    <artifactId>java110-interface</artifactId>
                                    <version>${microcommunity.version}</version>
                                    <type>jar</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                </artifactItem>
                            </artifactItems>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <mainClass>com.java110.store.StoreServiceApplicationStart</mainClass>
                </configuration>
            </plugin>
        </plugins>
        <pluginManagement>
            <plugins>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-dependency-plugin</artifactId>
                    <version>2.10</version>
                    <executions>
                        <execution>
                            <id>unpack</id>
                            <phase>generate-resources</phase>
                            <goals>
                                <goal>unpack</goal>
                            </goals>
                            <configuration>
                                <artifactItems>
                                    <artifactItem>
                                        <groupId>com.java110</groupId>
                                        <artifactId>java110-interface</artifactId>
                                        <version>${microcommunity.version}</version>
                                        <type>jar</type>
                                        <overWrite>true</overWrite>
                                        <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                    </artifactItem>
                                </artifactItems>
                            </configuration>
                        </execution>
                    </executions>
                </plugin>
                <plugin>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-maven-plugin</artifactId>
                    <configuration>
                        <mainClass>com.java110.store.StoreServiceApplicationStart</mainClass>
                    </configuration>
                </plugin>
            </plugins>
        </pluginManagement>
    </build>
</project>
service-store/src/main/java/com/java110/store/api/StoreApi.java
@@ -91,8 +91,9 @@
                    null);
        } finally {
            logger.debug("storeApi 请求报文{},返回报文:{}", orderInfo, responseJson.toJSONString());
            return responseJson.toJSONString();
        }
        return responseJson.toJSONString();
    }
    /**
service-user/pom.xml
@@ -32,40 +32,42 @@
    <build>
        <finalName>service-user</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
                <version>2.10</version>
                <executions>
                    <execution>
                        <id>unpack</id>
                        <phase>generate-resources</phase>
                        <goals>
                            <goal>unpack</goal>
                        </goals>
                        <configuration>
                            <artifactItems>
                                <artifactItem>
                                    <groupId>com.java110</groupId>
                                    <artifactId>java110-interface</artifactId>
                                    <version>${microcommunity.version}</version>
                                    <type>jar</type>
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                </artifactItem>
                            </artifactItems>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <configuration>
                    <mainClass>com.java110.user.UserServiceApplicationStart</mainClass>
                </configuration>
            </plugin>
        </plugins>
        <pluginManagement>
            <plugins>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-dependency-plugin</artifactId>
                    <version>2.10</version>
                    <executions>
                        <execution>
                            <id>unpack</id>
                            <phase>generate-resources</phase>
                            <goals>
                                <goal>unpack</goal>
                            </goals>
                            <configuration>
                                <artifactItems>
                                    <artifactItem>
                                        <groupId>com.java110</groupId>
                                        <artifactId>java110-interface</artifactId>
                                        <version>${microcommunity.version}</version>
                                        <type>jar</type>
                                        <overWrite>true</overWrite>
                                        <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                    </artifactItem>
                                </artifactItems>
                            </configuration>
                        </execution>
                    </executions>
                </plugin>
                <plugin>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-maven-plugin</artifactId>
                    <configuration>
                        <mainClass>com.java110.user.UserServiceApplicationStart</mainClass>
                    </configuration>
                </plugin>
            </plugins>
        </pluginManagement>
    </build>
</project>
service-user/src/main/java/com/java110/user/api/UserApi.java
@@ -71,8 +71,9 @@
            responseJson = DataTransactionFactory.createBusinessResponseJson(businessServiceDataFlow, ResponseConstant.RESULT_CODE_ERROR, e.getMessage() + e,
                    null);
        } finally {
            return responseJson.toJSONString();
        }
        return responseJson.toJSONString();
    }
service-user/src/main/java/com/java110/user/dao/IOwnerRoomRelServiceDao.java
@@ -53,7 +53,7 @@
     * @return 业主房屋信息
     * @throws DAOException DAO异常
     */
    List<Map> getOwnerRoomRelInfo(Map info) throws DAOException;
    List<Map<Object,Object>> getOwnerRoomRelInfo(Map<Object,Object> info) throws DAOException;
service-user/src/main/java/com/java110/user/dao/impl/OwnerRoomRelServiceDaoImpl.java
@@ -86,10 +86,10 @@
     * @throws DAOException DAO异常
     */
    @Override
    public List<Map> getOwnerRoomRelInfo(Map info) throws DAOException {
    public List<Map<Object,Object>> getOwnerRoomRelInfo(Map<Object,Object> info) throws DAOException {
        logger.debug("查询业主房屋信息 入参 info : {}", info);
        List<Map> businessOwnerRoomRelInfos = sqlSessionTemplate.selectList("ownerRoomRelServiceDaoImpl.getOwnerRoomRelInfo", info);
        List<Map<Object,Object>> businessOwnerRoomRelInfos = sqlSessionTemplate.selectList("ownerRoomRelServiceDaoImpl.getOwnerRoomRelInfo", info);
        return businessOwnerRoomRelInfos;
    }
service-user/src/main/java/com/java110/user/dao/impl/UserServiceDaoImpl.java
@@ -55,9 +55,9 @@
            return saveFlag;
        } finally {
            logger.debug("----【userServiceDaoImpl.saveDataToBoCust】保存数据出参 : saveFlag:" + saveFlag);
            return saveFlag;
        }
        return saveFlag;
    }
    /**
service-user/src/main/java/com/java110/user/listener/ownerRoomRel/AbstractOwnerRoomRelBusinessServiceDataFlowListener.java
@@ -35,7 +35,7 @@
     *
     * @param businessOwnerRoomRelInfo
     */
    protected void flushBusinessOwnerRoomRelInfo(Map businessOwnerRoomRelInfo, String statusCd) {
    protected void flushBusinessOwnerRoomRelInfo(Map<Object,Object> businessOwnerRoomRelInfo, String statusCd) {
        businessOwnerRoomRelInfo.put("newBId", businessOwnerRoomRelInfo.get("b_id"));
        businessOwnerRoomRelInfo.put("relId", businessOwnerRoomRelInfo.get("rel_id"));
        businessOwnerRoomRelInfo.put("operate", businessOwnerRoomRelInfo.get("operate"));
@@ -58,15 +58,15 @@
     */
    protected void autoSaveDelBusinessOwnerRoomRel(Business business, JSONObject businessOwnerRoomRel) {
//自动插入DEL
        Map info = new HashMap();
        Map<Object,Object> info = new HashMap<Object,Object>();
        info.put("relId", businessOwnerRoomRel.getString("relId"));
        info.put("statusCd", StatusConstant.STATUS_CD_VALID);
        List<Map> currentOwnerRoomRelInfos = getOwnerRoomRelServiceDaoImpl().getOwnerRoomRelInfo(info);
        List<Map<Object,Object>> currentOwnerRoomRelInfos = getOwnerRoomRelServiceDaoImpl().getOwnerRoomRelInfo(info);
        if (currentOwnerRoomRelInfos == null || currentOwnerRoomRelInfos.size() != 1) {
            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "未找到需要修改数据信息,入参错误或数据有问题,请检查" + info);
        }
        Map currentOwnerRoomRelInfo = currentOwnerRoomRelInfos.get(0);
        Map<Object,Object> currentOwnerRoomRelInfo = currentOwnerRoomRelInfos.get(0);
        currentOwnerRoomRelInfo.put("bId", business.getbId());
        currentOwnerRoomRelInfo.put("relId", currentOwnerRoomRelInfo.get("rel_id"));
        currentOwnerRoomRelInfo.put("operate", currentOwnerRoomRelInfo.get("operate"));