优化bug

java110-core/src/main/java/com/java110/core/cache/RedisConfiguration.java

@@ -43,6 +43,7 @@ public class RedisConfiguration extends CachingConfigurerSupport  {
         config.setMaxTotal(maxTotal);
         config.setMaxIdle(maxIdle);
         config.setMaxWaitMillis(maxWaitMillis);
+
         return config;
     }
 

java110-core/src/main/java/com/java110/core/smo/smallWechatAttr/ISmallWechatAttrInnerServiceSMO.java

@@ -1,4 +1,4 @@
-package com.java110.core.smo.smallWechatAttr;
+package com.java110.core.smo.store;
 
 import com.java110.core.feign.FeignConfiguration;
 import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;

java110-core/src/main/java/com/java110/core/smo/wechatMenu/IWechatMenuInnerServiceSMO.java

@@ -1,4 +1,4 @@
-package com.java110.core.smo.wechatMenu;
+package com.java110.core.smo.store;
 
 import com.java110.core.feign.FeignConfiguration;
 import com.java110.dto.wechatMenu.WechatMenuDto;

java110-core/src/main/java/com/java110/core/smo/userAttr/IUserAttrInnerServiceSMO.java

@@ -1,4 +1,4 @@
-package com.java110.core.smo.userAttr;
+package com.java110.core.smo.user;
 
 import com.java110.core.feign.FeignConfiguration;
 import com.java110.dto.user.UserAttrDto;

java110-generator/src/main/java/com/java110/code/back/GeneratorIInnerServiceSMO.java

@@ -20,12 +20,12 @@ public class GeneratorIInnerServiceSMO extends BaseGenerator {
                 .replace("@@shareName@@",data.getShareName())
                 .replace("商户", data.getDesc());
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/back/core/smo/" + data.getName() + "/I" + toUpperCaseFirstOne(data.getName()) + "InnerServiceSMO.java";
+                + "out/back/core/smo/" + data.getShareName() + "/I" + toUpperCaseFirstOne(data.getName()) + "InnerServiceSMO.java";
         writeFile(writePath,
                 fileContext);
         //复制生成的文件到对应分区目录下
         if (data.isAutoMove()) {
-            FileUtilBase.copyfile(writePath, "java110-core\\src\\main\\java\\com\\java110\\core\\smo\\" + data.getName() + "/I" + toUpperCaseFirstOne(data.getName()) + "InnerServiceSMO.java");
+            FileUtilBase.copyfile(writePath, "java110-core\\src\\main\\java\\com\\java110\\core\\smo\\" + data.getShareName() + "/I" + toUpperCaseFirstOne(data.getName()) + "InnerServiceSMO.java");
         }
     }
 }

service-api/src/main/java/com/java110/api/bmo/smallWeChat/impl/SmallWechatAttrBMOImpl.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.smallWeChat.ISmallWechatAttrBMO;
 import com.java110.core.context.DataFlowContext;
-import com.java110.core.smo.smallWechatAttr.ISmallWechatAttrInnerServiceSMO;
+import com.java110.core.smo.store.ISmallWechatAttrInnerServiceSMO;
 import com.java110.po.smallWechatAttr.SmallWechatAttrPo;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.util.BeanConvertUtil;

service-api/src/main/java/com/java110/api/bmo/smallWeChat/impl/WechatMenuBMOImpl.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.smallWeChat.IWechatMenuBMO;
 import com.java110.core.context.DataFlowContext;
-import com.java110.core.smo.wechatMenu.IWechatMenuInnerServiceSMO;
+import com.java110.core.smo.store.IWechatMenuInnerServiceSMO;
 import com.java110.po.wechatMenu.WechatMenuPo;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.util.BeanConvertUtil;

service-api/src/main/java/com/java110/api/bmo/user/impl/UserAttrBMOImpl.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.user.IUserAttrBMO;
 import com.java110.core.context.DataFlowContext;
-import com.java110.core.smo.userAttr.IUserAttrInnerServiceSMO;
+import com.java110.core.smo.user.IUserAttrInnerServiceSMO;
 import com.java110.po.userAttr.UserAttrPo;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.util.BeanConvertUtil;

service-api/src/main/java/com/java110/api/listener/smallWeChat/ListSmallWechatAttrsListener.java

@@ -5,7 +5,7 @@ import com.java110.api.listener.AbstractServiceApiListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.core.smo.smallWechatAttr.ISmallWechatAttrInnerServiceSMO;
+import com.java110.core.smo.store.ISmallWechatAttrInnerServiceSMO;
 import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;
 import com.java110.utils.constant.ServiceCodeSmallWechatAttrConstant;
 import com.java110.utils.util.Assert;

