Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

# Conflicts:
#	modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java

modules/i3plus-core-api/pom.xml

@@ -19,10 +19,6 @@
         </dependency>
         <dependency>
             <groupId>i3plus.pojo</groupId>
-            <artifactId>i3plus-pojo-mes</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-model</artifactId>
         </dependency>
 

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/IDataSimpleService.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.core.api.iservice.base;
 
-import cn.estsh.i3plus.pojo.mes.MachineFactory;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -15,7 +14,7 @@ import java.util.List;
  **/
 public interface IDataSimpleService {
 
-    void saveMachineFactory(MachineFactory machineFactory);
+    //void saveMachineFactory(MachineFactory machineFactory);
 
     /*@Transactional
     void updateMachineFactoryNameById(long id, String factoryName);

modules/i3plus-core-apiservice/pom.xml

@@ -103,10 +103,6 @@
             <artifactId>ehcache-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>i3plus.pojo</groupId>
-            <artifactId>i3plus-pojo-mes</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
@@ -161,7 +157,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <mainClass>cn.estsh.ImppGo</mainClass>
+                    <mainClass>cn.estsh.impp.framework.run.ImppGo</mainClass>
                     <layout>JAR</layout>
                 </configuration>
                 <executions>

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/ShiroAuthConfiguration.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
 
 import javax.annotation.Resource;
 import javax.servlet.Filter;
@@ -93,12 +94,13 @@ public class ShiroAuthConfiguration {
         return realms;
     }
 
-    @Bean
+    @Bean(name="modularRealmAuthenticator")
     public ModularRealmAuthenticator modularRealmAuthenticator(){
         return  new DefaultModularRealm(supportRealmMap());
     }
 
     @Bean
+    @DependsOn("modularRealmAuthenticator")
     public SecurityManager securityManager(){
         LOGGER.info("【app-shiro-加载securityManager】");
         DefaultWebSecurityManager securityManager =  new DefaultWebSecurityManager();

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanPackageConfiguration.java

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.core.apiservice.configuration;
+
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
+import cn.estsh.i3plus.pojo.base.jpa.factory.BaseMongoRepositoryFactoryBean;
+import cn.estsh.i3plus.pojo.base.jpa.factory.BaseRepositoryFactoryBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
+
+/**
+ * @Description : 需要扫描其他包的配置文件
+ *                  此类专门添加需要单独加载的其他模块的包
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-12-12 20:49
+ * @Modify:
+ **/
+@Configuration
+@Order(0)
+//扫描需要单独处理的对象类
+@EntityScan(basePackageClasses = {
+        //需要单独处理的其他模块对象
+})
+
+@EnableJpaRepositories(basePackages = {
+        //需要单独处理的其他模块持久化仓
+}, repositoryFactoryBeanClass = BaseRepositoryFactoryBean.class)
+
+@EnableMongoRepositories(basePackageClasses = {
+        //需要单独处理的其他模块mongo持久化仓
+},repositoryFactoryBeanClass = BaseMongoRepositoryFactoryBean.class)
+public class ScanPackageConfiguration {
+    public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG);
+
+    public ScanPackageConfiguration(){
+        LOGGER.info("【关联模块加载包处理...】");
+    }
+}

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java

@@ -4,11 +4,10 @@ import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueueConfig;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
-import cn.estsh.impp.framework.boot.util.ResultBean;
-import cn.estsh.i3plus.pojo.mes.MachineFactory;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
 import cn.estsh.impp.framework.boot.util.ImppRedis;
+import cn.estsh.impp.framework.boot.util.ResultBean;
 import com.rabbitmq.client.Channel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,7 +18,9 @@ import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.io.IOException;
