Merge remote-tracking branch 'origin/release/v1.2.0' into release/v1.2.0

dcuc-auth-model/src/main/java/com/dragoninfo/dcuc/auth/auth/vo/zerotrust/rolemanage/RoleSaveVo.java

@@ -38,18 +38,12 @@ public class RoleSaveVo {
     @ApiModelProperty(value = "业务域")
     private String roleBusiness;
 
-    @ApiModelProperty(value = "警种")
+    @ApiModelProperty(value = "角色类型 LOCAL:本地角色 ALL:全局角色")
     private String roleCategory;
 
     @NotBlank
     @ApiModelProperty(value = "是否限制配额")
-    private String limitCount;
-
-    /**
-     * 角色类型
-     */
-    @ApiModelProperty(value = "角色类型 LOCAL:本地角色 ALL:全局角色")
-    private String roleType;
+    private String isNotLimitCount;
 
     /**
      * 警种

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/audit/listener/AuthenticationLogListener.java

@@ -48,6 +48,8 @@ public class AuthenticationLogListener {
                 logger.info("receiveMessage value length 0 or null");
                 return;
             }
+            /*// 内部环境消息中心调试
+            MessageInfoDTO messageInfoDTO = JSONObject.parseObject(value, MessageInfoDTO.class);*/
             ObjectInputStream stream = new ObjectInputStream(new ByteArrayInputStream(value));
             MessageInfoDTO messageInfoDTO = (MessageInfoDTO) stream.readObject();
             logger.info("--------audit-log authentication 收到数据，{}", JSON.toJSONString(messageInfoDTO));

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/service/impl/zerotrust/RoleOperateApplyServiceImpl.java

@@ -5,6 +5,7 @@ import com.dragoninfo.dcuc.auth.auth.dto.zerotrust.approval.FlowApplyReqDto;
 import com.dragoninfo.dcuc.auth.auth.dto.zerotrust.approval.FlowSubmitRespDTO;
 import com.dragoninfo.dcuc.auth.auth.entity.zerotrust.RoleOperateContent;
 import com.dragoninfo.dcuc.auth.auth.enumresources.RoleManageOpeTypeEnum;
+import com.dragoninfo.dcuc.auth.auth.enumresources.YesNotEnum;
 import com.dragoninfo.dcuc.auth.auth.enumresources.zerotrust.approval.ApprovalApplyTypeEnum;
 import com.dragoninfo.dcuc.auth.auth.repo.zerotrust.RoleOperateContentRepository;
 import com.dragoninfo.dcuc.auth.auth.service.zerotrust.IRoleOperateApplyService;
@@ -19,6 +20,7 @@ import com.dragonsoft.duceap.base.entity.security.SecurityUser;
 import com.dragonsoft.duceap.base.utils.UserContextUtils;
 import com.dragonsoft.duceap.commons.util.UUIDUtils;
 import com.dragonsoft.duceap.commons.util.enums.EnumUtils;
+import com.dragonsoft.duceap.commons.util.string.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
@@ -99,6 +101,11 @@ public class RoleOperateApplyServiceImpl implements IRoleOperateApplyService {
         operateContent.setOperateType(typeEnum.getValue());
         operateContent.setPoliceCategory(roleSaveVo.getPoliceCategory());
         operateContent.setRoleBusiness(roleSaveVo.getRoleBusiness());
+        String notLimitCount = roleSaveVo.getIsNotLimitCount();
+        if (StringUtils.isNotBlank(notLimitCount)) {
+            operateContent.setLimitCount(
+                    YesNotEnum.YES.getValue().equals(roleSaveVo.getIsNotLimitCount()) ? "0" : "1");
+        }
         repository.save(operateContent);
         return ResponseDTO.success("", (Object) null);
     }

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/business/impl/zerotrust/ApprovalBusinessImpl.java

@@ -10,6 +10,7 @@ import com.dragoninfo.dcuc.auth.auth.dto.zerotrust.approval.*;
 import com.dragoninfo.dcuc.auth.auth.entity.RoleInfo;
 import com.dragoninfo.dcuc.auth.auth.entity.zerotrust.ApprovalResult;
 import com.dragoninfo.dcuc.auth.auth.entity.zerotrust.RoleOperateContent;
+import com.dragoninfo.dcuc.auth.auth.enumresources.YesNotEnum;
 import com.dragoninfo.dcuc.auth.auth.enumresources.zerotrust.approval.*;
 import com.dragoninfo.dcuc.auth.auth.service.IRoleInfoService;
 import com.dragoninfo.dcuc.auth.auth.service.zerotrust.IApprovalResultService;
@@ -318,7 +319,12 @@ public class ApprovalBusinessImpl implements IApprovalBusiness {
         roleInfo.setRoleLevel(roleOperateContent.getRoleLevel());
         roleInfo.setRoleCategory(roleOperateContent.getRoleCategory());
         roleInfo.setRoleBusiness(roleOperateContent.getRoleBusiness());
-        roleInfo.setIsNotLimitCount(roleOperateContent.getLimitCount());
+        roleInfo.setPoliceCategory(roleOperateContent.getPoliceCategory());
+        String limitCount = roleOperateContent.getLimitCount();
+        if( StringUtils.isNotBlank(limitCount)){
+            roleInfo.setIsNotLimitCount(
+                    YesNotEnum.YES.getValue().equals(limitCount) ? "0" : "1");
+        }
         roleInfo.setIsActive("1");
         return roleInfo;
     }

dcuc-auth-service/src/main/resources/application-auth.yml

@@ -5,8 +5,8 @@ dcuc:
         host: 127.0.0.1
         port: 514
         facility: LOCAL0
-      user-token-query-url:
-      app-token-query-url:
+      user-token-query-url: http://10.11.1.237:4523/m1/3011280-0-default/idp/rest/getUserTokenInfo
+      app-token-query-url: http://10.11.1.237:4523/m1/3011280-0-default/idp/rest/getAppTokenInfo
       user-info-query-url:
       notify-app-url-list:
       approval:
@@ -18,11 +18,11 @@ dcuc:
     menu-noclear: true
     #服务变更通知
     kafka:
-      app-key: dcuc69000787
-      app-secret: dcuc01494668
+      app-key: CUIA59559087
+      app-secret: CUIA17401300
       message-topic: 90120021
       message-jssq-topic: 90220013
-      kafka-servers: http://192.168.10.20:9981/dcms-manager
+      kafka-servers: http://10.201.2.14:9981/dcms-manager
     #审批中心
     approval-center:
       #是否开启kafka功能
@@ -42,7 +42,7 @@ dcuc:
       data-auth-bus-code:
     audit-log:
       #是否开启kafka功能
-      kafka: false
+      kafka: true
       authentication-topic: 10000028
       authentication-groupId: auditlog
       authorize-topic: 10000029

dcuc-auth-service/src/main/resources/application-base.yml

@@ -27,10 +27,10 @@ spring:
       max-request-size: 150MB
   kafka:
     producer:
-      bootstrap-servers: 192.168.10.20:9093
+      bootstrap-servers: 10.201.2.14:9092
       #kafka消费者配置
     consumer:
-      bootstrap-servers: 192.168.10.20:9093
+      bootstrap-servers: 10.201.2.14:9092
       enable-auto-commit: true
       auto-commit-interval: 1000
       max-poll-records: 500