zhouweidong@lab.ibiz5.com 部署微服务接口

config.xml

@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibzou/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzou/
+      mvn clean package -Papi
+      cd ibzou-provider/ibzou-provider-api
+      mvn -Papi docker:build
+      mvn -Papi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-provider-api.yaml ibzlab-rt --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40001
 
 ADD ibzou-provider-api.jar /ibzou-provider-api.jar

ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml

@@ -3,9 +3,21 @@ services:
   ibzou-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40001:40001"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=40001
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
     deploy:
       mode: replicated
       replicas: 1

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDepartmentResource.java

@@ -6,10 +6,8 @@ import java.util.List;
 import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
-
 import lombok.extern.slf4j.Slf4j;
 import com.alibaba.fastjson.JSONObject;
-
 import javax.servlet.ServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cglib.beans.BeanCopier;
@@ -24,21 +22,16 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.util.StringUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.security.access.prepost.PreAuthorize;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-
 import cn.ibizlab.api.dto.*;
 import cn.ibizlab.api.mapping.*;
 import cn.ibizlab.core.ou.domain.IBZDepartment;
 import cn.ibizlab.core.ou.service.IIBZDepartmentService;
 import cn.ibizlab.core.ou.filter.IBZDepartmentSearchContext;
 
-
-
-
 @Slf4j
 @Api(tags = {"IBZDepartment" })
 @RestController("api-ibzdepartment")
