-
diff --git a/hippo4j-auth/.gitignore b/hippo4j-auth/.gitignore
deleted file mode 100644
index 549e00a2..00000000
--- a/hippo4j-auth/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
diff --git a/hippo4j-auth/pom.xml b/hippo4j-auth/pom.xml
index 69d59712..46e52d9e 100644
--- a/hippo4j-auth/pom.xml
+++ b/hippo4j-auth/pom.xml
@@ -2,15 +2,12 @@
4.0.0
-
cn.hippo4jhippo4j-all${revision}
-
hippo4j-auth
- jartrue
@@ -70,5 +67,4 @@
hippo4j-common
-
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/GlobalSecurityConfig.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/GlobalSecurityConfig.java
index 25b364a1..61c202e9 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/GlobalSecurityConfig.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/GlobalSecurityConfig.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.config;
import cn.hippo4j.auth.constant.Constants;
@@ -26,10 +43,7 @@ import javax.annotation.Resource;
import java.util.stream.Stream;
/**
- * 安全配置.
- *
- * @author chen.ma
- * @date 2021/11/9 21:10
+ * Global security config.
*/
@Configuration
@EnableWebSecurity
@@ -91,5 +105,4 @@ public class GlobalSecurityConfig extends WebSecurityConfigurerAdapter {
String[] ignores = Stream.of("/hippo4j/v1/cs/auth/users/apply/token/**", "/hippo4j/v1/cs/configs/**").toArray(String[]::new);
web.ignoring().antMatchers(ignores);
}
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/constant/Constants.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/constant/Constants.java
index 739752d0..59139763 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/constant/Constants.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/constant/Constants.java
@@ -1,10 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.constant;
/**
* Constants.
- *
- * @author chen.ma
- * @date 2021/11/9 22:24
*/
public class Constants {
@@ -13,5 +27,4 @@ public class Constants {
public static final String SPLIT_COMMA = ",";
public static final long TOKEN_VALIDITY_IN_SECONDS = 18000L;
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java
index b7d52472..de7b9b3c 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.filter;
import cn.hippo4j.auth.model.biz.user.JwtUser;
@@ -31,9 +48,6 @@ import static cn.hippo4j.common.constant.Constants.MAP_INITIAL_CAPACITY;
/**
* JWT authentication filter.
- *
- * @author chen.ma
- * @date 2021/11/9 22:21
*/
@Slf4j
public class JWTAuthenticationFilter extends UsernamePasswordAuthenticationFilter {
@@ -50,13 +64,12 @@ public class JWTAuthenticationFilter extends UsernamePasswordAuthenticationFilte
@Override
public Authentication attemptAuthentication(HttpServletRequest request,
HttpServletResponse response) throws AuthenticationException {
- // 从输入流中获取到登录的信息
+ // Get logged in information from the input stream.
try {
LoginUser loginUser = new ObjectMapper().readValue(request.getInputStream(), LoginUser.class);
rememberMe.set(loginUser.getRememberMe());
return authenticationManager.authenticate(
- new UsernamePasswordAuthenticationToken(loginUser.getUsername(), loginUser.getPassword(), new ArrayList())
- );
+ new UsernamePasswordAuthenticationToken(loginUser.getUsername(), loginUser.getPassword(), new ArrayList()));
} catch (IOException e) {
logger.error("attemptAuthentication error :{}", e);
return null;
@@ -71,13 +84,11 @@ public class JWTAuthenticationFilter extends UsernamePasswordAuthenticationFilte
try {
JwtUser jwtUser = (JwtUser) authResult.getPrincipal();
boolean isRemember = rememberMe.get() == 1;
-
String role = "";
Collection authorities = jwtUser.getAuthorities();
for (GrantedAuthority authority : authorities) {
role = authority.getAuthority();
}
-
String token = JwtTokenUtil.createToken(jwtUser.getId(), jwtUser.getUsername(), role, isRemember);
response.setHeader("token", JwtTokenUtil.TOKEN_PREFIX + token);
response.setCharacterEncoding("UTF-8");
@@ -95,5 +106,4 @@ public class JWTAuthenticationFilter extends UsernamePasswordAuthenticationFilte
response.setCharacterEncoding("UTF-8");
response.getWriter().write(JSONUtil.toJsonStr(new ReturnT(-1, "Server Error")));
}
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java
index d7e65a87..5f46ffe9 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.filter;
import cn.hippo4j.auth.security.JwtTokenManager;
@@ -23,12 +40,10 @@ import java.io.IOException;
import java.util.Collections;
import static cn.hippo4j.common.constant.Constants.ACCESS_TOKEN;
+import static cn.hippo4j.common.web.exception.ErrorCodeEnum.LOGIN_TIMEOUT;
/**
* JWT authorization filter.
- *
- * @author chen.ma
- * @date 2021/11/9 22:21
*/
@Slf4j
public class JWTAuthorizationFilter extends BasicAuthenticationFilter {
@@ -44,37 +59,38 @@ public class JWTAuthorizationFilter extends BasicAuthenticationFilter {
protected void doFilterInternal(HttpServletRequest request,
HttpServletResponse response,
FilterChain chain) throws IOException, ServletException {
- // 验证客户端交互时 Token
+ // Token when verifying client interaction.
String accessToken = request.getParameter(ACCESS_TOKEN);
if (StrUtil.isNotBlank(accessToken)) {
tokenManager.validateToken(accessToken);
-
Authentication authentication = this.tokenManager.getAuthentication(accessToken);
SecurityContextHolder.getContext().setAuthentication(authentication);
-
chain.doFilter(request, response);
return;
}
- // 如果请求头中没有 Authorization 信息则直接放行
+ // If there is no Authorization information in the request header, it will be released directly.
String tokenHeader = request.getHeader(JwtTokenUtil.TOKEN_HEADER);
if (tokenHeader == null || !tokenHeader.startsWith(JwtTokenUtil.TOKEN_PREFIX)) {
chain.doFilter(request, response);
return;
}
- // 如果请求头中有 Token, 则进行解析, 并且设置认证信息
+ // If there is a Token in the request header, it is parsed and the authentication information is set.
try {
SecurityContextHolder.getContext().setAuthentication(getAuthentication(tokenHeader));
} catch (Exception ex) {
- // 返回 Json 形式的错误信息
response.setCharacterEncoding("UTF-8");
response.setContentType("application/json; charset=utf-8");
- response.getWriter().write(JSONUtil.toJSONString(Results.failure("-1", ex.getMessage())));
+ String resultStatus = "-1";
+ if (ex instanceof ServiceException) {
+ ServiceException serviceException = (ServiceException) ex;
+ resultStatus = serviceException.errorCode.getCode();
+ }
+ response.getWriter().write(JSONUtil.toJSONString(Results.failure(resultStatus, ex.getMessage())));
response.getWriter().flush();
return;
}
-
try {
super.doFilterInternal(request, response, chain);
} finally {
@@ -83,7 +99,7 @@ public class JWTAuthorizationFilter extends BasicAuthenticationFilter {
}
/**
- * Token 中获取用户信息并新建一个 Token.
+ * Obtain user information from Token and create a new Token.
*
* @param tokenHeader
* @return
@@ -92,21 +108,16 @@ public class JWTAuthorizationFilter extends BasicAuthenticationFilter {
String token = tokenHeader.replace(JwtTokenUtil.TOKEN_PREFIX, "");
boolean expiration = JwtTokenUtil.isExpiration(token);
if (expiration) {
- throw new ServiceException("登录时间过长，请退出重新登录");
+ throw new ServiceException(LOGIN_TIMEOUT);
}
-
String username = JwtTokenUtil.getUsername(token);
String userRole = JwtTokenUtil.getUserRole(token);
UserContext.setUserInfo(username, userRole);
-
String role = JwtTokenUtil.getUserRole(token);
if (username != null) {
return new UsernamePasswordAuthenticationToken(username, null,
- Collections.singleton(new SimpleGrantedAuthority(role))
- );
+ Collections.singleton(new SimpleGrantedAuthority(role)));
}
-
return null;
}
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/PermissionMapper.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/PermissionMapper.java
index f0977313..72e15e10 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/PermissionMapper.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/PermissionMapper.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -6,9 +23,6 @@ import org.apache.ibatis.annotations.Mapper;
/**
* Permission mapper.
- *
- * @author chen.ma
- * @date 2021/10/30 22:34
*/
@Mapper
public interface PermissionMapper extends BaseMapper {
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/RoleMapper.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/RoleMapper.java
index 0286d0cc..abff1ad5 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/RoleMapper.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/RoleMapper.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -6,9 +23,6 @@ import org.apache.ibatis.annotations.Mapper;
/**
* Role mapper.
- *
- * @author chen.ma
- * @date 2021/10/30 22:55
*/
@Mapper
public interface RoleMapper extends BaseMapper {
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/UserMapper.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/UserMapper.java
index 317c6023..40286f0e 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/UserMapper.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/mapper/UserMapper.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.mapper;
import cn.hippo4j.auth.model.UserInfo;
@@ -6,9 +23,6 @@ import org.apache.ibatis.annotations.Mapper;
/**
* User mapper.
- *
- * @author chen.ma
- * @date 2021/10/30 21:42
*/
@Mapper
public interface UserMapper extends BaseMapper {
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/PermissionInfo.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/PermissionInfo.java
index 2c8faaaa..93e05f6f 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/PermissionInfo.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/PermissionInfo.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.model;
import com.baomidou.mybatisplus.annotation.*;
@@ -7,9 +24,6 @@ import java.util.Date;
/**
* Permission info.
- *
- * @author chen.ma
- * @date 2021/10/30 22:33
*/
@Data
@TableName("permission")
@@ -54,5 +68,4 @@ public class PermissionInfo {
@TableLogic
@TableField(fill = FieldFill.INSERT)
private Integer delFlag;
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/RoleInfo.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/RoleInfo.java
index f3bca4a4..85ab766b 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/RoleInfo.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/RoleInfo.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.model;
import com.baomidou.mybatisplus.annotation.*;
@@ -7,9 +24,6 @@ import java.util.Date;
/**
* Role info.
- *
- * @author chen.ma
- * @date 2021/10/30 22:54
*/
@Data
@TableName("role")
@@ -49,5 +63,4 @@ public class RoleInfo {
@TableLogic
@TableField(fill = FieldFill.INSERT)
private Integer delFlag;
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/UserInfo.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/UserInfo.java
index 0c4cba74..994ae605 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/UserInfo.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/UserInfo.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.model;
import com.baomidou.mybatisplus.annotation.*;
@@ -7,9 +24,6 @@ import java.util.Date;
/**
* User info.
- *
- * @author chen.ma
- * @date 2021/10/30 21:37
*/
@Data
@TableName("user")
@@ -54,5 +68,4 @@ public class UserInfo {
@TableLogic
@TableField(fill = FieldFill.INSERT)
private Integer delFlag;
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/permission/PermissionQueryPageReqDTO.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/permission/PermissionQueryPageReqDTO.java
index 30e0b42c..2f4d05b9 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/permission/PermissionQueryPageReqDTO.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/permission/PermissionQueryPageReqDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.model.biz.permission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -5,9 +22,6 @@ import lombok.Data;
/**
* Permission query page.
- *
- * @author chen.ma
- * @date 2021/10/30 21:47
*/
@Data
public class PermissionQueryPageReqDTO extends Page {
@@ -15,5 +29,4 @@ public class PermissionQueryPageReqDTO extends Page {
public PermissionQueryPageReqDTO(long current, long size) {
super(current, size);
}
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/permission/PermissionRespDTO.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/permission/PermissionRespDTO.java
index 4d0bc92b..1ee6303f 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/permission/PermissionRespDTO.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/permission/PermissionRespDTO.java
@@ -1,12 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.model.biz.permission;
import lombok.Data;
/**
* Permission resp dto.
- *
- * @author chen.ma
- * @date 2021/10/30 22:21
*/
@Data
public class PermissionRespDTO {
@@ -25,5 +39,4 @@ public class PermissionRespDTO {
* action
*/
private String action;
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/role/RoleQueryPageReqDTO.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/role/RoleQueryPageReqDTO.java
index ae93f7e1..8fc764f4 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/role/RoleQueryPageReqDTO.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/role/RoleQueryPageReqDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.model.biz.role;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -5,9 +22,6 @@ import lombok.Data;
/**
* Role query page.
- *
- * @author chen.ma
- * @date 2021/10/30 21:47
*/
@Data
public class RoleQueryPageReqDTO extends Page {
@@ -15,5 +29,4 @@ public class RoleQueryPageReqDTO extends Page {
public RoleQueryPageReqDTO(long current, long size) {
super(current, size);
}
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/role/RoleRespDTO.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/role/RoleRespDTO.java
index 2adffbcb..2b15bdc3 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/role/RoleRespDTO.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/role/RoleRespDTO.java
@@ -1,24 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.model.biz.role;
import lombok.Data;
/**
* Role resp dto.
- *
- * @author chen.ma
- * @date 2021/10/30 22:49
*/
@Data
public class RoleRespDTO {
/**
- * role
+ * Role
*/
private String role;
/**
- * userName
+ * User name
*/
private String userName;
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/JwtUser.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/JwtUser.java
index d2b655d2..d2eabed0 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/JwtUser.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/JwtUser.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.model.biz.user;
import lombok.Data;
@@ -8,9 +25,6 @@ import java.util.Collection;
/**
* Jwt user.
- *
- * @author chen.ma
- * @date 2021/11/9 22:34
*/
@Data
public class JwtUser implements UserDetails {
@@ -54,5 +68,4 @@ public class JwtUser implements UserDetails {
public boolean isEnabled() {
return true;
}
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/LoginUser.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/LoginUser.java
index ad2184a8..0c15778c 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/LoginUser.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/LoginUser.java
@@ -1,12 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.model.biz.user;
import lombok.Data;
/**
* Login user.
- *
- * @author chen.ma
- * @date 2021/11/9 22:41
*/
@Data
public class LoginUser {
@@ -25,5 +39,4 @@ public class LoginUser {
* rememberMe
*/
private Integer rememberMe;
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserQueryPageReqDTO.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserQueryPageReqDTO.java
index 472e5b36..f4a5ec23 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserQueryPageReqDTO.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserQueryPageReqDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.model.biz.user;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -6,9 +23,6 @@ import lombok.experimental.Accessors;
/**
* User query page.
- *
- * @author chen.ma
- * @date 2021/10/30 21:47
*/
@Data
@Accessors(chain = true)
@@ -18,5 +32,4 @@ public class UserQueryPageReqDTO extends Page {
* userName
*/
private String userName;
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserReqDTO.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserReqDTO.java
index b84529d7..4dd3586c 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserReqDTO.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserReqDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.model.biz.user;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -6,9 +23,6 @@ import lombok.experimental.Accessors;
/**
* User req dto.
- *
- * @author chen.ma
- * @date 2021/11/11 20:30
*/
@Data
@Accessors(chain = true)
@@ -28,5 +42,4 @@ public class UserReqDTO extends Page {
* role
*/
private String role;
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserRespDTO.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserRespDTO.java
index a82f68f3..168c640d 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserRespDTO.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/model/biz/user/UserRespDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.model.biz.user;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -7,9 +24,6 @@ import java.util.Date;
/**
* User resp dto.
- *
- * @author chen.ma
- * @date 2021/10/30 21:51
*/
@Data
public class UserRespDTO {
@@ -35,5 +49,4 @@ public class UserRespDTO {
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date gmtModified;
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/AuthManager.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/AuthManager.java
index fdfbcdd1..765104d4 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/AuthManager.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/AuthManager.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.security;
import lombok.AllArgsConstructor;
@@ -9,10 +26,7 @@ import org.springframework.security.core.AuthenticationException;
import org.springframework.stereotype.Component;
/**
- * Auth manager
- *
- * @author chen.ma
- * @date 2021/12/20 20:34
+ * Auth manager.
*/
@Component
@AllArgsConstructor
@@ -39,8 +53,6 @@ public class AuthManager {
} catch (AuthenticationException e) {
throw new AccessException("Unknown user.");
}
-
return jwtTokenManager.createToken(userName);
}
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/JwtTokenManager.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/JwtTokenManager.java
index 157a9f66..84160cc9 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/JwtTokenManager.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/JwtTokenManager.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.security;
import cn.hutool.core.util.StrUtil;
@@ -20,19 +37,14 @@ import static cn.hippo4j.common.constant.Constants.AUTHORITIES_KEY;
/**
* Jwt token manager.
- *
- * @author chen.ma
- * @date 2021/12/20 20:36
*/
@Component
public class JwtTokenManager {
public String createToken(String userName) {
long now = System.currentTimeMillis();
-
Date validity;
validity = new Date(now + TOKEN_VALIDITY_IN_SECONDS * 1000L);
-
Claims claims = Jwts.claims().setSubject(userName);
return Jwts.builder().setClaims(claims).setExpiration(validity)
.signWith(SignatureAlgorithm.HS512, SECRET).compact();
@@ -50,12 +62,9 @@ public class JwtTokenManager {
*/
public Authentication getAuthentication(String token) {
Claims claims = Jwts.parser().setSigningKey(SECRET).parseClaimsJws(token).getBody();
-
List authorities = AuthorityUtils
.commaSeparatedStringToAuthorityList((String) claims.get(AUTHORITIES_KEY));
-
User principal = new User(claims.getSubject(), StrUtil.EMPTY, authorities);
return new UsernamePasswordAuthenticationToken(principal, StrUtil.EMPTY, authorities);
}
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/PermissionService.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/PermissionService.java
index 922c0576..dff771a3 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/PermissionService.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/PermissionService.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.service;
import cn.hippo4j.auth.model.biz.permission.PermissionRespDTO;
@@ -5,14 +22,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
/**
* Permission service.
- *
- * @author chen.ma
- * @date 2021/10/30 22:13
*/
public interface PermissionService {
/**
- * 分页查询权限列表.
+ * Paging query permission list.
*
* @param pageNo
* @param pageSize
@@ -21,7 +35,7 @@ public interface PermissionService {
IPage listPermission(int pageNo, int pageSize);
/**
- * 新增权限.
+ * Add permission.
*
* @param role
* @param resource
@@ -30,12 +44,11 @@ public interface PermissionService {
void addPermission(String role, String resource, String action);
/**
- * 删除权限.
+ * Remove permission.
*
* @param role
* @param resource
* @param action
*/
void deletePermission(String role, String resource, String action);
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/RoleService.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/RoleService.java
index 2b212e4c..5f155909 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/RoleService.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/RoleService.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,14 +24,11 @@ import java.util.List;
/**
* Role service.
- *
- * @author chen.ma
- * @date 2021/10/30 22:45
*/
public interface RoleService {
/**
- * 分页查询角色列表.
+ * Paging query role list.
*
* @param pageNo
* @param pageSize
@@ -23,7 +37,7 @@ public interface RoleService {
IPage listRole(int pageNo, int pageSize);
/**
- * 新增角色.
+ * Add role.
*
* @param role
* @param userName
@@ -31,7 +45,7 @@ public interface RoleService {
void addRole(String role, String userName);
/**
- * 删除角色.
+ * Delete role.
*
* @param role
* @param userName
@@ -39,11 +53,10 @@ public interface RoleService {
void deleteRole(String role, String userName);
/**
- * 根据角色模糊搜索.
+ * Fuzzy search by role.
*
* @param role
* @return
*/
List getRoleLike(String role);
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/UserService.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/UserService.java
index bbbffba5..6f98b582 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/UserService.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/UserService.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.service;
import cn.hippo4j.auth.model.biz.user.UserQueryPageReqDTO;
@@ -9,14 +26,11 @@ import java.util.List;
/**
* User service.
- *
- * @author chen.ma
- * @date 2021/10/30 21:34
*/
public interface UserService {
/**
- * 分页查询用户列表.
+ * Paging query user list.
*
* @param reqDTO
* @return
@@ -24,28 +38,28 @@ public interface UserService {
IPage listUser(UserQueryPageReqDTO reqDTO);
/**
- * 新增用户.
+ * New users.
*
* @param reqDTO
*/
void addUser(UserReqDTO reqDTO);
/**
- * 修改用户.
+ * Modify user.
*
* @param reqDTO
*/
void updateUser(UserReqDTO reqDTO);
/**
- * 删除用户.
+ * Delete users.
*
* @param userName
*/
void deleteUser(String userName);
/**
- * 根据用户名模糊搜索.
+ * Fuzzy search by username.
*
* @param userName
* @return
@@ -53,11 +67,10 @@ public interface UserService {
List getUserLikeUsername(String userName);
/**
- * 获取用户详情.
+ * Get user details.
*
* @param reqDTO
* @return
*/
UserRespDTO getUser(UserReqDTO reqDTO);
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/PermissionServiceImpl.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/PermissionServiceImpl.java
index ddbf36f4..b53b1c6a 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/PermissionServiceImpl.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/PermissionServiceImpl.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.service.impl;
import cn.hippo4j.auth.mapper.PermissionMapper;
@@ -16,9 +33,6 @@ import org.springframework.stereotype.Service;
/**
* Permission service impl.
- *
- * @author chen.ma
- * @date 2021/10/30 22:32
*/
@Service
@AllArgsConstructor
@@ -44,7 +58,6 @@ public class PermissionServiceImpl implements PermissionService {
if (existPermissionInfo != null) {
throw new RuntimeException("权限重复");
}
-
PermissionInfo insertPermission = new PermissionInfo();
insertPermission.setRole(role);
insertPermission.setResource(resource);
@@ -58,8 +71,6 @@ public class PermissionServiceImpl implements PermissionService {
.eq(StrUtil.isNotBlank(role), PermissionInfo::getRole, role)
.eq(StrUtil.isNotBlank(resource), PermissionInfo::getResource, resource)
.eq(StrUtil.isNotBlank(action), PermissionInfo::getAction, action);
-
permissionMapper.delete(updateWrapper);
}
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/RoleServiceImpl.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/RoleServiceImpl.java
index 04b7b59a..dd45b56c 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/RoleServiceImpl.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/RoleServiceImpl.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.service.impl;
import cn.hippo4j.auth.mapper.RoleMapper;
@@ -21,9 +38,6 @@ import java.util.stream.Collectors;
/**
* Role service impl.
- *
- * @author chen.ma
- * @date 2021/10/30 22:53
*/
@Service
@AllArgsConstructor
@@ -37,7 +51,6 @@ public class RoleServiceImpl implements RoleService {
public IPage listRole(int pageNo, int pageSize) {
RoleQueryPageReqDTO queryPage = new RoleQueryPageReqDTO(pageNo, pageSize);
IPage selectPage = roleMapper.selectPage(queryPage, null);
-
return selectPage.convert(each -> BeanUtil.toBean(each, RoleRespDTO.class));
}
@@ -49,7 +62,6 @@ public class RoleServiceImpl implements RoleService {
if (roleInfo != null) {
throw new RuntimeException("角色名重复");
}
-
RoleInfo insertRole = new RoleInfo();
insertRole.setRole(role);
insertRole.setUserName(userName);
@@ -63,12 +75,10 @@ public class RoleServiceImpl implements RoleService {
LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(RoleInfo.class).eq(RoleInfo::getUserName, userName);
roleStrList = roleMapper.selectList(queryWrapper).stream().map(RoleInfo::getRole).collect(Collectors.toList());
}
-
LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(RoleInfo.class)
.eq(StrUtil.isNotBlank(role), RoleInfo::getRole, role)
.eq(StrUtil.isNotBlank(userName), RoleInfo::getUserName, userName);
roleMapper.delete(updateWrapper);
-
roleStrList.forEach(each -> permissionService.deletePermission(each, "", ""));
}
@@ -77,11 +87,8 @@ public class RoleServiceImpl implements RoleService {
LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(RoleInfo.class)
.like(RoleInfo::getRole, role)
.select(RoleInfo::getRole);
-
List roleInfos = roleMapper.selectList(queryWrapper);
List roleNames = roleInfos.stream().map(RoleInfo::getRole).collect(Collectors.toList());
-
return roleNames;
}
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserDetailsServiceImpl.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserDetailsServiceImpl.java
index 5a1c1fc9..7592c8bb 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserDetailsServiceImpl.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserDetailsServiceImpl.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.service.impl;
import cn.hippo4j.auth.mapper.UserMapper;
@@ -15,9 +32,6 @@ import java.util.Set;
/**
* User details service impl.
- *
- * @author chen.ma
- * @date 2021/11/9 22:26
*/
public class UserDetailsServiceImpl implements UserDetailsService {
@@ -27,16 +41,12 @@ public class UserDetailsServiceImpl implements UserDetailsService {
@Override
public UserDetails loadUserByUsername(String userName) throws UsernameNotFoundException {
UserInfo userInfo = userMapper.selectOne(Wrappers.lambdaQuery(UserInfo.class).eq(UserInfo::getUserName, userName));
-
JwtUser jwtUser = new JwtUser();
jwtUser.setId(userInfo.getId());
jwtUser.setUsername(userName);
jwtUser.setPassword(userInfo.getPassword());
-
Set authorities = Collections.singleton(new SimpleGrantedAuthority(userInfo.getRole() + ""));
jwtUser.setAuthorities(authorities);
-
return jwtUser;
}
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java
index 6b0470fa..f94df6a2 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.service.impl;
import cn.hippo4j.auth.mapper.UserMapper;
@@ -26,9 +43,6 @@ import java.util.stream.Collectors;
/**
* User service impl.
- *
- * @author chen.ma
- * @date 2021/10/30 21:40
*/
@Service
@AllArgsConstructor
@@ -45,7 +59,6 @@ public class UserServiceImpl implements UserService {
LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(UserInfo.class)
.eq(StringUtil.isNotBlank(reqDTO.getUserName()), UserInfo::getUserName, reqDTO.getUserName());
IPage selectPage = userMapper.selectPage(reqDTO, queryWrapper);
-
return selectPage.convert(each -> BeanUtil.toBean(each, UserRespDTO.class));
}
@@ -57,7 +70,6 @@ public class UserServiceImpl implements UserService {
if (existUserInfo != null) {
throw new RuntimeException("用户名重复");
}
-
reqDTO.setPassword(bCryptPasswordEncoder.encode(reqDTO.getPassword()));
UserInfo insertUser = BeanUtil.toBean(reqDTO, UserInfo.class);
userMapper.insert(insertUser);
@@ -69,7 +81,6 @@ public class UserServiceImpl implements UserService {
reqDTO.setPassword(bCryptPasswordEncoder.encode(reqDTO.getPassword()));
}
UserInfo updateUser = BeanUtil.toBean(reqDTO, UserInfo.class);
-
LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(UserInfo.class)
.eq(UserInfo::getUserName, reqDTO.getUserName());
userMapper.update(updateUser, updateWrapper);
@@ -80,7 +91,6 @@ public class UserServiceImpl implements UserService {
LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(UserInfo.class)
.eq(UserInfo::getUserName, userName);
userMapper.delete(updateWrapper);
- // roleService.deleteRole("", userName);
}
@Override
@@ -88,10 +98,8 @@ public class UserServiceImpl implements UserService {
LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(UserInfo.class)
.like(UserInfo::getUserName, userName)
.select(UserInfo::getUserName);
-
List userInfos = userMapper.selectList(queryWrapper);
List userNames = userInfos.stream().map(UserInfo::getUserName).collect(Collectors.toList());
-
return userNames;
}
@@ -99,11 +107,9 @@ public class UserServiceImpl implements UserService {
public UserRespDTO getUser(UserReqDTO reqDTO) {
Wrapper queryWrapper = Wrappers.lambdaQuery(UserInfo.class).eq(UserInfo::getUserName, reqDTO.getUserName());
UserInfo userInfo = userMapper.selectOne(queryWrapper);
-
UserRespDTO respUser = Optional.ofNullable(userInfo)
.map(each -> BeanUtil.toBean(each, UserRespDTO.class))
.orElseThrow(() -> new ServiceException("查询无此用户, 可以尝试清空缓存或退出登录."));
return respUser;
}
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/JwtTokenUtil.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/JwtTokenUtil.java
index bdcaa95d..c78af646 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/JwtTokenUtil.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/JwtTokenUtil.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.toolkit;
import cn.hippo4j.auth.constant.Constants;
@@ -14,10 +31,7 @@ import java.util.List;
import static cn.hippo4j.common.constant.Constants.MAP_INITIAL_CAPACITY;
/**
- * Jwt token util.
- *
- * @author chen.ma
- * @date 2021/11/9 22:43
+ * JWT token util.
*/
public class JwtTokenUtil {
@@ -28,22 +42,22 @@ public class JwtTokenUtil {
public static final String ISS = "admin";
/**
- * 角色的 Key
+ * Character key.
*/
private static final String ROLE_CLAIMS = "rol";
/**
- * 过期时间是 3600 秒, 既 24 小时
+ * Expiration time is 3600 seconds, which is 24 hours.
*/
private static final long EXPIRATION = 86400L;
/**
- * 选择了记住我之后的过期时间为 7 天
+ * 7 days after selecting Remember me.
*/
private static final long EXPIRATION_REMEMBER = 7 * EXPIRATION;
/**
- * 创建 Token.
+ * Create Token.
*
* @param id
* @param username
@@ -66,7 +80,7 @@ public class JwtTokenUtil {
}
/**
- * Token 中获取用户名.
+ * Get the username from Token.
*
* @param token
* @return
@@ -77,7 +91,7 @@ public class JwtTokenUtil {
}
/**
- * Token 中获取用户名.
+ * Get the username from Token.
*
* @param token
* @return
@@ -88,7 +102,7 @@ public class JwtTokenUtil {
}
/**
- * 获取用户角色.
+ * Get user role.
*
* @param token
* @return
@@ -98,7 +112,7 @@ public class JwtTokenUtil {
}
/**
- * 是否已过期.
+ * Has it expired.
*
* @param token
* @return
@@ -114,5 +128,4 @@ public class JwtTokenUtil {
private static Claims getTokenBody(String token) {
return Jwts.parser().setSigningKey(SECRET).parseClaimsJws(token).getBody();
}
-
}
diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/ReturnT.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/ReturnT.java
index f46e4de8..ccc1ab1c 100644
--- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/ReturnT.java
+++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/ReturnT.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.auth.toolkit;
import lombok.Data;
@@ -7,9 +24,6 @@ import java.io.Serializable;
/**
* ReturnT.
- *
- * @author chen.ma
- * @date 2021/11/10 00:00
*/
@Data
@NoArgsConstructor
@@ -36,5 +50,4 @@ public class ReturnT implements Serializable {
this.code = SUCCESS_CODE;
this.content = content;
}
-
}
diff --git a/hippo4j-common/.gitignore b/hippo4j-common/.gitignore
deleted file mode 100644
index 549e00a2..00000000
--- a/hippo4j-common/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
diff --git a/hippo4j-common/pom.xml b/hippo4j-common/pom.xml
index 33969bc5..322db933 100644
--- a/hippo4j-common/pom.xml
+++ b/hippo4j-common/pom.xml
@@ -2,18 +2,12 @@
4.0.0
-
cn.hippo4jhippo4j-all${revision}
-
hippo4j-common
- jar
-
- ${project.artifactId}
- ${project.artifactId}
@@ -44,14 +38,20 @@
com.aliyunalibaba-dingtalk-service-sdk
+ true
- log4jlog4j
+ log4j
- true
+
+
+
+ commons-codec
+ commons-codec
+ 1.14
@@ -86,5 +86,4 @@
-
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java
index 05746360..a99e1a8d 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ClientCloseHookExecute.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.api;
import lombok.Data;
@@ -5,9 +22,6 @@ import lombok.experimental.Accessors;
/**
* Client close hook execute.
- *
- * @author chen.ma
- * @date 2022/1/6 22:14
*/
public interface ClientCloseHookExecute {
@@ -36,7 +50,5 @@ public interface ClientCloseHookExecute {
* groupKey
*/
private String groupKey;
-
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/api/JsonFacade.java b/hippo4j-common/src/main/java/cn/hippo4j/common/api/JsonFacade.java
index 566bbb71..eb72bfb9 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/api/JsonFacade.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/api/JsonFacade.java
@@ -1,12 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.api;
import java.util.List;
/**
* Json facade.
- *
- * @author chen.ma
- * @date 2021/12/13 20:01
*/
public interface JsonFacade {
@@ -37,5 +51,4 @@ public interface JsonFacade {
* @return
*/
List parseArray(String text, Class clazz);
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/api/NotifyConfigBuilder.java b/hippo4j-common/src/main/java/cn/hippo4j/common/api/NotifyConfigBuilder.java
index 951b91b0..2099a875 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/api/NotifyConfigBuilder.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/api/NotifyConfigBuilder.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.api;
import cn.hippo4j.common.notify.NotifyConfigDTO;
@@ -7,9 +24,6 @@ import java.util.Map;
/**
* Notify config builder.
- *
- * @author chen.ma
- * @date 2022/2/24 19:50
*/
public interface NotifyConfigBuilder {
@@ -19,5 +33,4 @@ public interface NotifyConfigBuilder {
* @return
*/
Map> buildNotify();
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadDetailState.java b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadDetailState.java
index a6bb2523..1fdd66f5 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadDetailState.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadDetailState.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.api;
import cn.hippo4j.common.model.ThreadDetailStateInfo;
@@ -7,9 +24,6 @@ import java.util.concurrent.ThreadPoolExecutor;
/**
* Get thread status in thread pool.
- *
- * @author chen.ma
- * @date 2022/1/9 12:47
*/
public interface ThreadDetailState {
@@ -28,5 +42,4 @@ public interface ThreadDetailState {
* @return
*/
List getThreadDetailStateInfo(ThreadPoolExecutor threadPoolExecutor);
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadPoolDynamicRefresh.java b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadPoolDynamicRefresh.java
index 0f2733da..2221044c 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadPoolDynamicRefresh.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/api/ThreadPoolDynamicRefresh.java
@@ -1,10 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.api;
+import java.util.Map;
+
/**
- * Thread pool dynamic refresh.
- *
- * @author chen.ma
- * @date 2022/2/26 12:26
+ * Thread-pool dynamic refresh.
*/
public interface ThreadPoolDynamicRefresh {
@@ -15,4 +31,12 @@ public interface ThreadPoolDynamicRefresh {
*/
void dynamicRefresh(String content);
+ /**
+ * Dynamic refresh.
+ *
+ * @param content
+ * @param newValueChangeMap
+ */
+ default void dynamicRefresh(String content, Map newValueChangeMap) {
+ }
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java b/hippo4j-common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java
index 574366ec..5c2eb3fe 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/config/ApplicationContextHolder.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.config;
import org.springframework.beans.BeansException;
@@ -9,9 +26,6 @@ import java.util.Map;
/**
* Application context holder.
- *
- * @author chen.ma
- * @date 2021/6/20 18:49
*/
public class ApplicationContextHolder implements ApplicationContextAware {
@@ -76,5 +90,4 @@ public class ApplicationContextHolder implements ApplicationContextAware {
public static ApplicationContext getInstance() {
return CONTEXT;
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/constant/Constants.java b/hippo4j-common/src/main/java/cn/hippo4j/common/constant/Constants.java
index e5f5e345..da6ccc9f 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/constant/Constants.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/constant/Constants.java
@@ -1,10 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.constant;
/**
* Constants.
- *
- * @author chen.ma
- * @date 2021/6/16 23:01
*/
public class Constants {
@@ -50,6 +64,10 @@ public class Constants {
public static final String MONITOR_PATH = BASE_PATH + "/monitor";
+ public static final String REGISTER_ADAPTER_BASE_PATH = BASE_PATH + "/adapter/thread-pool";
+
+ public static final String REGISTER_ADAPTER_PATH = REGISTER_ADAPTER_BASE_PATH + "/register";
+
public static final String HEALTH_CHECK_PATH = BASE_PATH + "/health/check";
public static final String PROBE_MODIFY_REQUEST = "Listening-Configs";
@@ -82,4 +100,7 @@ public class Constants {
public static final String UNKNOWN = "unknown";
+ public static final String EXECUTE_TIMEOUT_TRACE = "executeTimeoutTrace";
+
+ public static final int HTTP_EXECUTE_TIMEOUT = 5000;
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/design/builder/Builder.java b/hippo4j-common/src/main/java/cn/hippo4j/common/design/builder/Builder.java
index d787ef53..358a6ee1 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/design/builder/Builder.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/design/builder/Builder.java
@@ -1,20 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.design.builder;
import java.io.Serializable;
/**
* Builder pattern interface definition.
- *
- * @author chen.ma
- * @date 2021/7/5 21:39
*/
public interface Builder extends Serializable {
- /**
- * Build.
- *
- * @return
- */
T build();
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java
index 7c176edb..ffbb01b8 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/AbstractSubjectCenter.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.design.observer;
import cn.hippo4j.common.toolkit.CollectionUtil;
@@ -11,9 +28,6 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* Send observer notification.
- *
- * @author chen.ma
- * @date 2021/12/25 19:47
*/
@Slf4j
public class AbstractSubjectCenter {
@@ -128,7 +142,5 @@ public class AbstractSubjectCenter {
* Clear config cache.
*/
CLEAR_CONFIG_CACHE
-
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/Observer.java b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/Observer.java
index a8dbc17f..08b99581 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/Observer.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/Observer.java
@@ -1,10 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.design.observer;
/**
* Observer.
- *
- * @author chen.ma
- * @date 2021/12/25 19:46
*/
public interface Observer {
@@ -14,5 +28,4 @@ public interface Observer {
* @param observerMessage
*/
void accept(ObserverMessage observerMessage);
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java
index 9e9895b5..912b6b64 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/design/observer/ObserverMessage.java
@@ -1,18 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.design.observer;
/**
* Message notifying observer.
- *
- * @author chen.ma
- * @date 2021/12/25 19:54
*/
public interface ObserverMessage {
- /**
- * Message.
- *
- * @return
- */
T message();
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/enums/DelEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/enums/DelEnum.java
index 7e6848c7..70267d32 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/enums/DelEnum.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/enums/DelEnum.java
@@ -1,10 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.enums;
/**
* Del enum.
- *
- * @author chen.ma
- * @date 2021/3/26 18:45
*/
public enum DelEnum {
@@ -36,5 +50,4 @@ public enum DelEnum {
public String toString() {
return statusCode;
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java
index 81c1b1c4..15e74c4f 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/enums/EnableEnum.java
@@ -1,12 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.enums;
import java.util.Objects;
/**
* Enable enum.
- *
- * @author chen.ma
- * @date 2021/12/21 20:34
*/
public enum EnableEnum {
@@ -42,5 +56,4 @@ public enum EnableEnum {
public static boolean getBool(Integer intStatusCode) {
return Objects.equals(intStatusCode, EnableEnum.YES.getIntCode()) ? true : false;
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java
index cebe8a40..d38ccaed 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ExecutorFactory.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.executor;
import java.util.concurrent.Executors;
@@ -6,9 +23,6 @@ import java.util.concurrent.ThreadFactory;
/**
* Executor factory.
- *
- * @author chen.ma
- * @date 2021/6/23 18:35
*/
public class ExecutorFactory {
@@ -24,5 +38,4 @@ public class ExecutorFactory {
return executorService;
}
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java
index 0670aa95..9960b789 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/ThreadPoolManager.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.executor;
import java.util.HashMap;
@@ -9,10 +26,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
/**
- * Thread Pool Manager.
- *
- * @author chen.ma
- * @date 2021/6/23 18:36
+ * Thread-pool manager.
*/
public class ThreadPoolManager {
@@ -42,7 +56,6 @@ public class ThreadPoolManager {
lockers.put(tenantId, new Object());
}
}
-
final Object monitor = lockers.get(tenantId);
synchronized (monitor) {
Map> map = resourcesManager.get(tenantId);
@@ -59,5 +72,4 @@ public class ThreadPoolManager {
map.get(group).add(executor);
}
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/function/Matcher.java b/hippo4j-common/src/main/java/cn/hippo4j/common/function/Matcher.java
index 92810bfa..918ec3ee 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/function/Matcher.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/function/Matcher.java
@@ -1,20 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.function;
/**
* Matcher.
- *
- * @author chen.ma
- * @date 2022/1/9 13:29
*/
@FunctionalInterface
public interface Matcher {
- /**
- * Match.
- *
- * @param t
- * @return
- */
boolean match(T t);
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java b/hippo4j-common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java
index c8fe64ae..878691ec 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/function/NoArgsConsumer.java
@@ -1,17 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.function;
/**
- * 无参消费者.
- *
- * @author chen.ma
- * @date 2021/11/9 00:06
+ * No args consumer.
*/
@FunctionalInterface
public interface NoArgsConsumer {
- /**
- * 方法执行
- */
void accept();
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java
index a9f64620..f704c49b 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/GlobalRemotePoolInfo.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.model;
import lombok.Getter;
@@ -7,9 +24,6 @@ import java.io.Serializable;
/**
* Global remote pool info.
- *
- * @author chen.ma
- * @date 2021/6/23 21:08
*/
@Getter
@Setter
@@ -81,5 +95,4 @@ public class GlobalRemotePoolInfo implements Serializable {
* content
*/
private String content;
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java
index d5d7e526..7a527889 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/InstanceInfo.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.model;
import lombok.Data;
@@ -8,9 +25,6 @@ import lombok.extern.slf4j.Slf4j;
/**
* Instance info.
- *
- * @author chen.ma
- * @date 2021/7/13 22:10
*/
@Slf4j
@Getter
@@ -167,8 +181,5 @@ public class InstanceInfo {
private String lastDirtyTimestamp;
private String status;
-
}
-
}
-
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/ManyPoolRunStateInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ManyPoolRunStateInfo.java
deleted file mode 100644
index 76f205ed..00000000
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/ManyPoolRunStateInfo.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cn.hippo4j.common.model;
-
-import lombok.Data;
-
-/**
- * Many pool run state info.
- *
- * @author chen.ma
- * @date 2022/1/8 12:54
- */
-@Data
-public class ManyPoolRunStateInfo extends PoolRunStateInfo {
-
- /**
- * identify
- */
- private String identify;
-
- /**
- * active
- */
- private String active;
-
- /**
- * state
- */
- private String state;
-
-}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolBaseInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolBaseInfo.java
deleted file mode 100644
index 9217821a..00000000
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolBaseInfo.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package cn.hippo4j.common.model;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * Pool base info.
- *
- * @author chen.ma
- * @date 2022/1/22 12:10
- */
-@Data
-@Accessors(chain = true)
-public class PoolBaseInfo {
-
- /**
- * coreSize
- */
- private Integer coreSize;
-
- /**
- * maximumSize
- */
- private Integer maximumSize;
-
- /**
- * queueType
- */
- private String queueType;
-
- /**
- * queueCapacity
- */
- private Integer queueCapacity;
-
- /**
- * rejectedName
- */
- private String rejectedName;
-
- /**
- * keepAliveTime
- */
- private Long keepAliveTime;
-
-}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameter.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameter.java
deleted file mode 100644
index c21e380d..00000000
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameter.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package cn.hippo4j.common.model;
-
-/**
- * Pool parameter.
- *
- * @author chen.ma
- * @date 2021/6/24 16:04
- */
-public interface PoolParameter {
-
- /**
- * tenantId
- *
- * @return
- */
- String getTenantId();
-
- /**
- * itemId
- *
- * @return
- */
- String getItemId();
-
- /**
- * tpId
- *
- * @return
- */
- String getTpId();
-
- /**
- * coreSize
- *
- * @return
- */
- Integer getCoreSize();
-
- /**
- * maxSize
- *
- * @return
- */
- Integer getMaxSize();
-
- /**
- * queueType
- *
- * @return
- */
- Integer getQueueType();
-
- /**
- * capacity
- *
- * @return
- */
- Integer getCapacity();
-
- /**
- * keepAliveTime
- *
- * @return
- */
- Integer getKeepAliveTime();
-
- /**
- * rejectedType
- *
- * @return
- */
- Integer getRejectedType();
-
- /**
- * isAlarm
- *
- * @return
- */
- Integer getIsAlarm();
-
- /**
- * capacityAlarm
- *
- * @return
- */
- Integer getCapacityAlarm();
-
- /**
- * livenessAlarm
- *
- * @return
- */
- Integer getLivenessAlarm();
-
- /**
- * allowCoreThreadTimeOut
- *
- * @return
- */
- Integer getAllowCoreThreadTimeOut();
-
-}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameterInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameterInfo.java
deleted file mode 100644
index 5eaf0020..00000000
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolParameterInfo.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package cn.hippo4j.common.model;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * Thread pool parameter info.
- *
- * @author chen.ma
- * @date 2021/6/16 23:18
- */
-@Data
-@Accessors(chain = true)
-public class PoolParameterInfo implements PoolParameter, Serializable {
-
- private static final long serialVersionUID = -7123935122108553864L;
-
- /**
- * tenantId
- */
- private String tenantId;
-
- /**
- * itemId
- */
- private String itemId;
-
- /**
- * tpId
- */
- private String tpId;
-
- /**
- * content
- */
- private String content;
-
- /**
- * coreSize
- */
- private Integer coreSize;
-
- /**
- * maxSize
- */
- private Integer maxSize;
-
- /**
- * queueType
- */
- private Integer queueType;
-
- /**
- * capacity
- */
- private Integer capacity;
-
- /**
- * keepAliveTime
- */
- private Integer keepAliveTime;
-
- /**
- * rejectedType
- */
- private Integer rejectedType;
-
- /**
- * isAlarm
- */
- private Integer isAlarm;
-
- /**
- * capacityAlarm
- */
- private Integer capacityAlarm;
-
- /**
- * livenessAlarm
- */
- private Integer livenessAlarm;
-
- /**
- * allowCoreThreadTimeOut
- */
- private Integer allowCoreThreadTimeOut;
-
-}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolRunStateInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolRunStateInfo.java
deleted file mode 100644
index 41746348..00000000
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/PoolRunStateInfo.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package cn.hippo4j.common.model;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * Pool run state info.
- *
- * @author chen.ma
- * @date 2021/7/7 18:57
- */
-@Getter
-@Setter
-public class PoolRunStateInfo extends PoolBaseInfo implements Serializable {
-
- /**
- * currentLoad
- */
- private String currentLoad;
-
- /**
- * peakLoad
- */
- private String peakLoad;
-
- /**
- * tpId
- */
- private String tpId;
-
- /**
- * activeCount
- */
- private Integer activeCount;
-
- /**
- * poolSize
- */
- private Integer poolSize;
-
- /**
- * activeSize
- */
- private Integer activeSize;
-
- /**
- * The maximum number of threads that enter the thread pool at the same time
- */
- private Integer largestPoolSize;
-
- /**
- * queueSize
- */
- private Integer queueSize;
-
- /**
- * queueRemainingCapacity
- */
- private Integer queueRemainingCapacity;
-
- /**
- * completedTaskCount
- */
- private Long completedTaskCount;
-
- /**
- * rejectCount
- */
- private Long rejectCount;
-
- /**
- * host
- */
- private String host;
-
- /**
- * memoryProportion
- */
- private String memoryProportion;
-
- /**
- * freeMemory
- */
- private String freeMemory;
-
- /**
- * clientLastRefreshTime
- */
- private String clientLastRefreshTime;
-
- /**
- * timestamp
- */
- private Long timestamp;
-
-}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java
index 72663bd9..fe9e5d32 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadDetailStateInfo.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.model;
import lombok.Data;
@@ -7,9 +24,6 @@ import java.util.List;
/**
* Thread detail state info.
- *
- * @author chen.ma
- * @date 2022/1/9 12:36
*/
@Data
@Accessors(chain = true)
@@ -34,5 +48,4 @@ public class ThreadDetailStateInfo {
* threadStack
*/
private List threadStack;
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/model/TokenInfo.java b/hippo4j-common/src/main/java/cn/hippo4j/common/model/TokenInfo.java
index 81a2a2eb..8dfe3587 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/model/TokenInfo.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/model/TokenInfo.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.model;
import lombok.AllArgsConstructor;
@@ -6,9 +23,6 @@ import lombok.NoArgsConstructor;
/**
* Token info.
- *
- * @author chen.ma
- * @date 2021/12/20 20:02
*/
@Data
@NoArgsConstructor
@@ -24,5 +38,4 @@ public class TokenInfo {
* tokenTtl
*/
private Long tokenTtl;
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java
index 201c48da..a96e8df8 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/AbstractMessage.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.monitor;
import lombok.Data;
@@ -7,9 +24,6 @@ import java.util.List;
/**
* Base message.
- *
- * @author chen.ma
- * @date 2021/12/7 20:31
*/
@Data
@NoArgsConstructor
@@ -29,5 +43,4 @@ public abstract class AbstractMessage implements Message {
* message
*/
private List messages;
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/Message.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/Message.java
index 70de9bdd..87538dc3 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/Message.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/Message.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.monitor;
import java.io.Serializable;
@@ -5,9 +22,6 @@ import java.util.List;
/**
* Abstract message monitoring interface.
- *
- * @author chen.ma
- * @date 2021/12/6 20:16
*/
public interface Message extends Serializable {
@@ -31,5 +45,4 @@ public interface Message extends Serializable {
* @return
*/
List getMessages();
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java
index 8ca09d64..1778b9a7 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageRequest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.monitor;
import java.util.List;
@@ -5,9 +22,6 @@ import java.util.Map;
/**
* Message request.
- *
- * @author chen.ma
- * @date 2021/12/10 21:17
*/
public interface MessageRequest {
@@ -31,5 +45,4 @@ public interface MessageRequest {
* @return
*/
MessageTypeEnum getMessageType();
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java
index e4546a53..3bbfbed3 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageTypeEnum.java
@@ -1,10 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.monitor;
/**
* Message type enum.
- *
- * @author chen.ma
- * @date 2021/12/7 19:34
*/
public enum MessageTypeEnum {
@@ -17,5 +31,4 @@ public enum MessageTypeEnum {
* DEFAULT
*/
DEFAULT
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java
index 3acb1258..464d6fe5 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/MessageWrapper.java
@@ -1,22 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.monitor;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* Message wrapper.
- *
- * @author chen.ma
- * @date 2021/12/7 22:42
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class MessageWrapper implements MessageRequest {
+public class MessageWrapper implements MessageRequest, Serializable {
/**
* contentParams
@@ -47,5 +62,4 @@ public class MessageWrapper implements MessageRequest {
public MessageTypeEnum getMessageType() {
return messageType;
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java
index 058e38db..444aaa01 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/monitor/RuntimeMessage.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.monitor;
import lombok.Data;
@@ -5,9 +22,6 @@ import lombok.NoArgsConstructor;
/**
* Dynamic thread pool runtime data.
- *
- * @author chen.ma
- * @date 2021/12/6 18:18
*/
@Data
@NoArgsConstructor
@@ -67,5 +81,4 @@ public class RuntimeMessage extends AbstractMessage {
* timestamp
*/
private Long timestamp;
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlDTO.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlDTO.java
index 3bca8893..31cc68f0 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlDTO.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.notify;
import cn.hutool.core.util.StrUtil;
@@ -5,10 +22,7 @@ import lombok.Builder;
import lombok.Data;
/**
- * 报警控制实体.
- *
- * @author chen.ma
- * @date 2021/10/28 22:15
+ * Alarm control dto.
*/
@Data
@Builder
@@ -37,5 +51,4 @@ public class AlarmControlDTO {
public String buildPk() {
return StrUtil.builder(threadPool, "+", platform).toString();
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlHandler.java
index 019af2f9..8d10eeb1 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlHandler.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/AlarmControlHandler.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.notify;
import cn.hippo4j.common.constant.Constants;
@@ -13,9 +30,6 @@ import java.util.concurrent.locks.ReentrantLock;
/**
* Alarm control assembly.
- *
- * @author chen.ma
- * @date 2021/10/28 21:24
*/
public class AlarmControlHandler {
@@ -35,7 +49,6 @@ public class AlarmControlHandler {
if (cache == null) {
return false;
}
-
String pkId = cache.getIfPresent(alarmControl.getTypeEnum().name());
if (StrUtil.isBlank(pkId)) {
ReentrantLock lock = threadPoolLock.get(threadPoolKey);
@@ -51,7 +64,6 @@ public class AlarmControlHandler {
lock.unlock();
}
}
-
return false;
}
@@ -68,10 +80,8 @@ public class AlarmControlHandler {
.expireAfterWrite(interval, TimeUnit.MINUTES)
.build();
threadPoolAlarmCache.put(threadPoolKey, cache);
-
// Set the lock to prevent false sending of alarm information.
ReentrantLock reentrantLock = new ReentrantLock();
threadPoolLock.put(threadPoolKey, reentrantLock);
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/BaseSendMessageServiceImpl.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/BaseSendMessageServiceImpl.java
deleted file mode 100644
index eafe706f..00000000
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/BaseSendMessageServiceImpl.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package cn.hippo4j.common.notify;
-
-import cn.hippo4j.common.api.NotifyConfigBuilder;
-import cn.hippo4j.common.config.ApplicationContextHolder;
-import cn.hippo4j.common.notify.request.AlarmNotifyRequest;
-import cn.hippo4j.common.notify.request.ChangeParameterNotifyRequest;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-import com.google.common.collect.Maps;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.CommandLineRunner;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Base send message service impl.
- *
- * @author chen.ma
- * @date 2022/2/22 21:32
- */
-@Slf4j
-@RequiredArgsConstructor
-public class BaseSendMessageServiceImpl implements HippoSendMessageService, CommandLineRunner {
-
- private final NotifyConfigBuilder notifyConfigBuilder;
-
- private final AlarmControlHandler alarmControlHandler;
-
- private final Map> notifyConfigs = Maps.newHashMap();
-
- private final Map sendMessageHandlers = Maps.newHashMap();
-
- @Override
- public void sendAlarmMessage(NotifyTypeEnum typeEnum, AlarmNotifyRequest alarmNotifyRequest) {
- String threadPoolId = alarmNotifyRequest.getThreadPoolId();
- String buildKey = StrUtil.builder(threadPoolId, "+", "ALARM").toString();
- List notifyList = notifyConfigs.get(buildKey);
- if (CollUtil.isEmpty(notifyList)) {
- log.warn("Please configure alarm notification on the server. key :: [{}]", threadPoolId);
- return;
- }
-
- notifyList.forEach(each -> {
- try {
- SendMessageHandler messageHandler = sendMessageHandlers.get(each.getPlatform());
- if (messageHandler == null) {
- log.warn("Please configure alarm notification on the server. key :: [{}]", threadPoolId);
- return;
- }
-
- if (isSendAlarm(each.getThreadPoolId(), each.setTypeEnum(typeEnum))) {
- messageHandler.sendAlarmMessage(each, alarmNotifyRequest);
- }
- } catch (Exception ex) {
- log.warn("Failed to send thread pool alarm notification. key :: [{}]", threadPoolId, ex);
- }
- });
- }
-
- @Override
- public void sendChangeMessage(ChangeParameterNotifyRequest changeParameterNotifyRequest) {
- String threadPoolId = changeParameterNotifyRequest.getThreadPoolId();
- String buildKey = StrUtil.builder(threadPoolId, "+", "CONFIG").toString();
- List notifyList = notifyConfigs.get(buildKey);
- if (CollUtil.isEmpty(notifyList)) {
- log.warn("Please configure alarm notification on the server. key :: [{}]", threadPoolId);
- return;
- }
-
- notifyList.forEach(each -> {
- try {
- SendMessageHandler messageHandler = sendMessageHandlers.get(each.getPlatform());
- if (messageHandler == null) {
- log.warn("Please configure alarm notification on the server. key :: [{}]", threadPoolId);
- return;
- }
-
- messageHandler.sendChangeMessage(each, changeParameterNotifyRequest);
- } catch (Exception ex) {
- log.warn("Failed to send thread pool change notification. key :: [{}]", threadPoolId, ex);
- }
- });
- }
-
- /**
- * Is send alarm.
- *
- * @param threadPoolId
- * @param notifyInfo
- * @return
- */
- private boolean isSendAlarm(String threadPoolId, NotifyConfigDTO notifyInfo) {
- AlarmControlDTO alarmControl = AlarmControlDTO.builder()
- .threadPool(threadPoolId)
- .platform(notifyInfo.getPlatform())
- .typeEnum(notifyInfo.getTypeEnum())
- .build();
-
- return alarmControlHandler.isSendAlarm(alarmControl);
- }
-
- @Override
- public void run(String... args) throws Exception {
- Map sendMessageHandlerMap =
- ApplicationContextHolder.getBeansOfType(SendMessageHandler.class);
- sendMessageHandlerMap.values().forEach(each -> sendMessageHandlers.put(each.getType(), each));
-
- Map> buildNotify = notifyConfigBuilder.buildNotify();
- notifyConfigs.putAll(buildNotify);
- }
-
-}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoSendMessageService.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoSendMessageService.java
index 158d07fd..a460b95d 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoSendMessageService.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoSendMessageService.java
@@ -1,13 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.notify;
import cn.hippo4j.common.notify.request.AlarmNotifyRequest;
import cn.hippo4j.common.notify.request.ChangeParameterNotifyRequest;
/**
- * Send message service.
- *
- * @author chen.ma
- * @date 2022/2/22 19:56
+ * Hippo4j send message service.
*/
public interface HippoSendMessageService {
@@ -25,5 +39,4 @@ public interface HippoSendMessageService {
* @param changeParameterNotifyRequest
*/
void sendChangeMessage(ChangeParameterNotifyRequest changeParameterNotifyRequest);
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyConfigDTO.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyConfigDTO.java
index 5f7ef7b6..b9298ea2 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyConfigDTO.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyConfigDTO.java
@@ -1,13 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.notify;
import lombok.Data;
import lombok.experimental.Accessors;
/**
- * 通知实体.
- *
- * @author chen.ma
- * @date 2021/11/17 22:12
+ * Notify config dto.
*/
@Data
@Accessors(chain = true)
@@ -26,7 +40,7 @@ public class NotifyConfigDTO {
/**
* 线程池id
*/
- private String threadPoolId;
+ private String tpId;
/**
* 通知平台
@@ -43,6 +57,11 @@ public class NotifyConfigDTO {
*/
private String secretKey;
+ /**
+ * 加签
+ */
+ private String secret;
+
/**
* 报警间隔
*/
@@ -57,5 +76,4 @@ public class NotifyConfigDTO {
* 报警类型
*/
private NotifyTypeEnum typeEnum;
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyPlatformEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyPlatformEnum.java
index 3d2e65b4..6d197e65 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyPlatformEnum.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyPlatformEnum.java
@@ -1,10 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.notify;
/**
* Notify platform enum.
- *
- * @author chen.ma
- * @date 2021/8/15 15:50
*/
public enum NotifyPlatformEnum {
@@ -22,5 +36,4 @@ public enum NotifyPlatformEnum {
* WECHAT
*/
WECHAT
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyTypeEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyTypeEnum.java
index 1dbfd7cd..f2fc59d9 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyTypeEnum.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyTypeEnum.java
@@ -1,10 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.notify;
/**
* Notify type enum.
- *
- * @author chen.ma
- * @date 2022/2/22 19:44
*/
public enum NotifyTypeEnum {
@@ -26,6 +40,10 @@ public enum NotifyTypeEnum {
/**
* REJECT
*/
- REJECT
+ REJECT,
+ /**
+ * TIMEOUT
+ */
+ TIMEOUT
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/SendMessageHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/SendMessageHandler.java
index 13a8a961..0a9864e5 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/SendMessageHandler.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/SendMessageHandler.java
@@ -1,12 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.notify;
import cn.hippo4j.common.notify.request.base.NotifyRequest;
/**
* Send message handler.
- *
- * @author chen.ma
- * @date 2021/8/15 15:44
*/
public interface SendMessageHandler {
@@ -32,5 +46,4 @@ public interface SendMessageHandler receives;
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyDTO.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyDTO.java
index f864cd26..7a935bb4 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyDTO.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.notify;
import lombok.Data;
@@ -6,9 +23,6 @@ import java.util.List;
/**
* Thread pool notify DTO.
- *
- * @author chen.ma
- * @date 2022/2/24 19:08
*/
@Data
public class ThreadPoolNotifyDTO {
@@ -22,5 +36,4 @@ public class ThreadPoolNotifyDTO {
* notifyList
*/
private List notifyList;
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingAlarmConstants.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingAlarmConstants.java
index 1b5e77b3..556832aa 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingAlarmConstants.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingAlarmConstants.java
@@ -1,10 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.notify.platform;
/**
* Ding alarm constants.
- *
- * @author chen.ma
- * @date 2021/11/26 20:03
*/
public class DingAlarmConstants {
@@ -23,33 +37,48 @@ public class DingAlarmConstants {
*/
public static final String DING_NOTICE_TITLE = "动态线程池通知";
+ /**
+ * Trace 信息
+ */
+ public static final String DING_ALARM_TIMOUT_TRACE_REPLACE_TXT = "链路信息：%s \n\n";
+
+ /**
+ * 替换任务超时模板
+ */
+ public static final String DING_ALARM_TIMOUT_REPLACE_TXT =
+ "任务执行时间：%d / ms \n\n" +
+ "超时时间：%d / ms \n\n" +
+ DING_ALARM_TIMOUT_TRACE_REPLACE_TXT +
+ " --- \n\n ";
+
/**
* 线程池报警通知文本
*/
public static final String DING_ALARM_TXT =
- "[警报] %s - 动态线程池运行告警 \n\n" +
+ "**[警报] %s - 动态线程池运行告警（%s）** \n\n" +
" --- \n\n " +
- "线程池ID：%s \n\n " +
- "应用名称：%s \n\n " +
- "应用实例：%s \n\n " +
- "报警类型：%s \n\n " +
+ "线程池ID：%s \n\n " +
+ "应用名称：%s \n\n " +
+ "应用实例：%s \n\n " +
+ "实例标识：%s \n\n " +
" --- \n\n " +
- "核心线程数：%d \n\n " +
- "最大线程数：%d \n\n " +
- "当前线程数：%d \n\n " +
- "活跃线程数：%d \n\n " +
- "最大任务数：%d \n\n " +
- "线程池任务总量：%d \n\n " +
+ "核心线程数：%d \n\n " +
+ "最大线程数：%d \n\n " +
+ "当前线程数：%d \n\n " +
+ "活跃线程数：%d \n\n " +
+ "同存最大线程数：%d \n\n " +
+ "线程池任务总量：%d \n\n " +
" --- \n\n " +
- "队列类型：%s \n\n " +
- "队列容量：%d \n\n " +
- "队列元素个数：%d \n\n " +
- "队列剩余个数：%d \n\n " +
+ "队列类型：%s \n\n " +
+ "队列容量：%d \n\n " +
+ "队列元素个数：%d \n\n " +
+ "队列剩余个数：%d \n\n " +
" --- \n\n " +
- "拒绝策略：%s \n\n" +
- "拒绝策略执行次数：%d \n\n " +
- "OWNER：@%s \n\n" +
- "提示：%d 分钟内此线程池不会重复告警（可配置） \n\n" +
+ DING_ALARM_TIMOUT_REPLACE_TXT +
+ "拒绝策略：%s \n\n" +
+ "拒绝策略执行次数：%d \n\n " +
+ "OWNER：@%s \n\n" +
+ "提示：%d 分钟内此线程池不会重复告警（可配置） \n\n" +
" --- \n\n " +
"**播报时间：%s**";
@@ -57,26 +86,25 @@ public class DingAlarmConstants {
* 线程池参数变更通知文本
*/
public static final String DING_NOTICE_TXT =
- "[通知] %s - 动态线程池参数变更 \n\n" +
+ "**[通知] %s - 动态线程池参数变更** \n\n" +
" --- \n\n " +
- "线程池ID：%s \n\n " +
- "应用名称：%s \n\n " +
- "应用实例：%s \n\n " +
- " --- \n\n " +
- "核心线程数：%s \n\n " +
- "最大线程数：%s \n\n " +
- "核心线程超时：%s \n\n " +
- "线程存活时间：%s / SECONDS \n\n" +
+ "线程池ID：%s \n\n " +
+ "应用名称：%s \n\n " +
+ "应用实例：%s \n\n " +
" --- \n\n " +
- "队列类型：%s \n\n " +
- "队列容量：%s \n\n " +
+ "核心线程数：%s \n\n " +
+ "最大线程数：%s \n\n " +
+ "核心线程超时：%s \n\n " +
+ "线程存活时间：%s \n\n" +
+ "执行超时时间：%s \n\n" +
" --- \n\n " +
- "AGO 拒绝策略：%s \n\n" +
- "NOW 拒绝策略：%s \n\n" +
+ "队列类型：%s \n\n " +
+ "队列容量：%s \n\n " +
+ "AGO 拒绝策略：%s \n\n" +
+ "NOW 拒绝策略：%s \n\n" +
" --- \n\n " +
- "提示：动态线程池配置变更实时通知（无限制） \n\n" +
- "OWNER：@%s \n\n" +
+ "提示：动态线程池配置变更实时通知（无限制） \n\n" +
+ "OWNER：@%s \n\n" +
" --- \n\n " +
"**播报时间：%s**";
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingSendMessageHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingSendMessageHandler.java
index d6f18ec4..a8a02eeb 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingSendMessageHandler.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingSendMessageHandler.java
@@ -1,11 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.notify.platform;
import cn.hippo4j.common.notify.NotifyConfigDTO;
import cn.hippo4j.common.notify.NotifyPlatformEnum;
+import cn.hippo4j.common.notify.NotifyTypeEnum;
import cn.hippo4j.common.notify.SendMessageHandler;
import cn.hippo4j.common.notify.request.AlarmNotifyRequest;
import cn.hippo4j.common.notify.request.ChangeParameterNotifyRequest;
+import cn.hippo4j.common.toolkit.StringUtil;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import com.dingtalk.api.DefaultDingTalkClient;
import com.dingtalk.api.DingTalkClient;
import com.dingtalk.api.request.OapiRobotSendRequest;
@@ -13,17 +33,19 @@ import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.taobao.api.ApiException;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.List;
+import java.util.Objects;
-import static cn.hippo4j.common.notify.platform.DingAlarmConstants.DING_ALARM_TXT;
-import static cn.hippo4j.common.notify.platform.DingAlarmConstants.DING_NOTICE_TXT;
+import static cn.hippo4j.common.notify.platform.DingAlarmConstants.*;
/**
* Send ding notification message.
- *
- * @author chen.ma
- * @date 2021/8/15 15:49
*/
@Slf4j
public class DingSendMessageHandler implements SendMessageHandler {
@@ -37,19 +59,37 @@ public class DingSendMessageHandler implements SendMessageHandler mobiles) {
- String serverUrl = DingAlarmConstants.DING_ROBOT_SERVER_URL + secretKey;
+ private void execute(NotifyConfigDTO notifyConfig, String title, String text, List mobiles) {
+ String serverUrl = DingAlarmConstants.DING_ROBOT_SERVER_URL + notifyConfig.getSecretKey();
+ String secret = notifyConfig.getSecret();
+ if (StringUtil.isNotBlank(secret)) {
+ long timestamp = System.currentTimeMillis();
+ String stringToSign = timestamp + "\n" + secret;
+ try {
+ Mac mac = Mac.getInstance("HmacSHA256");
+ mac.init(new SecretKeySpec(secret.getBytes(StandardCharsets.UTF_8), "HmacSHA256"));
+ byte[] signData = mac.doFinal(stringToSign.getBytes(StandardCharsets.UTF_8));
+ String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), StandardCharsets.UTF_8.name());
+ serverUrl = serverUrl + "×tamp=" + timestamp + "&sign=" + sign;
+ } catch (Exception ex) {
+ log.error("Failed to sign the message sent by nailing.", ex);
+ }
+ }
DingTalkClient dingTalkClient = new DefaultDingTalkClient(serverUrl);
OapiRobotSendRequest request = new OapiRobotSendRequest();
request.setMsgtype("markdown");
-
OapiRobotSendRequest.Markdown markdown = new OapiRobotSendRequest.Markdown();
markdown.setTitle(title);
markdown.setText(text);
-
OapiRobotSendRequest.At at = new OapiRobotSendRequest.At();
at.setAtMobiles(mobiles);
-
request.setAt(at);
request.setMarkdown(markdown);
-
try {
dingTalkClient.execute(request);
} catch (ApiException ex) {
log.error("Ding failed to send message", ex);
}
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkAlarmConstants.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkAlarmConstants.java
index 9c551266..2f04d6c0 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkAlarmConstants.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkAlarmConstants.java
@@ -1,10 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.notify.platform;
/**
- * lark alarm constants.
- *
- * @author imyzt
- * @date 2021-11-23 19:29
+ * Lark alarm constants.
*/
public class LarkAlarmConstants {
@@ -30,14 +44,30 @@ public class LarkAlarmConstants {
*/
public static final String LARK_OPENID_PREFIX = "ou_";
+ /**
+ * Trace 信息
+ */
+ public static final String LARK_ALARM_TIMOUT_TRACE_REPLACE_TXT = ",{\"is_short\":true,\"text\":{\"content\":\"** 链路信息：** %s\",\"tag\":\"lark_md\"}}";
+
+ /**
+ * 替换任务超时模板
+ */
+ public static final String LARK_ALARM_TIMOUT_REPLACE_TXT =
+ "{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 任务执行时间：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 超时时间：** %s\",\"tag\":\"lark_md\"}}" +
+ LARK_ALARM_TIMOUT_TRACE_REPLACE_TXT +
+ "],\"tag\":\"div\"},{\"tag\":\"hr\"},";
+
/**
* lark alarm json str
*/
- public static final String LARK_ALARM_JSON_STR = "{\"msg_type\":\"interactive\",\"card\":{\"config\":{\"wide_screen_mode\":true},\"header\":{\"template\":\"red\",\"title\":{\"content\":\"[\uD83D\uDD25警报] %s 动态线程池运行告警\",\"tag\":\"plain_text\"}},\"elements\":[{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 线程池ID：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 应用名称：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 应用实例：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 报警类型：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 核心线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 最大线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 当前线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 活跃线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 最大任务数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 线程池任务总量：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 队列类型：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 队列容量：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 队列元素个数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 队列剩余个数：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 拒绝策略：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 拒绝策略执行次数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** OWNER：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 播报时间： ** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"tag\":\"note\",\"elements\":[{\"tag\":\"plain_text\",\"content\":\"提示： %s 分钟内此线程池不会重复告警（可配置）\"}]}]}}";
+ public static final String LARK_ALARM_JSON_STR =
+ "{\"msg_type\":\"interactive\",\"card\":{\"config\":{\"wide_screen_mode\":true},\"header\":{\"template\":\"red\",\"title\":{\"content\":\"[\uD83D\uDD25警报] %s 动态线程池运行告警（%s）\",\"tag\":\"plain_text\"}},\"elements\":[{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 线程池ID：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 应用名称：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 应用实例：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 核心线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 最大线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 当前线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 活跃线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 同存最大线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 线程池任务总量：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 队列类型：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 队列容量：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 队列元素个数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 队列剩余个数：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},"
+ + LARK_ALARM_TIMOUT_REPLACE_TXT
+ + "{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 拒绝策略：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 拒绝策略执行次数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** OWNER：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 播报时间： ** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"tag\":\"note\",\"elements\":[{\"tag\":\"plain_text\",\"content\":\"提示： %s 分钟内此线程池不会重复告警（可配置）\"}]}]}}";
/**
* lark notice json str
*/
- public static final String LARK_NOTICE_JSON_STR = "{\"msg_type\":\"interactive\",\"card\":{\"config\":{\"wide_screen_mode\":true},\"header\":{\"template\":\"greed\",\"title\":{\"content\":\"[通知] %s 动态线程池参数变更\",\"tag\":\"plain_text\"}},\"elements\":[{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 线程池ID：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 应用名称：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 应用实例：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 核心线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 最大线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 核心线程超时：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 线程存活时间：** %s / SECONDS\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 队列类型：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 队列容量：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** AGO 拒绝策略：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** NOW 拒绝策略执行次数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** OWNER：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 播报时间： ** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"tag\":\"note\",\"elements\":[{\"tag\":\"plain_text\",\"content\":\"提示：动态线程池配置变更实时通知（无限制）\"}]}]}}";
-
+ public static final String LARK_NOTICE_JSON_STR =
+ "{\"msg_type\":\"interactive\",\"card\":{\"config\":{\"wide_screen_mode\":true},\"header\":{\"template\":\"greed\",\"title\":{\"content\":\"[通知] %s 动态线程池参数变更\",\"tag\":\"plain_text\"}},\"elements\":[{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 线程池ID：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 应用名称：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 应用实例：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 核心线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 最大线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 核心线程超时：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 线程存活时间：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 队列类型：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 队列容量：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 执行超时时间：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** AGO 拒绝策略：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** NOW 拒绝策略：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** OWNER：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 播报时间： ** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"tag\":\"note\",\"elements\":[{\"tag\":\"plain_text\",\"content\":\"提示：动态线程池配置变更实时通知（无限制）\"}]}]}}";
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkSendMessageHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkSendMessageHandler.java
index 1ed16d93..17c67fa9 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkSendMessageHandler.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkSendMessageHandler.java
@@ -1,7 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.notify.platform;
import cn.hippo4j.common.notify.NotifyConfigDTO;
import cn.hippo4j.common.notify.NotifyPlatformEnum;
+import cn.hippo4j.common.notify.NotifyTypeEnum;
import cn.hippo4j.common.notify.SendMessageHandler;
import cn.hippo4j.common.notify.request.AlarmNotifyRequest;
import cn.hippo4j.common.notify.request.ChangeParameterNotifyRequest;
@@ -14,15 +32,13 @@ import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import java.util.Arrays;
+import java.util.Objects;
import java.util.stream.Collectors;
import static cn.hippo4j.common.notify.platform.LarkAlarmConstants.*;
/**
* Send lark notification message.
- *
- * @author imyzt
- * @date 2021/11/22 21:12
*/
@Slf4j
@AllArgsConstructor
@@ -36,20 +52,34 @@ public class LarkSendMessageHandler implements SendMessageHandler StrUtil.startWith(receive, LARK_OPENID_PREFIX) ?
- String.format(LARK_AT_FORMAT_OPENID, receive) : String.format(LARK_AT_FORMAT_USERNAME, receive))
+ .map(receive -> StrUtil.startWith(receive, LARK_OPENID_PREFIX) ? String.format(LARK_AT_FORMAT_OPENID, receive) : String.format(LARK_AT_FORMAT_USERNAME, receive))
.collect(Collectors.joining(" "));
}
private void execute(String secretKey, String text) {
String serverUrl = LARK_BOT_URL + secretKey;
-
try {
HttpRequest.post(serverUrl).body(text).execute();
} catch (Exception ex) {
log.error("Lark failed to send message", ex);
}
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatAlarmConstants.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatAlarmConstants.java
index 48542c62..f63e1d55 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatAlarmConstants.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatAlarmConstants.java
@@ -1,10 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.notify.platform;
/**
- * Ding alarm constants.
- *
- * @author chen.ma
- * @date 2021/11/26 20:03
+ * We chat alarm constants.
*/
public class WeChatAlarmConstants {
@@ -13,27 +27,40 @@ public class WeChatAlarmConstants {
*/
public static final String WE_CHAT_SERVER_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=";
+ /**
+ * Trace 信息
+ */
+ public static final String WE_CHAT_ALARM_TIMOUT_TRACE_REPLACE_TXT = "> 链路信息：%s \n";
+
+ /**
+ * 替换任务超时模板
+ */
+ public static final String WE_CHAT_ALARM_TIMOUT_REPLACE_TXT =
+ "> 任务执行时间：%s / ms \n" +
+ "> 超时时间：%s / ms \n" +
+ WE_CHAT_ALARM_TIMOUT_TRACE_REPLACE_TXT;
+
/**
* 线程池报警通知文本
*/
public static final String WE_CHAT_ALARM_TXT =
- "### [警报] %s - 动态线程池运行告警 \n" +
+ "### [警报] %s - 动态线程池运行告警（%s） \n" +
"> 线程池ID：%s \n" +
"> 应用名称：%s \n" +
"> 应用实例：%s \n" +
- "> 报警类型：%s \n" +
"> 核心线程数：%s \n" +
"> 最大线程数：%s \n" +
"> 当前线程数：%s \n" +
"> 活跃线程数：%s \n" +
- "> 最大任务数：%s \n" +
+ "> 同存最大线程数：%s \n" +
"> 线程池任务总量：%s \n" +
"> 队列类型：%s \n" +
"> 队列容量：%s \n" +
"> 队列元素个数：%s \n" +
"> 队列剩余个数：%s \n" +
"> 拒绝策略：%s \n" +
- "> 拒绝策略执行次数：%s \n" +
+ "> 拒绝策略执行次数：%s \n" +
+ WE_CHAT_ALARM_TIMOUT_REPLACE_TXT +
"> OWNER：<@%s> \n" +
"> 提示：%d 分钟内此线程池不会重复告警（可配置） \n\n" +
"**播报时间：%s**";
@@ -49,7 +76,8 @@ public class WeChatAlarmConstants {
"> 核心线程数：%s \n" +
"> 最大线程数：%s \n" +
"> 核心线程超时：%s \n" +
- "> 线程存活时间：%s / SECONDS \n" +
+ "> 线程存活时间：%s \n" +
+ "> 执行超时时间：%s \n" +
"> 队列类型：%s \n" +
"> 队列容量：%s \n" +
"> AGO 拒绝策略：%s \n" +
@@ -57,5 +85,4 @@ public class WeChatAlarmConstants {
"> OWNER：<@%s> \n" +
"> 提示：动态线程池配置变更实时通知（无限制） \n\n" +
"**播报时间：%s**";
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatSendMessageHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatSendMessageHandler.java
index 913796c3..1d5ddd0b 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatSendMessageHandler.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatSendMessageHandler.java
@@ -1,25 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.notify.platform;
-import cn.hippo4j.common.notify.NotifyConfigDTO;
-import cn.hippo4j.common.notify.NotifyPlatformEnum;
-import cn.hippo4j.common.notify.SendMessageHandler;
+import cn.hippo4j.common.notify.*;
import cn.hippo4j.common.notify.request.AlarmNotifyRequest;
import cn.hippo4j.common.notify.request.ChangeParameterNotifyRequest;
import cn.hippo4j.common.toolkit.JSONUtil;
+import cn.hippo4j.common.toolkit.StringUtil;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
import com.google.common.base.Joiner;
import lombok.Data;
import lombok.experimental.Accessors;
import lombok.extern.slf4j.Slf4j;
+import java.util.Objects;
+
import static cn.hippo4j.common.notify.platform.WeChatAlarmConstants.*;
/**
* WeChat send message handler.
- *
- * @author chen.ma
- * @date 2021/11/26 20:06
*/
@Slf4j
public class WeChatSendMessageHandler implements SendMessageHandler {
@@ -33,19 +49,34 @@ public class WeChatSendMessageHandler implements SendMessageHandler<@").join(receives);
+ String weChatAlarmTxt;
+ String weChatAlarmTimoutReplaceTxt;
+ if (Objects.equals(alarmNotifyRequest.getNotifyTypeEnum(), NotifyTypeEnum.TIMEOUT)) {
+ String executeTimeoutTrace = alarmNotifyRequest.getExecuteTimeoutTrace();
+ if (StringUtil.isNotBlank(executeTimeoutTrace)) {
+ String weChatAlarmTimoutTraceReplaceTxt = String.format(WE_CHAT_ALARM_TIMOUT_TRACE_REPLACE_TXT, executeTimeoutTrace);
+ weChatAlarmTimoutReplaceTxt = StrUtil.replace(WE_CHAT_ALARM_TIMOUT_REPLACE_TXT, WE_CHAT_ALARM_TIMOUT_TRACE_REPLACE_TXT, weChatAlarmTimoutTraceReplaceTxt);
+ } else {
+ weChatAlarmTimoutReplaceTxt = StrUtil.replace(WE_CHAT_ALARM_TIMOUT_REPLACE_TXT, WE_CHAT_ALARM_TIMOUT_TRACE_REPLACE_TXT, "");
+ }
+ weChatAlarmTimoutReplaceTxt = String.format(weChatAlarmTimoutReplaceTxt, alarmNotifyRequest.getExecuteTime(), alarmNotifyRequest.getExecuteTimeOut());
+ weChatAlarmTxt = StrUtil.replace(WE_CHAT_ALARM_TXT, WE_CHAT_ALARM_TIMOUT_REPLACE_TXT, weChatAlarmTimoutReplaceTxt);
+ } else {
+ weChatAlarmTxt = StrUtil.replace(WE_CHAT_ALARM_TXT, WE_CHAT_ALARM_TIMOUT_REPLACE_TXT, "");
+ }
String text = String.format(
- WE_CHAT_ALARM_TXT,
+ weChatAlarmTxt,
// 环境
alarmNotifyRequest.getActive(),
+ // 报警类型
+ alarmNotifyRequest.getNotifyTypeEnum(),
// 线程池ID
alarmNotifyRequest.getThreadPoolId(),
// 应用名称
alarmNotifyRequest.getAppName(),
// 实例信息
alarmNotifyRequest.getIdentify(),
- // 报警类型
- notifyConfig.getTypeEnum(),
// 核心线程数
alarmNotifyRequest.getCorePoolSize(),
// 最大线程数
@@ -75,18 +106,15 @@ public class WeChatSendMessageHandler implements SendMessageHandler<@").join(receives);
-
String text = String.format(
WE_CHAT_NOTICE_TXT,
// 环境
@@ -105,6 +133,8 @@ public class WeChatSendMessageHandler implements SendMessageHandler groupKeys;
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/BaseNotifyRequest.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/BaseNotifyRequest.java
index 455e07d3..0b8597bd 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/BaseNotifyRequest.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/BaseNotifyRequest.java
@@ -1,12 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.notify.request.base;
import lombok.Data;
/**
* Base notify request.
- *
- * @author chen.ma
- * @date 2022/2/22 19:35
*/
@Data
public class BaseNotifyRequest implements NotifyRequest {
@@ -40,5 +54,4 @@ public class BaseNotifyRequest implements NotifyRequest {
* receives
*/
private String receives;
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/NotifyRequest.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/NotifyRequest.java
index 5e42abe7..46b80731 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/NotifyRequest.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/request/base/NotifyRequest.java
@@ -1,10 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.notify.request.base;
/**
* Notify request.
- *
- * @author chen.ma
- * @date 2022/2/22 19:38
*/
public interface NotifyRequest {
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java
index db1f6440..bf7d3bde 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ArrayUtil.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.toolkit;
import cn.hippo4j.common.function.Matcher;
@@ -6,9 +23,6 @@ import java.lang.reflect.Array;
/**
* Array util.
- *
- * @author chen.ma
- * @date 2021/12/30 21:42
*/
public class ArrayUtil {
@@ -34,7 +48,6 @@ public class ArrayUtil {
return !isEmpty(array);
}
-
/**
* First match.
*
@@ -51,7 +64,6 @@ public class ArrayUtil {
}
}
}
-
return null;
}
@@ -70,7 +82,8 @@ public class ArrayUtil {
return clone(array1);
}
final Class type1 = array1.getClass().getComponentType();
- @SuppressWarnings("unchecked") final T[] joinedArray = (T[]) Array.newInstance(type1, array1.length + array2.length);
+ @SuppressWarnings("unchecked")
+ final T[] joinedArray = (T[]) Array.newInstance(type1, array1.length + array2.length);
System.arraycopy(array1, 0, joinedArray, 0, array1.length);
try {
System.arraycopy(array2, 0, joinedArray, array1.length, array2.length);
@@ -98,5 +111,4 @@ public class ArrayUtil {
}
return array.clone();
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Assert.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Assert.java
index 5ce48ec9..1bff8abf 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Assert.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Assert.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.toolkit;
import org.springframework.util.CollectionUtils;
@@ -8,9 +25,6 @@ import java.util.Map;
/**
* Assert.
- *
- * @author chen.ma
- * @date 2021/6/29 09:36
*/
public class Assert {
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java
index a43c3452..61f263cd 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/CollectionUtil.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.toolkit;
import java.util.Collection;
@@ -7,9 +24,6 @@ import java.util.Map;
/**
* Collection util.
- *
- * @author chen.ma
- * @date 2021/12/22 20:43
*/
public class CollectionUtil {
@@ -49,7 +63,6 @@ public class CollectionUtil {
return !isEmpty(list);
}
-
/**
* Is empty.
*
@@ -109,5 +122,4 @@ public class CollectionUtil {
public static boolean isNotEmpty(Collection collection) {
return !isEmpty(collection);
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java
index da44380a..c9d79fb1 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ConditionUtil.java
@@ -1,12 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.toolkit;
import cn.hippo4j.common.function.NoArgsConsumer;
/**
* Condition util.
- *
- * @author chen.ma
- * @date 2021/11/6 22:40
*/
public class ConditionUtil {
@@ -17,5 +31,4 @@ public class ConditionUtil {
falseConsumer.accept();
}
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java
index 4120ca56..5a79cce6 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java
@@ -1,20 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.toolkit;
import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.model.PoolParameter;
-import cn.hippo4j.common.model.PoolParameterInfo;
+import cn.hippo4j.common.model.ThreadPoolParameter;
+import cn.hippo4j.common.model.ThreadPoolParameterInfo;
/**
* Content util.
- *
- * @author chen.ma
- * @date 2021/6/24 16:13
*/
public class ContentUtil {
- public static String getPoolContent(PoolParameter parameter) {
- PoolParameterInfo poolInfo = new PoolParameterInfo();
- poolInfo.setTenantId(parameter.getTenantId())
+ public static String getPoolContent(ThreadPoolParameter parameter) {
+ ThreadPoolParameterInfo threadPoolParameterInfo = new ThreadPoolParameterInfo();
+ threadPoolParameterInfo.setTenantId(parameter.getTenantId())
.setItemId(parameter.getItemId())
.setTpId(parameter.getTpId())
.setCoreSize(parameter.getCoreSize())
@@ -27,10 +41,10 @@ public class ContentUtil {
.setLivenessAlarm(parameter.getLivenessAlarm())
.setAllowCoreThreadTimeOut(parameter.getAllowCoreThreadTimeOut())
.setRejectedType(parameter.getRejectedType());
- return JSONUtil.toJSONString(poolInfo);
+ return JSONUtil.toJSONString(threadPoolParameterInfo);
}
- public static String getGroupKey(PoolParameter parameter) {
+ public static String getGroupKey(ThreadPoolParameter parameter) {
StringBuilder stringBuilder = new StringBuilder();
String resultStr = stringBuilder.append(parameter.getTpId())
.append(Constants.GROUP_KEY_DELIMITER)
@@ -45,13 +59,10 @@ public class ContentUtil {
StringBuilder stringBuilder = new StringBuilder();
for (int i = 0; i < parameters.length; i++) {
stringBuilder.append(parameters[i]);
-
if (i < parameters.length - 1) {
stringBuilder.append(Constants.GROUP_KEY_DELIMITER);
}
}
-
return stringBuilder.toString();
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java
index 1d3ceb20..b082690d 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/GroupKey.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.toolkit;
import cn.hippo4j.common.constant.Constants;
@@ -7,9 +24,6 @@ import static cn.hippo4j.common.constant.Constants.GROUP_KEY_DELIMITER;
/**
* Group key.
- *
- * @author chen.ma
- * @date 2021/6/24 21:12
*/
public class GroupKey {
@@ -24,11 +38,9 @@ public class GroupKey {
public static String getKey(String... params) {
StringBuilder groupKey = new StringBuilder();
groupKey.append(params[0]).append(GROUP_KEY_DELIMITER);
-
for (int i = 1; i < params.length - 1; i++) {
groupKey.append(params[i]).append(GROUP_KEY_DELIMITER);
}
-
groupKey.append(params[params.length]);
return groupKey.toString();
}
@@ -46,7 +58,6 @@ public class GroupKey {
sb.append(GROUP_KEY_DELIMITER);
urlEncode(datumStr, sb);
}
-
return sb.toString();
}
@@ -66,5 +77,4 @@ public class GroupKey {
}
}
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java
index c576851a..33dbe282 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JSONUtil.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.toolkit;
import cn.hippo4j.common.api.JsonFacade;
@@ -6,9 +23,6 @@ import java.util.List;
/**
* JSON util.
- *
- * @author chen.ma
- * @date 2021/12/13 20:27
*/
public class JSONUtil {
@@ -37,5 +51,4 @@ public class JSONUtil {
return JSON_FACADE.parseArray(text, clazz);
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java
index a230a72f..4e0a4676 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.toolkit;
import cn.hippo4j.common.api.JsonFacade;
@@ -16,9 +33,6 @@ import java.util.List;
/**
* Jackson util.
- *
- * @author chen.ma
- * @date 2021/12/13 20:02
*/
public class JacksonHandler implements JsonFacade {
@@ -53,5 +67,4 @@ public class JacksonHandler implements JsonFacade {
CollectionType collectionType = MAPPER.getTypeFactory().constructCollectionType(ArrayList.class, clazz);
return MAPPER.readValue(text, collectionType);
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java
index e263e822..2586f90d 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Md5Util.java
@@ -1,7 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.toolkit;
import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.model.PoolParameter;
+import cn.hippo4j.common.model.ThreadPoolParameter;
import java.io.IOException;
import java.net.URLEncoder;
@@ -11,9 +28,6 @@ import java.util.List;
/**
* MD5 util.
- *
- * @author chen.ma
- * @date 2021/6/22 17:55
*/
public class Md5Util {
@@ -50,16 +64,14 @@ public class Md5Util {
public static String encodeHexString(byte[] bytes) {
int l = bytes.length;
char[] out = new char[l << 1];
-
for (int i = 0, j = 0; i < l; i++) {
out[j++] = DIGITS_LOWER[(0xF0 & bytes[i]) >>> 4];
out[j++] = DIGITS_LOWER[0x0F & bytes[i]];
}
-
return new String(out);
}
- public static String getTpContentMd5(PoolParameter config) {
+ public static String getTpContentMd5(ThreadPoolParameter config) {
return Md5Util.md5Hex(ContentUtil.getPoolContent(config), "UTF-8");
}
@@ -67,9 +79,7 @@ public class Md5Util {
if (null == changedGroupKeys) {
return "";
}
-
StringBuilder sb = new StringBuilder();
-
for (String groupKey : changedGroupKeys) {
String[] dataIdGroupId = GroupKey.parseKey(groupKey);
sb.append(dataIdGroupId[0]);
@@ -89,9 +99,7 @@ public class Md5Util {
}
sb.append(Constants.LINE_SEPARATOR);
}
-
// To encode WORD_SEPARATOR and LINE_SEPARATOR invisible characters, encoded value is %02 and %01
return URLEncoder.encode(sb.toString(), "UTF-8");
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java
index ae7d85e9..671f61b5 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/MessageConvert.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.toolkit;
import cn.hippo4j.common.monitor.AbstractMessage;
@@ -11,9 +28,6 @@ import java.util.Map;
/**
* Message convert.
- *
- * @author chen.ma
- * @date 2021/12/10 21:27
*/
public class MessageConvert {
@@ -27,7 +41,6 @@ public class MessageConvert {
MessageWrapper wrapper = new MessageWrapper();
wrapper.setResponseClass(message.getClass());
wrapper.setMessageType(message.getMessageType());
-
List> messageMapList = new ArrayList();
List messages = message.getMessages();
messages.forEach(each -> {
@@ -35,7 +48,6 @@ public class MessageConvert {
Map mapObj = JSONUtil.parseObject(eachVal, Map.class);
messageMapList.add(mapObj);
});
-
wrapper.setContentParams(messageMapList);
return wrapper;
}
@@ -50,17 +62,14 @@ public class MessageConvert {
public static Message convert(MessageWrapper messageWrapper) {
AbstractMessage message = (AbstractMessage) messageWrapper.getResponseClass().newInstance();
List> contentParams = messageWrapper.getContentParams();
-
List messages = new ArrayList();
contentParams.forEach(each -> {
String eachVal = JSONUtil.toJSONString(each);
Message messageObj = JSONUtil.parseObject(eachVal, messageWrapper.getResponseClass());
messages.add(messageObj);
});
-
message.setMessages(messages);
message.setMessageType(messageWrapper.getMessageType());
return message;
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java
index 3de7caf2..0b299752 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.toolkit;
import java.lang.reflect.AccessibleObject;
@@ -8,9 +25,6 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* Reflect util.
- *
- * @author chen.ma
- * @date 2022/1/9 13:16
*/
public class ReflectUtil {
@@ -20,7 +34,6 @@ public class ReflectUtil {
if (null == obj || StringUtil.isBlank(fieldName)) {
return null;
}
-
Field field = getField(obj instanceof Class ? (Class) obj : obj.getClass(), fieldName);
return getFieldValue(obj, field);
}
@@ -32,7 +45,6 @@ public class ReflectUtil {
if (obj instanceof Class) {
obj = null;
}
-
setAccessible(field);
Object result;
try {
@@ -41,7 +53,6 @@ public class ReflectUtil {
String exceptionMsg = String.format("IllegalAccess for %s.%s", field.getDeclaringClass(), field.getName());
throw new RuntimeException(exceptionMsg, e);
}
-
return result;
}
@@ -62,7 +73,6 @@ public class ReflectUtil {
if (null != allFields) {
return allFields;
}
-
allFields = getFieldsDirectly(beanClass, true);
FIELDS_CACHE.put(beanClass, allFields);
return allFields;
@@ -70,7 +80,6 @@ public class ReflectUtil {
public static Field[] getFieldsDirectly(Class beanClass, boolean withSuperClassFields) throws SecurityException {
Assert.notNull(beanClass);
-
Field[] allFields = null;
Class searchType = beanClass;
Field[] declaredFields;
@@ -95,8 +104,6 @@ public class ReflectUtil {
if (null == field) {
return null;
}
-
return field.getName();
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java
index 2d1e5074..13bdb67c 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/StringUtil.java
@@ -1,10 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.toolkit;
/**
* String util.
- *
- * @author chen.ma
- * @date 2021/12/22 20:58
*/
public class StringUtil {
@@ -20,20 +34,16 @@ public class StringUtil {
*/
public static boolean isBlank(CharSequence str) {
int length;
-
if ((str == null) || ((length = str.length()) == 0)) {
return true;
}
-
for (int i = 0; i < length; i++) {
char c = str.charAt(i);
-
boolean charNotBlank = Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\ufeff' || c == '\u202a';
if (charNotBlank == false) {
return false;
}
}
-
return true;
}
@@ -146,8 +156,6 @@ public class StringUtil {
sb.append(c);
}
}
-
return sb.toString();
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java
index 0c524ee2..faf39c49 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ThreadUtil.java
@@ -1,19 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.toolkit;
/**
* Thread util.
- *
- * @author chen.ma
- * @date 2021/12/6 23:34
*/
public class ThreadUtil {
/**
- * 创建新线程.
+ * New thread.
*
- * @param runnable {@link Runnable}
- * @param name 线程名
- * @param isDaemon 是否守护线程
+ * @param runnable
+ * @param name
+ * @param isDaemon
* @return {@link Thread}
*/
public static Thread newThread(Runnable runnable, String name, boolean isDaemon) {
@@ -23,9 +37,9 @@ public class ThreadUtil {
}
/**
- * 挂起当前线程.
+ * Suspend the current thread.
*
- * @param millis 毫秒
+ * @param millis
* @return
*/
public static boolean sleep(long millis) {
@@ -36,8 +50,6 @@ public class ThreadUtil {
return false;
}
}
-
return true;
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java
index f4f2bd01..5b433671 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.toolkit;
import lombok.AllArgsConstructor;
@@ -8,9 +25,6 @@ import java.util.Optional;
/**
* User context (Transition scheme).
- *
- * @author chen.ma
- * @date 2021/11/17 21:13
*/
public class UserContext {
@@ -40,7 +54,5 @@ public class UserContext {
private String username;
private String userRole;
-
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Result.java b/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Result.java
index e9909d59..73237e14 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Result.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Result.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.web.base;
import lombok.Data;
@@ -7,9 +24,6 @@ import java.io.Serializable;
/**
* Result.
- *
- * @author chen.ma
- * @date 2021/3/19 16:12
*/
@Data
@Accessors(chain = true)
@@ -17,16 +31,32 @@ public class Result implements Serializable {
private static final long serialVersionUID = -4408341719434417427L;
+ /**
+ * Correct return code.
+ */
public static final String SUCCESS_CODE = "0";
+ /**
+ * Return code.
+ */
private String code;
+ /**
+ * Message.
+ */
private String message;
+ /**
+ * Response data.
+ */
private T data;
+ /**
+ * Is success.
+ *
+ * @return
+ */
public boolean isSuccess() {
return SUCCESS_CODE.equals(code);
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Results.java b/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Results.java
index 2adc23bb..f3dd8402 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Results.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/web/base/Results.java
@@ -1,13 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.web.base;
+import cn.hippo4j.common.web.exception.AbstractException;
+import cn.hippo4j.common.web.exception.ErrorCode;
import cn.hippo4j.common.web.exception.ErrorCodeEnum;
-import cn.hippo4j.common.web.exception.ServiceException;
+
+import java.util.Optional;
/**
* Results.
- *
- * @author chen.ma
- * @date 2021/3/19 16:12
*/
public final class Results {
@@ -22,9 +39,17 @@ public final class Results {
.setData(data);
}
- public static Result failure(ServiceException serviceException) {
- return new Result().setCode(ErrorCodeEnum.SERVICE_ERROR.getCode())
- .setMessage(serviceException.getMessage());
+ public static Result failure() {
+ return failure(ErrorCodeEnum.SERVICE_ERROR.getCode(), ErrorCodeEnum.SERVICE_ERROR.getMessage());
+ }
+
+ public static Result failure(AbstractException abstractException) {
+ String errorCode = Optional.ofNullable(abstractException.getErrorCode())
+ .map(ErrorCode::getCode)
+ .orElse(ErrorCodeEnum.SERVICE_ERROR.getCode());
+
+ return new Result().setCode(errorCode)
+ .setMessage(abstractException.getMessage());
}
public static Result failure(Throwable throwable) {
@@ -32,16 +57,13 @@ public final class Results {
.setMessage(throwable.getMessage());
}
- public static Result failure(String code, String message) {
- return new Result()
- .setCode(code)
- .setMessage(message);
+ public static Result failure(ErrorCode errorCode) {
+ return failure(errorCode.getCode(), errorCode.getMessage());
}
- public static Result failure(ErrorCodeEnum errorCode) {
- return new Result()
- .setCode(errorCode.getCode())
- .setMessage(errorCode.getMessage());
+ public static Result failure(String code, String message) {
+ return new Result()
+ .setCode(code)
+ .setMessage(message);
}
-
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ErrorCodeEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ErrorCodeEnum.java
index 9f4dbf60..63116639 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ErrorCodeEnum.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ErrorCodeEnum.java
@@ -1,17 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.web.exception;
/**
* Error code enum.
- *
- * @author chen.ma
- * @date 2021/3/19 16:07
*/
-public enum ErrorCodeEnum {
+public enum ErrorCodeEnum implements ErrorCode {
/**
* UNKNOWN_ERROR
*/
UNKNOWN_ERROR {
+
@Override
public String getCode() {
return "1";
@@ -27,6 +42,7 @@ public enum ErrorCodeEnum {
* VALIDATION_ERROR
*/
VALIDATION_ERROR {
+
@Override
public String getCode() {
return "2";
@@ -42,6 +58,7 @@ public enum ErrorCodeEnum {
* SERVICE_ERROR
*/
SERVICE_ERROR {
+
@Override
public String getCode() {
return "3";
@@ -57,6 +74,7 @@ public enum ErrorCodeEnum {
* NOT_FOUND
*/
NOT_FOUND {
+
@Override
public String getCode() {
return "404";
@@ -66,10 +84,21 @@ public enum ErrorCodeEnum {
public String getMessage() {
return "NOT_FOUND";
}
- };
+ },
- public abstract String getCode();
+ /**
+ * LOGIN_TIMEOUT
+ */
+ LOGIN_TIMEOUT {
- public abstract String getMessage();
+ @Override
+ public String getCode() {
+ return "A000004";
+ }
+ @Override
+ public String getMessage() {
+ return "登录时间过长, 请退出重新登录";
+ }
+ }
}
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java b/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java
index 9527812a..79d03838 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/web/exception/ServiceException.java
@@ -1,47 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.common.web.exception;
-import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* Service exception.
- *
- * @author chen.ma
- * @date 2021/3/19 16:14
*/
-@Data
@EqualsAndHashCode(callSuper = true)
-public class ServiceException extends RuntimeException {
+public class ServiceException extends AbstractException {
- private static final long serialVersionUID = -8667394300356618037L;
+ public ServiceException() {
+ this(ErrorCodeEnum.SERVICE_ERROR);
+ }
- private String detail;
+ public ServiceException(ErrorCode errorCode) {
+ this(errorCode.getMessage(), null, errorCode);
+ }
public ServiceException(String message) {
- super(message);
+ this(message, null, ErrorCodeEnum.SERVICE_ERROR);
}
- public ServiceException(String message, String detail) {
- super(message);
- this.detail = detail;
+ public ServiceException(Throwable cause) {
+ this(cause, cause.getMessage());
}
public ServiceException(String message, Throwable cause) {
- super(message, cause);
- this.detail = cause.getMessage();
+ this(message, cause, ErrorCodeEnum.SERVICE_ERROR);
+ }
+
+ public ServiceException(Throwable cause, String message) {
+ this(message, cause, ErrorCodeEnum.SERVICE_ERROR);
}
- public ServiceException(String message, String detail, Throwable cause) {
- super(message, cause);
- this.detail = detail;
+ public ServiceException(Throwable cause, ErrorCode errorCode) {
+ this(errorCode.getMessage(), cause, errorCode);
+ }
+
+ public ServiceException(String message, Throwable cause, ErrorCode errorCode) {
+ super(message, cause, errorCode);
}
@Override
public String toString() {
return "ServiceException{" +
- "message='" + getMessage() + "'," +
- "detail='" + getDetail() + "'" +
+ "code='" + errorCode.getCode() + "'," +
+ "message='" + errorCode.getMessage() + "'" +
'}';
}
-
}
diff --git a/hippo4j-config/.gitignore b/hippo4j-config/.gitignore
deleted file mode 100644
index 549e00a2..00000000
--- a/hippo4j-config/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
diff --git a/hippo4j-config/pom.xml b/hippo4j-config/pom.xml
index b71eeb86..208344a8 100644
--- a/hippo4j-config/pom.xml
+++ b/hippo4j-config/pom.xml
@@ -2,7 +2,6 @@
4.0.0
-
cn.hippo4jhippo4j-all
@@ -10,10 +9,7 @@
hippo4j-config
- jar
- ${project.artifactId}
- ${project.artifactId}true
@@ -65,6 +61,15 @@
cn.hippo4jlog-record-tool
-
+
+ cn.hippo4j
+ hippo4j-adapter-base
+
+
+
+ io.netty
+ netty-all
+
+
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/config/CommonConfig.java b/hippo4j-config/src/main/java/cn/hippo4j/config/config/CommonConfig.java
index 8ccd178f..2546b521 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/config/CommonConfig.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/config/CommonConfig.java
@@ -1,6 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.config;
import cn.hippo4j.common.config.ApplicationContextHolder;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
@@ -18,7 +36,8 @@ import static cn.hippo4j.common.constant.Constants.AVAILABLE_PROCESSORS;
public class CommonConfig {
@Bean
- public ApplicationContextHolder simpleApplicationContextHolder() {
+ @ConditionalOnMissingBean
+ public ApplicationContextHolder hippo4JApplicationContextHolder() {
return new ApplicationContextHolder();
}
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/config/MyMetaObjectHandler.java b/hippo4j-config/src/main/java/cn/hippo4j/config/config/MyMetaObjectHandler.java
index bbecb097..8e612bec 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/config/MyMetaObjectHandler.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/config/MyMetaObjectHandler.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.config;
import cn.hippo4j.common.enums.DelEnum;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/config/MybatisPlusConfig.java b/hippo4j-config/src/main/java/cn/hippo4j/config/config/MybatisPlusConfig.java
index 2e7c5b92..d4ed3313 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/config/MybatisPlusConfig.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/config/MybatisPlusConfig.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.config;
import com.baomidou.mybatisplus.annotation.DbType;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/config/ServerBootstrapProperties.java b/hippo4j-config/src/main/java/cn/hippo4j/config/config/ServerBootstrapProperties.java
index 3e6db115..9f9910b7 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/config/ServerBootstrapProperties.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/config/ServerBootstrapProperties.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.config;
import lombok.Getter;
@@ -31,4 +48,5 @@ public class ServerBootstrapProperties {
*/
private Integer cleanHistoryDataPeriod = 30;
+ private String nettyServerPort = "8899";
}
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/controller/ConfigController.java b/hippo4j-config/src/main/java/cn/hippo4j/config/controller/ConfigController.java
index 8c62fc48..0aaf9a84 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/controller/ConfigController.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/controller/ConfigController.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.controller;
import cn.hippo4j.config.model.ConfigAllInfo;
@@ -37,10 +54,10 @@ public class ConfigController {
@GetMapping
public Result detailConfigInfo(
- @RequestParam("tpId") String tpId,
- @RequestParam("itemId") String itemId,
- @RequestParam("namespace") String namespace,
- @RequestParam(value = "instanceId", required = false) String instanceId) {
+ @RequestParam("tpId") String tpId,
+ @RequestParam("itemId") String itemId,
+ @RequestParam("namespace") String namespace,
+ @RequestParam(value = "instanceId", required = false) String instanceId) {
ConfigAllInfo configAllInfo = configService.findConfigRecentInfo(tpId, itemId, namespace, instanceId);
return Results.success(configAllInfo);
}
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/event/AbstractEvent.java b/hippo4j-config/src/main/java/cn/hippo4j/config/event/AbstractEvent.java
index 7684d5d4..baf065b4 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/event/AbstractEvent.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/event/AbstractEvent.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.event;
import java.io.Serializable;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/event/AbstractSlowEvent.java b/hippo4j-config/src/main/java/cn/hippo4j/config/event/AbstractSlowEvent.java
index 9334adb5..a79a0116 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/event/AbstractSlowEvent.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/event/AbstractSlowEvent.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.event;
/**
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/event/ConfigDataChangeEvent.java b/hippo4j-config/src/main/java/cn/hippo4j/config/event/ConfigDataChangeEvent.java
index 23ed93cf..6ba10e23 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/event/ConfigDataChangeEvent.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/event/ConfigDataChangeEvent.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.event;
import org.springframework.util.StringUtils;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/event/LocalDataChangeEvent.java b/hippo4j-config/src/main/java/cn/hippo4j/config/event/LocalDataChangeEvent.java
index 03bcb6f3..f4487e11 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/event/LocalDataChangeEvent.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/event/LocalDataChangeEvent.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.event;
/**
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/ConfigInfoMapper.java b/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/ConfigInfoMapper.java
index 7a319c85..e74fe5e1 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/ConfigInfoMapper.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/ConfigInfoMapper.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.mapper;
import cn.hippo4j.config.model.ConfigAllInfo;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/ConfigInstanceMapper.java b/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/ConfigInstanceMapper.java
index bc9c38c6..658e7873 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/ConfigInstanceMapper.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/ConfigInstanceMapper.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.mapper;
import cn.hippo4j.config.model.ConfigInstanceInfo;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/DashboardMapper.java b/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/DashboardMapper.java
index cf3ee996..06e1f810 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/DashboardMapper.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/DashboardMapper.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.mapper;
import org.apache.ibatis.annotations.Mapper;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/HisRunDataMapper.java b/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/HisRunDataMapper.java
index 573992cc..e9a9675c 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/HisRunDataMapper.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/HisRunDataMapper.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.mapper;
import cn.hippo4j.config.model.HisRunDataInfo;
@@ -50,7 +67,6 @@ public interface HisRunDataMapper extends BaseMapper {
"limit 4")
List queryThreadPoolMaxRanking(@Param("startTime") Long startTime, @Param("endTime") Long endTime);
-
@Data
class ThreadPoolTaskRanking {
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/ItemInfoMapper.java b/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/ItemInfoMapper.java
index b8915728..8ba7d774 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/ItemInfoMapper.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/ItemInfoMapper.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/LogRecordMapper.java b/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/LogRecordMapper.java
index e64d6749..32b302b4 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/LogRecordMapper.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/LogRecordMapper.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/NotifyInfoMapper.java b/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/NotifyInfoMapper.java
index a683848b..c415923b 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/NotifyInfoMapper.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/NotifyInfoMapper.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.mapper;
import cn.hippo4j.config.model.NotifyInfo;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/TenantInfoMapper.java b/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/TenantInfoMapper.java
index ff3cb1e7..6b39ec6b 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/TenantInfoMapper.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/TenantInfoMapper.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/CacheItem.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/CacheItem.java
index 8f7af161..c79f5f97 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/CacheItem.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/CacheItem.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model;
import cn.hippo4j.common.toolkit.Md5Util;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigAllInfo.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigAllInfo.java
index 970e5ce2..373b2233 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigAllInfo.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigAllInfo.java
@@ -1,6 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model;
-import cn.hippo4j.common.model.PoolParameter;
+import cn.hippo4j.common.model.ThreadPoolParameter;
import cn.hippo4j.common.toolkit.JSONUtil;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -19,7 +36,7 @@ import java.util.Date;
*/
@Data
@TableName("config")
-public class ConfigAllInfo extends ConfigInfo implements PoolParameter {
+public class ConfigAllInfo extends ConfigInfo implements ThreadPoolParameter {
private static final long serialVersionUID = -2417394244017463665L;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigInfo.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigInfo.java
index df96539e..e19521ef 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigInfo.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigInfo.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model;
import lombok.Data;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigInfoBase.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigInfoBase.java
index f52eaecb..479ed7c7 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigInfoBase.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigInfoBase.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model;
import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigInstanceInfo.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigInstanceInfo.java
index d0318c19..2d0c15b3 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigInstanceInfo.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigInstanceInfo.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model;
import com.baomidou.mybatisplus.annotation.*;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/HisRunDataInfo.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/HisRunDataInfo.java
index 88ea0f39..998ffeb6 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/HisRunDataInfo.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/HisRunDataInfo.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model;
import com.baomidou.mybatisplus.annotation.*;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/ItemInfo.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/ItemInfo.java
index cedb767e..fa821d51 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/ItemInfo.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/ItemInfo.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model;
import com.baomidou.mybatisplus.annotation.*;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/NotifyInfo.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/NotifyInfo.java
index 69ef6912..996286fb 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/NotifyInfo.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/NotifyInfo.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model;
import com.baomidou.mybatisplus.annotation.*;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/TenantInfo.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/TenantInfo.java
index 077df416..7b30d79b 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/TenantInfo.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/TenantInfo.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model;
import com.baomidou.mybatisplus.annotation.*;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemQueryReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemQueryReqDTO.java
index bec92e4a..550dc122 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemQueryReqDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemQueryReqDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.item;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemRespDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemRespDTO.java
index 303db8ee..0c0efaf4 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemRespDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemRespDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.item;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemSaveReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemSaveReqDTO.java
index 03edf4dc..b4b9bd32 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemSaveReqDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemSaveReqDTO.java
@@ -1,10 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.item;
import lombok.Data;
import javax.validation.constraints.Pattern;
-
/**
* Item save req dto.
*
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemUpdateReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemUpdateReqDTO.java
index 455c44d2..c961ddfc 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemUpdateReqDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemUpdateReqDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.item;
import lombok.Data;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/log/LogRecordQueryReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/log/LogRecordQueryReqDTO.java
index 2bbb7518..4d90757e 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/log/LogRecordQueryReqDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/log/LogRecordQueryReqDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.log;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/log/LogRecordRespDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/log/LogRecordRespDTO.java
index c904b893..13473a4f 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/log/LogRecordRespDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/log/LogRecordRespDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.log;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/monitor/MonitorActiveRespDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/monitor/MonitorActiveRespDTO.java
index 1a509bce..794cb3bd 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/monitor/MonitorActiveRespDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/monitor/MonitorActiveRespDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.monitor;
import lombok.AllArgsConstructor;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/monitor/MonitorQueryReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/monitor/MonitorQueryReqDTO.java
index 60eea99d..c0b65e4b 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/monitor/MonitorQueryReqDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/monitor/MonitorQueryReqDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.monitor;
import lombok.Data;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/monitor/MonitorRespDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/monitor/MonitorRespDTO.java
index 54359c5f..5575e387 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/monitor/MonitorRespDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/monitor/MonitorRespDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.monitor;
import lombok.Data;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyListRespDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyListRespDTO.java
index ce34d053..314952ae 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyListRespDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyListRespDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.notify;
import cn.hippo4j.config.model.NotifyInfo;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyQueryReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyQueryReqDTO.java
index c9b14954..e32e7b9a 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyQueryReqDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyQueryReqDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.notify;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyReqDTO.java
index f97aa15e..d734ba0e 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyReqDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyReqDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.notify;
import lombok.Data;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyRespDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyRespDTO.java
index c3cf7771..bc94f66b 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyRespDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/notify/NotifyRespDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.notify;
import lombok.Data;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantQueryReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantQueryReqDTO.java
index bd76dc6c..126cd9b5 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantQueryReqDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantQueryReqDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.tenant;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantRespDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantRespDTO.java
index 0c9982c7..57cccb9b 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantRespDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantRespDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.tenant;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantSaveReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantSaveReqDTO.java
index 47a682d7..cf3d8da9 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantSaveReqDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantSaveReqDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.tenant;
import lombok.Data;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantUpdateReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantUpdateReqDTO.java
index e4bc3a77..7e79abee 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantUpdateReqDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantUpdateReqDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.tenant;
import cn.hippo4j.common.toolkit.JSONUtil;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolDelReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolDelReqDTO.java
index b4e8b18e..769b58db 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolDelReqDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolDelReqDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.threadpool;
import lombok.Data;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolQueryReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolQueryReqDTO.java
index 19027869..a5007305 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolQueryReqDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolQueryReqDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.threadpool;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolRespDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolRespDTO.java
index 031c4745..4cfd5305 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolRespDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolRespDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.threadpool;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolSaveOrUpdateReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolSaveOrUpdateReqDTO.java
index 831a9930..a6705b49 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolSaveOrUpdateReqDTO.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolSaveOrUpdateReqDTO.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.model.biz.threadpool;
import lombok.Data;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/AbstractMonitorDataExecuteStrategy.java b/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/AbstractMonitorDataExecuteStrategy.java
index 159acbd5..f838732c 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/AbstractMonitorDataExecuteStrategy.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/AbstractMonitorDataExecuteStrategy.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.monitor;
import cn.hippo4j.common.monitor.Message;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/DefaultMonitorDataResolver.java b/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/DefaultMonitorDataResolver.java
index 0e80b421..313916bf 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/DefaultMonitorDataResolver.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/DefaultMonitorDataResolver.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.monitor;
import cn.hippo4j.common.monitor.Message;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/QueryMonitorExecuteChoose.java b/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/QueryMonitorExecuteChoose.java
index 357fb722..f17511ff 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/QueryMonitorExecuteChoose.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/QueryMonitorExecuteChoose.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.monitor;
import cn.hippo4j.common.config.ApplicationContextHolder;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/RuntimeDataResolver.java b/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/RuntimeDataResolver.java
index b2dc7804..29afc0f9 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/RuntimeDataResolver.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/RuntimeDataResolver.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.monitor;
import cn.hippo4j.common.monitor.MessageTypeEnum;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/TimeCleanHistoryDataTask.java b/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/TimeCleanHistoryDataTask.java
index 94816ef9..7df83e52 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/TimeCleanHistoryDataTask.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/TimeCleanHistoryDataTask.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.monitor;
import cn.hippo4j.common.executor.ExecutorFactory;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/notify/DefaultPublisher.java b/hippo4j-config/src/main/java/cn/hippo4j/config/notify/DefaultPublisher.java
index 39a052dd..542616e0 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/notify/DefaultPublisher.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/notify/DefaultPublisher.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.notify;
import cn.hippo4j.config.event.AbstractEvent;
@@ -64,7 +81,7 @@ public class DefaultPublisher extends Thread implements EventPublisher {
private void openEventHandler() {
try {
int waitTimes = 60;
- for (; ; ) {
+ for (;;) {
if (shutdown || hasSubscriber() || waitTimes <= 0) {
break;
}
@@ -76,7 +93,7 @@ public class DefaultPublisher extends Thread implements EventPublisher {
waitTimes--;
}
- for (; ; ) {
+ for (;;) {
if (shutdown) {
break;
}
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/notify/DefaultSharePublisher.java b/hippo4j-config/src/main/java/cn/hippo4j/config/notify/DefaultSharePublisher.java
index ad408343..e5ad4fe8 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/notify/DefaultSharePublisher.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/notify/DefaultSharePublisher.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.notify;
import cn.hippo4j.config.event.AbstractEvent;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/notify/EventPublisher.java b/hippo4j-config/src/main/java/cn/hippo4j/config/notify/EventPublisher.java
index 927cc37f..02e1afa2 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/notify/EventPublisher.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/notify/EventPublisher.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.notify;
import cn.hippo4j.config.event.AbstractEvent;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/notify/NotifyCenter.java b/hippo4j-config/src/main/java/cn/hippo4j/config/notify/NotifyCenter.java
index e4a98982..d4aed4ba 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/notify/NotifyCenter.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/notify/NotifyCenter.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.notify;
import cn.hippo4j.config.event.AbstractEvent;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/notify/listener/AbstractSmartSubscriber.java b/hippo4j-config/src/main/java/cn/hippo4j/config/notify/listener/AbstractSmartSubscriber.java
index 1bcb3990..be5e7476 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/notify/listener/AbstractSmartSubscriber.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/notify/listener/AbstractSmartSubscriber.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.notify.listener;
import cn.hippo4j.config.event.AbstractEvent;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/notify/listener/AbstractSubscriber.java b/hippo4j-config/src/main/java/cn/hippo4j/config/notify/listener/AbstractSubscriber.java
index d746341e..afeca271 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/notify/listener/AbstractSubscriber.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/notify/listener/AbstractSubscriber.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.notify.listener;
import cn.hippo4j.config.event.AbstractEvent;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigCacheService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigCacheService.java
index 5744399d..1dabf5f7 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigCacheService.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigCacheService.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service;
import cn.hippo4j.common.config.ApplicationContextHolder;
@@ -28,9 +45,6 @@ import java.util.concurrent.atomic.AtomicInteger;
/**
* Config cache service.
- *
- * @author chen.ma
- * @date 2021/6/24 21:19
*/
@Slf4j
public class ConfigCacheService {
@@ -42,8 +56,6 @@ public class ConfigCacheService {
}
/**
- * TODO: 数据结构、客户端停机时 remove 操作待重构
- *
* key: message-produce+dynamic-threadpool-example+prescription+192.168.20.227:8088_xxx
* val:
* key: 192.168.20.227:8088_xxx
@@ -65,12 +77,10 @@ public class ConfigCacheService {
*/
private synchronized static String getContentMd5IsNullPut(String groupKey, String clientIdentify) {
Map cacheItemMap = Optional.ofNullable(CLIENT_CONFIG_CACHE.get(groupKey)).orElse(Maps.newHashMap());
-
CacheItem cacheItem = null;
if (CollUtil.isNotEmpty(cacheItemMap) && (cacheItem = cacheItemMap.get(clientIdentify)) != null) {
return cacheItem.md5;
}
-
if (CONFIG_SERVICE == null) {
CONFIG_SERVICE = ApplicationContextHolder.getBean(ConfigService.class);
}
@@ -81,7 +91,6 @@ public class ConfigCacheService {
cacheItemMap.put(clientIdentify, cacheItem);
CLIENT_CONFIG_CACHE.put(groupKey, cacheItemMap);
}
-
return (cacheItem != null) ? cacheItem.md5 : Constants.NULL;
}
@@ -89,14 +98,12 @@ public class ConfigCacheService {
if (CONFIG_SERVICE == null) {
CONFIG_SERVICE = ApplicationContextHolder.getBean(ConfigService.class);
}
-
String[] params = groupKey.split("\\+");
ConfigAllInfo config = CONFIG_SERVICE.findConfigRecentInfo(params);
if (config == null || StringUtils.isEmpty(config.getTpId())) {
String errorMessage = String.format("config is null. tpId :: %s, itemId :: %s, tenantId :: %s", params[0], params[1], params[2]);
throw new RuntimeException(errorMessage);
}
-
return Md5Util.getTpContentMd5(config);
}
@@ -118,12 +125,10 @@ public class ConfigCacheService {
if (ipCacheItemMap != null && (item = ipCacheItemMap.get(ip)) != null) {
return item;
}
-
CacheItem tmp = new CacheItem(groupKey);
Map cacheItemMap = Maps.newHashMap();
cacheItemMap.put(ip, tmp);
CLIENT_CONFIG_CACHE.putIfAbsent(groupKey, cacheItemMap);
-
return tmp;
}
@@ -143,19 +148,14 @@ public class ConfigCacheService {
/**
* Remove config cache.
*
- * @param groupKey 租户 + 项目 + IP
+ * @param groupKey tenant + item + IP
*/
public static void removeConfigCache(String groupKey) {
coarseRemove(groupKey);
}
- /**
- * Coarse remove.
- *
- * @param coarse
- */
private synchronized static void coarseRemove(String coarse) {
- // 模糊搜索
+ // fuzzy search
List identificationList = MapUtil.parseMapForFilter(CLIENT_CONFIG_CACHE, coarse);
for (String cacheMapKey : identificationList) {
Map removeCacheItem = CLIENT_CONFIG_CACHE.remove(cacheMapKey);
@@ -173,7 +173,5 @@ public class ConfigCacheService {
log.info("Clean up the configuration cache. Key :: {}", observerMessage.message());
coarseRemove(observerMessage.message());
}
-
}
-
}
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigChangePublisher.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigChangePublisher.java
index e65a7282..084c8925 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigChangePublisher.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigChangePublisher.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service;
import cn.hippo4j.config.notify.NotifyCenter;
@@ -5,9 +22,6 @@ import cn.hippo4j.config.event.LocalDataChangeEvent;
/**
* Config change publisher.
- *
- * @author chen.ma
- * @date 2021/6/24 23:34
*/
public class ConfigChangePublisher {
@@ -19,5 +33,4 @@ public class ConfigChangePublisher {
public static void notifyConfigChange(LocalDataChangeEvent event) {
NotifyCenter.publishEvent(event);
}
-
}
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigServletInner.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigServletInner.java
index fcd3606d..bbe8ee51 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigServletInner.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigServletInner.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service;
import com.google.common.cache.Cache;
@@ -14,9 +31,6 @@ import static cn.hippo4j.common.constant.Constants.WEIGHT_CONFIGS;
/**
* Config servlet inner.
- *
- * @author chen.ma
- * @date 2021/6/22 23:13
*/
@Service
@RequiredArgsConstructor
@@ -30,7 +44,7 @@ public class ConfigServletInner {
.build();
/**
- * 轮询配置.
+ * Poll configuration.
*
* @param request
* @param response
@@ -43,15 +57,14 @@ public class ConfigServletInner {
longPollingService.addLongPollingClient(request, response, clientMd5Map, probeRequestSize);
return HttpServletResponse.SC_OK + "";
}
-
return HttpServletResponse.SC_OK + "";
}
/**
- * 校验复请求是否重.
+ * Check whether the repeat request is repeated.
*
- * 有使用者提出在公司环境部署时, 会出现相同的请求重复调用.
- * 此问题属于极其个别场景. 由于复现不出, 所以先以这种方式解决问题.
+ * When a user proposes to deploy in the company environment, the same request will be called repeatedly.
+ * This problem belongs to an extremely individual scenario. Since it cannot be reproduced, so first solve the problem in this way.
*
* @param request
* @return
@@ -63,8 +76,6 @@ public class ConfigServletInner {
deWeightCache.put(clientIdentify, System.currentTimeMillis());
return true;
}
-
return false;
}
-
}
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/LongPollingService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/LongPollingService.java
index 14fcb070..e9fa3e5b 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/LongPollingService.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/LongPollingService.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service;
import cn.hippo4j.common.toolkit.JSONUtil;
@@ -31,9 +48,6 @@ import static cn.hippo4j.common.constant.Constants.GROUP_KEY_DELIMITER;
/**
* Long polling service.
- *
- * @author chen.ma
- * @date 2021/6/22 23:14
*/
@Slf4j
@Service
@@ -53,11 +67,8 @@ public class LongPollingService {
public LongPollingService() {
allSubs = new ConcurrentLinkedQueue();
-
ConfigExecutor.scheduleLongPolling(new StatTask(), 0L, 30L, TimeUnit.SECONDS);
-
NotifyCenter.registerToPublisher(LocalDataChangeEvent.class, NotifyCenter.ringBufferSize);
-
NotifyCenter.registerSubscriber(new AbstractSubscriber() {
@Override
@@ -103,15 +114,13 @@ public class LongPollingService {
@Override
public void run() {
try {
- for (Iterator iter = allSubs.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = allSubs.iterator(); iter.hasNext();) {
ClientLongPolling clientSub = iter.next();
-
String identity = groupKey + GROUP_KEY_DELIMITER + identify;
List parseMapForFilter = Lists.newArrayList(identity);
if (StrUtil.isBlank(identify)) {
parseMapForFilter = MapUtil.parseMapForFilter(clientSub.clientMd5Map, groupKey);
}
-
parseMapForFilter.forEach(each -> {
if (clientSub.clientMd5Map.containsKey(each)) {
getRetainIps().put(clientSub.clientIdentify, System.currentTimeMillis());
@@ -141,7 +150,6 @@ public class LongPollingService {
String appName = req.getHeader(CLIENT_APP_NAME_HEADER);
String noHangUpFlag = req.getHeader(LongPollingService.LONG_POLLING_NO_HANG_UP_HEADER);
int delayTime = SwitchService.getSwitchInteger(SwitchService.FIXED_DELAY_TIME, 500);
-
long timeout = Math.max(10000, Long.parseLong(str) - delayTime);
if (isFixedPolling()) {
timeout = Math.max(10000, getFixedPollingInterval());
@@ -155,12 +163,9 @@ public class LongPollingService {
return;
}
}
-
String clientIdentify = RequestUtil.getClientIdentify(req);
-
final AsyncContext asyncContext = req.startAsync();
asyncContext.setTimeout(0L);
-
ConfigExecutor.executeLongPolling(new ClientLongPolling(asyncContext, clientMd5Map, clientIdentify, probeRequestSize, timeout - delayTime, appName));
}
@@ -201,7 +206,6 @@ public class LongPollingService {
try {
getRetainIps().put(ClientLongPolling.this.clientIdentify, System.currentTimeMillis());
allSubs.remove(ClientLongPolling.this);
-
if (isFixedPolling()) {
List changedGroups = Md5ConfigUtil.compareMd5((HttpServletRequest) asyncContext.getRequest(), clientMd5Map);
if (changedGroups.size() > 0) {
@@ -215,9 +219,7 @@ public class LongPollingService {
} catch (Exception ex) {
log.error("Long polling error :: {}", ex.getMessage(), ex);
}
-
}, timeoutTime, TimeUnit.MILLISECONDS);
-
allSubs.add(this);
}
@@ -245,9 +247,7 @@ public class LongPollingService {
asyncContext.complete();
return;
}
-
HttpServletResponse response = (HttpServletResponse) asyncContext.getResponse();
-
try {
String respStr = buildRespStr(changedGroups);
response.setHeader("Pragma", "no-cache");
@@ -261,7 +261,6 @@ public class LongPollingService {
asyncContext.complete();
}
}
-
}
public Map getRetainIps() {
@@ -329,5 +328,4 @@ public class LongPollingService {
private static int getFixedPollingInterval() {
return SwitchService.getSwitchInteger(SwitchService.FIXED_POLLING_INTERVAL, FIXED_POLLING_INTERVAL_MS);
}
-
}
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/SwitchService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/SwitchService.java
index d12c240a..879c2acf 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/SwitchService.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/SwitchService.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service;
import lombok.extern.slf4j.Slf4j;
@@ -8,9 +25,6 @@ import java.util.Map;
/**
* Switch service.
- *
- * @author chen.ma
- * @date 2021/6/23 18:23
*/
@Slf4j
@Service
@@ -47,5 +61,4 @@ public class SwitchService {
}
return rtn;
}
-
}
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigService.java
index 11421384..1d41253c 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigService.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigService.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.biz;
import cn.hippo4j.config.model.ConfigAllInfo;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/HisRunDataService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/HisRunDataService.java
index c90afb67..59c35840 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/HisRunDataService.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/HisRunDataService.java
@@ -1,11 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.biz;
import cn.hippo4j.common.monitor.Message;
+import cn.hippo4j.common.monitor.MessageWrapper;
+import cn.hippo4j.common.web.base.Result;
import cn.hippo4j.config.model.HisRunDataInfo;
import cn.hippo4j.config.model.biz.monitor.MonitorActiveRespDTO;
import cn.hippo4j.config.model.biz.monitor.MonitorQueryReqDTO;
import cn.hippo4j.config.model.biz.monitor.MonitorRespDTO;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@@ -48,4 +68,11 @@ public interface HisRunDataService extends IService {
*/
void save(Message message);
+ /**
+ * dataCollect.
+ *
+ * @param messageWrapper
+ */
+ Result dataCollect(MessageWrapper messageWrapper);
+
}
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ItemService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ItemService.java
index e6c411e5..c11ce694 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ItemService.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ItemService.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.biz;
import cn.hippo4j.config.model.biz.item.ItemRespDTO;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/LogRecordBizService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/LogRecordBizService.java
index ca0bae9c..f7eccea5 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/LogRecordBizService.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/LogRecordBizService.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.biz;
import cn.hippo4j.config.model.biz.log.LogRecordQueryReqDTO;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/NotifyService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/NotifyService.java
index c2fa944c..08d6e1e4 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/NotifyService.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/NotifyService.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.biz;
import cn.hippo4j.config.model.biz.notify.NotifyListRespDTO;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/TenantService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/TenantService.java
index d586b118..d115675f 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/TenantService.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/TenantService.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.biz;
import cn.hippo4j.config.model.biz.tenant.TenantQueryReqDTO;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ThreadPoolService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ThreadPoolService.java
index 55002e09..644410a5 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ThreadPoolService.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ThreadPoolService.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.biz;
import cn.hippo4j.config.model.biz.threadpool.ThreadPoolQueryReqDTO;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java
index f6d45949..e0247925 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigServiceImpl.java
@@ -1,6 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.biz.impl;
import cn.hippo4j.common.config.ApplicationContextHolder;
+import cn.hippo4j.common.enums.DelEnum;
import cn.hippo4j.common.toolkit.*;
import cn.hippo4j.common.web.exception.ServiceException;
import cn.hippo4j.config.event.LocalDataChangeEvent;
@@ -113,16 +131,11 @@ public class ConfigServiceImpl implements ConfigService {
ConfigServiceImpl configService = ApplicationContextHolder.getBean(this.getClass());
configInfo.setCapacity(getQueueCapacityByType(configInfo));
- try {
- ConditionUtil
- .condition(
- existConfig == null,
- () -> configService.addConfigInfo(configInfo),
- () -> configService.updateConfigInfo(identify, configInfo)
- );
- } catch (Exception ex) {
- updateConfigInfo(identify, configInfo);
- }
+ ConditionUtil
+ .condition(
+ existConfig == null,
+ () -> configService.addConfigInfo(configInfo),
+ () -> configService.updateConfigInfo(identify, configInfo));
ConfigChangePublisher.notifyConfigChange(new LocalDataChangeEvent(identify, ContentUtil.getGroupKey(configInfo)));
}
@@ -139,8 +152,17 @@ public class ConfigServiceImpl implements ConfigService {
config.setMd5(Md5Util.getTpContentMd5(config));
try {
- if (SqlHelper.retBool(configInfoMapper.insert(config))) {
- return config.getId();
+ // 当前为单体应用, 后续支持集群部署时切换分布式锁.
+ synchronized (ConfigService.class) {
+ ConfigAllInfo configAllInfo = configInfoMapper.selectOne(
+ Wrappers.lambdaQuery(ConfigAllInfo.class)
+ .eq(ConfigAllInfo::getTpId, config.getTpId())
+ .eq(ConfigAllInfo::getDelFlag, DelEnum.NORMAL.getIntCode()));
+ Assert.isNull(configAllInfo, "线程池配置已存在.");
+
+ if (SqlHelper.retBool(configInfoMapper.insert(config))) {
+ return config.getId();
+ }
}
} catch (Exception ex) {
log.error("[db-error] message :: {}", ex.getMessage(), ex);
@@ -150,12 +172,7 @@ public class ConfigServiceImpl implements ConfigService {
return null;
}
- @LogRecord(
- bizNo = "{{#config.itemId}}_{{#config.tpId}}",
- category = "THREAD_POOL_UPDATE",
- success = "核心线程: {{#config.coreSize}}, 最大线程: {{#config.maxSize}}, 队列类型: {{#config.queueType}}, 队列容量: {{#config.capacity}}, 拒绝策略: {{#config.rejectedType}}",
- detail = "{{#config.toString()}}"
- )
+ @LogRecord(bizNo = "{{#config.itemId}}_{{#config.tpId}}", category = "THREAD_POOL_UPDATE", success = "核心线程: {{#config.coreSize}}, 最大线程: {{#config.maxSize}}, 队列类型: {{#config.queueType}}, 队列容量: {{#config.capacity}}, 拒绝策略: {{#config.rejectedType}}", detail = "{{#config.toString()}}")
public void updateConfigInfo(String identify, ConfigAllInfo config) {
LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(ConfigAllInfo.class)
.eq(ConfigAllInfo::getTpId, config.getTpId())
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/HisRunDataServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/HisRunDataServiceImpl.java
index bedd43b1..0e0b4a6b 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/HisRunDataServiceImpl.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/HisRunDataServiceImpl.java
@@ -1,14 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.biz.impl;
import cn.hippo4j.common.monitor.Message;
+import cn.hippo4j.common.monitor.MessageWrapper;
import cn.hippo4j.common.monitor.RuntimeMessage;
import cn.hippo4j.common.toolkit.GroupKey;
+import cn.hippo4j.common.toolkit.MessageConvert;
+import cn.hippo4j.common.web.base.Result;
+import cn.hippo4j.common.web.base.Results;
import cn.hippo4j.config.config.ServerBootstrapProperties;
import cn.hippo4j.config.mapper.HisRunDataMapper;
import cn.hippo4j.config.model.HisRunDataInfo;
import cn.hippo4j.config.model.biz.monitor.MonitorActiveRespDTO;
import cn.hippo4j.config.model.biz.monitor.MonitorQueryReqDTO;
import cn.hippo4j.config.model.biz.monitor.MonitorRespDTO;
+import cn.hippo4j.config.monitor.QueryMonitorExecuteChoose;
import cn.hippo4j.config.service.biz.HisRunDataService;
import cn.hippo4j.config.toolkit.BeanUtil;
import cn.hutool.core.date.DateTime;
@@ -16,6 +38,7 @@ import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import lombok.AllArgsConstructor;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -37,6 +60,10 @@ public class HisRunDataServiceImpl extends ServiceImpl query(MonitorQueryReqDTO reqDTO) {
Date currentDate = new Date();
@@ -149,4 +176,18 @@ public class HisRunDataServiceImpl extends ServiceImpl dataCollect(MessageWrapper messageWrapper) {
+ Runnable task = () -> {
+ Message message = MessageConvert.convert(messageWrapper);
+ queryMonitorExecuteChoose.chooseAndExecute(message);
+ };
+ try {
+ monitorThreadPoolTaskExecutor.execute(task);
+ } catch (Exception ex) {
+ log.error("Monitoring data insertion database task overflow.", ex);
+ }
+ return Results.success();
+ }
+
}
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ItemServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ItemServiceImpl.java
index 71c9d3c7..5bc0b0a8 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ItemServiceImpl.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ItemServiceImpl.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.biz.impl;
import cn.hippo4j.common.toolkit.Assert;
@@ -77,15 +94,18 @@ public class ItemServiceImpl implements ItemService {
LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ItemInfo.class)
.eq(ItemInfo::getItemId, reqDTO.getItemId());
- ItemInfo existItemInfo = itemInfoMapper.selectOne(queryWrapper);
- Assert.isNull(existItemInfo, "项目 ID 不允许重复.");
+ // 当前为单体应用, 后续支持集群部署时切换分布式锁.
+ synchronized (ItemService.class) {
+ ItemInfo existItemInfo = itemInfoMapper.selectOne(queryWrapper);
+ Assert.isNull(existItemInfo, "项目配置已存在.");
- ItemInfo itemInfo = BeanUtil.convert(reqDTO, ItemInfo.class);
- int insertResult = itemInfoMapper.insert(itemInfo);
+ ItemInfo itemInfo = BeanUtil.convert(reqDTO, ItemInfo.class);
+ int insertResult = itemInfoMapper.insert(itemInfo);
- boolean retBool = SqlHelper.retBool(insertResult);
- if (!retBool) {
- throw new RuntimeException("Save error");
+ boolean retBool = SqlHelper.retBool(insertResult);
+ if (!retBool) {
+ throw new RuntimeException("Save error");
+ }
}
}
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/LogRecordBizServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/LogRecordBizServiceImpl.java
index 553bc84b..760eb5d5 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/LogRecordBizServiceImpl.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/LogRecordBizServiceImpl.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.biz.impl;
import cn.hippo4j.config.mapper.LogRecordMapper;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/LogRecordServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/LogRecordServiceImpl.java
index 5e8a8158..d0f1d405 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/LogRecordServiceImpl.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/LogRecordServiceImpl.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.biz.impl;
import cn.hippo4j.config.mapper.LogRecordMapper;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/NotifyServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/NotifyServiceImpl.java
index 4a9d405f..685a2107 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/NotifyServiceImpl.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/NotifyServiceImpl.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.biz.impl;
import cn.hippo4j.common.toolkit.GroupKey;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/TenantServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/TenantServiceImpl.java
index 6f1b3e16..04238bc0 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/TenantServiceImpl.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/TenantServiceImpl.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.biz.impl;
import cn.hippo4j.common.toolkit.Assert;
@@ -71,26 +88,23 @@ public class TenantServiceImpl implements TenantService {
LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(TenantInfo.class)
.eq(TenantInfo::getTenantId, reqDTO.getTenantId());
- TenantInfo existTenantInfo = tenantInfoMapper.selectOne(queryWrapper);
- Assert.isNull(existTenantInfo, "租户 ID 不允许重复.");
+ // 当前为单体应用, 后续支持集群部署时切换分布式锁.
+ synchronized (TenantService.class) {
+ TenantInfo existTenantInfo = tenantInfoMapper.selectOne(queryWrapper);
+ Assert.isNull(existTenantInfo, "租户配置已存在.");
- TenantInfo tenantInfo = BeanUtil.convert(reqDTO, TenantInfo.class);
- int insertResult = tenantInfoMapper.insert(tenantInfo);
+ TenantInfo tenantInfo = BeanUtil.convert(reqDTO, TenantInfo.class);
+ int insertResult = tenantInfoMapper.insert(tenantInfo);
- boolean retBool = SqlHelper.retBool(insertResult);
- if (!retBool) {
- throw new RuntimeException("Save Error.");
+ boolean retBool = SqlHelper.retBool(insertResult);
+ if (!retBool) {
+ throw new RuntimeException("Save Error.");
+ }
}
}
@Override
- @LogRecord(
- prefix = "item",
- bizNo = "{{#reqDTO.tenantId}}_{{#reqDTO.tenantName}}",
- category = "TENANT_UPDATE",
- success = "更新租户, ID :: {{#reqDTO.id}}, 租户名称由 :: {TENANT{#reqDTO.id}} -> {{#reqDTO.tenantName}}",
- detail = "{{#reqDTO.toString()}}"
- )
+ @LogRecord(prefix = "item", bizNo = "{{#reqDTO.tenantId}}_{{#reqDTO.tenantName}}", category = "TENANT_UPDATE", success = "更新租户, ID :: {{#reqDTO.id}}, 租户名称由 :: {TENANT{#reqDTO.id}} -> {{#reqDTO.tenantName}}", detail = "{{#reqDTO.toString()}}")
public void updateTenant(TenantUpdateReqDTO reqDTO) {
TenantInfo tenantInfo = BeanUtil.convert(reqDTO, TenantInfo.class);
int updateResult = tenantInfoMapper.update(tenantInfo, Wrappers
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java
index 01a13017..456faf28 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.biz.impl;
import cn.hippo4j.common.enums.DelEnum;
@@ -66,20 +83,14 @@ public class ThreadPoolServiceImpl implements ThreadPoolService {
configService.insertOrUpdate(identify, BeanUtil.convert(reqDTO, ConfigAllInfo.class));
}
- @LogRecord(
- bizNo = "{{#reqDTO.itemId}}_{{#reqDTO.tpId}}",
- category = "THREAD_POOL_DELETE",
- success = "删除线程池: {{#reqDTO.tpId}}",
- detail = "{{#reqDTO.toString()}}"
- )
+ @LogRecord(bizNo = "{{#reqDTO.itemId}}_{{#reqDTO.tpId}}", category = "THREAD_POOL_DELETE", success = "删除线程池: {{#reqDTO.tpId}}", detail = "{{#reqDTO.toString()}}")
@Override
public void deletePool(ThreadPoolDelReqDTO reqDTO) {
configInfoMapper.delete(
Wrappers.lambdaUpdate(ConfigAllInfo.class)
.eq(ConfigAllInfo::getTenantId, reqDTO.getTenantId())
.eq(ConfigAllInfo::getItemId, reqDTO.getItemId())
- .eq(ConfigAllInfo::getTpId, reqDTO.getTpId())
- );
+ .eq(ConfigAllInfo::getTpId, reqDTO.getTpId()));
}
@Override
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/handler/ClientCloseHookRemoveConfigCache.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/handler/ClientCloseHookRemoveConfigCache.java
index 2ab54a67..3c8dda3a 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/handler/ClientCloseHookRemoveConfigCache.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/handler/ClientCloseHookRemoveConfigCache.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.handler;
import cn.hippo4j.common.api.ClientCloseHookExecute;
@@ -21,8 +38,7 @@ public class ClientCloseHookRemoveConfigCache implements ClientCloseHookExecute
public void closeHook(ClientCloseHookReq req) {
log.info(
"Remove Config Cache, Execute client hook function. Req :: {}",
- JSONUtil.toJSONString(req)
- );
+ JSONUtil.toJSONString(req));
try {
String groupKey = req.getGroupKey();
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/handler/CustomOperatorGetServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/handler/CustomOperatorGetServiceImpl.java
index 56f8edef..86cb7835 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/handler/CustomOperatorGetServiceImpl.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/handler/CustomOperatorGetServiceImpl.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.handler;
import cn.hippo4j.common.toolkit.StringUtil;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/handler/TenantIdFunctionServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/handler/TenantIdFunctionServiceImpl.java
index bff1cdb4..e9073dfe 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/handler/TenantIdFunctionServiceImpl.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/handler/TenantIdFunctionServiceImpl.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.service.handler;
import cn.hippo4j.config.model.biz.tenant.TenantRespDTO;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/BeanUtil.java b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/BeanUtil.java
index 4e67e579..467171fe 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/BeanUtil.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/BeanUtil.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.toolkit;
import com.github.dozermapper.core.DozerBeanMapperBuilder;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/ClassUtil.java b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/ClassUtil.java
index e38019b5..740d1893 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/ClassUtil.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/ClassUtil.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.toolkit;
import java.util.Objects;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/ConfigExecutor.java b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/ConfigExecutor.java
index 88840e08..223566f5 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/ConfigExecutor.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/ConfigExecutor.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.toolkit;
import cn.hippo4j.common.executor.ExecutorFactory;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/EnvUtil.java b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/EnvUtil.java
index ba98053f..9a471d86 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/EnvUtil.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/EnvUtil.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.toolkit;
import org.apache.commons.lang3.StringUtils;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/MapUtil.java b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/MapUtil.java
index d153ffa0..a3993a00 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/MapUtil.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/MapUtil.java
@@ -1,15 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.toolkit;
import cn.hutool.core.collection.CollUtil;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.Optional;
import java.util.function.BiFunction;
-import java.util.stream.Collectors;
/**
* Map util.
@@ -35,7 +49,6 @@ public class MapUtil {
return val;
}
-
/**
* 根据 Key 进行模糊匹配.
*
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/Md5ConfigUtil.java b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/Md5ConfigUtil.java
index b0d47329..f2227c75 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/Md5ConfigUtil.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/Md5ConfigUtil.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.toolkit;
import cn.hippo4j.common.toolkit.GroupKey;
@@ -17,7 +34,6 @@ import java.util.Map;
import static cn.hippo4j.common.constant.Constants.LINE_SEPARATOR;
import static cn.hippo4j.common.constant.Constants.WORD_SEPARATOR;
-
/**
* Md5 config util.
*
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/RequestUtil.java b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/RequestUtil.java
index 26b3b51b..f829fc12 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/RequestUtil.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/RequestUtil.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.toolkit;
import cn.hutool.core.util.StrUtil;
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/SimpleReadWriteLock.java b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/SimpleReadWriteLock.java
index 7b69a0fc..bd990288 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/SimpleReadWriteLock.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/SimpleReadWriteLock.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.toolkit;
/**
diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/SingletonRepository.java b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/SingletonRepository.java
index 4f82e85b..8e2ed565 100644
--- a/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/SingletonRepository.java
+++ b/hippo4j-config/src/main/java/cn/hippo4j/config/toolkit/SingletonRepository.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.config.toolkit;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/hippo4j-console/.gitignore b/hippo4j-console/.gitignore
deleted file mode 100644
index 549e00a2..00000000
--- a/hippo4j-console/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
diff --git a/hippo4j-console/pom.xml b/hippo4j-console/pom.xml
index b74baf8c..b62db91b 100644
--- a/hippo4j-console/pom.xml
+++ b/hippo4j-console/pom.xml
@@ -2,7 +2,6 @@
4.0.0
-
cn.hippo4jhippo4j-all
@@ -39,6 +38,11 @@
org.hibernate.validatorhibernate-validator
+
+
+ cn.hutool
+ hutool-all
+
@@ -49,5 +53,4 @@
-
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/config/GlobalExceptionHandler.java b/hippo4j-console/src/main/java/cn/hippo4j/console/config/GlobalExceptionHandler.java
index 034e4a88..9b0ab566 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/config/GlobalExceptionHandler.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/config/GlobalExceptionHandler.java
@@ -1,9 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.console.config;
import cn.hippo4j.common.toolkit.CollectionUtil;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.web.base.Result;
import cn.hippo4j.common.web.base.Results;
+import cn.hippo4j.common.web.exception.AbstractException;
import cn.hippo4j.common.web.exception.ServiceException;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
@@ -18,22 +36,18 @@ import javax.servlet.http.HttpServletRequest;
import java.util.Optional;
/**
- * 全局异常捕获器.
- *
- * @author chen.ma
- * @date 2021/11/18 22:18
+ * Global exception handler.
*/
@Slf4j
@RestControllerAdvice
public class GlobalExceptionHandler {
- @ExceptionHandler(value = {ServiceException.class})
- public Result serviceException(HttpServletRequest request, ServiceException ex) {
+ @ExceptionHandler(value = {AbstractException.class})
+ public Result serviceException(HttpServletRequest request, AbstractException ex) {
if (ex.getCause() != null) {
log.error("[{}] {} [ex] {}", request.getMethod(), request.getRequestURL().toString(), ex.toString(), ex.getCause());
return Results.failure(ex);
}
-
log.info("[{}] {} [ex] {}", request.getMethod(), request.getRequestURL().toString(), ex.toString());
return Results.failure(ex);
}
@@ -46,7 +60,6 @@ public class GlobalExceptionHandler {
String exceptionStr = Optional.ofNullable(firstFieldError)
.map(FieldError::getDefaultMessage)
.orElse(StringUtil.EMPTY);
-
log.error("[{}] {} [ex] {}", request.getMethod(), getUrl(request), exceptionStr);
return Results.failure(new ServiceException(exceptionStr));
}
@@ -61,8 +74,6 @@ public class GlobalExceptionHandler {
if (StringUtils.isEmpty(request.getQueryString())) {
return request.getRequestURL().toString();
}
-
return request.getRequestURL().toString() + "?" + request.getQueryString();
}
-
}
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/config/WebConfig.java b/hippo4j-console/src/main/java/cn/hippo4j/console/config/WebConfig.java
index fe9296b0..e9b8aaf6 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/config/WebConfig.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/config/WebConfig.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.console.config;
import org.springframework.context.annotation.Configuration;
@@ -6,9 +23,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
/**
* Web config.
- *
- * @author chen.ma
- * @date 2021/11/9 22:56
*/
@Configuration
public class WebConfig implements WebMvcConfigurer {
@@ -18,5 +32,4 @@ public class WebConfig implements WebMvcConfigurer {
registry.addResourceHandler("/index.html").addResourceLocations("classpath:/static/index.html");
registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/static/");
}
-
}
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ClientCloseHookController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ClientCloseHookController.java
index 9785c160..cf7a66d5 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ClientCloseHookController.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ClientCloseHookController.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.console.controller;
import cn.hippo4j.common.api.ClientCloseHookExecute;
@@ -14,9 +31,6 @@ import java.util.Map;
/**
* Client close hook controller.
- *
- * @author chen.ma
- * @date 2022/1/6 22:30
*/
@RestController
@RequestMapping(Constants.BASE_PATH + "/client/close")
@@ -28,5 +42,4 @@ public class ClientCloseHookController {
clientCloseHookExecuteMap.forEach((key, execute) -> execute.closeHook(req));
return Results.success();
}
-
}
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/DashboardController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/DashboardController.java
index e76d758e..3aca1125 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/DashboardController.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/DashboardController.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.console.controller;
import cn.hippo4j.common.constant.Constants;
@@ -12,9 +29,6 @@ import org.springframework.web.bind.annotation.RestController;
/**
* Dash board controller.
- *
- * @author chen.ma
- * @date 2021/11/10 21:03
*/
@RestController
@AllArgsConstructor
@@ -51,5 +65,4 @@ public class DashboardController {
RankingChart rankingChart = dashboardService.getRankingChart();
return Results.success(rankingChart);
}
-
}
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/HealthCheckController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/HealthCheckController.java
index 6aa75fef..3ba4ef60 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/HealthCheckController.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/HealthCheckController.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.console.controller;
import cn.hippo4j.common.constant.Constants;
@@ -13,9 +30,6 @@ import static cn.hippo4j.common.constant.Constants.UP;
/**
* Health check controller.
- *
- * @author chen.ma
- * @date 2021/12/8 21:02
*/
@Slf4j
@RestController
@@ -27,5 +41,4 @@ public class HealthCheckController {
public Result healthCheck() {
return Results.success(UP);
}
-
}
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ItemController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ItemController.java
index 9d5d2948..1b2f71d2 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ItemController.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ItemController.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.console.controller;
import cn.hippo4j.common.constant.Constants;
@@ -15,9 +32,6 @@ import org.springframework.web.bind.annotation.*;
/**
* Item controller.
- *
- * @author chen.ma
- * @date 2021/6/29 21:42
*/
@RestController
@AllArgsConstructor
@@ -53,5 +67,4 @@ public class ItemController {
itemService.deleteItem(tenantId, itemId);
return Results.success();
}
-
}
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/LogRecordController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/LogRecordController.java
index 62825a1d..52dffbc7 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/LogRecordController.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/LogRecordController.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.console.controller;
import cn.hippo4j.common.constant.Constants;
@@ -15,9 +32,6 @@ import org.springframework.web.bind.annotation.RestController;
/**
* Log record controller.
- *
- * @author chen.ma
- * @date 2021/11/17 21:10
*/
@RestController
@AllArgsConstructor
@@ -30,5 +44,4 @@ public class LogRecordController {
public Result> queryPage(@RequestBody LogRecordQueryReqDTO queryReqDTO) {
return Results.success(logRecordBizService.queryPage(queryReqDTO));
}
-
}
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/MonitorController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/MonitorController.java
deleted file mode 100644
index 3ee3198b..00000000
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/MonitorController.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package cn.hippo4j.console.controller;
-
-import cn.hippo4j.common.constant.Constants;
-import cn.hippo4j.common.monitor.Message;
-import cn.hippo4j.common.monitor.MessageWrapper;
-import cn.hippo4j.common.toolkit.MessageConvert;
-import cn.hippo4j.common.web.base.Result;
-import cn.hippo4j.common.web.base.Results;
-import cn.hippo4j.config.model.biz.monitor.MonitorActiveRespDTO;
-import cn.hippo4j.config.model.biz.monitor.MonitorQueryReqDTO;
-import cn.hippo4j.config.model.biz.monitor.MonitorRespDTO;
-import cn.hippo4j.config.monitor.QueryMonitorExecuteChoose;
-import cn.hippo4j.config.service.biz.HisRunDataService;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * Monitor controller.
- *
- * @author chen.ma
- * @date 2021/12/7 22:29
- */
-@Slf4j
-@RestController
-@AllArgsConstructor
-@RequestMapping(Constants.BASE_PATH + "/monitor")
-public class MonitorController {
-
- private final HisRunDataService hisRunDataService;
-
- private final QueryMonitorExecuteChoose queryMonitorExecuteChoose;
-
- private final ThreadPoolTaskExecutor monitorThreadPoolTaskExecutor;
-
- @GetMapping
- public Result> queryMonitor(MonitorQueryReqDTO reqDTO) {
- List monitorRespList = hisRunDataService.query(reqDTO);
- return Results.success(monitorRespList);
- }
-
- @PostMapping("/info")
- public Result queryInfoThreadPoolMonitor(@RequestBody MonitorQueryReqDTO reqDTO) {
- MonitorActiveRespDTO monitorRespList = hisRunDataService.queryInfoThreadPoolMonitor(reqDTO);
- return Results.success(monitorRespList);
- }
-
- @PostMapping("/last/task/count")
- public Result queryThreadPoolLastTaskCount(@RequestBody MonitorQueryReqDTO reqDTO) {
- MonitorRespDTO resultDTO = hisRunDataService.queryThreadPoolLastTaskCount(reqDTO);
- return Results.success(resultDTO);
- }
-
- @PostMapping
- public Result dataCollect(@RequestBody MessageWrapper messageWrapper) {
- Runnable task = () -> {
- Message message = MessageConvert.convert(messageWrapper);
- queryMonitorExecuteChoose.chooseAndExecute(message);
- };
-
- try {
- monitorThreadPoolTaskExecutor.execute(task);
- } catch (Exception ex) {
- log.error("Monitoring data insertion database task overflow.", ex);
- }
-
- return Results.success();
- }
-
-}
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/NotifyController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/NotifyController.java
index 8b82b5f5..203b2f9f 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/NotifyController.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/NotifyController.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.console.controller;
import cn.hippo4j.common.constant.Constants;
@@ -15,10 +32,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
- * 通知管理.
- *
- * @author chen.ma
- * @date 2021/11/17 22:00
+ * Notify controller.
*/
@RestController
@AllArgsConstructor
@@ -62,5 +76,4 @@ public class NotifyController {
notifyService.enableNotify(id, status);
return Results.success();
}
-
}
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/PermissionController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/PermissionController.java
index 94a19bfb..89715e6e 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/PermissionController.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/PermissionController.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.console.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,9 +27,6 @@ import org.springframework.web.bind.annotation.*;
/**
* Permission controller.
- *
- * @author chen.ma
- * @date 2021/10/30 22:08
*/
@RestController
@AllArgsConstructor
@@ -38,5 +52,4 @@ public class PermissionController {
permissionService.deletePermission(role, resource, action);
return Results.success();
}
-
}
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/RoleController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/RoleController.java
index 06648324..5758ef2f 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/RoleController.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/RoleController.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.console.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,9 +29,6 @@ import java.util.List;
/**
* Role controller.
- *
- * @author chen.ma
- * @date 2021/10/30 22:16
*/
@RestController
@AllArgsConstructor
@@ -46,5 +60,4 @@ public class RoleController {
List resultRole = roleService.getRoleLike(role);
return Results.success(resultRole);
}
-
}
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/TenantController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/TenantController.java
index 9082a384..ce259601 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/TenantController.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/TenantController.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.console.controller;
import cn.hippo4j.common.constant.Constants;
@@ -15,9 +32,6 @@ import org.springframework.web.bind.annotation.*;
/**
* Tenant controller.
- *
- * @author chen.ma
- * @date 2021/6/25 18:31
*/
@RestController
@AllArgsConstructor
@@ -54,5 +68,4 @@ public class TenantController {
tenantService.deleteTenantById(tenantId);
return Results.success(Boolean.TRUE);
}
-
}
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java
index 29935a35..59f902cf 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java
@@ -1,7 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.console.controller;
import cn.hippo4j.common.constant.Constants;
import cn.hippo4j.common.model.InstanceInfo;
+import cn.hippo4j.common.toolkit.JSONUtil;
import cn.hippo4j.common.toolkit.StringUtil;
import cn.hippo4j.common.web.base.Result;
import cn.hippo4j.common.web.base.Results;
@@ -14,10 +32,14 @@ import cn.hippo4j.config.service.ConfigCacheService;
import cn.hippo4j.config.service.biz.ThreadPoolService;
import cn.hippo4j.config.toolkit.BeanUtil;
import cn.hippo4j.console.model.ThreadPoolInstanceInfo;
+import cn.hippo4j.console.model.WebThreadPoolReqDTO;
+import cn.hippo4j.console.model.WebThreadPoolRespDTO;
import cn.hippo4j.discovery.core.BaseInstanceRegistry;
import cn.hippo4j.discovery.core.Lease;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.text.StrBuilder;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.collect.Lists;
import lombok.AllArgsConstructor;
@@ -28,13 +50,11 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import static cn.hippo4j.common.constant.Constants.HTTP_EXECUTE_TIMEOUT;
import static cn.hippo4j.common.toolkit.ContentUtil.getGroupKey;
/**
* Thread pool controller.
- *
- * @author chen.ma
- * @date 2021/6/30 20:54
*/
@RestController
@AllArgsConstructor
@@ -74,61 +94,101 @@ public class ThreadPoolController {
return Results.success();
}
- @GetMapping("/list/instance/{itemId}/{tpId}")
- public Result> listInstance(@PathVariable("itemId") String itemId, @PathVariable("tpId") String tpId) {
+ @GetMapping("/run/state/{tpId}")
+ public Result runState(@PathVariable("tpId") String tpId,
+ @RequestParam(value = "clientAddress") String clientAddress) {
+ String urlString = StrBuilder.create("http://", clientAddress, "/run/state/", tpId).toString();
+ String data = HttpUtil.get(urlString, HTTP_EXECUTE_TIMEOUT);
+ Result result = JSONUtil.parseObject(data, Result.class);
+ return result;
+ }
+
+ @GetMapping("/run/thread/state/{tpId}")
+ public Result runThreadState(@PathVariable("tpId") String tpId,
+ @RequestParam(value = "clientAddress") String clientAddress) {
+ String urlString = StrBuilder.create("http://", clientAddress, "/run/thread/state/", tpId).toString();
+ String data = HttpUtil.get(urlString, HTTP_EXECUTE_TIMEOUT);
+ Result result = JSONUtil.parseObject(data, Result.class);
+ return result;
+ }
+
+ @GetMapping("/list/client/instance/{itemId}")
+ public Result listClientInstance(@PathVariable("itemId") String itemId) {
List> leases = baseInstanceRegistry.listInstance(itemId);
Lease first = CollUtil.getFirst(leases);
if (first == null) {
return Results.success(Lists.newArrayList());
}
+ List returnThreadPool = Lists.newArrayList();
+ for (Lease each : leases) {
+ Result poolBaseState;
+ try {
+ poolBaseState = getPoolBaseState(each.getHolder().getCallBackUrl());
+ } catch (Throwable ignored) {
+ continue;
+ }
+ WebThreadPoolRespDTO result = BeanUtil.convert(poolBaseState.getData(), WebThreadPoolRespDTO.class);
+ result.setActive(each.getHolder().getActive());
+ result.setIdentify(each.getHolder().getIdentify());
+ result.setClientAddress(each.getHolder().getCallBackUrl());
+ returnThreadPool.add(result);
+ }
+ return Results.success(returnThreadPool);
+ }
+
+ @GetMapping("/web/base/info")
+ public Result getPoolBaseState(@RequestParam(value = "clientAddress") String clientAddress) {
+ String urlString = StrBuilder.create("http://", clientAddress, "/web/base/info").toString();
+ String data = HttpUtil.get(urlString, HTTP_EXECUTE_TIMEOUT);
+ Result result = JSONUtil.parseObject(data, Result.class);
+ return result;
+ }
+
+ @GetMapping("/web/run/state")
+ public Result getPoolRunState(@RequestParam(value = "clientAddress") String clientAddress) {
+ String urlString = StrBuilder.create("http://", clientAddress, "/web/run/state").toString();
+ String data = HttpUtil.get(urlString, HTTP_EXECUTE_TIMEOUT);
+ Result result = JSONUtil.parseObject(data, Result.class);
+ return result;
+ }
+ @PostMapping("/web/update/pool")
+ public Result updateWebThreadPool(@RequestBody WebThreadPoolReqDTO requestParam) {
+ for (String each : requestParam.getClientAddressList()) {
+ String urlString = StrBuilder.create("http://", each, "/web/update/pool").toString();
+ HttpUtil.post(urlString, JSONUtil.toJSONString(requestParam), HTTP_EXECUTE_TIMEOUT);
+ }
+ return Results.success();
+ }
+
+ @GetMapping("/list/instance/{itemId}/{tpId}")
+ public Result> listInstance(@PathVariable("itemId") String itemId,
+ @PathVariable("tpId") String tpId) {
+ List> leases = baseInstanceRegistry.listInstance(itemId);
+ Lease first = CollUtil.getFirst(leases);
+ if (first == null) {
+ return Results.success(Lists.newArrayList());
+ }
InstanceInfo holder = first.getHolder();
String itemTenantKey = holder.getGroupKey();
String groupKey = getGroupKey(tpId, itemTenantKey);
Map content = ConfigCacheService.getContent(groupKey);
- Map activeMap = leases.stream()
- .map(each -> each.getHolder())
- .filter(each -> StringUtil.isNotBlank(each.getActive()))
- .collect(Collectors.toMap(InstanceInfo::getIdentify, InstanceInfo::getActive));
-
- Map clientBasePathMap = leases.stream()
- .map(each -> each.getHolder())
+ Map activeMap =
+ leases.stream().map(each -> each.getHolder()).filter(each -> StringUtil.isNotBlank(each.getActive()))
+ .collect(Collectors.toMap(InstanceInfo::getIdentify, InstanceInfo::getActive));
+ Map clientBasePathMap = leases.stream().map(each -> each.getHolder())
.filter(each -> StringUtil.isNotBlank(each.getClientBasePath()))
.collect(Collectors.toMap(InstanceInfo::getIdentify, InstanceInfo::getClientBasePath));
-
List returnThreadPool = Lists.newArrayList();
content.forEach((key, val) -> {
- ThreadPoolInstanceInfo threadPoolInstanceInfo = BeanUtil.convert(val.configAllInfo, ThreadPoolInstanceInfo.class);
+ ThreadPoolInstanceInfo threadPoolInstanceInfo =
+ BeanUtil.convert(val.configAllInfo, ThreadPoolInstanceInfo.class);
threadPoolInstanceInfo.setClientAddress(StrUtil.subBefore(key, Constants.IDENTIFY_SLICER_SYMBOL, false));
threadPoolInstanceInfo.setActive(activeMap.get(key));
threadPoolInstanceInfo.setIdentify(key);
threadPoolInstanceInfo.setClientBasePath(clientBasePathMap.get(key));
returnThreadPool.add(threadPoolInstanceInfo);
});
-
- return Results.success(returnThreadPool);
- }
-
- @GetMapping("/list/client/instance/{itemId}")
- public Result listClientInstance(@PathVariable("itemId") String itemId) {
- List> leases = baseInstanceRegistry.listInstance(itemId);
- Lease first = CollUtil.getFirst(leases);
- if (first == null) {
- return Results.success(Lists.newArrayList());
- }
-
- List returnThreadPool = Lists.newArrayList();
- leases.forEach(each -> {
- InstanceInfo holder = each.getHolder();
- ThreadPoolInstanceInfo threadPoolInstanceInfo = new ThreadPoolInstanceInfo();
- threadPoolInstanceInfo.setActive(holder.getActive());
- threadPoolInstanceInfo.setClientAddress(holder.getCallBackUrl());
- threadPoolInstanceInfo.setIdentify(holder.getIdentify());
-
- returnThreadPool.add(threadPoolInstanceInfo);
- });
-
return Results.success(returnThreadPool);
}
-
}
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/UserController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/UserController.java
index 04091505..dea073cb 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/UserController.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/UserController.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.console.controller;
import cn.hippo4j.auth.model.UserInfo;
@@ -20,9 +37,6 @@ import static cn.hippo4j.auth.constant.Constants.TOKEN_VALIDITY_IN_SECONDS;
/**
* User controller.
- *
- * @author chen.ma
- * @date 2021/10/30 21:15
*/
@RestController
@AllArgsConstructor
@@ -75,5 +89,4 @@ public class UserController {
List resultUserNames = userService.getUserLikeUsername(userName);
return Results.success(resultUserNames);
}
-
}
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/model/ChartInfo.java b/hippo4j-console/src/main/java/cn/hippo4j/console/model/ChartInfo.java
index cba5cefc..2d9e378f 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/model/ChartInfo.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/model/ChartInfo.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.console.model;
import lombok.Data;
@@ -5,32 +22,28 @@ import lombok.experimental.Accessors;
/**
* Char info.
- *
- * @author chen.ma
- * @date 2021/11/10 21:06
*/
@Data
@Accessors(chain = true)
public class ChartInfo {
/**
- * 租户统计
+ * tenantCount
*/
private Integer tenantCount;
/**
- * 项目统计
+ * itemCount
*/
private Integer itemCount;
/**
- * 线程池统计
+ * threadPoolCount
*/
private Integer threadPoolCount;
/**
- * 线程池实例统计
+ * threadPoolInstanceCount
*/
private Integer threadPoolInstanceCount;
-
}
diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/model/LineChartInfo.java b/hippo4j-console/src/main/java/cn/hippo4j/console/model/LineChartInfo.java
index 452bc719..342f0251 100644
--- a/hippo4j-console/src/main/java/cn/hippo4j/console/model/LineChartInfo.java
+++ b/hippo4j-console/src/main/java/cn/hippo4j/console/model/LineChartInfo.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package cn.hippo4j.console.model;
import lombok.AllArgsConstructor;
@@ -8,9 +25,6 @@ import java.util.List;
/**
* Line chart info.
- *
- * @author chen.ma
- * @date 2021/12/11 12:49
*/
@Data
@NoArgsConstructor
@@ -36,5 +50,4 @@ public class LineChartInfo {
* fourList
*/
private List
+
+ 
-
- 
+
+ 
-
+
+ 
+
+
-## Stars 趋势
+## 我们的荣誉
-[](https://starchart.cc/acmenlt/dynamic-threadpool)
+Hippo-4J 获得了一些宝贵的荣誉，这属于每一位对 Hippo-4J 做出过贡献的成员，谢谢各位的付出。
+
-## 鸣谢
+## 友情链接
-Hippo4J 项目基于或参考以下项目:
+- [JavaGuide](https://github.com/Snailclimb/JavaGuide)：一份涵盖大部分 Java 程序员所需要掌握的核心知识。
+- [Guide-Rpc-Framework](https://github.com/Snailclimb/guide-rpc-framework)：一款基于 Netty+Kyro+Zookeeper 实现的自定义 RPC 框架。
+- [toBeBetterJavaer](https://github.com/itwanger/toBeBetterJavaer)：一份通俗易懂、风趣幽默的Java学习指南，内容涵盖Java基础、Java并发编程等核心知识点。
+- [Austin](https://github.com/ZhongFuCheng3y/austin)：消息推送平台，推送下发【邮件】【短信】【微信服务号】【微信小程序】【企业微信】【钉钉】等消息类型。
-- [Nacos](https://github.com/alibaba/nacos)
-- [Eureka](https://github.com/Netflix/Eureka)
-- [mzt-biz-log](https://github.com/mouzt/mzt-biz-log)
-- [equator](https://github.com/dadiyang/equator)
+## 鸣谢
+
+Hippo-4J 项目基于或参考以下项目：[Nacos](https://github.com/alibaba/nacos)、[Eureka](https://github.com/Netflix/Eureka)、[Mzt-Biz-Log](https://github.com/mouzt/mzt-biz-log)、[Equator](https://github.com/dadiyang/equator)。
感谢 JetBrains 提供的免费开源 License：
+