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

modules/i3plus-core-apiservice/pom.xml

@@ -106,7 +106,7 @@
         <!-- sqlserver -->
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>sqljdbc4</artifactId>
+            <artifactId>mssql-jdbc</artifactId>
         </dependency>
 
         <!-- postgresql -->

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

@@ -19,17 +19,20 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
-import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import static cn.estsh.i3plus.platform.common.util.PlatformConstWords.SQL_SERVER_PARAM_MAX_MUM;
+
 /**
  * @Description : 系统角色业务接口实现
  * @Reference   :
@@ -145,7 +148,12 @@ public class SysRoleService implements ISysRoleService {
             refRoleMenuRDao.deleteByPropertyIn("roleId",roleIds);
 
             if(ids != null && ids.length > 0){
-                List<SysMenu> list = sysMenuRDao.findAllById(Arrays.asList(ids));
+                List<SysMenu> list = new ArrayList<>();
+                // sqlserver限制最大传参数量
+                for (List<Long> idList : ListUtils.partition(Arrays.asList(ids), SQL_SERVER_PARAM_MAX_MUM)) {
+                    System.out.println("切割大小："+idList.size());
+                    list.addAll(sysMenuRDao.findAllById(idList));
+                }
                 SysRefRoleMenu ref = null;
 
                 // 插入角色权限关系

pom.xml

@@ -170,8 +170,8 @@
             <!-- sqlserver -->
             <dependency>
                 <groupId>com.microsoft.sqlserver</groupId>
-                <artifactId>sqljdbc4</artifactId>
+                <artifactId>mssql-jdbc</artifactId>
-                <version>4.0</version>
+                <version>8.2.0.jre8</version>
             </dependency>
 
             <!-- postgresql -->

sonar-project.properties

@@ -0,0 +1,17 @@
+
+# must be unique in a given SonarQube instance
+sonar.projectKey=i3plus.core:i3plus-core
+
+# --- optional properties ---
+
+# defaults to project key
+sonar.projectName=i3plus-core
+# defaults to 'not provided'
+sonar.projectVersion=1.0-DEV-SNAPSHOT
+ 
+# Path is relative to the sonar-project.properties file. Defaults to .
+#sonar.sources=./
+#sonar.java.binaries=target
+ 
+# Encoding of the source code. Default is default system encoding
+sonar.sourceEncoding=UTF-8