@@ -97,7 +90,7 @@ public class IBZDepartmentResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasPermission('','checkkey',{'Sql',this.ibzdepartmentMapping,#ibzdepartmentdto})")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZDepartment-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"IBZDepartment" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody IBZDepartmentDTO ibzdepartmentdto) {

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZDeptMemberResource.java

@@ -6,10 +6,8 @@ import java.util.List;
 import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
-
 import lombok.extern.slf4j.Slf4j;
 import com.alibaba.fastjson.JSONObject;
-
 import javax.servlet.ServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cglib.beans.BeanCopier;
@@ -24,21 +22,16 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.util.StringUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.security.access.prepost.PreAuthorize;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-
 import cn.ibizlab.api.dto.*;
 import cn.ibizlab.api.mapping.*;
 import cn.ibizlab.core.ou.domain.IBZDeptMember;
 import cn.ibizlab.core.ou.service.IIBZDeptMemberService;
 import cn.ibizlab.core.ou.filter.IBZDeptMemberSearchContext;
 
-
-
-
 @Slf4j
 @Api(tags = {"IBZDeptMember" })
 @RestController("api-ibzdeptmember")

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZEmployeeResource.java

@@ -6,10 +6,8 @@ import java.util.List;
 import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
-
 import lombok.extern.slf4j.Slf4j;
 import com.alibaba.fastjson.JSONObject;
-
 import javax.servlet.ServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cglib.beans.BeanCopier;
@@ -24,21 +22,16 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.util.StringUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.security.access.prepost.PreAuthorize;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-
 import cn.ibizlab.api.dto.*;
 import cn.ibizlab.api.mapping.*;
 import cn.ibizlab.core.ou.domain.IBZEmployee;
 import cn.ibizlab.core.ou.service.IIBZEmployeeService;
 import cn.ibizlab.core.ou.filter.IBZEmployeeSearchContext;
 
-
-
-
 @Slf4j
 @Api(tags = {"IBZEmployee" })
 @RestController("api-ibzemployee")
@@ -100,7 +93,7 @@ public class IBZEmployeeResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasPermission('','checkkey',{'Sql',this.ibzemployeeMapping,#ibzemployeedto})")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZEmployee-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"IBZEmployee" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody IBZEmployeeDTO ibzemployeedto) {

ibzou-provider/ibzou-provider-api/src/main/java/cn/ibizlab/api/rest/IBZOrganizationResource.java

@@ -6,10 +6,8 @@ import java.util.List;
 import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
-
 import lombok.extern.slf4j.Slf4j;
 import com.alibaba.fastjson.JSONObject;
-
 import javax.servlet.ServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cglib.beans.BeanCopier;
@@ -24,21 +22,16 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.util.StringUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.security.access.prepost.PreAuthorize;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-
 import cn.ibizlab.api.dto.*;
 import cn.ibizlab.api.mapping.*;
 import cn.ibizlab.core.ou.domain.IBZOrganization;
 import cn.ibizlab.core.ou.service.IIBZOrganizationService;
 import cn.ibizlab.core.ou.filter.IBZOrganizationSearchContext;
 
-
-
-
 @Slf4j
 @Api(tags = {"IBZOrganization" })
 @RestController("api-ibzorganization")
@@ -54,7 +47,7 @@ public class IBZOrganizationResource {
 
     public IBZOrganizationDTO permissionDTO=new IBZOrganizationDTO();
 
-    @PreAuthorize("hasPermission('','checkkey',{'Sql',this.ibzorganizationMapping,#ibzorganizationdto})")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-IBZOrganization-CheckKey-all')")
     @ApiOperation(value = "CheckKey", tags = {"IBZOrganization" },  notes = "CheckKey")
 	@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/checkkey")
     public ResponseEntity<Boolean> checkKey(@RequestBody IBZOrganizationDTO ibzorganizationdto) {

ibzou-util/src/main/java/cn/ibizlab/util/security/AuthPermissionEvaluator.java

@@ -117,43 +117,6 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
         }
     }
 
-    /**
-     * 批save校验
-     * @param deStorageMode
-     * @param entityList
-     * @param dataRangeList
-     * @return
-     */
-    private boolean saveBatchActionPermissionValid(String deStorageMode, List<EntityBase> entityList, JSONArray dataRangeList) {
-
-        if(entityList==null || entityList.size()==0)
-               return false;
-        EntityBase tempEntity=entityList.get(0);
-        Map<String,String> permissionField=getPermissionField(tempEntity);
-        String keyFieldName=permissionField.get(keyFieldTag);
-        List createList=new ArrayList();
-        List<String> updateList =new ArrayList();
-
-        for(EntityBase entity : entityList){
-            Object id = entity.get(keyFieldName);
-            if(ObjectUtils.isEmpty(id))
-              createList.add(entity);
-            else
-              updateList.add(String.valueOf(id));
-        }
-        if(updateList.size()>0){
-            boolean isUpdate = otherBatchActionPermissionValidRouter(deStorageMode, tempEntity ,updateList, dataRangeList);
-            if(!isUpdate)
-              return false;
-        }
-        if(createList.size()>0){
-            boolean isCreate=createBatchActionPermissionValid(entityList,dataRangeList);
-            if(!isCreate)
-             return false;
-        }
-        return true;
-    }
-
     /**
      * 实体行为权限检查 ：用于检查当前用户是否拥有实体的新建、编辑、删除权限
      *
@@ -214,6 +177,43 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
         }
     }
 
+    /**
+     * 批save校验
+     * @param deStorageMode
+     * @param entityList
+     * @param dataRangeList
+     * @return
+     */
+    private boolean saveBatchActionPermissionValid(String deStorageMode, List<EntityBase> entityList, JSONArray dataRangeList) {
+
+        if(entityList==null || entityList.size()==0)
+            return false;
+        EntityBase tempEntity=entityList.get(0);
+        Map<String,String> permissionField=getPermissionField(tempEntity);
+        String keyFieldName=permissionField.get(keyFieldTag);
+        List createList=new ArrayList();
+        List<String> updateList =new ArrayList();
+
+        for(EntityBase entity : entityList){
+            Object id = entity.get(keyFieldName);
+            if(ObjectUtils.isEmpty(id))
+                createList.add(entity);
+            else
+                updateList.add(String.valueOf(id));
+        }
+        if(updateList.size()>0){
+            boolean isUpdate = otherBatchActionPermissionValidRouter(deStorageMode, tempEntity ,updateList, dataRangeList);
+            if(!isUpdate)
+                return false;
+        }
+        if(createList.size()>0){
+            boolean isCreate=createBatchActionPermissionValid(entityList,dataRangeList);
+            if(!isCreate)
+                return false;
+        }
+        return true;
+    }
+
     /**
      * 批处理新建权限校验
      * @param entityList