瀏覽代碼

Merge branch 'yica_update_auth_210317' into 'develop'

1.修改服务变更通知

See merge request dcuc/auth-back!83
黄资权 4 年之前
父節點
當前提交
558e95f5bd

+ 1 - 0
src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/controller/AuthServiceController.java

@@ -93,6 +93,7 @@ public class AuthServiceController {
         content.forEach(item -> {
             ServiceAuthResultVo vo = new ServiceAuthResultVo();
             BeanUtils.copyProperties(item, vo);
+            vo.setServiceStatus(item.getAuthStatus());
             vo.setPrivilegedTime(item.getCreateTime());
             voList.add(vo);
         });

+ 3 - 0
src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/vo/ServiceAuthResultVo.java

@@ -26,6 +26,9 @@ public class ServiceAuthResultVo {
     @ApiModelProperty(value = "服务名称", required = true)
     private String serviceName;
 
+    @ApiModelProperty(value = "服务状态", required = true)
+    private String serviceStatus;
+
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "授权时间", required = true)
     private Date privilegedTime;

+ 1 - 1
src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/login/DcucLoginController.java

@@ -78,7 +78,7 @@ public class DcucLoginController {
             securityUser.setSecurityOrg(rootOrgid);
             return securityUser;
         } catch (Exception var3) {
-            logger.error("获取用户信息异常", var3.getMessage());
+            logger.error("获取用户信息异常", var3);
             throw new SecurityException("获取用户信息异常", var3);
         }
     }