修改 Hippo4j artifactId 以及 package 名称.

pull/10/head
chen.ma 4 years ago
parent df4b7431ab
commit 9d2d325c84

@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.github.acmenlt</groupId>
<groupId>cn.hippo4j</groupId>
<artifactId>hippo4j-all</artifactId>
<version>${revision}</version>
</parent>
<artifactId>auth</artifactId>
<artifactId>hippo4j-auth</artifactId>
<packaging>jar</packaging>
<properties>
@ -66,8 +66,8 @@
</dependency>
<dependency>
<groupId>io.github.acmenlt</groupId>
<artifactId>common</artifactId>
<groupId>cn.hippo4j</groupId>
<artifactId>hippo4j-common</artifactId>
</dependency>
</dependencies>

@ -1,9 +1,9 @@
package com.github.dynamic.threadpool.auth.config;
package cn.hippo4j.auth.config;
import com.github.dynamic.threadpool.auth.constant.Constants;
import com.github.dynamic.threadpool.auth.filter.JWTAuthenticationFilter;
import com.github.dynamic.threadpool.auth.filter.JWTAuthorizationFilter;
import com.github.dynamic.threadpool.auth.service.impl.UserDetailsServiceImpl;
import cn.hippo4j.auth.constant.Constants;
import cn.hippo4j.auth.filter.JWTAuthenticationFilter;
import cn.hippo4j.auth.filter.JWTAuthorizationFilter;
import cn.hippo4j.auth.service.impl.UserDetailsServiceImpl;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.auth.constant;
package cn.hippo4j.auth.constant;
/**
* Constants.

@ -1,12 +1,12 @@
package com.github.dynamic.threadpool.auth.filter;
package cn.hippo4j.auth.filter;
import cn.hutool.json.JSONUtil;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.dynamic.threadpool.auth.model.biz.user.JwtUser;
import com.github.dynamic.threadpool.auth.model.biz.user.LoginUser;
import com.github.dynamic.threadpool.auth.toolkit.JwtTokenUtil;
import com.github.dynamic.threadpool.auth.toolkit.ReturnT;
import com.github.dynamic.threadpool.common.web.base.Results;
import cn.hippo4j.auth.model.biz.user.JwtUser;
import cn.hippo4j.auth.model.biz.user.LoginUser;
import cn.hippo4j.auth.toolkit.JwtTokenUtil;
import cn.hippo4j.auth.toolkit.ReturnT;
import cn.hippo4j.common.web.base.Results;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@ -25,7 +25,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import static com.github.dynamic.threadpool.auth.constant.Constants.SPLIT_COMMA;
import static cn.hippo4j.auth.constant.Constants.SPLIT_COMMA;
/**
* JWT authentication filter.

@ -1,9 +1,9 @@
package com.github.dynamic.threadpool.auth.filter;
package cn.hippo4j.auth.filter;
import com.alibaba.fastjson.JSON;
import com.github.dynamic.threadpool.auth.toolkit.JwtTokenUtil;
import com.github.dynamic.threadpool.common.web.base.Results;
import com.github.dynamic.threadpool.common.web.exception.ServiceException;
import cn.hippo4j.auth.toolkit.JwtTokenUtil;
import cn.hippo4j.common.web.base.Results;
import cn.hippo4j.common.web.exception.ServiceException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

@ -1,7 +1,7 @@
package com.github.dynamic.threadpool.auth.mapper;
package cn.hippo4j.auth.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.dynamic.threadpool.auth.model.PermissionInfo;
import cn.hippo4j.auth.model.PermissionInfo;
import org.apache.ibatis.annotations.Mapper;
/**

@ -1,7 +1,7 @@
package com.github.dynamic.threadpool.auth.mapper;
package cn.hippo4j.auth.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.dynamic.threadpool.auth.model.RoleInfo;
import cn.hippo4j.auth.model.RoleInfo;
import org.apache.ibatis.annotations.Mapper;
/**

@ -1,7 +1,7 @@
package com.github.dynamic.threadpool.auth.mapper;
package cn.hippo4j.auth.mapper;
import cn.hippo4j.auth.model.UserInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.dynamic.threadpool.auth.model.UserInfo;
import org.apache.ibatis.annotations.Mapper;
/**

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.auth.model;
package cn.hippo4j.auth.model;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.auth.model;
package cn.hippo4j.auth.model;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.auth.model;
package cn.hippo4j.auth.model;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.auth.model.biz.permission;
package cn.hippo4j.auth.model.biz.permission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.auth.model.biz.permission;
package cn.hippo4j.auth.model.biz.permission;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.auth.model.biz.role;
package cn.hippo4j.auth.model.biz.role;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.auth.model.biz.role;
package cn.hippo4j.auth.model.biz.role;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.auth.model.biz.user;
package cn.hippo4j.auth.model.biz.user;
import lombok.Data;
import org.springframework.security.core.GrantedAuthority;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.auth.model.biz.user;
package cn.hippo4j.auth.model.biz.user;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.auth.model.biz.user;
package cn.hippo4j.auth.model.biz.user;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.auth.model.biz.user;
package cn.hippo4j.auth.model.biz.user;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.auth.model.biz.user;
package cn.hippo4j.auth.model.biz.user;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

@ -1,7 +1,7 @@
package com.github.dynamic.threadpool.auth.service;
package cn.hippo4j.auth.service;
import cn.hippo4j.auth.model.biz.permission.PermissionRespDTO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.dynamic.threadpool.auth.model.biz.permission.PermissionRespDTO;
/**
* Permission service.

@ -1,7 +1,7 @@
package com.github.dynamic.threadpool.auth.service;
package cn.hippo4j.auth.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.dynamic.threadpool.auth.model.biz.role.RoleRespDTO;
import cn.hippo4j.auth.model.biz.role.RoleRespDTO;
import java.util.List;

@ -1,9 +1,9 @@
package com.github.dynamic.threadpool.auth.service;
package cn.hippo4j.auth.service;
import cn.hippo4j.auth.model.biz.user.UserQueryPageReqDTO;
import cn.hippo4j.auth.model.biz.user.UserRespDTO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.dynamic.threadpool.auth.model.biz.user.UserQueryPageReqDTO;
import com.github.dynamic.threadpool.auth.model.biz.user.UserReqDTO;
import com.github.dynamic.threadpool.auth.model.biz.user.UserRespDTO;
import cn.hippo4j.auth.model.biz.user.UserReqDTO;
import java.util.List;

@ -1,23 +1,18 @@
package com.github.dynamic.threadpool.auth.service.impl;
package cn.hippo4j.auth.service.impl;
import cn.hippo4j.auth.mapper.PermissionMapper;
import cn.hippo4j.auth.model.biz.permission.PermissionQueryPageReqDTO;
import cn.hippo4j.auth.model.biz.permission.PermissionRespDTO;
import cn.hippo4j.auth.service.PermissionService;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.dynamic.threadpool.auth.mapper.PermissionMapper;
import com.github.dynamic.threadpool.auth.model.PermissionInfo;
import com.github.dynamic.threadpool.auth.model.biz.permission.PermissionQueryPageReqDTO;
import com.github.dynamic.threadpool.auth.model.biz.permission.PermissionRespDTO;
import com.github.dynamic.threadpool.auth.service.PermissionService;
import cn.hippo4j.auth.model.PermissionInfo;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
/**
* Permission service impl.

@ -1,25 +1,21 @@
package com.github.dynamic.threadpool.auth.service.impl;
package cn.hippo4j.auth.service.impl;
import cn.hippo4j.auth.mapper.RoleMapper;
import cn.hippo4j.auth.model.biz.role.RoleQueryPageReqDTO;
import cn.hippo4j.auth.model.biz.role.RoleRespDTO;
import cn.hippo4j.auth.service.PermissionService;
import cn.hippo4j.auth.service.RoleService;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.github.dynamic.threadpool.auth.mapper.RoleMapper;
import com.github.dynamic.threadpool.auth.model.RoleInfo;
import com.github.dynamic.threadpool.auth.model.biz.role.RoleQueryPageReqDTO;
import com.github.dynamic.threadpool.auth.model.biz.role.RoleRespDTO;
import com.github.dynamic.threadpool.auth.service.PermissionService;
import com.github.dynamic.threadpool.auth.service.RoleService;
import cn.hippo4j.auth.model.RoleInfo;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

@ -1,9 +1,9 @@
package com.github.dynamic.threadpool.auth.service.impl;
package cn.hippo4j.auth.service.impl;
import cn.hippo4j.auth.mapper.UserMapper;
import cn.hippo4j.auth.model.UserInfo;
import cn.hippo4j.auth.model.biz.user.JwtUser;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.dynamic.threadpool.auth.mapper.UserMapper;
import com.github.dynamic.threadpool.auth.model.UserInfo;
import com.github.dynamic.threadpool.auth.model.biz.user.JwtUser;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;

@ -1,18 +1,18 @@
package com.github.dynamic.threadpool.auth.service.impl;
package cn.hippo4j.auth.service.impl;
import cn.hippo4j.auth.mapper.UserMapper;
import cn.hippo4j.auth.model.UserInfo;
import cn.hippo4j.auth.model.biz.user.UserQueryPageReqDTO;
import cn.hippo4j.auth.model.biz.user.UserRespDTO;
import cn.hippo4j.auth.service.RoleService;
import cn.hippo4j.auth.service.UserService;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.dynamic.threadpool.auth.mapper.UserMapper;
import com.github.dynamic.threadpool.auth.model.UserInfo;
import com.github.dynamic.threadpool.auth.model.biz.user.UserQueryPageReqDTO;
import com.github.dynamic.threadpool.auth.model.biz.user.UserReqDTO;
import com.github.dynamic.threadpool.auth.model.biz.user.UserRespDTO;
import com.github.dynamic.threadpool.auth.service.RoleService;
import com.github.dynamic.threadpool.auth.service.UserService;
import cn.hippo4j.auth.model.biz.user.UserReqDTO;
import lombok.AllArgsConstructor;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;

@ -1,5 +1,6 @@
package com.github.dynamic.threadpool.auth.toolkit;
package cn.hippo4j.auth.toolkit;
import cn.hippo4j.auth.constant.Constants;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.ExpiredJwtException;
import io.jsonwebtoken.Jwts;
@ -10,8 +11,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import static com.github.dynamic.threadpool.auth.constant.Constants.SPLIT_COMMA;
/**
* Jwt token util.
*
@ -58,7 +57,7 @@ public class JwtTokenUtil {
.signWith(SignatureAlgorithm.HS512, SECRET)
.setClaims(map)
.setIssuer(ISS)
.setSubject(id + SPLIT_COMMA + username)
.setSubject(id + Constants.SPLIT_COMMA + username)
.setIssuedAt(new Date())
.setExpiration(new Date(System.currentTimeMillis() + expiration * 1000))
.compact();
@ -71,7 +70,7 @@ public class JwtTokenUtil {
* @return
*/
public static String getUsername(String token) {
List<String> userInfo = Arrays.asList(getTokenBody(token).getSubject().split(SPLIT_COMMA));
List<String> userInfo = Arrays.asList(getTokenBody(token).getSubject().split(Constants.SPLIT_COMMA));
return userInfo.get(1);
}
@ -82,7 +81,7 @@ public class JwtTokenUtil {
* @return
*/
public static Integer getUserId(String token) {
List<String> userInfo = Arrays.asList(getTokenBody(token).getSubject().split(SPLIT_COMMA));
List<String> userInfo = Arrays.asList(getTokenBody(token).getSubject().split(Constants.SPLIT_COMMA));
return Integer.parseInt(userInfo.get(0));
}

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.auth.toolkit;
package cn.hippo4j.auth.toolkit;
import lombok.Data;
import lombok.NoArgsConstructor;

@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.github.acmenlt</groupId>
<groupId>cn.hippo4j</groupId>
<artifactId>hippo4j-all</artifactId>
<version>${revision}</version>
</parent>
<artifactId>common</artifactId>
<artifactId>hippo4j-common</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.common.config;
package cn.hippo4j.common.config;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.common.constant;
package cn.hippo4j.common.constant;
import org.springframework.expression.spel.ast.Identifier;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.common.executor;
package cn.hippo4j.common.executor;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.common.executor;
package cn.hippo4j.common.executor;
import java.util.HashMap;
import java.util.HashSet;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.common.function;
package cn.hippo4j.common.function;
/**
* .

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.common.model;
package cn.hippo4j.common.model;
import lombok.Getter;
import lombok.Setter;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.common.model;
package cn.hippo4j.common.model;
import lombok.Data;
import lombok.Getter;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.common.model;
package cn.hippo4j.common.model;
/**
* Pool parameter.

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.common.model;
package cn.hippo4j.common.model;
import lombok.Data;
import lombok.experimental.Accessors;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.common.model;
package cn.hippo4j.common.model;
import lombok.Getter;
import lombok.Setter;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.common.toolkit;
package cn.hippo4j.common.toolkit;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

@ -1,6 +1,6 @@
package com.github.dynamic.threadpool.common.toolkit;
package cn.hippo4j.common.toolkit;
import com.github.dynamic.threadpool.common.function.NoArgsConsumer;
import cn.hippo4j.common.function.NoArgsConsumer;
/**
* Condition util.

@ -1,9 +1,9 @@
package com.github.dynamic.threadpool.common.toolkit;
package cn.hippo4j.common.toolkit;
import cn.hippo4j.common.constant.Constants;
import com.alibaba.fastjson.JSON;
import com.github.dynamic.threadpool.common.constant.Constants;
import com.github.dynamic.threadpool.common.model.PoolParameter;
import com.github.dynamic.threadpool.common.model.PoolParameterInfo;
import cn.hippo4j.common.model.PoolParameter;
import cn.hippo4j.common.model.PoolParameterInfo;
/**
* Content util.

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.common.toolkit;
package cn.hippo4j.common.toolkit;
import org.springframework.util.StringUtils;

@ -1,7 +1,7 @@
package com.github.dynamic.threadpool.common.toolkit;
package cn.hippo4j.common.toolkit;
import com.github.dynamic.threadpool.common.constant.Constants;
import com.github.dynamic.threadpool.common.model.PoolParameter;
import cn.hippo4j.common.constant.Constants;
import cn.hippo4j.common.model.PoolParameter;
import org.springframework.util.StringUtils;
import java.io.IOException;
@ -10,8 +10,6 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.List;
import static com.github.dynamic.threadpool.common.constant.Constants.WORD_SEPARATOR;
/**
* MD5 util.
*
@ -76,12 +74,12 @@ public class Md5Util {
for (String groupKey : changedGroupKeys) {
String[] dataIdGroupId = GroupKey.parseKey(groupKey);
sb.append(dataIdGroupId[0]);
sb.append(WORD_SEPARATOR);
sb.append(Constants.WORD_SEPARATOR);
sb.append(dataIdGroupId[1]);
// if have tenant, then set it
if (dataIdGroupId.length == 3) {
if (!StringUtils.isEmpty(dataIdGroupId[2])) {
sb.append(WORD_SEPARATOR);
sb.append(Constants.WORD_SEPARATOR);
sb.append(dataIdGroupId[2]);
}
}

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.common.web.base;
package cn.hippo4j.common.web.base;
import lombok.Data;
import lombok.experimental.Accessors;

@ -1,7 +1,7 @@
package com.github.dynamic.threadpool.common.web.base;
package cn.hippo4j.common.web.base;
import com.github.dynamic.threadpool.common.web.exception.ErrorCodeEnum;
import com.github.dynamic.threadpool.common.web.exception.ServiceException;
import cn.hippo4j.common.web.exception.ErrorCodeEnum;
import cn.hippo4j.common.web.exception.ServiceException;
/**
* Results.

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.common.web.exception;
package cn.hippo4j.common.web.exception;
/**
* Error code enum.

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.common.web.exception;
package cn.hippo4j.common.web.exception;
import lombok.Data;
import lombok.EqualsAndHashCode;

@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.github.acmenlt</groupId>
<groupId>cn.hippo4j</groupId>
<artifactId>hippo4j-all</artifactId>
<version>${revision}</version>
</parent>
<artifactId>config</artifactId>
<artifactId>hippo4j-config</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
@ -47,8 +47,8 @@
</dependency>
<dependency>
<groupId>io.github.acmenlt</groupId>
<artifactId>common</artifactId>
<groupId>cn.hippo4j</groupId>
<artifactId>hippo4j-common</artifactId>
</dependency>
<dependency>
@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>io.github.acmenlt</groupId>
<groupId>cn.hippo4j</groupId>
<artifactId>log-record-tool</artifactId>
</dependency>
</dependencies>

@ -1,6 +1,6 @@
package com.github.dynamic.threadpool.config.config;
package cn.hippo4j.config.config;
import com.github.dynamic.threadpool.common.config.ApplicationContextHolder;
import cn.hippo4j.common.config.ApplicationContextHolder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@ -1,7 +1,7 @@
package com.github.dynamic.threadpool.config.config;
package cn.hippo4j.config.config;
import cn.hippo4j.config.enums.DelEnum;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.github.dynamic.threadpool.config.enums.DelEnum;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.config;
package cn.hippo4j.config.config;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;

@ -1,16 +1,15 @@
package com.github.dynamic.threadpool.config.controller;
package cn.hippo4j.config.controller;
import com.github.dynamic.threadpool.config.service.biz.ConfigService;
import com.github.dynamic.threadpool.common.constant.Constants;
import com.github.dynamic.threadpool.common.web.base.Result;
import com.github.dynamic.threadpool.common.web.base.Results;
import com.github.dynamic.threadpool.config.model.ConfigAllInfo;
import com.github.dynamic.threadpool.config.model.ConfigInfoBase;
import com.github.dynamic.threadpool.config.service.ConfigServletInner;
import com.github.dynamic.threadpool.config.toolkit.Md5ConfigUtil;
import cn.hippo4j.config.model.ConfigAllInfo;
import cn.hippo4j.config.model.ConfigInfoBase;
import cn.hippo4j.config.service.ConfigServletInner;
import cn.hippo4j.config.toolkit.Md5ConfigUtil;
import cn.hippo4j.config.service.biz.ConfigService;
import cn.hippo4j.common.constant.Constants;
import cn.hippo4j.common.web.base.Result;
import cn.hippo4j.common.web.base.Results;
import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.enums;
package cn.hippo4j.config.enums;
/**
* Del enum.

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.event;
package cn.hippo4j.config.event;
import org.springframework.util.StringUtils;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.event;
package cn.hippo4j.config.event;
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicLong;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.event;
package cn.hippo4j.config.event;
/**
* Local data change event.

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.event;
package cn.hippo4j.config.event;
/**
* Slow event.

@ -1,7 +1,7 @@
package com.github.dynamic.threadpool.config.mapper;
package cn.hippo4j.config.mapper;
import cn.hippo4j.config.model.ConfigAllInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.dynamic.threadpool.config.model.ConfigAllInfo;
import org.apache.ibatis.annotations.Mapper;
/**

@ -1,7 +1,7 @@
package com.github.dynamic.threadpool.config.mapper;
package cn.hippo4j.config.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.dynamic.threadpool.config.model.ItemInfo;
import cn.hippo4j.config.model.ItemInfo;
import org.apache.ibatis.annotations.Mapper;
/**

@ -1,7 +1,7 @@
package com.github.dynamic.threadpool.config.mapper;
package cn.hippo4j.config.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.dynamic.threadpool.logrecord.model.LogRecordInfo;
import cn.hippo4j.tools.logrecord.model.LogRecordInfo;
import org.apache.ibatis.annotations.Mapper;
/**

@ -1,7 +1,7 @@
package com.github.dynamic.threadpool.config.mapper;
package cn.hippo4j.config.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.dynamic.threadpool.config.model.TenantInfo;
import cn.hippo4j.config.model.TenantInfo;
import org.apache.ibatis.annotations.Mapper;
/**

@ -1,9 +1,9 @@
package com.github.dynamic.threadpool.config.model;
package cn.hippo4j.config.model;
import com.github.dynamic.threadpool.common.toolkit.Md5Util;
import com.github.dynamic.threadpool.config.toolkit.SimpleReadWriteLock;
import com.github.dynamic.threadpool.config.toolkit.SingletonRepository;
import com.github.dynamic.threadpool.common.constant.Constants;
import cn.hippo4j.common.toolkit.Md5Util;
import cn.hippo4j.config.toolkit.SimpleReadWriteLock;
import cn.hippo4j.config.toolkit.SingletonRepository;
import cn.hippo4j.common.constant.Constants;
import lombok.Getter;
import lombok.Setter;

@ -1,11 +1,11 @@
package com.github.dynamic.threadpool.config.model;
package cn.hippo4j.config.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.dynamic.threadpool.common.model.PoolParameter;
import cn.hippo4j.common.model.PoolParameter;
import lombok.Data;
import java.util.Date;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.model;
package cn.hippo4j.config.model;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.model;
package cn.hippo4j.config.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.model;
package cn.hippo4j.config.model;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.model;
package cn.hippo4j.config.model;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.model.biz.item;
package cn.hippo4j.config.model.biz.item;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.model.biz.item;
package cn.hippo4j.config.model.biz.item;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.model.biz.item;
package cn.hippo4j.config.model.biz.item;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.model.biz.item;
package cn.hippo4j.config.model.biz.item;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.model.biz.tenant;
package cn.hippo4j.config.model.biz.tenant;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.model.biz.tenant;
package cn.hippo4j.config.model.biz.tenant;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.model.biz.tenant;
package cn.hippo4j.config.model.biz.tenant;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.model.biz.tenant;
package cn.hippo4j.config.model.biz.tenant;
import com.alibaba.fastjson.JSON;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.model.biz.threadpool;
package cn.hippo4j.config.model.biz.threadpool;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.model.biz.threadpool;
package cn.hippo4j.config.model.biz.threadpool;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data;

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.model.biz.threadpool;
package cn.hippo4j.config.model.biz.threadpool;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

@ -1,8 +1,8 @@
package com.github.dynamic.threadpool.config.notify;
package cn.hippo4j.config.notify;
import cn.hutool.core.collection.ConcurrentHashSet;
import com.github.dynamic.threadpool.config.notify.listener.Subscriber;
import com.github.dynamic.threadpool.config.event.Event;
import cn.hippo4j.config.notify.listener.Subscriber;
import cn.hippo4j.config.event.Event;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.CollectionUtils;

@ -1,9 +1,9 @@
package com.github.dynamic.threadpool.config.notify;
package cn.hippo4j.config.notify;
import cn.hutool.core.collection.ConcurrentHashSet;
import com.github.dynamic.threadpool.config.notify.listener.Subscriber;
import com.github.dynamic.threadpool.config.event.Event;
import com.github.dynamic.threadpool.config.event.SlowEvent;
import cn.hippo4j.config.notify.listener.Subscriber;
import cn.hippo4j.config.event.Event;
import cn.hippo4j.config.event.SlowEvent;
import java.util.Map;
import java.util.Set;

@ -1,7 +1,7 @@
package com.github.dynamic.threadpool.config.notify;
package cn.hippo4j.config.notify;
import com.github.dynamic.threadpool.config.notify.listener.Subscriber;
import com.github.dynamic.threadpool.config.event.Event;
import cn.hippo4j.config.notify.listener.Subscriber;
import cn.hippo4j.config.event.Event;
/**
* Event publisher.

@ -1,11 +1,11 @@
package com.github.dynamic.threadpool.config.notify;
import com.github.dynamic.threadpool.config.notify.listener.SmartSubscriber;
import com.github.dynamic.threadpool.config.notify.listener.Subscriber;
import com.github.dynamic.threadpool.config.toolkit.ClassUtil;
import com.github.dynamic.threadpool.config.toolkit.MapUtil;
import com.github.dynamic.threadpool.config.event.Event;
import com.github.dynamic.threadpool.config.event.SlowEvent;
package cn.hippo4j.config.notify;
import cn.hippo4j.config.notify.listener.SmartSubscriber;
import cn.hippo4j.config.notify.listener.Subscriber;
import cn.hippo4j.config.toolkit.ClassUtil;
import cn.hippo4j.config.toolkit.MapUtil;
import cn.hippo4j.config.event.Event;
import cn.hippo4j.config.event.SlowEvent;
import lombok.extern.slf4j.Slf4j;
import java.util.Map;

@ -1,6 +1,6 @@
package com.github.dynamic.threadpool.config.notify.listener;
package cn.hippo4j.config.notify.listener;
import com.github.dynamic.threadpool.config.event.Event;
import cn.hippo4j.config.event.Event;
import java.util.List;

@ -1,6 +1,6 @@
package com.github.dynamic.threadpool.config.notify.listener;
package cn.hippo4j.config.notify.listener;
import com.github.dynamic.threadpool.config.event.Event;
import cn.hippo4j.config.event.Event;
import java.util.concurrent.Executor;

@ -1,15 +1,15 @@
package com.github.dynamic.threadpool.config.service;
package cn.hippo4j.config.service;
import cn.hippo4j.config.notify.NotifyCenter;
import cn.hutool.core.collection.CollUtil;
import com.github.dynamic.threadpool.config.service.biz.ConfigService;
import com.github.dynamic.threadpool.common.config.ApplicationContextHolder;
import com.github.dynamic.threadpool.common.constant.Constants;
import com.github.dynamic.threadpool.common.toolkit.Md5Util;
import com.github.dynamic.threadpool.config.event.LocalDataChangeEvent;
import com.github.dynamic.threadpool.config.model.CacheItem;
import com.github.dynamic.threadpool.config.model.ConfigAllInfo;
import com.github.dynamic.threadpool.config.notify.NotifyCenter;
import com.github.dynamic.threadpool.config.toolkit.MapUtil;
import cn.hippo4j.config.service.biz.ConfigService;
import cn.hippo4j.common.config.ApplicationContextHolder;
import cn.hippo4j.common.constant.Constants;
import cn.hippo4j.common.toolkit.Md5Util;
import cn.hippo4j.config.event.LocalDataChangeEvent;
import cn.hippo4j.config.model.CacheItem;
import cn.hippo4j.config.model.ConfigAllInfo;
import cn.hippo4j.config.toolkit.MapUtil;
import com.google.common.collect.Maps;
import org.springframework.util.StringUtils;

@ -1,7 +1,7 @@
package com.github.dynamic.threadpool.config.service;
package cn.hippo4j.config.service;
import com.github.dynamic.threadpool.config.event.LocalDataChangeEvent;
import com.github.dynamic.threadpool.config.notify.NotifyCenter;
import cn.hippo4j.config.notify.NotifyCenter;
import cn.hippo4j.config.event.LocalDataChangeEvent;
/**
* Config change publisher.

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.service;
package cn.hippo4j.config.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@ -1,17 +1,17 @@
package com.github.dynamic.threadpool.config.service;
package cn.hippo4j.config.service;
import cn.hippo4j.config.notify.NotifyCenter;
import cn.hippo4j.config.toolkit.Md5ConfigUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.github.dynamic.threadpool.config.notify.listener.Subscriber;
import com.github.dynamic.threadpool.config.toolkit.ConfigExecutor;
import com.github.dynamic.threadpool.config.toolkit.MapUtil;
import com.github.dynamic.threadpool.config.toolkit.Md5ConfigUtil;
import com.github.dynamic.threadpool.config.toolkit.RequestUtil;
import com.github.dynamic.threadpool.common.toolkit.Md5Util;
import com.github.dynamic.threadpool.common.web.base.Results;
import com.github.dynamic.threadpool.config.event.Event;
import com.github.dynamic.threadpool.config.event.LocalDataChangeEvent;
import com.github.dynamic.threadpool.config.notify.NotifyCenter;
import cn.hippo4j.config.notify.listener.Subscriber;
import cn.hippo4j.config.toolkit.ConfigExecutor;
import cn.hippo4j.config.toolkit.MapUtil;
import cn.hippo4j.config.toolkit.RequestUtil;
import cn.hippo4j.common.toolkit.Md5Util;
import cn.hippo4j.common.web.base.Results;
import cn.hippo4j.config.event.Event;
import cn.hippo4j.config.event.LocalDataChangeEvent;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -26,7 +26,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import static com.github.dynamic.threadpool.common.constant.Constants.GROUP_KEY_DELIMITER;
import static cn.hippo4j.common.constant.Constants.GROUP_KEY_DELIMITER;
/**
* Long polling service.

@ -1,4 +1,4 @@
package com.github.dynamic.threadpool.config.service;
package cn.hippo4j.config.service;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

@ -1,6 +1,6 @@
package com.github.dynamic.threadpool.config.service.biz;
package cn.hippo4j.config.service.biz;
import com.github.dynamic.threadpool.config.model.ConfigAllInfo;
import cn.hippo4j.config.model.ConfigAllInfo;
/**
* Config service.

@ -1,10 +1,10 @@
package com.github.dynamic.threadpool.config.service.biz;
package cn.hippo4j.config.service.biz;
import cn.hippo4j.config.model.biz.item.ItemRespDTO;
import cn.hippo4j.config.model.biz.item.ItemUpdateReqDTO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.dynamic.threadpool.config.model.biz.item.ItemQueryReqDTO;
import com.github.dynamic.threadpool.config.model.biz.item.ItemRespDTO;
import com.github.dynamic.threadpool.config.model.biz.item.ItemSaveReqDTO;
import com.github.dynamic.threadpool.config.model.biz.item.ItemUpdateReqDTO;
import cn.hippo4j.config.model.biz.item.ItemQueryReqDTO;
import cn.hippo4j.config.model.biz.item.ItemSaveReqDTO;
import java.util.List;

@ -1,10 +1,10 @@
package com.github.dynamic.threadpool.config.service.biz;
package cn.hippo4j.config.service.biz;
import cn.hippo4j.config.model.biz.tenant.TenantQueryReqDTO;
import cn.hippo4j.config.model.biz.tenant.TenantRespDTO;
import cn.hippo4j.config.model.biz.tenant.TenantSaveReqDTO;
import cn.hippo4j.config.model.biz.tenant.TenantUpdateReqDTO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.dynamic.threadpool.config.model.biz.tenant.TenantQueryReqDTO;
import com.github.dynamic.threadpool.config.model.biz.tenant.TenantRespDTO;
import com.github.dynamic.threadpool.config.model.biz.tenant.TenantSaveReqDTO;
import com.github.dynamic.threadpool.config.model.biz.tenant.TenantUpdateReqDTO;
/**
* Tenant service.

@ -1,10 +1,10 @@
package com.github.dynamic.threadpool.config.service.biz;
package cn.hippo4j.config.service.biz;
import cn.hippo4j.config.model.biz.threadpool.ThreadPoolQueryReqDTO;
import cn.hippo4j.config.model.biz.threadpool.ThreadPoolRespDTO;
import cn.hippo4j.config.model.biz.threadpool.ThreadPoolSaveOrUpdateReqDTO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolDelReqDTO;
import com.github.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolQueryReqDTO;
import com.github.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolRespDTO;
import com.github.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolSaveOrUpdateReqDTO;
import cn.hippo4j.config.model.biz.threadpool.ThreadPoolDelReqDTO;
import java.util.List;

@ -1,26 +1,23 @@
package com.github.dynamic.threadpool.config.service.biz.impl;
package cn.hippo4j.config.service.biz.impl;
import cn.hippo4j.config.event.LocalDataChangeEvent;
import cn.hippo4j.config.mapper.ConfigInfoMapper;
import cn.hippo4j.config.model.ConfigAllInfo;
import cn.hippo4j.config.model.ConfigInfoBase;
import cn.hippo4j.config.service.ConfigChangePublisher;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.github.dynamic.threadpool.common.toolkit.ConditionUtil;
import com.github.dynamic.threadpool.common.toolkit.ContentUtil;
import com.github.dynamic.threadpool.common.toolkit.Md5Util;
import com.github.dynamic.threadpool.config.event.LocalDataChangeEvent;
import com.github.dynamic.threadpool.config.mapper.ConfigInfoMapper;
import com.github.dynamic.threadpool.config.model.ConfigAllInfo;
import com.github.dynamic.threadpool.config.model.ConfigInfoBase;
import com.github.dynamic.threadpool.config.service.ConfigChangePublisher;
import com.github.dynamic.threadpool.config.service.biz.ConfigService;
import cn.hippo4j.common.toolkit.ConditionUtil;
import cn.hippo4j.common.toolkit.ContentUtil;
import cn.hippo4j.common.toolkit.Md5Util;
import cn.hippo4j.config.service.biz.ConfigService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.Optional;
/**
* Config service impl.
*

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save