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

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

@@ -60,17 +60,20 @@ public class AppStartSystemInit implements CommandLineRunner {
 
     @Override
     public void run(String... args) throws Exception {
-        LOGGER.info("【IMPP-Core开始绑定资源信息...】");
+        try {
-        packIMPPResources();
+            LOGGER.info("【IMPP-Core开始绑定资源信息...】");
-
+            packIMPPResources();
-        LOGGER.info("【IMPP-Core开始加载基础信息...】");
-        systemInitService.putAndLoadAll();
 
-        // 加载系统配置文件
+            LOGGER.info("【IMPP-Core开始加载基础信息...】");
-        LOGGER.info("【IMPP-Core 加载系统配置文件到缓存中 ...】");
+            systemInitService.putAndLoadAll();
-        systemConfig.loadSystemConfig(CommonEnumUtil.SOFT_TYPE.CORE.getCode());
-        LOGGER.info("【IMPP-Core 加载系统配置文件到缓存完成】");
 
+            // 加载系统配置文件
+            LOGGER.info("【IMPP-Core 加载系统配置文件到缓存中 ...】");
+            systemConfig.loadSystemConfig(CommonEnumUtil.SOFT_TYPE.CORE.getCode());
+            LOGGER.info("【IMPP-Core 加载系统配置文件到缓存完成】");
+        }catch (Exception e){
+            e.printStackTrace();
+        }
     }
 
     /**

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

@@ -80,10 +80,6 @@ public class SystemInitService implements ISystemInitService {
         reloadElasticSearchClient();
         LOGGER.info("加载ElasticSearch Client Url 信息完成");
 
-        LOGGER.info("【IMPP-License 加载 License ...】");
-        ImppLicenseTool.cloneLicense();
-        ImppLicenseTool.getLicense();
-        LOGGER.info("【IMPP-License 加载 License完成】");
     }
 
     @Override

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionDetailService.java

@@ -1,9 +1,9 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
-import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionDetailService;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion;
+import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionDetail;
-import cn.estsh.i3plus.pojo.platform.repository.SysPojoVersionRepository;
+import cn.estsh.i3plus.pojo.platform.repository.SysPojoVersionDetailRepository;
 import cn.estsh.impp.framework.base.service.CrudService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -16,13 +16,13 @@ import org.springframework.stereotype.Service;
  * @Modify:
  **/
 @Service
-public class SysPojoVersionDetailService extends CrudService<SysPojoVersion> implements ISysPojoVersionService {
+public class SysPojoVersionDetailService extends CrudService<SysPojoVersionDetail> implements ISysPojoVersionDetailService {
 
     @Autowired
-    private SysPojoVersionRepository pojoVersionRDao;
+    private SysPojoVersionDetailRepository pojoVersionRDao;
 
     @Override
-    public BaseRepository<SysPojoVersion, Long> getRepository() {
+    public BaseRepository<SysPojoVersionDetail, Long> getRepository() {
         return pojoVersionRDao;
     }
 }