Merge branch 'dev' into test

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

@@ -57,6 +57,13 @@ public interface ISysUserInfoService {
     void refreshRefUserOrganize(Long userInfoId, Long organizeId, String userName);
 
     /**
+     * 刷新用户账号信息
+     * @param userInfoId
+     */
+    @ApiOperation(value = "刷新用户账号信息",notes = "根据UserInfoId 刷新用户账号信息")
+    void refreshUserInfoUserNum(Long userInfoId);
+
+    /**
      * 根据Key 删除数据
      * @param id
      */

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

@@ -46,9 +46,9 @@ public class DemoAuthController extends CoreBaseController {
         LOGGER.info("用户登陆：{},{},{}",loginName,loginPwd,languageCode);
         try {
             SessionUser sUser = systemLoginService.queryUserLogin(loginName,loginPwd,languageCode);
-            LOGGER.info("会员登陆：{}",sUser);
+            LOGGER.info("sid:{}, 会员登陆：{}",AuthUtil.getSession().getId(),sUser);
             AuthUtil.setSessionObject("languageCode",languageCode);
-            return new ResultBean(true,"");
+            return new ResultBean(true,AuthUtil.getSession().getId());
         } catch (ImppBusiException e) {
             return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution());
         }
@@ -75,7 +75,7 @@ public class DemoAuthController extends CoreBaseController {
      * @return
      */
     @GetMapping(value="/get-user-info")
-    @ApiOperation(value="登出",notes="登出")
+    @ApiOperation(value="获取用户信息",notes="获取用户信息")
     public ResultBean getUserInfo(HttpServletRequest request){
         LOGGER.info("获取用户信息...lang:{}",AuthUtil.getSessionAttribute("languageCode"));
         try {

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

@@ -75,7 +75,7 @@ public class AuthController extends CoreBaseController {
 
             LOGGER.info("会员登陆：{}",user);
             AuthUtil.setSessionObject("languageCode",languageCode);
-            result = new ResultBean(true, "", AuthUtil.getSessionUser());
+            result = new ResultBean(true, AuthUtil.getSession().getId().toString(), AuthUtil.getSessionUser());
             result.setUrl("/");
         } catch (IncorrectCredentialsException e) {
             // 密码错误

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

@@ -103,6 +103,7 @@ public class SysUserController extends CoreBaseController{
 
             // 更新用户关系
             sysUserService.refreshSysRefUserRole(user,StringTool.getArrayLong(roleIds),getSessionUser().getUserName());
+            sysUserInfoService.refreshUserInfoUserNum(userInfo.getId());
 
             return ResultBean.success("操作成功")
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
@@ -290,6 +291,7 @@ public class SysUserController extends CoreBaseController{
             ValidatorBean.checkNotNull(id, "用户id 不能为空");
 
             sysUserService.deleteSysUserById(Long.parseLong(id));
+            sysUserInfoService.refreshUserInfoUserNum(Long.parseLong(id));
             return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);

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

@@ -195,6 +195,19 @@ public class SysUserInfoService implements ISysUserInfoService {
     }
 
     @Override
+    @ApiOperation(value = "刷新用户账号信息",notes = "根据UserInfoId 刷新用户账号信息")
+    public void refreshUserInfoUserNum(Long userInfoId) {
+        LOGGER.info("用户信息 SysUserInfo userInfoId:{}",userInfoId);
+        SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId);
+        if(userInfo != null){
+            int count = sysUserRepository.findByPropertyCount("userInfoId", userInfo.getId());
+            userInfo.setUserNum(count);
+            sysUserInfoRDao.save(userInfo);
+
+        }
+    }
+
+    @Override
     public void deleteSysUserInfoById(Long id) {
         LOGGER.info("用户信息 SysUserInfo id:{}",id);
         sysUserInfoRDao.deleteById(id);

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 {
@@ -260,6 +264,7 @@ public class SysUserService implements ISysUserService {
         if(null != list && list.size() > 0){
             for (SysUser sysUser : list) {
                 sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
+                sysUserInfoService.refreshUserInfoUserNum(sysUser.getUserInfoId());
             }
 
             sysUserRDao.saveAll(list);

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

@@ -1,15 +1,15 @@
 #项目端口
 server.port=8100
 #本机ip
-impp.server.ip=192.168.1.56
+impp.server.ip=192.168.1.40
 #console控制台服务（zipkin追踪全路径）
-impp.console.ip=http://csd.estsh.com
+impp.console.ip=http://192.168.1.40:8010
 
 ################ 功能配置1 ################
 #若无法连接注册中心，是否需要一直检测加入
 impp.cluster.fetch=true
 #服务注册中心
-impp.cluster.regist.center=http://regd.estsh.com/eureka/
+impp.cluster.regist.center=http://192.168.1.40:8000/eureka/
 #多注册中心
 #impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/
 

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

@@ -30,3 +30,11 @@ spring.mvc.view.prefix=/upload_demo
 spring.mvc.view.suffix=.jsp
 #静态文件访问配置
 spring.resources.static-locations=/static/**,/**
+
+########扫包路径########
+#基础包路径
+impp.app.base-packages=cn.estsh.i3plus.core
+#对象包路径，可以多个包，逗号分隔
+impp.app.base-pojo=cn.estsh.i3plus.pojo.base,cn.estsh.i3plus.pojo.platform
+#微服包路径
+impp.app.icloud-package=cn.estsh.i3plus.icloud