commit:权限模块新增分配详情功能

This commit is contained in:
Jerry
2020-11-21 11:33:37 +08:00
parent 5cdf9b7115
commit 512b9be702
401 changed files with 5651 additions and 1328 deletions

View File

@@ -3,10 +3,9 @@ package com.orange.demo.common.core.base.client;
import com.orange.demo.common.core.object.MyAggregationParam;
import com.orange.demo.common.core.object.MyQueryParam;
import com.orange.demo.common.core.object.ResponseResult;
import com.orange.demo.common.core.object.Tuple2;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
/**
* 远程调用接口。
@@ -52,6 +51,26 @@ public interface BaseClient<D, K> {
*/
ResponseResult<Boolean> existId(K id);
/**
* 删除主键Id关联的对象。
*
* @param id 主键Id。
* @return 应答结果对象。
*/
default ResponseResult<Void> delete(K id) {
throw new UnsupportedOperationException();
}
/**
* 删除符合过滤条件的数据。
*
* @param filter 过滤对象。
* @return 应答结果对象,包含删除数量。
*/
default ResponseResult<Integer> deleteBy(D filter) {
throw new UnsupportedOperationException();
}
/**
* 获取远程主对象中符合查询条件的数据列表。
* 缺省实现是因为字典类型的远程调用客户端中,不需要实现该方法,因此尽早抛出异常,用户可自行修改。
@@ -106,4 +125,14 @@ public interface BaseClient<D, K> {
default ResponseResult<List<Map<String, Object>>> aggregateBy(MyAggregationParam aggregationParam) {
throw new UnsupportedOperationException();
}
/**
* 根据主键Id及其列表数据(not in list)进行过滤,返回给定的数据。返回的对象数据中,仅仅包含实体对象自己的数据,以及配置的字典关联数据。
*
* @param queryParam 查询参数。
* @return 应答结果对象,包含数据列表,以及整个符合条件的数据总量(分页之前)。
*/
default ResponseResult<Tuple2<List<D>, K>> listByNotInList(MyQueryParam queryParam) {
throw new UnsupportedOperationException();
}
}

View File

@@ -0,0 +1,85 @@
package com.orange.demo.common.core.base.client;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.object.MyAggregationParam;
import com.orange.demo.common.core.object.MyQueryParam;
import com.orange.demo.common.core.object.ResponseResult;
import com.orange.demo.common.core.object.Tuple2;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import java.util.*;
/**
* FeignClient 熔断降级处理对象。
*
* @param <D> 实体对象类型。
* @param <K> 主键类型。
* @param <T> Feign客户端对象类型。
* @author Jerry
* @date 2020-08-08
*/
@Slf4j
public abstract class BaseFallbackFactory<D, K, T extends BaseClient<D, K>>
implements FallbackFactory<T>, BaseClient<D, K> {
@Override
public ResponseResult<List<D>> listByIds(Set<K> idSet, Boolean withDict) {
return ResponseResult.error(ErrorCodeEnum.RPC_DATA_ACCESS_FAILED);
}
@Override
public ResponseResult<D> getById(K id, Boolean withDict) {
return ResponseResult.error(ErrorCodeEnum.RPC_DATA_ACCESS_FAILED);
}
@Override
public ResponseResult<Boolean> existIds(Set<K> idSet) {
return ResponseResult.error(ErrorCodeEnum.RPC_DATA_ACCESS_FAILED);
}
@Override
public ResponseResult<Boolean> existId(K id) {
return ResponseResult.error(ErrorCodeEnum.RPC_DATA_ACCESS_FAILED);
}
@Override
public ResponseResult<Void> delete(K id) {
return ResponseResult.error(ErrorCodeEnum.RPC_DATA_ACCESS_FAILED);
}
@Override
public ResponseResult<Integer> deleteBy(D filter) {
return ResponseResult.error(ErrorCodeEnum.RPC_DATA_ACCESS_FAILED);
}
@Override
public ResponseResult<List<D>> listBy(MyQueryParam queryParam) {
return ResponseResult.error(ErrorCodeEnum.RPC_DATA_ACCESS_FAILED);
}
@Override
public ResponseResult<D> getBy(MyQueryParam queryParam) {
return ResponseResult.error(ErrorCodeEnum.RPC_DATA_ACCESS_FAILED);
}
@Override
public ResponseResult<List<Map<String, Object>>> listMapBy(MyQueryParam queryParam) {
return ResponseResult.error(ErrorCodeEnum.RPC_DATA_ACCESS_FAILED);
}
@Override
public ResponseResult<Integer> countBy(MyQueryParam queryParam) {
return ResponseResult.error(ErrorCodeEnum.RPC_DATA_ACCESS_FAILED);
}
@Override
public ResponseResult<List<Map<String, Object>>> aggregateBy(MyAggregationParam aggregationParam) {
return ResponseResult.error(ErrorCodeEnum.RPC_DATA_ACCESS_FAILED);
}
@Override
public ResponseResult<Tuple2<List<D>, K>> listByNotInList(MyQueryParam queryParam) {
return ResponseResult.error(ErrorCodeEnum.RPC_DATA_ACCESS_FAILED);
}
}

View File

