Skip to content

Commit 9f8f3eb

Browse files
committed
hotfix:修复鉴权interceptor遗漏请求来源
1 parent 7db90bd commit 9f8f3eb

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

release/conf/i18n/en.toml

-13
Original file line numberDiff line numberDiff line change
@@ -156,19 +156,11 @@
156156
401002 = "auth token empty" #EmptyAutToken
157157
401003 = "token already disabled" #TokenDisabled
158158
401004 = "token not existed" #TokenNotExisted
159-
<<<<<<< HEAD
160159
403001 = "token verify exception" #AuthTokenVerifyException
161160
403002 = "operation role exception" #OperationRoleException
162161
404001 = "not found the host cmdb" #CMDBNotFindHost
163162
409000 = "data is conflict, please try again" #DataConflict
164163
429001 = "instance has too many requests" #InstanceTooManyRequests
165-
=======
166-
403001 = "server limit the ip access" #IPRateLimit
167-
403002 = "server limit the api access" #APIRateLimit
168-
404001 = "not found the host cmdb" #CMDBNotFindHost
169-
409000 = "data is conflict, please try again" #DataConflict
170-
429001 = "your instance has too many requests" #InstanceTooManyRequests
171-
>>>>>>> c07080f0... docs:add error code desc
172164
500000 = "execute exception" #ExecuteException
173165
500001 = "store layer exception" #StoreLayerException
174166
500002 = "cmdb plugin exception" #CMDBPluginException
@@ -177,8 +169,3 @@
177169
500006 = "parse circuit breaker failed" #ParseCircuitBreakerException
178170
500007 = "heartbeat execute exception" #HeartbeatException
179171
500008 = "instance async regist timeout" #InstanceRegisTimeout
180-
<<<<<<< HEAD
181-
=======
182-
500100 = "token verify exception" #AuthTokenVerifyException
183-
500101 = "operation role exception" #OperationRoleException
184-
>>>>>>> c07080f0... docs:add error code desc

0 commit comments

Comments
 (0)