service-api/src/main/java/com/java110/api/listener/smallWeChat/ListWechatMenusListener.java

@@ -5,7 +5,7 @@ import com.java110.api.listener.AbstractServiceApiListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.core.smo.wechatMenu.IWechatMenuInnerServiceSMO;
+import com.java110.core.smo.store.IWechatMenuInnerServiceSMO;
 import com.java110.dto.wechatMenu.WechatMenuDto;
 import com.java110.utils.constant.ServiceCodeWechatMenuConstant;
 import com.java110.utils.util.Assert;

service-api/src/main/java/com/java110/api/listener/smallWeChat/PublishWechatMenuListener.java

@@ -9,7 +9,7 @@ import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
 import com.java110.core.factory.WechatFactory;
 import com.java110.core.smo.store.ISmallWeChatInnerServiceSMO;
-import com.java110.core.smo.wechatMenu.IWechatMenuInnerServiceSMO;
+import com.java110.core.smo.store.IWechatMenuInnerServiceSMO;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.dto.wechatMenu.WechatMenuDto;
 import com.java110.utils.constant.ServiceCodeWechatMenuConstant;

service-api/src/main/java/com/java110/api/listener/smallWeChat/SaveWechatMenuListener.java

@@ -6,7 +6,7 @@ import com.java110.api.listener.AbstractServiceApiPlusListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.core.smo.wechatMenu.IWechatMenuInnerServiceSMO;
+import com.java110.core.smo.store.IWechatMenuInnerServiceSMO;
 import com.java110.dto.wechatMenu.WechatMenuDto;
 import com.java110.utils.constant.ServiceCodeWechatMenuConstant;
 import com.java110.utils.util.Assert;

service-api/src/main/java/com/java110/api/listener/smallWeChat/UpdateWechatMenuListener.java

@@ -6,15 +6,12 @@ import com.java110.api.listener.AbstractServiceApiPlusListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.core.smo.wechatMenu.IWechatMenuInnerServiceSMO;
 import com.java110.dto.wechatMenu.WechatMenuDto;
 import com.java110.utils.constant.ServiceCodeWechatMenuConstant;
 import com.java110.utils.util.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 
-import java.util.List;
-
 
 /**
  * 保存公众号菜单侦听

service-job/src/main/java/com/java110/job/task/wechat/PublicWeChatPushMessageTemplate.java

@@ -3,7 +3,7 @@ package com.java110.job.task.wechat;
 import com.alibaba.fastjson.JSON;
 import com.java110.core.factory.WechatFactory;
 import com.java110.core.smo.fee.IFeeInnerServiceSMO;
-import com.java110.core.smo.smallWechatAttr.ISmallWechatAttrInnerServiceSMO;
+import com.java110.core.smo.store.ISmallWechatAttrInnerServiceSMO;
 import com.java110.core.smo.store.ISmallWeChatInnerServiceSMO;
 import com.java110.core.smo.user.IOwnerAppUserInnerServiceSMO;
 import com.java110.dto.community.CommunityDto;

service-store/src/main/java/com/java110/store/smo/impl/SmallWechatAttrInnerServiceSMOImpl.java

@@ -2,7 +2,7 @@ package com.java110.store.smo.impl;
 
 
 import com.java110.store.dao.ISmallWechatAttrServiceDao;
-import com.java110.core.smo.smallWechatAttr.ISmallWechatAttrInnerServiceSMO;
+import com.java110.core.smo.store.ISmallWechatAttrInnerServiceSMO;
 import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.base.smo.BaseServiceSMO;

service-store/src/main/java/com/java110/store/smo/impl/WechatMenuInnerServiceSMOImpl.java

@@ -2,7 +2,7 @@ package com.java110.store.smo.impl;
 
 
 import com.java110.store.dao.IWechatMenuServiceDao;
-import com.java110.core.smo.wechatMenu.IWechatMenuInnerServiceSMO;
+import com.java110.core.smo.store.IWechatMenuInnerServiceSMO;
 import com.java110.dto.wechatMenu.WechatMenuDto;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.base.smo.BaseServiceSMO;

service-user/src/main/java/com/java110/user/smo/impl/UserAttrInnerServiceSMOImpl.java

@@ -3,7 +3,7 @@ package com.java110.user.smo.impl;
 
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
-import com.java110.core.smo.userAttr.IUserAttrInnerServiceSMO;
+import com.java110.core.smo.user.IUserAttrInnerServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.user.UserAttrDto;
 import com.java110.dto.user.UserDto;