合并代码 解决冲突

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java

@@ -199,6 +199,9 @@ public interface ISysUserService {
     @ApiOperation(value = "账号检查",notes = "检查账号信息唯一(登录名、邮箱、手机号)")
     void checkSysUserOnly(SysUser user);
 
+    @ApiOperation(value = "查询账户数量")
+    long getSysUserCount();
+
     /**
      * 登录封装账号信息
      * @param sessionUser

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
+import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
 import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
@@ -76,6 +77,9 @@ public class SysUserService implements ISysUserService {
     @Autowired
     private SysPositionRepository sysPositionRDao;
 
+    @Autowired
+    private ISysUserInfoService sysUserInfoService;
+
     @Override
     @ApiOperation(value = "用户登录", notes = "用户登录功能实现")
     public SessionUser queryUserLogin(String loginName, String password, String languageCode) throws AuthenticationException {
@@ -89,7 +93,6 @@ public class SysUserService implements ISysUserService {
             throw new CredentialsException("用户不存在");
         }
 
-
         packSessionUser(sessionUser, user, user.getUserType(), languageCode);
         AuthUtil.setSessionUser(sessionUser);
         refreshUserLoginInformation(user.getId());

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

@@ -29,4 +29,18 @@ server.tomcat.uri-encoding=UTF-8
 spring.mvc.view.prefix=/upload_demo
 spring.mvc.view.suffix=.jsp
 #静态文件访问配置
-spring.resources.static-locations=/static/**,/**
+spring.resources.static-locations=/static/**,/**
+
+########扫包路径########
+#app基础包路径
+impp.app.base-packages=cn.estsh.i3plus.core
+#app对象路径
+impp.app.pojo-packages=cn.estsh.i3plus.pojo.platform
+#dao接口包
+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