升级orm框架，阿里云hostname的bug引起不能启动项目

pom.xml

@@ -124,7 +124,7 @@
             <dependency>
                 <groupId>com.baomidou</groupId>
                 <artifactId>mybatis-plus-boot-starter</artifactId>
-                <version>3.4.3.1</version>
+                <version>3.4.3.2</version>
             </dependency>
             <dependency>
                 <groupId>com.h2database</groupId>

sxz-core/src/main/java/com/fdkk/sxz/other/listener/RunBuild.java

@@ -107,7 +107,7 @@ public class RunBuild {
     }
 
     @RabbitHandler
-    @RabbitListener(queues = TopicRabbitConfig.MODEL, concurrency = "2")
+    @RabbitListener(queues = TopicRabbitConfig.MODEL)
     public void model(String str) {
         RunBuild.log.info("模型转换：" + str);
         modelBuild(str);

sxz-core/src/main/java/com/fdkk/sxz/system/controller/ResourceController.java

@@ -2,12 +2,12 @@ package com.fdkk.sxz.system.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fdkk.sxz.annotation.auth.CurrentUser;
-import com.fdkk.sxz.base.Result;
 import com.fdkk.sxz.base.BaseController;
-import com.fdkk.sxz.system.dto.CreateResource;
-import com.fdkk.sxz.system.dto.UpdateResource;
+import com.fdkk.sxz.base.Result;
 import com.fdkk.sxz.entity.system.Resource;
 import com.fdkk.sxz.entity.system.User;
+import com.fdkk.sxz.system.dto.CreateResource;
+import com.fdkk.sxz.system.dto.UpdateResource;
 import com.fdkk.sxz.system.service.IResourceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -57,7 +57,7 @@ public class ResourceController extends BaseController {
         BeanCopier.create(CreateResource.class, Resource.class, false).copy(resource, resEntity, null);
         boolean result = resourceService.createResource(resEntity);
         if (result) {
-            return success("添加成功",resEntity);
+            return success("添加成功", resEntity);
         } else {
             return failure("添加失败，请重试");
         }
@@ -74,7 +74,7 @@ public class ResourceController extends BaseController {
         BeanCopier.create(UpdateResource.class, Resource.class, false).copy(resource, resEntity, null);
         boolean result = resourceService.updateResource(resEntity);
         if (result) {
-            return success("修改成功",resEntity);
+            return success("修改成功", resEntity);
         } else {
             return failure("修改失败");
         }
@@ -103,13 +103,13 @@ public class ResourceController extends BaseController {
         String resourceKey = resource.getResourceKey();
         QueryWrapper<Resource> resourceQueryWrapper = new QueryWrapper<>();
         resourceQueryWrapper.eq("resource_key", resourceKey);
-        if(null != resource.getId()) {
+        if (null != resource.getId()) {
             resourceQueryWrapper.ne("id", resource.getId());
         }
-        int count = resourceService.count(resourceQueryWrapper);
-        if (count == 0){
+        long count = resourceService.count(resourceQueryWrapper);
+        if (count == 0) {
             return successPut(true);
-        } else{
+        } else {
             return errorPut(false);
         }
     }

sxz-core/src/main/java/com/fdkk/sxz/system/controller/RoleController.java

@@ -1,14 +1,14 @@
 package com.fdkk.sxz.system.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fdkk.sxz.base.BaseController;
 import com.fdkk.sxz.base.PageResult;
 import com.fdkk.sxz.base.Result;
-import com.fdkk.sxz.base.BaseController;
+import com.fdkk.sxz.entity.system.Role;
+import com.fdkk.sxz.entity.system.RoleResource;
 import com.fdkk.sxz.system.dto.CreateRole;
 import com.fdkk.sxz.system.dto.UpdateRole;
 import com.fdkk.sxz.system.dto.UpdateRoleResource;
-import com.fdkk.sxz.entity.system.Role;
-import com.fdkk.sxz.entity.system.RoleResource;
 import com.fdkk.sxz.system.service.IRoleResourceService;
 import com.fdkk.sxz.system.service.IRoleService;
 import com.github.pagehelper.Page;
@@ -27,9 +27,9 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
+ * @author Xiewj
  * @ClassName: RoleController
  * @Description: Role前端控制器
- * @author Xiewj
  * @date 2018年5月18日 下午4:06:17
  */
 @RestController
@@ -111,7 +111,7 @@ public class RoleController extends BaseController {
     @PostMapping("/batch/delete")
     @ApiOperation(value = "批量删除角色")
     @ApiImplicitParam(name = "roleIds", value = "角色ID列表", required = true, dataType = "List")
-    public Result  batchDelete(@RequestBody List<Integer> roleIds) {
+    public Result batchDelete(@RequestBody List<Integer> roleIds) {
         if (CollectionUtils.isEmpty(roleIds)) {
             return failure("角色ID列表不能为空");
         }
@@ -131,9 +131,9 @@ public class RoleController extends BaseController {
     @ApiOperation(value = "修改角色状态")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "roleId", value = "角色ID", required = true, dataType = "Integer", paramType = "path"),
-            @ApiImplicitParam(name = "roleStatus", value = "角色状态", required = true, dataType = "String", paramType = "path") })
-    public Result  updateStatus(@PathVariable("roleId") Integer roleId,
-            @PathVariable("roleStatus") String roleStatus) {
+            @ApiImplicitParam(name = "roleStatus", value = "角色状态", required = true, dataType = "String", paramType = "path")})
+    public Result updateStatus(@PathVariable("roleId") Integer roleId,
+                               @PathVariable("roleStatus") String roleStatus) {
         if (null == roleId || StringUtils.isEmpty(roleStatus)) {
             return failure("ID和状态不能为空");
         }
@@ -204,13 +204,13 @@ public class RoleController extends BaseController {
         String roleName = role.getRoleName();
         QueryWrapper<Role> roleQueryWrapper = new QueryWrapper<>();
         roleQueryWrapper.eq("role_name", roleName);
-        if(null != role.getId()) {
+        if (null != role.getId()) {
             roleQueryWrapper.ne("id", role.getId());
         }
-        int count = roleService.count(roleQueryWrapper);
-        if (count == 0){
+        long count = roleService.count(roleQueryWrapper);
+        if (count == 0) {
             return successPut(true);
-        } else{
+        } else {
             return errorPut(false);
         }
     }
@@ -222,13 +222,13 @@ public class RoleController extends BaseController {
         String roleKey = role.getRoleKey();
         QueryWrapper<Role> roleQueryWrapper = new QueryWrapper<>();
         roleQueryWrapper.eq("role_key", roleKey);
-        if(null != role.getId()) {
+        if (null != role.getId()) {
             roleQueryWrapper.ne("id", role.getId());
         }
-        int count = roleService.count(roleQueryWrapper);
-        if (count == 0){
+        long count = roleService.count(roleQueryWrapper);
+        if (count == 0) {
             return successPut(true);
-        } else{
+        } else {
             return errorPut(false);
         }
     }

sxz-core/src/main/java/com/fdkk/sxz/system/controller/SysOrganizationController.java

@@ -1,12 +1,12 @@
 package com.fdkk.sxz.system.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fdkk.sxz.base.BaseController;
 import com.fdkk.sxz.base.Result;
 import com.fdkk.sxz.constant.Constant;
-import com.fdkk.sxz.base.BaseController;
+import com.fdkk.sxz.entity.system.Organization;
 import com.fdkk.sxz.system.dto.CreateOrganization;
 import com.fdkk.sxz.system.dto.UpdateOrganization;
-import com.fdkk.sxz.entity.system.Organization;
 import com.fdkk.sxz.system.service.IOrganizationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -68,9 +68,9 @@ public class SysOrganizationController extends BaseController {
         }
         boolean result = organizationService.createOrganization(orgEntity);
         if (result) {
-            return success("修改成功",orgEntity);
+            return success("修改成功", orgEntity);
         } else {
-            return  failure("修改失败");
+            return failure("修改失败");
         }
     }
 
@@ -91,9 +91,9 @@ public class SysOrganizationController extends BaseController {
         }
         boolean result = organizationService.updateOrganization(orgEntity);
         if (result) {
-            return success("修改成功",orgEntity);
+            return success("修改成功", orgEntity);
         } else {
-            return  failure("修改失败");
+            return failure("修改失败");
         }
     }
 
@@ -120,13 +120,13 @@ public class SysOrganizationController extends BaseController {
         String organizationName = organization.getOrganizationName();
         QueryWrapper<Organization> organizationQueryWrapper = new QueryWrapper<>();
         organizationQueryWrapper.eq("organization_name", organizationName);
-        if(null != organization.getId()) {
+        if (null != organization.getId()) {
             organizationQueryWrapper.ne("id", organization.getId());
         }
-        int count = organizationService.count(organizationQueryWrapper);
-        if (count == 0){
+        long count = organizationService.count(organizationQueryWrapper);
+        if (count == 0) {
             return successPut(true);
-        } else{
+        } else {
             return errorPut(false);
         }
     }
@@ -138,13 +138,13 @@ public class SysOrganizationController extends BaseController {
         String organizationKey = organization.getOrganizationKey();
         QueryWrapper<Organization> organizationQueryWrapper = new QueryWrapper<>();
         organizationQueryWrapper.eq("organization_key", organizationKey);
-        if(null != organization.getId()) {
+        if (null != organization.getId()) {
             organizationQueryWrapper.ne("id", organization.getId());
         }
-        int count = organizationService.count(organizationQueryWrapper);
-        if (count == 0){
+        long count = organizationService.count(organizationQueryWrapper);
+        if (count == 0) {
             return successPut(true);
-        } else{
+        } else {
             return errorPut(false);
         }
     }

sxz-core/src/main/java/com/fdkk/sxz/system/controller/SysUserController.java

@@ -4,12 +4,12 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fdkk.sxz.annotation.auth.CurrentUser;
 import com.fdkk.sxz.base.BaseController;
-import com.fdkk.sxz.system.dto.*;
+import com.fdkk.sxz.base.PageResult;
+import com.fdkk.sxz.base.Result;
 import com.fdkk.sxz.entity.system.User;
+import com.fdkk.sxz.system.dto.*;
 import com.fdkk.sxz.system.service.IDataPermissionService;
 import com.fdkk.sxz.system.service.IUserService;
-import com.fdkk.sxz.base.PageResult;
-import com.fdkk.sxz.base.Result;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -30,9 +30,9 @@ import javax.validation.Valid;
 import java.util.List;
 
 /**
+ * @author Xiewj
  * @ClassName: UserController
  * @Description: User前端控制器
- * @author Xiewj
  * @date 2018年5月18日 下午4:03:58
  */
 @RestController
@@ -62,7 +62,7 @@ public class SysUserController extends BaseController {
             @ApiImplicitParam(name = "roleId", value = "角色", required = false, dataType = "integer", paramType = "query"),
             @ApiImplicitParam(name = "userStatus", value = "用户状态", required = false, dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "size", value = "每页条数", required = false, dataType = "Integer", paramType = "query"),
-            @ApiImplicitParam(name = "current", value = "当前页", required = false, dataType = "Integer", paramType = "query") })
+            @ApiImplicitParam(name = "current", value = "当前页", required = false, dataType = "Integer", paramType = "query")})
     public PageResult<UserInfo> list(@ApiIgnore QueryUser user, @ApiIgnore Page<UserInfo> page) {
 
         PageInfo<UserInfo> pageUser = userService.selectUserList(page, user);
@@ -137,9 +137,9 @@ public class SysUserController extends BaseController {
         if (null == userId) {
             return failure("用户ID不能为空");
         }
-        User user= userService.findById(userId);
-        boolean result=false;
-        if (ObjectUtil.isNotNull(user)){
+        User user = userService.findById(userId);
+        boolean result = false;
+        if (ObjectUtil.isNotNull(user)) {
             user.setRecStatus("I");
             result = userService.removeById(user.getId());
         }
@@ -199,7 +199,7 @@ public class SysUserController extends BaseController {
     @ApiOperation(value = "管理员修改用户状态")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "integer", paramType = "path"),
-            @ApiImplicitParam(name = "status", value = "用户状态", required = true, dataType = "String", paramType = "path") })
+            @ApiImplicitParam(name = "status", value = "用户状态", required = true, dataType = "String", paramType = "path")})
     public Result updateStatus(@PathVariable("userId") Long userId, @PathVariable("status") String status) {
         if (null == userId || StringUtils.isEmpty(status)) {
             return failure("ID和状态不能为空");
@@ -258,10 +258,10 @@ public class SysUserController extends BaseController {
         String userAccount = user.getUserAccount();
         QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
         userQueryWrapper.eq("user_account", userAccount);
-        if(null != user.getId()) {
+        if (null != user.getId()) {
             userQueryWrapper.ne("id", user.getId());
         }
-        int count = userService.count(userQueryWrapper);
+        long count = userService.count(userQueryWrapper);
 
         if (count == 0) {
             return successPut(true);
@@ -277,10 +277,10 @@ public class SysUserController extends BaseController {
         String userNickName = user.getUserNickName();
         QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
         userQueryWrapper.eq("user_nick_name", userNickName);
-        if(null != user.getId()) {
+        if (null != user.getId()) {
             userQueryWrapper.ne("id", user.getId());
         }
-        int count = userService.count(userQueryWrapper);
+        long count = userService.count(userQueryWrapper);
         if (count == 0) {
             return successPut(true);
         } else {
@@ -295,10 +295,10 @@ public class SysUserController extends BaseController {
         String userMobile = user.getUserMobile();
         QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
         userQueryWrapper.eq("user_mobile", userMobile);
-        if(null != user.getId()) {
+        if (null != user.getId()) {
             userQueryWrapper.ne("id", user.getId());
         }
-        int count = userService.count(userQueryWrapper);
+        long count = userService.count(userQueryWrapper);
         if (count == 0) {
             return successPut(true);
         } else {
@@ -313,10 +313,10 @@ public class SysUserController extends BaseController {
         String userEmail = user.getUserEmail();
         QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
         userQueryWrapper.eq("user_email", userEmail);
-        if(null != user.getId()) {
+        if (null != user.getId()) {
             userQueryWrapper.ne("id", user.getId());
         }
-        int count = userService.count(userQueryWrapper);
+        long count = userService.count(userQueryWrapper);
         if (count == 0) {
             return successPut(true);
         } else {

sxz-core/src/main/java/com/fdkk/sxz/system/service/impl/ResourceServiceImpl.java

@@ -1,10 +1,10 @@
 package com.fdkk.sxz.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fdkk.sxz.exception.BusinessException;
 import com.fdkk.sxz.base.impl.BaseServiceImpl;
-import com.fdkk.sxz.system.mapper.ResourceMapper;
 import com.fdkk.sxz.entity.system.Resource;
+import com.fdkk.sxz.exception.BusinessException;
+import com.fdkk.sxz.system.mapper.ResourceMapper;
 import com.fdkk.sxz.system.service.IResourceService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,7 +38,7 @@ public class ResourceServiceImpl extends BaseServiceImpl<ResourceMapper, Resourc
         String resourceKey = resource.getResourceKey();
         QueryWrapper<Resource> resourceQueryWrapper = new QueryWrapper<>();
         resourceQueryWrapper.eq("resource_key", resourceKey);
-        int count = this.count(resourceQueryWrapper);
+        long count = this.count(resourceQueryWrapper);
         if (count > 0) {
             throw new BusinessException("资源标识已存在");
         }
@@ -53,7 +53,7 @@ public class ResourceServiceImpl extends BaseServiceImpl<ResourceMapper, Resourc
         String resourceKey = resource.getResourceKey();
         QueryWrapper<Resource> resourceQueryWrapper = new QueryWrapper<>();
         resourceQueryWrapper.eq("resource_key", resourceKey).ne("id", resource.getId());
-        int count = this.count(resourceQueryWrapper);
+        long count = this.count(resourceQueryWrapper);
         if (count > 0) {
             throw new BusinessException("资源标识已存在");
         }
@@ -82,7 +82,7 @@ public class ResourceServiceImpl extends BaseServiceImpl<ResourceMapper, Resourc
     public List<Resource> queryResourceByUserId(Long userId) {
         List<Resource> resourceList = resourceMapper.queryResourceByUserId(userId);
         Map<Long, Resource> resourceMap = new HashMap<>();
-        List<Resource> menus = this.assembleResourceTree(resourceList,resourceMap);
+        List<Resource> menus = this.assembleResourceTree(resourceList, resourceMap);
         return menus;
     }
 
@@ -102,18 +102,18 @@ public class ResourceServiceImpl extends BaseServiceImpl<ResourceMapper, Resourc
     public List<Resource> queryResourceByParentId(Long parentId) {
         List<Resource> resourceList = resourceMapper.queryResourceTreeProc(parentId);
         Map<Long, Resource> resourceMap = new HashMap<>();
-        List<Resource> menus = this.assembleResourceTree(resourceList,resourceMap);
+        List<Resource> menus = this.assembleResourceTree(resourceList, resourceMap);
         return menus;
     }
 
     /**
      * 组装子父级目录
+     *
      * @param resourceList
      * @param resourceMap
      * @return
      */
-    private List<Resource> assembleResourceTree(List<Resource> resourceList, Map<Long, Resource> resourceMap)
-    {
+    private List<Resource> assembleResourceTree(List<Resource> resourceList, Map<Long, Resource> resourceMap) {
         List<Resource> menus = new ArrayList<>();
         for (Resource resource : resourceList) {
             resourceMap.put(resource.getId(), resource);