@@ -63,7 +64,7 @@ public class DemoRedisMqController extends CoreBaseController{
     @ApiOperation(value="缓存",notes="放入数据")
     public ResultBean putCache(){
         //放入缓存
-        redisCore.putObject("machineFactory",new MachineFactory("111","nnnn"));
+        //redisCore.putObject("machineFactory",new MachineFactory("111","nnnn"));
         redisCore.putObject("wms","123123123");
 
         return new ResultBean(true,"已放入缓存");
@@ -72,11 +73,11 @@ public class DemoRedisMqController extends CoreBaseController{
     @GetMapping(value="/get-cache")
     @ApiOperation(value="缓存",notes="获取数据")
     public ResultBean getCache(){
-        MachineFactory mf = (MachineFactory) redisCore.getObject("machineFactory");
+        //MachineFactory mf = (MachineFactory) redisCore.getObject("machineFactory");
-        System.out.println("1===== " + mf);
+        //System.out.println("1===== " + mf);
         System.out.println("2===== " + redisCore.getObject("wms"));
 
-        return new ResultBean(true,mf);
+        return new ResultBean(true);
     }
 
     @GetMapping(value="/send-mq")
@@ -91,7 +92,7 @@ public class DemoRedisMqController extends CoreBaseController{
         this.rabbitTemplate.convertAndSend(I3CoreQueueConfig.DEMO_HANDLE_QUEUE, context);
 
         System.out.println("发送Object数据 : " + context);
-        this.rabbitTemplate.convertAndSend(I3CoreQueueConfig.DEMO_OBJ_QUEUE, new MachineFactory("111mq","rabbit"));
+        //this.rabbitTemplate.convertAndSend(I3CoreQueueConfig.DEMO_OBJ_QUEUE, new MachineFactory("111mq","rabbit"));
 
         return new ResultBean(true,"操作成功");
     }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java

@@ -4,15 +4,15 @@ import cn.estsh.i3plus.core.api.iservice.base.IDataSimpleService;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.util.ResultBean;
-import cn.estsh.i3plus.pojo.mes.MachineFactory;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PutMapping;
-
+import org.springframework.web.bind.annotation.RequestMapping;
-import java.util.List;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Description :
@@ -33,10 +33,10 @@ public class SimpleController extends CoreBaseController{
     @PutMapping(value="/insert")
     @ApiOperation(value="service服务",notes="返回内容添加service")
     public ResultBean insertFactory(@RequestParam("name")String name, @RequestParam("code")String code){
-        MachineFactory machineFactory = new MachineFactory();
+//        MachineFactory machineFactory = new MachineFactory();
-        machineFactory.setFactoryName(name);
+//        machineFactory.setFactoryName(name);
-        machineFactory.setFactoryCode(code);
+//        machineFactory.setFactoryCode(code);
-        dataSimpleService.saveMachineFactory(machineFactory);
+//        dataSimpleService.saveMachineFactory(machineFactory);
 
         return new ResultBean(true,"工厂已保存");
     }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/dao/IMachineFactoryDao.java

@@ -1,45 +1,39 @@
-package cn.estsh.i3plus.core.apiservice.dao;
+//package cn.estsh.i3plus.core.apiservice.dao;
-
+//
-import cn.estsh.i3plus.pojo.mes.MachineFactory;
+////import cn.estsh.i3plus.pojo.mes.MachineFactory;
-import org.springframework.data.jpa.repository.Modifying;
+//import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.jpa.repository.Query;
+//
-import org.springframework.data.repository.CrudRepository;
+///**
-import org.springframework.data.repository.query.Param;
+// * @Description : hql申明查询demo
-import org.springframework.stereotype.Repository;
+// * 继承了crudrepository，包含了常用hql方法
-
+// * @Reference : 如果需要执行原生sql，则添加 @Query(sql,nativeQuery=true)
-import java.util.List;
+// * @Author : alwaysfrin
-
+// * @CreateDate : 2018-09-05 16:41
-/**
+// * @Modify:
- * @Description : hql申明查询demo
+// **/
- * 继承了crudrepository，包含了常用hql方法
+////@Repository
- * @Reference : 如果需要执行原生sql，则添加 @Query(sql,nativeQuery=true)
+//public interface IMachineFactoryDao extends CrudRepository<MachineFactory,Long> {
- * @Author : alwaysfrin
+//
- * @CreateDate : 2018-09-05 16:41
+//    //此处findBy开头，会自动根据属性名进行查询
- * @Modify:
+//    /*List<MachineFactory> findByFactoryName(String factoryName);
- **/
+//
-//@Repository
+//    @Modifying
-public interface IMachineFactoryDao extends CrudRepository<MachineFactory,Long> {
+//    @Query("update MachineFactory mf set mf.factoryName = :factoryName where mf.id = :id")
-
+//    void updateMachineFactoryNameById(long id, String factoryName);
-    //此处findBy开头，会自动根据属性名进行查询
+//
-    /*List<MachineFactory> findByFactoryName(String factoryName);
+//    @Modifying
-
+//    @Query("delete from MachineFactory mf where id = :id")
-    @Modifying
+//    void deleteMachineFactoryById(@Param("id") long id);
-    @Query("update MachineFactory mf set mf.factoryName = :factoryName where mf.id = :id")
+//
-    void updateMachineFactoryNameById(long id, String factoryName);
+//    //按位查询
-
+//    @Query("select mf from MachineFactory mf where factoryName = ?1")
-    @Modifying
+//    List<MachineFactory> findMachineFactoryByFactoryName(String factoryName);
-    @Query("delete from MachineFactory mf where id = :id")
+//
-    void deleteMachineFactoryById(@Param("id") long id);
+//    //参数匹配
-
+//    @Query("from MachineFactory mf where mf.factoryCode = :factoryCode")
-    //按位查询
+//    List<MachineFactory> findMachineFactoryByFactoryCode(@Param("factoryCode") String factoryCode);
-    @Query("select mf from MachineFactory mf where factoryName = ?1")
+//
-    List<MachineFactory> findMachineFactoryByFactoryName(String factoryName);
+//    //自定义Hql
-
+//    @Query("from MachineFactory mf where mf.createDatetime like '2018-01-01%'")
-    //参数匹配
+//    List<MachineFactory> findMachineFactorySpecial();*/
-    @Query("from MachineFactory mf where mf.factoryCode = :factoryCode")
+//}
-    List<MachineFactory> findMachineFactoryByFactoryCode(@Param("factoryCode") String factoryCode);
-
-    //自定义Hql
-    @Query("from MachineFactory mf where mf.createDatetime like '2018-01-01%'")
-    List<MachineFactory> findMachineFactorySpecial();*/
-}

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/DataSimpleServiceImpl.java

@@ -1,12 +1,8 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.core.api.iservice.base.IDataSimpleService;
-import cn.estsh.i3plus.core.apiservice.dao.IMachineFactoryDao;
-import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
-import cn.estsh.i3plus.pojo.mes.MachineFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -20,15 +16,15 @@ import org.springframework.stereotype.Service;
 public class DataSimpleServiceImpl implements IDataSimpleService {
     private Logger LOGGER = LoggerFactory.getLogger(this.getClass());
 
-    @Autowired
+//    @Autowired
-    private IMachineFactoryDao machineFactoryDao;
+//    private IMachineFactoryDao machineFactoryDao;
 
-    @Override
+//    @Override
-    public void saveMachineFactory(MachineFactory machineFactory) {
+//    public void saveMachineFactory(MachineFactory machineFactory) {
-        //生成主键
+//        //生成主键
-        machineFactory.setId(new SnowflakeIdMaker().nextId());
+//        machineFactory.setId(new SnowflakeIdMaker().nextId());
-        machineFactoryDao.save(machineFactory);
+//        machineFactoryDao.save(machineFactory);
-    }
+//    }
 /*
     @Override
     public void updateMachineFactoryNameById(long id, String factoryName) {

modules/i3plus-core-apiservice/src/main/resources/application.properties

@@ -32,9 +32,15 @@ spring.mvc.view.suffix=.jsp
 spring.resources.static-locations=/static/**,/**
 
 ########扫包路径########
-#基础包路径
+#app基础包路径
 impp.app.base-packages=cn.estsh.i3plus.core
-#对象包路径，可以多个包，逗号分隔
+#app对象路径
-impp.app.base-pojo=cn.estsh.i3plus.pojo.base,cn.estsh.i3plus.pojo.platform
+impp.app.pojo-packages=cn.estsh.i3plus.pojo.platform
-#微服包路径
+#dao接口包
-impp.app.icloud-package=cn.estsh.i3plus.icloud
+impp.app.pojo-dao=${impp.app.base-packages}.apiservice.dao
+#mongo-dao接口包
+impp.app.pojo-mongo-dao=${impp.app.base-packages}.apiservice.daomongo
+#对象持久化包路径，可以多个包，逗号分隔
+impp.app.pojo-repository=${impp.app.pojo-packages}.repository
+#mongodb资源仓
+impp.app.pojo-mongo-repository=${impp.app.pojo-packages}.repositorymongo

pom.xml

@@ -93,21 +93,10 @@
             </dependency>
             <dependency>
                 <groupId>i3plus.pojo</groupId>
-                <artifactId>i3plus-pojo-mes</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>i3plus.pojo</groupId>
                 <artifactId>i3plus-pojo-base</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>i3plus.pojo</groupId>
-                <artifactId>i3plus-pojo-mes</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <!-- wei'fu微服调用 -->
             <dependency>
                 <groupId>i3plus.icloud</groupId>