-
Notifications
You must be signed in to change notification settings - Fork 201
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1719 from Tencent/3.6.x
Merge: 3.6.x->master
- Loading branch information
Showing
17 changed files
with
161 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
...mmons/common/src/main/java/com/tencent/bk/job/common/exception/InternalCmdbException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package com.tencent.bk.job.common.exception; | ||
|
|
||
| import lombok.Getter; | ||
| import lombok.ToString; | ||
|
|
||
| /** | ||
| * 内部服务异常--调用CMDB异常 | ||
| */ | ||
| @Getter | ||
| @ToString | ||
| public class InternalCmdbException extends InternalException { | ||
|
|
||
| public InternalCmdbException(Throwable cause, Integer errorCode, Object[] errorParams) { | ||
| super(cause, errorCode, errorParams); | ||
| } | ||
|
|
||
| public InternalCmdbException(String message, Throwable cause, Integer errorCode) { | ||
| super(message, cause, errorCode); | ||
| } | ||
|
|
||
| public InternalCmdbException(String message, Integer errorCode) { | ||
| super(message, errorCode); | ||
| } | ||
|
|
||
| public InternalCmdbException(Integer errorCode, Object[] errorParams) { | ||
| super(errorCode, errorParams); | ||
| } | ||
|
|
||
| } |
16 changes: 16 additions & 0 deletions
16
...mmons/common/src/main/java/com/tencent/bk/job/common/exception/InternalCmsiException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.tencent.bk.job.common.exception; | ||
|
|
||
| import lombok.Getter; | ||
| import lombok.ToString; | ||
|
|
||
| /** | ||
| * 内部服务异常--调用cmsi接口异常 | ||
| */ | ||
| @Getter | ||
| @ToString | ||
| public class InternalCmsiException extends InternalException { | ||
|
|
||
| public InternalCmsiException(String message, Throwable cause, Integer errorCode) { | ||
| super(message, cause, errorCode); | ||
| } | ||
| } |
24 changes: 24 additions & 0 deletions
24
...ommons/common/src/main/java/com/tencent/bk/job/common/exception/InternalIamException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package com.tencent.bk.job.common.exception; | ||
|
|
||
| import lombok.Getter; | ||
| import lombok.ToString; | ||
|
|
||
| /** | ||
| * 内部服务异常--调用IAM异常 | ||
| */ | ||
| @Getter | ||
| @ToString | ||
| public class InternalIamException extends InternalException { | ||
|
|
||
| public InternalIamException(Throwable cause, Integer errorCode, Object[] errorParams) { | ||
| super(cause, errorCode, errorParams); | ||
| } | ||
|
|
||
| public InternalIamException(String message, Integer errorCode) { | ||
| super(message, errorCode); | ||
| } | ||
|
|
||
| public InternalIamException(String message, Throwable cause, Integer errorCode) { | ||
| super(message, cause, errorCode); | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
...common/src/main/java/com/tencent/bk/job/common/exception/InternalUserManageException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.tencent.bk.job.common.exception; | ||
|
|
||
| import lombok.Getter; | ||
| import lombok.ToString; | ||
|
|
||
| /** | ||
| * 内部服务异常--用户管理异常 | ||
| */ | ||
| @Getter | ||
| @ToString | ||
| public class InternalUserManageException extends InternalException { | ||
|
|
||
| public InternalUserManageException(String message, Throwable cause, Integer errorCode) { | ||
| super(message, cause, errorCode); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.