@@ -147,6 +147,18 @@ public abstract class BaseController<M, D, K> {
!MyCommonUtil.existBlankArgument(id) && service().getById(id) != null);
}
/**
* 删除符合过滤条件的数据。
*
* @param filter 过滤对象。
* @param modelMapper 对象映射函数对象。如果为空则使用MyModelUtil中的缺省转换函数。
* @return 删除数量。
*/
public ResponseResult<Integer> baseDeleteBy(
D filter, BaseModelMapper<D, M> modelMapper) throws Exception {
return ResponseResult.success(service().removeBy(convertToModel(filter, modelMapper)));
}
/**
* 自定义过滤条件、显示字段和排序字段的单表查询。主要用于微服务间远程过程调用。
* NOTE: 和baseListMapBy方法的差别只是返回的数据形式不同该接口以对象列表的形式返回数据。
@@ -246,7 +258,7 @@ public abstract class BaseController<M, D, K> {
// 完成一些共同性规则的验证。
VerifyAggregationInfo verifyInfo = this.verifyAndParseAggregationParam(param);
if (!verifyInfo.isSuccess) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, verifyInfo.errorMsg);
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, verifyInfo.errorMsg);
}
// 构建SelectList
StringBuilder selectList = new StringBuilder(64);
@@ -353,6 +365,24 @@ public abstract class BaseController<M, D, K> {
return resultDto;
}
/**
* 将Dto对象转换为Model实体对象。
* 如果Model存在该实体的ModelMapper就用该ModelMapper转换否则使用缺省的基于字段反射的copy。
*
* @param dto Dto对象。
* @param modelMapper 从实体对象到Dto对象的映射对象。
* @return 转换后的Dto域对象。
*/
private M convertToModel(D dto, BaseModelMapper<D, M> modelMapper) {
M result;
if (modelMapper != null) {
result = modelMapper.toModel(dto);
} else {
result = MyModelUtil.copyTo(dto, modelClass);
}
return result;
}
private VerifyAggregationInfo verifyAndParseAggregationParam(MyAggregationParam param) {
VerifyAggregationInfo verifyInfo = new VerifyAggregationInfo();
if (!AggregationKind.isValid(param.getAggregationKind())) {

View File

@@ -191,6 +191,29 @@ public abstract class BaseService<M, D, K> {
return false;
}
/**
* 根据过滤条件删除数据。
*
* @param filter 过滤对象。
* @return 删除数量。
*/
public Integer removeBy(M filter) throws Exception {
if (deletedFlagField == null) {
return mapper().delete(filter);
}
Example e = new Example(modelClass);
Example.Criteria c = e.createCriteria();
Field[] fields = ReflectUtil.getFields(modelClass);
for (Field field : fields) {
if (field.getAnnotation(Transient.class) == null) {
this.assembleCriteriaByFilter(filter, field, c);
}
}
M deletedObject = modelClass.newInstance();
this.setDeletedFlagMethod.invoke(deletedObject, GlobalDeletedFlag.DELETED);
return mapper().updateByExampleSelective(deletedObject, e);
}
/**
* 判断主键Id关联的数据是否存在。
*

View File

@@ -1,6 +1,13 @@
package com.orange.demo.common.core.cache;
import com.orange.demo.common.core.exception.MapCacheAccessException;
import lombok.extern.slf4j.Slf4j;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Function;
/**
@@ -11,6 +18,7 @@ import java.util.function.Function;
* @author Jerry
* @date 2020-08-08
*/
@Slf4j
public class MapDictionaryCache<K, V> implements DictionaryCache<K, V> {
/**
@@ -21,6 +29,14 @@ public class MapDictionaryCache<K, V> implements DictionaryCache<K, V> {
* 获取字典主键数据的函数对象。
*/
protected Function<V, K> idGetter;
/**
* 由于大部分场景是读取操作,所以使用读写锁提高并发的伸缩性。
*/
protected ReadWriteLock lock = new ReentrantReadWriteLock();
/**
* 超时时长。单位毫秒。
*/
protected static final long TIMEOUT = 2000L;
/**
* 当前对象的构造器函数。
@@ -52,10 +68,27 @@ public class MapDictionaryCache<K, V> implements DictionaryCache<K, V> {
* @return 全部字段数据列表。
*/
@Override
public synchronized List<V> getAll() {
public List<V> getAll() {
List<V> resultList = new LinkedList<>();
for (Map.Entry<K, V> entry : dataMap.entrySet()) {
resultList.add(entry.getValue());
String exceptionMessage;
try {
if (lock.readLock().tryLock(TIMEOUT, TimeUnit.MILLISECONDS)) {
try {
for (Map.Entry<K, V> entry : dataMap.entrySet()) {
resultList.add(entry.getValue());
}
} finally {
lock.readLock().unlock();
}
} else {
throw new TimeoutException();
}
} catch (Exception e) {
exceptionMessage = String.format(
"LOCK Operation of [MapDictionaryCache::getInList] encountered EXCEPTION [%s] for DICT.",
e.getClass().getSimpleName());
log.warn(exceptionMessage);
throw new MapCacheAccessException(exceptionMessage, e);
}
return resultList;
}
@@ -67,14 +100,31 @@ public class MapDictionaryCache<K, V> implements DictionaryCache<K, V> {
* @return 对象列表。
*/
@Override
public synchronized List<V> getInList(Set<K> keys) {
public List<V> getInList(Set<K> keys) {
List<V> resultList = new LinkedList<>();
keys.forEach(key -> {
V object = dataMap.get(key);
if (object != null) {
resultList.add(object);
String exceptionMessage;
try {
if (lock.readLock().tryLock(TIMEOUT, TimeUnit.MILLISECONDS)) {
try {
keys.forEach(key -> {
V object = dataMap.get(key);
if (object != null) {
resultList.add(object);
}
});
} finally {
lock.readLock().unlock();
}
} else {
throw new TimeoutException();
}
});
} catch (Exception e) {
exceptionMessage = String.format(
"LOCK Operation of [MapDictionaryCache::getInList] encountered EXCEPTION [%s] for DICT.",
e.getClass().getSimpleName());
log.warn(exceptionMessage);
throw new MapCacheAccessException(exceptionMessage, e);
}
return resultList;
}
@@ -84,14 +134,31 @@ public class MapDictionaryCache<K, V> implements DictionaryCache<K, V> {
* @param dataList 待缓存的数据列表。
*/
@Override
public synchronized void putAll(List<V> dataList) {
public void putAll(List<V> dataList) {
if (dataList == null) {
return;
}
dataList.forEach(dataObj -> {
K id = idGetter.apply(dataObj);
dataMap.put(id, dataObj);
});
String exceptionMessage;
try {
if (lock.readLock().tryLock(TIMEOUT, TimeUnit.MILLISECONDS)) {
try {
dataList.forEach(dataObj -> {
K id = idGetter.apply(dataObj);
dataMap.put(id, dataObj);
});
} finally {
lock.readLock().unlock();
}
} else {
throw new TimeoutException();
}
} catch (Exception e) {
exceptionMessage = String.format(
"LOCK Operation of [MapDictionaryCache::getInList] encountered EXCEPTION [%s] for DICT.",
e.getClass().getSimpleName());
log.warn(exceptionMessage);
throw new MapCacheAccessException(exceptionMessage, e);
}
}
/**
@@ -101,23 +168,65 @@ public class MapDictionaryCache<K, V> implements DictionaryCache<K, V> {
* @param force true则强制刷新如果false当缓存中存在数据时不刷新。
*/
@Override
public synchronized void reload(List<V> dataList, boolean force) {
public void reload(List<V> dataList, boolean force) {
if (!force && this.getCount() > 0) {
return;
}
this.invalidateAll();
this.putAll(dataList);
String exceptionMessage;
try {
if (lock.readLock().tryLock(TIMEOUT, TimeUnit.MILLISECONDS)) {
try {
dataMap.clear();
dataList.forEach(dataObj -> {
K id = idGetter.apply(dataObj);
dataMap.put(id, dataObj);
});
} finally {
lock.readLock().unlock();
}
} else {
throw new TimeoutException();
}
} catch (Exception e) {
exceptionMessage = String.format(
"LOCK Operation of [MapDictionaryCache::getInList] encountered EXCEPTION [%s] for DICT.",
e.getClass().getSimpleName());
log.warn(exceptionMessage);
throw new MapCacheAccessException(exceptionMessage, e);
}
}
/**
* 从缓存中获取指定的数据。
*
* @param 数据的key。
* @param id 数据的key。
* @return 获取到的数据如果没有返回null。
*/
@Override
public synchronized V get(K id) {
return id == null ? null : dataMap.get(id);
public V get(K id) {
if (id == null) {
return null;
}
V data;
String exceptionMessage;
try {
if (lock.readLock().tryLock(TIMEOUT, TimeUnit.MILLISECONDS)) {
try {
data = dataMap.get(id);
} finally {
lock.readLock().unlock();
}
} else {
throw new TimeoutException();
}
} catch (Exception e) {
exceptionMessage = String.format(
"LOCK Operation of [MapDictionaryCache::getInList] encountered EXCEPTION [%s] for DICT.",
e.getClass().getSimpleName());
log.warn(exceptionMessage);
throw new MapCacheAccessException(exceptionMessage, e);
}
return data;
}
/**
@@ -127,8 +236,25 @@ public class MapDictionaryCache<K, V> implements DictionaryCache<K, V> {
* @param object 字典数据对象。
*/
@Override
public synchronized void put(K id, V object) {
dataMap.put(id, object);
public void put(K id, V object) {
String exceptionMessage;
try {
if (lock.readLock().tryLock(TIMEOUT, TimeUnit.MILLISECONDS)) {
try {
dataMap.put(id, object);
} finally {
lock.readLock().unlock();
}
} else {
throw new TimeoutException();
}
} catch (Exception e) {
exceptionMessage = String.format(
"LOCK Operation of [MapDictionaryCache::getInList] encountered EXCEPTION [%s] for DICT.",
e.getClass().getSimpleName());
log.warn(exceptionMessage);
throw new MapCacheAccessException(exceptionMessage, e);
}
}
/**
@@ -137,7 +263,7 @@ public class MapDictionaryCache<K, V> implements DictionaryCache<K, V> {
* @return 返回缓存的数据数量。
*/
@Override
public synchronized int getCount() {
public int getCount() {
return dataMap.size();
}
@@ -148,8 +274,30 @@ public class MapDictionaryCache<K, V> implements DictionaryCache<K, V> {
* @return 返回被删除的对象如果主键不存在返回null。
*/
@Override
public synchronized V invalidate(K id) {
return id == null ? null : dataMap.remove(id);
public V invalidate(K id) {
if (id == null) {
return null;
}
String exceptionMessage;
V data;
try {
if (lock.readLock().tryLock(TIMEOUT, TimeUnit.MILLISECONDS)) {
try {
data = dataMap.remove(id);
} finally {
lock.readLock().unlock();
}
} else {
throw new TimeoutException();
}
} catch (Exception e) {
exceptionMessage = String.format(
"LOCK Operation of [MapDictionaryCache::getInList] encountered EXCEPTION [%s] for DICT.",
e.getClass().getSimpleName());
log.warn(exceptionMessage);
throw new MapCacheAccessException(exceptionMessage, e);
}
return data;
}
/**
@@ -158,19 +306,53 @@ public class MapDictionaryCache<K, V> implements DictionaryCache<K, V> {
* @param keys 待删除数据的主键集合。
*/
@Override
public synchronized void invalidateSet(Set<K> keys) {
keys.forEach(id -> {
if (id != null) {
dataMap.remove(id);
public void invalidateSet(Set<K> keys) {
String exceptionMessage;
try {
if (lock.readLock().tryLock(TIMEOUT, TimeUnit.MILLISECONDS)) {
try {
keys.forEach(id -> {
if (id != null) {
dataMap.remove(id);
}
});
} finally {
lock.readLock().unlock();
}
} else {
throw new TimeoutException();
}
});
} catch (Exception e) {
exceptionMessage = String.format(
"LOCK Operation of [MapDictionaryCache::getInList] encountered EXCEPTION [%s] for DICT.",
e.getClass().getSimpleName());
log.warn(exceptionMessage);
throw new MapCacheAccessException(exceptionMessage, e);
}
}
/**
* 清空缓存。
*/
@Override
public synchronized void invalidateAll() {
dataMap.clear();
public void invalidateAll() {
String exceptionMessage;
try {
if (lock.readLock().tryLock(TIMEOUT, TimeUnit.MILLISECONDS)) {
try {
dataMap.clear();
} finally {
lock.readLock().unlock();
}
} else {
throw new TimeoutException();
}
} catch (Exception e) {
exceptionMessage = String.format(
"LOCK Operation of [MapDictionaryCache::getInList] encountered EXCEPTION [%s] for DICT.",
e.getClass().getSimpleName());
log.warn(exceptionMessage);
throw new MapCacheAccessException(exceptionMessage, e);
}
}
}

View File

@@ -1,9 +1,13 @@
package com.orange.demo.common.core.cache;
import com.orange.demo.common.core.exception.MapCacheAccessException;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimap;
import lombok.extern.slf4j.Slf4j;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.function.Function;
/**
@@ -14,6 +18,7 @@ import java.util.function.Function;
* @author Jerry
* @date 2020-08-08
*/
@Slf4j
public class MapTreeDictionaryCache<K, V> extends MapDictionaryCache<K, V> {
/**
@@ -61,8 +66,27 @@ public class MapTreeDictionaryCache<K, V> extends MapDictionaryCache<K, V> {
* @param parentId 父主键Id。
* @return 子数据列表。
*/
public synchronized List<V> getListByParentId(K parentId) {
return new LinkedList<>(allTreeMap.get(parentId));
public List<V> getListByParentId(K parentId) {
List<V> resultList = new LinkedList<>();
String exceptionMessage;
try {
if (lock.readLock().tryLock(TIMEOUT, TimeUnit.MILLISECONDS)) {
try {
resultList.addAll(allTreeMap.get(parentId));
} finally {
lock.readLock().unlock();
}
} else {
throw new TimeoutException();
}
} catch (Exception e) {
exceptionMessage = String.format(
"LOCK Operation of [MapDictionaryCache::getInList] encountered EXCEPTION [%s] for DICT.",
e.getClass().getSimpleName());
log.warn(exceptionMessage);
throw new MapCacheAccessException(exceptionMessage, e);
}
return resultList;
}
/**
@@ -71,16 +95,33 @@ public class MapTreeDictionaryCache<K, V> extends MapDictionaryCache<K, V> {
* @param dataList 待缓存的数据列表。
*/
@Override
public synchronized void putAll(List<V> dataList) {
public void putAll(List<V> dataList) {
if (dataList == null) {
return;
}
super.putAll(dataList);
dataList.forEach(data -> {
K parentId = parentIdGetter.apply(data);
allTreeMap.remove(parentId, data);
allTreeMap.put(parentId, data);
});
String exceptionMessage;
try {
if (lock.readLock().tryLock(TIMEOUT, TimeUnit.MILLISECONDS)) {
try {
super.putAll(dataList);
dataList.forEach(data -> {
K parentId = parentIdGetter.apply(data);
allTreeMap.remove(parentId, data);
allTreeMap.put(parentId, data);
});
} finally {
lock.readLock().unlock();
}
} else {
throw new TimeoutException();
}
} catch (Exception e) {
exceptionMessage = String.format(
"LOCK Operation of [MapDictionaryCache::getInList] encountered EXCEPTION [%s] for DICT.",
e.getClass().getSimpleName());
log.warn(exceptionMessage);
throw new MapCacheAccessException(exceptionMessage, e);
}
}
/**
@@ -90,11 +131,28 @@ public class MapTreeDictionaryCache<K, V> extends MapDictionaryCache<K, V> {
* @param data 字典数据对象。
*/
@Override
public synchronized void put(K id, V data) {
super.put(id, data);
K parentId = parentIdGetter.apply(data);
allTreeMap.remove(parentId, data);
allTreeMap.put(parentId, data);
public void put(K id, V data) {
String exceptionMessage;
try {
if (lock.readLock().tryLock(TIMEOUT, TimeUnit.MILLISECONDS)) {
try {
super.put(id, data);
K parentId = parentIdGetter.apply(data);
allTreeMap.remove(parentId, data);
allTreeMap.put(parentId, data);
} finally {
lock.readLock().unlock();
}
} else {
throw new TimeoutException();
}
} catch (Exception e) {
exceptionMessage = String.format(
"LOCK Operation of [MapDictionaryCache::getInList] encountered EXCEPTION [%s] for DICT.",
e.getClass().getSimpleName());
log.warn(exceptionMessage);
throw new MapCacheAccessException(exceptionMessage, e);
}
}
/**
@@ -104,11 +162,29 @@ public class MapTreeDictionaryCache<K, V> extends MapDictionaryCache<K, V> {
* @return 返回被删除的对象如果主键不存在返回null。
*/
@Override
public synchronized V invalidate(K id) {
V v = super.invalidate(id);
if (v != null) {
K parentId = parentIdGetter.apply(v);
allTreeMap.remove(parentId, v);
public V invalidate(K id) {
V v;
String exceptionMessage;
try {
if (lock.readLock().tryLock(TIMEOUT, TimeUnit.MILLISECONDS)) {
try {
v = super.invalidate(id);
if (v != null) {
K parentId = parentIdGetter.apply(v);
allTreeMap.remove(parentId, v);
}
} finally {
lock.readLock().unlock();
}
} else {
throw new TimeoutException();
}
} catch (Exception e) {
exceptionMessage = String.format(
"LOCK Operation of [MapDictionaryCache::getInList] encountered EXCEPTION [%s] for DICT.",
e.getClass().getSimpleName());
log.warn(exceptionMessage);
throw new MapCacheAccessException(exceptionMessage, e);
}
return v;
}
@@ -119,24 +195,58 @@ public class MapTreeDictionaryCache<K, V> extends MapDictionaryCache<K, V> {
* @param keys 待删除数据的主键集合。
*/
@Override
public synchronized void invalidateSet(Set<K> keys) {
keys.forEach(id -> {
if (id != null) {
V data = dataMap.remove(id);
if (data != null) {
K parentId = parentIdGetter.apply(data);
allTreeMap.remove(parentId, data);
public void invalidateSet(Set<K> keys) {
String exceptionMessage;
try {
if (lock.readLock().tryLock(TIMEOUT, TimeUnit.MILLISECONDS)) {
try {
keys.forEach(id -> {
if (id != null) {
V data = dataMap.remove(id);
if (data != null) {
K parentId = parentIdGetter.apply(data);
allTreeMap.remove(parentId, data);
}
}
});
} finally {
lock.readLock().unlock();
}
} else {
throw new TimeoutException();
}
});
} catch (Exception e) {
exceptionMessage = String.format(
"LOCK Operation of [MapDictionaryCache::getInList] encountered EXCEPTION [%s] for DICT.",
e.getClass().getSimpleName());
log.warn(exceptionMessage);
throw new MapCacheAccessException(exceptionMessage, e);
}
}
/**
* 清空缓存。
*/
@Override
public synchronized void invalidateAll() {
super.invalidateAll();
allTreeMap.clear();
public void invalidateAll() {
String exceptionMessage;
try {
if (lock.readLock().tryLock(TIMEOUT, TimeUnit.MILLISECONDS)) {
try {
super.invalidateAll();
allTreeMap.clear();
} finally {
lock.readLock().unlock();
}
} else {
throw new TimeoutException();
}
} catch (Exception e) {
exceptionMessage = String.format(
"LOCK Operation of [MapDictionaryCache::getInList] encountered EXCEPTION [%s] for DICT.",
e.getClass().getSimpleName());
log.warn(exceptionMessage);
throw new MapCacheAccessException(exceptionMessage, e);
}
}
}

View File

@@ -8,6 +8,10 @@ package com.orange.demo.common.core.constant;
*/
public final class ApplicationConstant {
/**
* 为字典表数据缓存时,缓存名称的固定后缀。
*/
public static final String DICT_CACHE_NAME_SUFFIX = "-DICT";
/**
* 图片文件上传的父目录。
*/

View File

@@ -37,7 +37,7 @@ public enum ErrorCodeEnum {
INVALID_USER_STATUS("用户状态错误,请刷新后重试!"),
HAS_CHILDREN_DATA("数据验证失败,子数据存在,请刷新后重试!"),
DATA_VALIDATAED_FAILED("数据验证失败,请核对!"),
DATA_VALIDATED_FAILED("数据验证失败,请核对!"),
UPLOAD_FILE_FAILED("文件上传失败,请联系管理员!"),
DATA_SAVE_FAILED("数据保存失败,请联系管理员!"),
DATA_ACCESS_FAILED("数据访问失败,请联系管理员!"),

View File

@@ -0,0 +1,20 @@
package com.orange.demo.common.core.exception;
/**
* 内存缓存访问失败。比如:获取分布式数据锁超时、等待线程中断等。
*
* @author Jerry
* @date 2020-08-08
*/
public class MapCacheAccessException extends RuntimeException {
/**
* 构造函数。
*
* @param msg 错误信息。
* @param cause 原始异常。
*/
public MapCacheAccessException(String msg, Throwable cause) {
super(msg, cause);
}
}

View File

@@ -20,6 +20,7 @@ import org.springframework.web.method.support.ModelAndViewContainer;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.lang.reflect.ParameterizedType;
import java.math.BigDecimal;
import java.util.*;
/**
@@ -45,6 +46,7 @@ public class MyRequestArgumentResolver implements HandlerMethodArgumentResolver
classSet.add(Double.class);
classSet.add(Boolean.class);
classSet.add(Byte.class);
classSet.add(BigDecimal.class);
classSet.add(Character.class);
}
@@ -100,7 +102,7 @@ public class MyRequestArgumentResolver implements HandlerMethodArgumentResolver
}
// 获取参数类型。
Class<?> parameterType = parameter.getParameterType();
//基本类型
// 基本类型
if (parameterType.isPrimitive()) {
return parsePrimitive(parameterType.getName(), value);
}
@@ -196,6 +198,12 @@ public class MyRequestArgumentResolver implements HandlerMethodArgumentResolver
return number.doubleValue();
} else if (parameterType == Byte.class) {
return number.byteValue();
} else if (parameterType == BigDecimal.class) {
if (value instanceof Double || value instanceof Float) {
return BigDecimal.valueOf(number.doubleValue());
} else {
return BigDecimal.valueOf(number.longValue());
}
}
} else if (parameterType == Boolean.class) {
return value.toString();

View File

@@ -76,6 +76,9 @@ public class MyGroupParam extends ArrayList<MyGroupParam.GroupInfo> {
private static GroupBaseData parseGroupBaseData(GroupInfo groupInfo, Class<?> modelClazz) {
GroupBaseData baseData = new GroupBaseData();
if (StringUtils.isBlank(groupInfo.fieldName)) {
throw new IllegalArgumentException("GroupInfo.fieldName can't be EMPTY");
}
String[] stringArray = StringUtils.split(groupInfo.fieldName,'.');
if (stringArray.length == 1) {
baseData.modelName = modelClazz.getSimpleName();

View File

@@ -110,11 +110,11 @@ public class LocalUpDownloader extends BaseUpDownloader {
try {
byte[] bytes = uploadFile.getBytes();
Path path = Paths.get(uploadPath + responseInfo.getFilename());
//如果没有files文件夹则创建
// 如果没有files文件夹则创建
if (!Files.isWritable(path)) {
Files.createDirectories(Paths.get(uploadPath));
}
//文件写入指定路径
// 文件写入指定路径
Files.write(path, bytes);
} catch (IOException e) {
log.error("Failed to write uploaded file [" + uploadFile.getOriginalFilename() + " ].", e);

View File

@@ -6,6 +6,9 @@ import org.springframework.context.ApplicationContextAware;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Component;
import java.util.Collection;
import java.util.Map;
/**
* Spring 系统启动应用感知对象主要用于获取Spring Bean的上下文对象后续的代码中可以直接查找系统中加载的Bean对象。
*
@@ -62,6 +65,19 @@ public class ApplicationContextHolder implements ApplicationContextAware {
return applicationContext.getBean(beanType);
}
/**
* 根据Bean的ClassType获取Bean对象列表。
*
* @param beanType Bean的Class类型。。
* @param <T> 返回的Bean类型。
* @return Bean对象列表。
*/
public static <T> Collection<T> getBeanListOfType(Class<T> beanType) {
assertApplicationContext();
Map<String, T> beanMap = applicationContext.getBeansOfType(beanType);
return beanMap == null ? null : beanMap.values();
}
private static void assertApplicationContext() {
if (ApplicationContextHolder.applicationContext == null) {
throw new MyRuntimeException("applicaitonContext属性为null,请检查是否注入了ApplicationContextHolder!");

View File

@@ -32,29 +32,29 @@ public class IpUtil {
*/
public static String getRemoteIpAddress(HttpServletRequest request) {
String ip = null;
//X-Forwarded-ForSquid 服务代理
// X-Forwarded-ForSquid 服务代理
String ipAddresses = request.getHeader("X-Forwarded-For");
if (StringUtils.isBlank(ipAddresses) || UNKNOWN.equalsIgnoreCase(ipAddresses)) {
//Proxy-Client-IPapache 服务代理
// Proxy-Client-IPapache 服务代理
ipAddresses = request.getHeader("Proxy-Client-IP");
}
if (StringUtils.isBlank(ipAddresses) || UNKNOWN.equalsIgnoreCase(ipAddresses)) {
//WL-Proxy-Client-IPweblogic 服务代理
// WL-Proxy-Client-IPweblogic 服务代理
ipAddresses = request.getHeader("WL-Proxy-Client-IP");
}
if (StringUtils.isBlank(ipAddresses) || UNKNOWN.equalsIgnoreCase(ipAddresses)) {
//HTTP_CLIENT_IP有些代理服务器
// HTTP_CLIENT_IP有些代理服务器
ipAddresses = request.getHeader("HTTP_CLIENT_IP");
}
if (StringUtils.isBlank(ipAddresses) || UNKNOWN.equalsIgnoreCase(ipAddresses)) {
//X-Real-IPnginx服务代理
// X-Real-IPnginx服务代理
ipAddresses = request.getHeader("X-Real-IP");
}
//有些网络通过多层代理那么获取到的ip就会有多个一般都是通过逗号,分割开来并且第一个ip为客户端的真实IP
// 有些网络通过多层代理那么获取到的ip就会有多个一般都是通过逗号,分割开来并且第一个ip为客户端的真实IP
if (StringUtils.isNotBlank(ipAddresses)) {
ip = ipAddresses.split(",")[0];
}
//还是不能获取到最后再通过request.getRemoteAddr();获取
// 还是不能获取到最后再通过request.getRemoteAddr();获取
if (StringUtils.isBlank(ipAddresses) || UNKNOWN.equalsIgnoreCase(ipAddresses)) {
ip = request.getRemoteAddr();
}
@@ -69,29 +69,29 @@ public class IpUtil {
*/
public static String getRemoteIpAddress(ServerHttpRequest request) {
String ip = null;
//X-Forwarded-ForSquid 服务代理
// X-Forwarded-ForSquid 服务代理
String ipAddresses = request.getHeaders().getFirst("X-Forwarded-For");
if (StringUtils.isBlank(ipAddresses) || UNKNOWN.equalsIgnoreCase(ipAddresses)) {
//Proxy-Client-IPapache 服务代理
// Proxy-Client-IPapache 服务代理
ipAddresses = request.getHeaders().getFirst("Proxy-Client-IP");
}
if (StringUtils.isBlank(ipAddresses) || UNKNOWN.equalsIgnoreCase(ipAddresses)) {
//WL-Proxy-Client-IPweblogic 服务代理
// WL-Proxy-Client-IPweblogic 服务代理
ipAddresses = request.getHeaders().getFirst("WL-Proxy-Client-IP");
}
if (StringUtils.isBlank(ipAddresses) || UNKNOWN.equalsIgnoreCase(ipAddresses)) {
//HTTP_CLIENT_IP有些代理服务器
// HTTP_CLIENT_IP有些代理服务器
ipAddresses = request.getHeaders().getFirst("HTTP_CLIENT_IP");
}
if (StringUtils.isBlank(ipAddresses) || UNKNOWN.equalsIgnoreCase(ipAddresses)) {
//X-Real-IPnginx服务代理
// X-Real-IPnginx服务代理
ipAddresses = request.getHeaders().getFirst("X-Real-IP");
}
//有些网络通过多层代理那么获取到的ip就会有多个一般都是通过逗号,分割开来并且第一个ip为客户端的真实IP
// 有些网络通过多层代理那么获取到的ip就会有多个一般都是通过逗号,分割开来并且第一个ip为客户端的真实IP
if (StringUtils.isNotBlank(ipAddresses)) {
ip = ipAddresses.split(",")[0];
}
//还是不能获取到最后再通过request.getRemoteAddr();获取
// 还是不能获取到最后再通过request.getRemoteAddr();获取
if (StringUtils.isBlank(ipAddresses) || UNKNOWN.equalsIgnoreCase(ipAddresses)) {
ip = request.getRemoteAddress().getAddress().getHostAddress();
}

View File

@@ -46,9 +46,9 @@ public class RsaUtil {
// 得到私钥字符串
String privateKeyString = Base64.getEncoder().encodeToString(privateKey.getEncoded());
// 将公钥和私钥保存到Map
//0表示公钥
// 0表示公钥
keyMap.put(0, publicKeyString);
//1表示私钥
// 1表示私钥
keyMap.put(1, privateKeyString);
}
@@ -61,11 +61,11 @@ public class RsaUtil {
* @throws Exception 加密过程中的异常信息
*/
public static String encrypt(String str, String publicKey) throws Exception {
//base64编码的公钥
// base64编码的公钥
byte[] decoded = Base64.getDecoder().decode(publicKey);
RSAPublicKey pubKey = (RSAPublicKey) KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(decoded));
//RSA加密。后面这个更安全但是SonarQube始终report安全漏洞。"RSA/ECB/PKCS1Padding"
//而浏览器自带的Javascript加密功能目前safari不支持而且用的人也不太多。所以暂时都不考虑了。
// RSA加密。后面这个更安全但是SonarQube始终report安全漏洞。"RSA/ECB/PKCS1Padding"
// 而浏览器自带的Javascript加密功能目前safari不支持而且用的人也不太多。所以暂时都不考虑了。
Cipher cipher = Cipher.getInstance("RSA");
cipher.init(Cipher.ENCRYPT_MODE, pubKey);
return Base64.getEncoder().encodeToString(cipher.doFinal(str.getBytes(StandardCharsets.UTF_8)));
@@ -80,12 +80,12 @@ public class RsaUtil {
* @throws Exception 解密过程中的异常信息
*/
public static String decrypt(String str, String privateKey) throws Exception {
//64位解码加密后的字符串
// 64位解码加密后的字符串
byte[] inputByte = Base64.getDecoder().decode(str);
//base64编码的私钥
// base64编码的私钥
byte[] decoded = Base64.getDecoder().decode(privateKey);
RSAPrivateKey priKey = (RSAPrivateKey) KeyFactory.getInstance("RSA").generatePrivate(new PKCS8EncodedKeySpec(decoded));
//RSA解密
// RSA解密
Cipher cipher = Cipher.getInstance("RSA");
cipher.init(Cipher.DECRYPT_MODE, priKey);
return new String(cipher.doFinal(inputByte));
@@ -93,9 +93,9 @@ public class RsaUtil {
public static void main(String[] args) throws Exception {
long temp = System.currentTimeMillis();
//生成公钥和私钥
// 生成公钥和私钥
genKeyPair();
//加密字符串
// 加密字符串
System.out.println("公钥:" + keyMap.get(0));
System.out.println("私钥:" + keyMap.get(1));
System.out.println("生成密钥消耗时间:" + (System.currentTimeMillis() - temp) / 1000.0 + "");

View File

@@ -1,222 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: io.minio:minio:7.0.2" level="project" />
<orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.7.1" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
<orderEntry type="library" name="Maven: xpp3:xpp3:1.1.3.3" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.12.0" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.10.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.2" level="project" />
<orderEntry type="library" name="Maven: com.github.spotbugs:spotbugs-annotations:4.0.0" level="project" />
<orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="module" module-name="common-core" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.10.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.31" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.31" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.31" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.10.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-csv:1.8" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.4.5" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.74" level="project" />
<orderEntry type="library" name="Maven: com.github.ben-manes.caffeine:caffeine:2.8.1" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.1.0" level="project" />
<orderEntry type="library" name="Maven: cn.jimmyshi:bean-query:1.1.5" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-all:1.3" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
<orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.19" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.1.5" level="project" />
<orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.13" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.1" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.1" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.13" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.11" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:2.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
<orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.29" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.12.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.12.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.12.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-jul:2.12.1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.2.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.2" level="project" />
<orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.11" level="project" />
<orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
<orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-starter-client:2.2.3" level="project" />
<orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-client:2.2.3" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.6" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.2.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.2.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.2.1" level="project" />
<orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.59" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.7.4" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.7.4" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.7.4" level="project" />
<orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
<orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:10.7.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
<orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.18" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.10.2" level="project" />
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.18" level="project" />
<orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.18" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
<orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.mapstruct:mapstruct-processor:1.3.1.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:4.3.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.curator:curator-framework:4.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.curator:curator-client:4.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.5.3-beta" level="project" />
<orderEntry type="library" name="Maven: commons-cli:commons-cli:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.4.0" level="project" />
<orderEntry type="library" name="Maven: com.github.luben:zstd-jni:1.4.3-1" level="project" />
<orderEntry type="library" name="Maven: org.lz4:lz4-java:1.6.0" level="project" />
<orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.7.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.12.10" level="project" />
<orderEntry type="library" name="Maven: com.lmax:disruptor:3.4.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.5.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.2.5.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.5.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.vintage:junit-vintage-engine:5.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.10.8" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.8" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.4.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.2.4.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
</component>
</module>

View File

@@ -1,29 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>common</artifactId>
<groupId>com.orange.demo</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-minio</artifactId>
<version>1.0.0</version>
<name>common-minio</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
<version>${minio.version}</version>
</dependency>
<dependency>
<groupId>com.orange.demo</groupId>
<artifactId>common-core</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>
</project>

View File

@@ -1,48 +0,0 @@
package com.orange.demo.common.minio.config;
import com.orange.demo.common.minio.wrapper.MinioTemplate;
import io.minio.MinioClient;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
/**
* common-minio模块的自动配置引导类。仅当配置项minio.enabled为true的时候加载。
*
* @author Jerry
* @date 2020-08-08
*/
@EnableConfigurationProperties(MinioProperties.class)
@ConditionalOnProperty(prefix = "minio", name = "enabled")
public class MinioAutoConfiguration {
/**
* 将minio原生的客户端类封装成bean对象便于集成同时也可以灵活使用客户端的所有功能。
*
* @param p 属性配置对象。
* @return minio的原生客户端对象。
*/
@Bean
@ConditionalOnMissingBean
public MinioClient minioClient(MinioProperties p) throws Exception {
MinioClient client = new MinioClient(p.getEndpoint(), p.getAccessKey(), p.getSecretKey());
if (!client.bucketExists(p.getBucketName())) {
client.makeBucket(p.getBucketName());
}
return client;
}
/**
* 封装的minio模板类。
*
* @param p 属性配置对象。
* @param c minio的原生客户端bean对象。
* @return minio模板的bean对象。
*/
@Bean
@ConditionalOnMissingBean
public MinioTemplate minioTemplate(MinioProperties p, MinioClient c) {
return new MinioTemplate(p, c);
}
}

View File

@@ -1,32 +0,0 @@
package com.orange.demo.common.minio.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* common-minio模块的配置类。
*
* @author Jerry
* @date 2020-08-08
*/
@Data
@ConfigurationProperties(prefix = "minio")
public class MinioProperties {
/**
* 访问入口地址。
*/
private String endpoint;
/**
* 访问安全的key。
*/
private String accessKey;
/**
* 访问安全的密钥。
*/
private String secretKey;
/**
* 缺省桶名称。
*/
private String bucketName;
}

View File

@@ -1,100 +0,0 @@
package com.orange.demo.common.minio.util;
import cn.hutool.core.io.IoUtil;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.upload.UpDownloaderFactory;
import com.orange.demo.common.core.upload.UploadResponseInfo;
import com.orange.demo.common.core.upload.BaseUpDownloader;
import com.orange.demo.common.core.upload.UploadStoreTypeEnum;
import com.orange.demo.common.minio.wrapper.MinioTemplate;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.Objects;
/**
* 基于Minio上传和下载文件操作的工具类。
*
* @author Jerry
* @date 2020-08-08
*/
@Slf4j
@Component
@ConditionalOnProperty(prefix = "minio", name = "enabled")
public class MinioUpDownloader extends BaseUpDownloader {
@Autowired
private MinioTemplate minioTemplate;
@Autowired
private UpDownloaderFactory factory;
@PostConstruct
public void doRegister() {
factory.registerUpDownloader(UploadStoreTypeEnum.MINIO_SYSTEM, this);
}
/**
* 执行文件上传操作将文件数据存入Minio。
*
* @param serviceContextPath 微服务的上下文路径,如: /admin/upms。
* @param rootBaseDir 存放上传文件的根目录。(minio中忽略该值因为使用了bucket)
* @param modelName 所在数据表的实体对象名。
* @param fieldName 关联字段的实体对象属性名。
* @param uploadFile Http请求中上传的文件对象。
* @param asImage 是否为图片对象。图片是无需权限验证的,因此和附件存放在不同的子目录。
* @return 上传应答信息对象。该对象始终不为null。
* @throws Exception minio抛出的异常。
*/
@Override
public UploadResponseInfo doUpload(
String serviceContextPath,
String rootBaseDir,
String modelName,
String fieldName,
Boolean asImage,
MultipartFile uploadFile) throws Exception {
UploadResponseInfo responseInfo = new UploadResponseInfo();
if (Objects.isNull(uploadFile) || uploadFile.isEmpty()) {
responseInfo.setUploadFailed(true);
responseInfo.setErrorMessage(ErrorCodeEnum.INVALID_UPLOAD_FILE_ARGUMENT.getErrorMessage());
return responseInfo;
}
String uploadPath = super.makeFullPath(null, modelName, fieldName, asImage);
super.fillUploadResponseInfo(responseInfo, serviceContextPath, uploadFile.getOriginalFilename());
minioTemplate.putObject(uploadPath + "/" + responseInfo.getFilename(), uploadFile.getInputStream());
return responseInfo;
}
/**
* 执行下载操作从Minio读取数据。并将读取的文件数据直接写入到HttpServletResponse应答对象。
*
* @param rootBaseDir 文件下载的根目录。(minio中忽略该值因为使用了bucket)
* @param modelName 所在数据表的实体对象名。
* @param fieldName 关联字段的实体对象属性名。
* @param fileName 文件名。
* @param asImage 是否为图片对象。图片是无需权限验证的,因此和附件存放在不同的子目录。
* @param response Http 应答对象。
*/
@Override
public void doDownload(
String rootBaseDir,
String modelName,
String fieldName,
String fileName,
Boolean asImage,
HttpServletResponse response) throws Exception {
String uploadPath = this.makeFullPath(null, modelName, fieldName, asImage);
String fullFileanme = uploadPath + "/" + fileName;
response.setHeader("content-type", "application/octet-stream");
response.setContentType("application/octet-stream");
response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
InputStream in = minioTemplate.getStream(fullFileanme);
IoUtil.copy(in, response.getOutputStream());
}
}

View File

@@ -1,209 +0,0 @@
package com.orange.demo.common.minio.wrapper;
import com.orange.demo.common.minio.config.MinioProperties;
import io.minio.MinioClient;
import io.minio.ObjectStat;
import io.minio.PutObjectOptions;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.InputStream;
/**
* 封装的minio客户端模板类。
*
* @author Jerry
* @date 2020-08-08
*/
@Slf4j
public class MinioTemplate {
private static final String TMP_DIR = System.getProperty("java.io.tmpdir") + File.separator;
private final MinioProperties properties;
private final MinioClient client;
public MinioTemplate(MinioProperties properties, MinioClient client) {
super();
this.properties = properties;
this.client = client;
}
/**
* 判断bucket是否存在。
*
* @param bucketName 桶名称。
* @return 存在返回true否则false。
*/
public boolean bucketExists(String bucketName) {
try {
return client.bucketExists(bucketName);
} catch (Exception e) {
log.error("", e);
}
return false;
}
/**
* 创建桶。
*
* @param bucketName 桶名称。
*/
public void makeBucket(String bucketName) throws Exception {
if (!client.bucketExists(bucketName)) {
client.makeBucket(bucketName);
}
}
/**
* 存放对象。
*
* @param bucketName 桶名称。
* @param objectName 对象名称。
* @param filename 本地上传的文件名称。
*/
public void putObject(String bucketName, String objectName, String filename) throws Exception {
client.putObject(bucketName, objectName, filename, new PutObjectOptions(-1, -1));
}
/**
* 存放对象。桶名称为配置中的桶名称。
*
* @param objectName 对象名称。
* @param filename 本地上传的文件名称。
*/
public void putObject(String objectName, String filename) throws Exception {
this.putObject(properties.getBucketName(), objectName, filename);
}
/**
* 读取输入流并存放。
*
* @param bucketName 桶名称。
* @param objectName 对象名称。
* @param stream 读取后上传的文件流。
*/
public void putObject(String bucketName, String objectName, InputStream stream) throws Exception {
client.putObject(bucketName, objectName, stream, new PutObjectOptions(stream.available(), -1));
}
/**
* 读取输入流并存放。
*
* @param objectName 对象名称。
* @param stream 读取后上传的文件流。
*/
public void putObject(String objectName, InputStream stream) throws Exception {
this.putObject(properties.getBucketName(), objectName, stream);
}
/**
* 移除对象。
*
* @param bucketName 桶名称。
* @param objectName 对象名称。
*/
public void removeObject(String bucketName, String objectName) throws Exception {
client.removeObject(bucketName, objectName);
}
/**
* 移除对象。桶名称为配置中的桶名称。
*
* @param objectName 对象名称。
*/
public void removeObject(String objectName) throws Exception {
this.removeObject(properties.getBucketName(), objectName);
}
/**
* 获取文件输入流。
*
* @param bucket 桶名称。
* @param objectName 对象名称。
* @return 文件的输入流。
*/
public InputStream getStream(String bucket, String objectName) throws Exception {
return client.getObject(bucket, objectName);
}
/**
* 获取文件输入流。
*
* @param objectName 对象名称。
* @return 文件的输入流。
*/
public InputStream getStream(String objectName) throws Exception {
return this.getStream(properties.getBucketName(), objectName);
}
/**
* 获取存储的文件对象。
*
* @param bucket 桶名称。
* @param objectName 对象名称。
* @return 读取后存储到文件的文件对象。
*/
public File getFile(String bucket, String objectName) throws Exception {
InputStream in = getStream(bucket, objectName);
File dir = new File(TMP_DIR);
if (!dir.exists() || dir.isFile()) {
dir.mkdirs();
}
File file = new File(TMP_DIR + objectName);
FileUtils.copyInputStreamToFile(in, file);
return file;
}
/**
* 获取存储的文件对象。桶名称为配置中的桶名称。
*
* @param objectName 对象名称。
* @return 读取后存储到文件的文件对象。
*/
public File getFile(String objectName) throws Exception {
return this.getFile(properties.getBucketName(), objectName);
}
/**
* 获取指定文件的URL。
*
* @param bucketName 桶名称。
* @param objectName 对象名称。
* @return 指定文件的URL。
*/
public String getObjectUrl(String bucketName, String objectName) throws Exception {
return client.getObjectUrl(bucketName, objectName);
}
/**
* 获取指定文件的URL。桶名称为配置中的桶名称。
*
* @param objectName 对象名称。
* @return 指定文件的URL。
*/
public String getObjectUrl(String objectName) throws Exception {
return this.getObjectUrl(properties.getBucketName(), objectName);
}
/**
* 获取对象状态信息。
*
* @param bucketName 桶名称。
* @param objectName 对象名称。
* @return 对象状态和meta信息。
*/
public ObjectStat statObject(String bucketName, String objectName) throws Exception {
return client.statObject(bucketName, objectName, null);
}
/**
* 获取对象状态信息。桶名称为配置中的桶名称。
*
* @param objectName 对象名称。
* @return 对象状态和meta信息。
*/
public ObjectStat statObject(String objectName) throws Exception {
return client.statObject(properties.getBucketName(), objectName, null);
}
}

View File

@@ -1,2 +0,0 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.orange.demo.common.minio.config.MinioAutoConfiguration

View File

@@ -2,16 +2,18 @@ package com.orange.demo.common.redis.cache;
import com.alibaba.fastjson.JSON;
import com.orange.demo.common.core.cache.DictionaryCache;
import com.orange.demo.common.core.constant.ApplicationConstant;
import com.orange.demo.common.core.exception.RedisCacheAccessException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.redisson.api.RMap;
import org.redisson.api.RReadWriteLock;
import org.redisson.api.RedissonClient;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -41,7 +43,7 @@ public class RedisDictionaryCache<K, V> implements DictionaryCache<K, V> {
/**
* 由于大部分场景是读取操作,所以使用读写锁提高并发的伸缩性。
*/
protected RReadWriteLock lock;
protected ReadWriteLock lock;
/**
* 超时时长。单位毫秒。
*/
@@ -87,8 +89,8 @@ public class RedisDictionaryCache<K, V> implements DictionaryCache<K, V> {
Class<V> valueClazz,
Function<V, K> idGetter) {
this.redissonClient = redissonClient;
this.dataMap = redissonClient.getMap(dictionaryName + "-DICT");
this.lock = redissonClient.getReadWriteLock(dictionaryName + "-DICT-LOCK");
this.dataMap = redissonClient.getMap(dictionaryName + ApplicationConstant.DICT_CACHE_NAME_SUFFIX);
this.lock = new ReentrantReadWriteLock();
this.valueClazz = valueClazz;
this.idGetter = idGetter;
}

View File

@@ -40,7 +40,7 @@ public class JedisConfig {
@Bean
public JedisPool getJedisPool() {
//Jedis配置信息
// Jedis配置信息
JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
jedisPoolConfig.setMaxTotal(maxTotal);
jedisPoolConfig.setMaxIdle(maxIdle);

View File

@@ -9,6 +9,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
* @date 2020-08-08
*/
@EnableConfigurationProperties({IdGeneratorProperties.class})
public class IdGeneratorAutoConfigure {
public class IdGeneratorAutoConfig {
}

View File

@@ -91,12 +91,12 @@ public class SnowflakeIdGenerator implements MyIdGenerator {
if (lastTimestamp == timestamp) {
sequence = (sequence + 1) & SEQUENCE_MASK;
if (sequence == 0) {
//seq 为0的时候表示是下一毫秒时间开始对seq做随机
// seq 为0的时候表示是下一毫秒时间开始对seq做随机
sequence = RANDOM.nextInt(100);
timestamp = tilNextMillis(lastTimestamp);
}
} else {
//如果是新的ms开始
// 如果是新的ms开始
sequence = RANDOM.nextInt(100);
}
lastTimestamp = timestamp;

View File

@@ -68,19 +68,19 @@ public class SnowflakeZookeeperHolder {
curator.start();
Stat stat = curator.checkExists().forPath(pathForever);
if (stat == null) {
//不存在根节点,机器第一次启动,创建/snowflake/ip:port-000000000,并上传数据
// 不存在根节点,机器第一次启动,创建/snowflake/ip:port-000000000,并上传数据
zkAddressNode = createNode(curator);
//worker id 默认是0
// worker id 默认是0
updateLocalWorkerId(workerId);
//定时上报本机时间给forever节点
// 定时上报本机时间给forever节点
scheduledUploadData(curator, zkAddressNode);
return true;
} else {
//ip:port->00001
// ip:port->00001
Map<String, Integer> nodeMap = Maps.newHashMap();
//ip:port->(ipport-000001)
// ip:port->(ipport-000001)
Map<String, String> realNode = Maps.newHashMap();
//存在根节点,先检查是否有属于自己的根节点
// 存在根节点,先检查是否有属于自己的根节点
List<String> keys = curator.getChildren().forPath(pathForever);
for (String key : keys) {
String[] nodeKey = key.split("-");
@@ -89,16 +89,16 @@ public class SnowflakeZookeeperHolder {
}
Integer workerid = nodeMap.get(listenAddress);
if (workerid != null) {
//有自己的节点,zk_AddressNode=ip:port
// 有自己的节点,zk_AddressNode=ip:port
zkAddressNode = pathForever + "/" + realNode.get(listenAddress);
//启动worder时使用会使用
// 启动worder时使用会使用
workerId = workerid;
if (!checkInitTimeStamp(curator, zkAddressNode)) {
throw new CheckLastTimeException(
"Init timestamp check error,forever node timestamp greater than this node time");
}
} else {
//表示新启动的节点,创建持久节点 ,不用check时间
// 表示新启动的节点,创建持久节点 ,不用check时间
String newNode = createNode(curator);
zkAddressNode = newNode;
String[] nodeKey = newNode.split("-");
@@ -137,7 +137,7 @@ public class SnowflakeZookeeperHolder {
byte[] bytes = curator.getData().forPath(zkAddressNode);
ObjectMapper mapper = new ObjectMapper();
Endpoint endPoint = mapper.readValue(new String(bytes), Endpoint.class);
//该节点的时间不能小于最后一次上报的时间
// 该节点的时间不能小于最后一次上报的时间
return endPoint.getTimestamp() <= System.currentTimeMillis();
}
@@ -184,7 +184,7 @@ public class SnowflakeZookeeperHolder {
log.error("update file cache error ", e);
}
} else {
//不存在文件,父目录页肯定不存在
// 不存在文件,父目录页肯定不存在
try {
boolean mkdirs = leafConfFile.getParentFile().mkdirs();
log.info("init local file cache create parent dis status is {}, worker id is {}", mkdirs, workId);

View File

@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.orange.demo.common.sequence.config.IdGeneratorAutoConfigure
com.orange.demo.common.sequence.config.IdGeneratorAutoConfig

View File

@@ -1,12 +1,8 @@
package com.orange.demo.common.swagger.config;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.boot.context.properties.ConfigurationProperties;
import java.util.ArrayList;
import java.util.List;
/**
* 配置参数对象。
*

View File

@@ -71,7 +71,7 @@ public class ByteBodyUtils {
fieldType = CLASS_POOL.get(String.class.getName());
}
} catch (NotFoundException e) {
//抛异常
// 抛异常
ClassClassPath path = new ClassClassPath(propetyType);
CLASS_POOL.insertClassPath(path);
try {

View File

@@ -55,7 +55,7 @@ public class DynamicBodyModelPlugin implements OperationModelsProviderPlugin {
@Override
public boolean supports(DocumentationType delimiter) {
//支持2.0版本
// 支持2.0版本
return delimiter == DocumentationType.SWAGGER_2;
}
}

View File

@@ -40,7 +40,7 @@ public class DynamicBodyParameterBuilder implements OperationBuilderPlugin {
List<ResolvedMethodParameter> bodyParameter = methodParameters.stream()
.filter(p -> p.hasParameterAnnotation(MyRequestBody.class)).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(bodyParameter)) {
//构造model
// 构造model
String groupName = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, context.getGroupName());
String clazzName = groupName + StringUtils.capitalize(context.getName());
ResolvedMethodParameter methodParameter = bodyParameter.get(0);

View File

@@ -14,7 +14,6 @@
<modules>
<module>common-core</module>
<module>common-redis</module>
<module>common-minio</module>
<module>common-sequence</module>
<module>common-swagger</module>
</modules>