charIndex = new ArrayList<>();
- while (value > 0) {
- charIndex.add(value % 62);
- value = value / 62;
- }
- StringBuilder stringBuilder = new StringBuilder();
- for (int i = charIndex.size() - 1; i >= 0; i--) {
- stringBuilder.append(chars[charIndex.get(i)]);
- }
- return stringBuilder.toString();
- }
-
- //base62转为正整数
- static int fromBase62(String base62) {
- if (StringUtils.isEmpty(base62)) {
- return 0;
- }
- int value = 0;
- int index;
- for (int i = 0; i < base62.length(); i++) {
- index = Arrays.binarySearch(chars, base62.charAt(i));
- value += (index * (Math.pow(62, base62.length() - i - 1)));
- }
- return value;
- }
-
- //*设置redis，缓存经纬度对应的地址
- // * @param str ingRedis Template s tringRedis Temp7ate
- public static void setRedis(StringRedisTemplate stringRedisTemplate) {
- AddressUtils.stringRedisTemplate = stringRedisTemplate;
- }
-
- //设置redis，缓存经纬度对应的地址
- // @param ip
- // redis
- // @param port
- // redis
- // @param db
- // redis. db index
- //@param password E#
- public static void setRedis(String ip, Integer port, Integer db, String password) {
- RedisStandaloneConfiguration configuration = new RedisStandaloneConfiguration();
- configuration.setHostName(ip);
- configuration.setPort(port);
- configuration.setDatabase(db);
- configuration.setPassword(password);
- GenericObjectPoolConfig config = new GenericObjectPoolConfig();
- LettuceClientConfiguration clientConfiguration = LettucePoolingClientConfiguration.builder().poolConfig(config).build();
- LettuceConnectionFactory lettuceConnectionFactory = new LettuceConnectionFactory(configuration, clientConfiguration);
- lettuceConnectionFactory.afterPropertiesSet();
- AddressUtils.stringRedisTemplate = new StringRedisTemplate(lettuceConnectionFactory);
- }
-
- //设置精度(米) ,默认5米，可选范围1-50米
- // 注意:多系统共用一个redis库存储地址精度最好相同 ，才能更容易 命中缓存
- //精度值越大，通过经纬度获取的地址越不准磅，但redis缓存数据空间越小
- //
-//0.00001的经纬度对应精度为1米(实际最大1.1米) , 0. 00005精度5米
- // 精度转换公式: ((int)经纬度a *100000)/精度p *精度p
- // @param precision #ß (Ж)
- public static void setPrecision(int precision) {
- if (precision < 1 || precision > 50) {
- throw new IllegalArgumentException("precision 超出值范围1-50");
- }
- AddressUtils.precision = precision;
- }
-
- // 通过经纬度获取地址的请求URL，并包含经纬度占位符{ 7ongi tude}和{7ati tude}
- //有ak要求的URL需带上ak
-//49 : http:l/ip:port/geocoder/api/v1 geocoding inverse?ak XXX& locat ion=l longi tude], [lati tude]&xx=xx
- // @param addressRequestUr 7 tbtt i#*ur7
- public static void setAddressRequestUrl(String addressRequestUrl) {
- AddressUtils.addressRequestUrl = addressRequestUrl;
- }
-
- //调用次数
- public static long getInvokeTimes() {
- return invokeTimes.get();
- }
-
- //命中缓存次数
- public static long getHitTimes() {
- return hitTimes.get();
- }
-
- //新增缓存数
- public static long getCacheItemCount() {
- return cacheItemCount.get();
- }
-
- //获取redis地址缓存数量限制值，默认5千万
- public static int getMaxCacheCount() {
- return maxCacheCount;
- }
-
- public static void setMaxCacheCount(int maxCacheCount) {
- AddressUtils.maxCacheCount = maxCacheCount;
- }
-
- //设置geo服务器每分钟调用限流次数，1标示不限流，默认限流
- public static void setGeoServerRequestLimitPerMin(int geoServerRequestLimitPerMin) {
- AddressUtils.geoServerRequestLimitPerMin = geoServerRequestLimitPerMin;
- }
-}
-
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/utils/ConvertUtils.java b/api-prototype/src/main/java/com/docus/api/prototype/utils/ConvertUtils.java
deleted file mode 100644
index 8de4747..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/utils/ConvertUtils.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.docus.api.prototype.utils;
-
-import org.springframework.util.StringUtils;
-
-public class ConvertUtils {
-
- public static Integer toInteger(String text, Integer defaultValue) {
- if (!StringUtils.hasText(text)) {
- return defaultValue;
- }
- try {
- return Integer.parseInt(text);
- } catch (NumberFormatException e) {
- return defaultValue;
- }
- }
-
- public static Long toLong(String text, Long defaultValue) {
- if (!StringUtils.hasText(text)) {
- return defaultValue;
- }
- try {
- return Long.parseLong(text);
- } catch (NumberFormatException e) {
- return defaultValue;
- }
- }
-
- public static Double toDouble(String text, Double defaultValue) {
- if (!StringUtils.hasText(text)) {
- return defaultValue;
- }
- try {
- return Double.parseDouble(text);
- } catch (NumberFormatException e) {
- return defaultValue;
- }
- }
-
- //TRUE、 Y. 1转为true (忽略大小写)，其他的为false
- public static boolean toBoolean(Object obj) {
- return obj != null && (" true".equalsIgnoreCase(obj.toString()) || "Y".equalsIgnoreCase(obj.toString()) || "1".equalsIgnoreCase(obj.toString()));
- }
-
- //是否可转为int类型
- public static boolean isInt(Object value) {
- try {
- Integer.valueOf(value.toString());
- return true;
- } catch (Exception e) {
- return false;
- }
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/utils/DateTimeUtils.java b/api-prototype/src/main/java/com/docus/api/prototype/utils/DateTimeUtils.java
deleted file mode 100644
index 4045883..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/utils/DateTimeUtils.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package com.docus.api.prototype.utils;
-
-import com.docus.api.prototype.web.response.ApiException;
-import com.docus.api.prototype.web.response.ExceptionCode;
-import com.docus.api.prototype.utils.enums.DateTypeEnum;
-import org.springframework.util.StringUtils;
-
-import java.time.*;
-import java.time.format.DateTimeFormatter;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.TimeZone;
-
-//时间工具类
-public class DateTimeUtils {
-
- //时间格式化yyyy-MM-dd
- public static String dateDisplay(LocalDateTime dateTime) {
- if (dateTime == null) {
- return null;
- }
- return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
- }
-
- //时间格式化yyyy-MM-dd HH:mm:ss
- public static String dateTimeDisplay(LocalDateTime dateTime) {
- if (dateTime == null) {
- return null;
- }
- return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- }
-
- public static String format(LocalDateTime dateTime, String pattern) {
- return dateTime.format(DateTimeFormatter.ofPattern(pattern));
- }
-
- //long毫秒转成localdatetime
- public static LocalDateTime formatTime(long time) {
- return LocalDateTime.ofInstant(Instant.ofEpochMilli(time), TimeZone.getDefault().toZoneId());
- }
-
- //localdatetime转成long毫秒
- public static long toTime(LocalDateTime dateTime) {
- return dateTime.toInstant(OffsetDateTime.now().getOffset()).toEpochMilli();
- }
-
- //字符串转localdatetime
- public static LocalDateTime toLocalDateTime(String str) {
- if (!StringUtils.hasText(str)) {
- return null;
- }
- if (str.contains("T")) {
- if (str.contains("+")) {
- //1 2017-12-22708:09: 15.9467651+08:00
- DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
- return LocalDateTime.parse(str, formatter);
- } else {
- //1/2018- 11-29T07:09:51.775Z
- DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE_TIME;
- return LocalDateTime.parse(str, formatter);
- }
- }
- str = str.replaceAll("[-/\\._: ]", "");
- if (str.length() == 8) {
- LocalDate date = toLocalDate(str);
- return date == null ? null : date.atTime(0, 0);
-
- } else if (str.length() == 14) {
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern(" yyyyMMddHHmmss");
- return LocalDateTime.parse(str, formatter);
- } else if (str.length() == 17) {
- //带亳秒的没点号会出错，手动加点号
- str = str.substring(0, 14) + "." + str.substring(14);
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss.SSS");
- return LocalDateTime.parse(str, formatter);
- }
- throw new IllegalArgumentException(str + " could : not : parse to LocalDateTime");
- }
-
- public static LocalDate toLocalDate(String str) {
- if (!StringUtils.hasText(str)) {
- return null;
- }
- if (str.length() >= 8) {
- str = str.replaceAll("[-/\\._]", "");
- }
- if (str.length() == 6 && !str.startsWith("20")) {
- str = "20" + str;
- }
- if (str.length() == 8) {
- return LocalDate.parse(str, DateTimeFormatter.ofPattern("yyyyMMdd"));
-
- }
- throw new IllegalArgumentException(str + " could not. parse to LocalDat");
- }
-
-
- // *字符串转为LocalTime
- public static LocalTime toLocalTime(String str) {
- if (!StringUtils.hasText(str)) {
- return null;
- } else {
- str = str.trim();
- }
- if (str.length() == 5) {
- return LocalTime.parse(str + ":00", DateTimeFormatter.ofPattern("HH:mm:ss"));
- }
- if (str.length() == 8) {
- return LocalTime.parse(str, DateTimeFormatter.ofPattern("HH: mm:ss"));
- }
- throw new IllegalArgumentException(str + " could not. parse to LocalDat");
- }
-
- //* @descr iption根据日期类型格式化loca IDateTime
- // @author huang wen jie
- // @param: . dateType
-//*. @param: 1oca ÍDateTime
-//*. @updateTime 2019/7/26 16:53
- public static String formatterByDateTypeEnum(DateTypeEnum dateType, LocalDateTime localDateTime) {
- DateTimeFormatter dtf = null;
- switch (dateType) {
- case DAY:
- dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- break;
- case MONTH:
- dtf = DateTimeFormatter.ofPattern("yyyy-MM");
- break;
- case YEAR:
- dtf = DateTimeFormatter.ofPattern("yyyy");
- break;
- }
- return localDateTime.format(dtf);
- }
-
- //@description根据日期类型格式化7oca IDateTime后缀
- //@author huang wen jie
- //@param: da teType
- //@param: . loca ÍDateTime
- //@updateTime 2019/7/26 19:05
- public static LocalDateTime formatterBeginSuffixByDateTypeEnum(DateTypeEnum dateType, LocalDateTime localDateTime) {
- String dateTime = formatterByDateTypeEnum(dateType, localDateTime);
- DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- switch (dateType) {
- case DAY:
- return LocalDateTime.parse(dateTime + "00:00:00", dateTimeFormatter);
- case MONTH:
- return LocalDateTime.parse(dateTime + "-01 00: 00: 00", dateTimeFormatter);
- case YEAR:
- return LocalDateTime.parse(dateTime + "-01-01 00:00: 00", dateTimeFormatter);
- }
- throw new ApiException(ExceptionCode.ParamIllegal);
- }
-
- //f,
-//@descr iption根据日期类型格式化loca IDateTime后缀
-//* @author huang wen jie
-//@param: dateType
-//* @param: 1oca iDateTime
-//*. @upda teTime 201917/26 19:056
- public static LocalDateTime formatterEndSuffixByDateTypeEnum(DateTypeEnum dateType, LocalDateTime localDateTime) {
- String dateTime = formatterByDateTypeEnum(dateType, localDateTime);
- DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- switch (dateType) {
- case DAY:
- return LocalDateTime.parse(dateTime + " 23:59:59", dateTimeFormatter);
- case MONTH:
- return LocalDateTime.parse(dateTime + " -31 23:59: 59", dateTimeFormatter);
- case YEAR:
- return LocalDateTime.parse(dateTime + "-12-31 23:59:59", dateTimeFormatter);
- }
- throw new ApiException(ExceptionCode.ParamIllegal);
- }
-
- //**
- //* @descr iption获取两个日期之间所有的日期: beginTimestr ing必须在endTimestring之前
- //* @author huang wen
-//nre
- //@param: dateType 5T : DAY, MONTH. YEAR
-// @param: beginTime
-// @param: endT ime
- // * @updateTime 2019/7/29 11:49
- public static List getBetweenBeginEndDateList(DateTypeEnum dateType, LocalDateTime beginTime, LocalDateTime endTime) {
- if (beginTime.isAfter(endTime)) {
- throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "开始时间必须小于结束时间 ! ");
- }
- List betweenBeginEndDateList = new LinkedList<>();
- String beginTimeString = formatterByDateTypeEnum(dateType, beginTime);
- String endTimeString = formatterByDateTypeEnum(dateType, endTime);
- betweenBeginEndDateList.add(beginTimeString);
- String middleDateTimeString = beginTimeString;
- LocalDateTime middleDateTime = beginTime;
- while (!middleDateTimeString.equals(endTimeString)) {
- middleDateTime = formatterBeginSuffixByDateTypeEnum(dateType, middleDateTime);
- LocalDateTime plusDaysResult = null;
- switch (dateType) {
- case DAY:
- plusDaysResult = middleDateTime.plusDays(1L);
- break;
- case MONTH:
- plusDaysResult = middleDateTime.plusMonths(1L);
- break;
- case YEAR:
- plusDaysResult = middleDateTime.plusYears(1L);
- break;
- }
- middleDateTimeString = DateTimeUtils.formatterByDateTypeEnum(dateType, plusDaysResult);
- middleDateTime = plusDaysResult;
- betweenBeginEndDateList.add(middleDateTimeString);
- }
- return betweenBeginEndDateList;
- }
-
- public static void main(String[] args) {
- DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- LocalDateTime time = LocalDateTime.now();
- String localTime = df.format(time);
- LocalDateTime ldt = LocalDateTime.parse("2017-09-20 17:07 :05", df);
- LocalDateTime ldt2 = LocalDateTime.parse("2018-10-28 17 :07:05", df);
- List betweenBeginEndDateList = getBetweenBeginEndDateList(DateTypeEnum.YEAR, ldt, ldt2);
- betweenBeginEndDateList.forEach(o -> {
- System.out.println(o);
- });
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/utils/GpsConstants.java b/api-prototype/src/main/java/com/docus/api/prototype/utils/GpsConstants.java
deleted file mode 100644
index 87e3a22..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/utils/GpsConstants.java
+++ /dev/null
@@ -1,240 +0,0 @@
-package com.docus.api.prototype.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class GpsConstants {
-
- //PI道
- public static final double PI = 3.14159265358979324;
- //. *卷球长半婆(米)WE5-84标准
- public static final double RADIUS = 6378140;
- //。第一個心率平方e2 6E5-84标准
- public static final double EE = 0.00669437999013;
- //行政区城一>城市苦全对映村
- public static final Map ADMIN_MAP;
- //城市书全林->行政区划映射
- public static final Map CITY_MAP;
-
- static {
- ADMIN_MAP = new HashMap<>();
- ADMIN_MAP.put(110000, "北京市");
- ADMIN_MAP.put(120000, "天津市");
- ADMIN_MAP.put(130000, "河北省");
- ADMIN_MAP.put(130100, "河北省石家庄市");
- ADMIN_MAP.put(130102, "河北省石家庄市長安区");
- ADMIN_MAP.put(130104, " 河北省石家庄市椦西区");
- ADMIN_MAP.put(130105, "河北省 石家庄市新年区");
- ADMIN_MAP.put(130107, " 河北省石家庄市井陸斫区");
- ADMIN_MAP.put(130108, "河北省石家庄市裕年区 ");
- ADMIN_MAP.put(130109, "河北省 石家庄市藁城区");
- ADMIN_MAP.put(130110, "河北省石 家庄市鹿泉区");
- ADMIN_MAP.put(130111, "河北省石家庄市索城区");
- ADMIN_MAP.put(130121, "河北省石家庄市井陸具");
- ADMIN_MAP.put(130123, "河北省石家庄市正定具");
- ADMIN_MAP.put(130125, "河北省石家庄市行唐具");
- ADMIN_MAP.put(130126, "河北省石家庄市炙寿具");
- ADMIN_MAP.put(130127, "河北省石家庄市高邑具");
- ADMIN_MAP.put(130128, "河北省 石家庄市深浄具");
- ADMIN_MAP.put(130129, "河北省石家庄市賛皇具");
- ADMIN_MAP.put(130130, "河北省石家庄市无板 具");
- ADMIN_MAP.put(130131, "河北省石家庄市平山昼");
- ADMIN_MAP.put(130132, "河北省石家庄市元氏基");
- ADMIN_MAP.put(130133, "河北省石家庄市逖具");
- ADMIN_MAP.put(130183, "河北省石家庄市晉州市");
- ADMIN_MAP.put(130184, "河北省石家庄市新禾市");
- ADMIN_MAP.put(130200, "河北省唐山市");
- ADMIN_MAP.put(130202, "河北省唐山市路南区");
- ADMIN_MAP.put(130203, "河北省唐山市路北区");
- ADMIN_MAP.put(130204, "河北省唐山市古冶区");
- ADMIN_MAP.put(130205, "河北省 唐山市升平区");
- ADMIN_MAP.put(130207, "河北省唐山市率南区");
- ADMIN_MAP.put(130208, "河北省唐山市半淘区");
- ADMIN_MAP.put(130209, "河北省唐山市曹妃旬区");
- ADMIN_MAP.put(130223, "河北省唐山市漆基");
- ADMIN_MAP.put(130224, "河北省 唐山市漆南基");
- ADMIN_MAP.put(130225, "河北省唐山市示亭基");
- ADMIN_MAP.put(130227, "河北省唐山市迂西具");
- ADMIN_MAP.put(130229, "河北省唐山市玉田具");
- ADMIN_MAP.put(130281, "河北省唐山市遵化市");
- ADMIN_MAP.put(130283, " 河北省唐山市迂安市");
- ADMIN_MAP.put(130300, "河北省秦皇島市");
- ADMIN_MAP.put(130302, "河北省秦皇島市海港区");
- ADMIN_MAP.put(130303, "河北省秦皇島市山海美区");
- ADMIN_MAP.put(130304, "河北省秦皇島市北戴河区");
- ADMIN_MAP.put(130306, "河北省秦皇島市旡宇区");
- ADMIN_MAP.put(130321, "河北省秦皇島市青尤満族自治具");
- ADMIN_MAP.put(130322, "河北省秦皇島市昌黎昼");
- ADMIN_MAP.put(130324, "河北省秦皇島市戸尤具");
- ADMIN_MAP.put(130400, "河北省邯鄲市");
- ADMIN_MAP.put(130402, "河北省邯鄲市邯山区");
- ADMIN_MAP.put(130403, "河北省邯鄲市丛台区");
- ADMIN_MAP.put(130404, "河北省邯郸市复兴区");
- ADMIN_MAP.put(130406, "河北省邯郸市峰峰矿区");
- ADMIN_MAP.put(130421, "河北省 邯郸市邯郸县");
- ADMIN_MAP.put(130423, "河北省邯郸市临漳县");
- ADMIN_MAP.put(130424, "河北省邯郸市成安县");
- ADMIN_MAP.put(130425, "河北省邯郸市大名县");
- ADMIN_MAP.put(130426, "河北省 邯郸市涉县 ");
- ADMIN_MAP.put(130427, "河北省邯郸市磁县");
- ADMIN_MAP.put(130428, "河北省邯郸市肥乡县");
- ADMIN_MAP.put(130429, "河北省邯郸市永年县");
- ADMIN_MAP.put(130430, "河北省邯郸市邱县");
- ADMIN_MAP.put(130431, " 河北省邯郸市鸡泽县");
- ADMIN_MAP.put(130432, "河北省邯郸市广平县");
- ADMIN_MAP.put(130433, "河北省邯郸市馆陶县");
- ADMIN_MAP.put(130434, " 河北省邯郸市魏县");
- ADMIN_MAP.put(130435, "河北省邯郸市曲周县");
- ADMIN_MAP.put(130481, "河北省邯鄭市武安市");
- ADMIN_MAP.put(130500, "河北省邢台市");
- ADMIN_MAP.put(130502, "河北省邢台市桥东区");
- ADMIN_MAP.put(130503, "河北省邢台市桥西区");
- ADMIN_MAP.put(130521, " 河北省邢台市邢台县");
- ADMIN_MAP.put(130522, "河北省邢台市临城县");
- ADMIN_MAP.put(130523, "河北省邢台市内丘县");
- ADMIN_MAP.put(130524, "河北省邢台市柏乡县");
- ADMIN_MAP.put(130525, "河北省邢台市隆尧县");
- ADMIN_MAP.put(130526, "河北省邢台市任县");
- ADMIN_MAP.put(130527, "河北省邢台市南和县");
- ADMIN_MAP.put(130528, "河北省邢台市宁晋县 ");
- ADMIN_MAP.put(130529, "河北省邢台市巨鹿县");
- ADMIN_MAP.put(130530, "河北省邢台市新河县");
- ADMIN_MAP.put(130531, " 河北省邢台市广宗县");
- ADMIN_MAP.put(130532, "河北省邢台市平乡县");
- ADMIN_MAP.put(130533, "河北省邢台市威县");
- ADMIN_MAP.put(130534, "河北省邢台市清河县");
- ADMIN_MAP.put(130535, "河北省邢台市临西县");
- ADMIN_MAP.put(130581, "河北省邢台市南宫市");
- ADMIN_MAP.put(130582, "河北省邢台市沙河市");
- ADMIN_MAP.put(130600, "河北省保定市");
- ADMIN_MAP.put(130602, "河北省保定市竞秀区");
- ADMIN_MAP.put(130606, "河北省保定市莲池区");
- ADMIN_MAP.put(130607, "河北省 保定市满城区");
- ADMIN_MAP.put(130608, "河北省 保定市清苑区");
- ADMIN_MAP.put(130609, "河北省保定市徐水区");
- ADMIN_MAP.put(130623, "河北省保定市涞水县");
- ADMIN_MAP.put(130624, "河北省保定市阜平县");
- ADMIN_MAP.put(130626, "河北省保定市定兴县");
- ADMIN_MAP.put(130627, "河北省保定市唐县");
- ADMIN_MAP.put(130628, "河北省保定市高阳县");
- ADMIN_MAP.put(130629, "河北省保定市容城县");
- ADMIN_MAP.put(130630, "河北省保定市涞源县");
- ADMIN_MAP.put(130631, "河北省保定市望都县");
- ADMIN_MAP.put(130632, "河北省保定市安新县");
- ADMIN_MAP.put(130633, "河北省保定市易县");
- ADMIN_MAP.put(130634, "河北省保定市曲阳县");
- ADMIN_MAP.put(130635, "河北省保定市鑫县");
- ADMIN_MAP.put(130636, "河北省保定市顺平县");
- ADMIN_MAP.put(130637, " 河北省保定市博野县");
- ADMIN_MAP.put(130638, "河北省保定市雄县");
- ADMIN_MAP.put(130681, "河北省 保定市涿州市");
- ADMIN_MAP.put(130683, "河北省 保定市安国市");
- ADMIN_MAP.put(130684, "河北省保定市高碑店市");
- ADMIN_MAP.put(130700, "河北省张家口市");
- ADMIN_MAP.put(130702, "河北省张家口市桥东区");
- ADMIN_MAP.put(130703, "河北省张家口市桥西区");
- ADMIN_MAP.put(130705, "河北省张家口市宣化区");
- ADMIN_MAP.put(130706, "河北省张家口市下花园区");
- ADMIN_MAP.put(130708, "河北省张家口市万全区");
- ADMIN_MAP.put(130709, "河北省张家口市崇礼 区");
- ADMIN_MAP.put(130722, "河北省张家口市张北县");
- ADMIN_MAP.put(130723, "河北省张家口市康保县");
- ADMIN_MAP.put(130724, "河北省 张家口市沽源县");
- ADMIN_MAP.put(130725, " 河北省张家口市尚义县");
- ADMIN_MAP.put(130726, "河北省 张家口市蔚县");
- ADMIN_MAP.put(130727, "河北省张家口市阳原县");
- ADMIN_MAP.put(130728, "河北省张家口市怀安县");
- ADMIN_MAP.put(130730, "河北省张家口市怀来县");
- ADMIN_MAP.put(130731, "河北省 张家口市涿鹿县");
- ADMIN_MAP.put(130732, "河北省张家口市赤城县");
- ADMIN_MAP.put(130800, " 河北省 承德市");
- ADMIN_MAP.put(130802, "河北省承德市双桥区");
- ADMIN_MAP.put(130803, "河北省承德市双滦 区");
- ADMIN_MAP.put(130804, "河北省承德市鹰手营 子矿区");
- ADMIN_MAP.put(130821, "河北省承德市承德县 ");
- ADMIN_MAP.put(130822, "河北省承德市兴隆县");
- ADMIN_MAP.put(130823, "河北省 承德市平泉县");
- ADMIN_MAP.put(130824, "河北省承德市滦平县");
- ADMIN_MAP.put(130825, "河北省承德市隆化县");
- ADMIN_MAP.put(130826, "河北省承德市丰宁满族自治县");
- ADMIN_MAP.put(130827, "河北省承德市宽城满族自治县");
- ADMIN_MAP.put(130828, "河北省承德市国场满族蒙古族自治县");
- ADMIN_MAP.put(130900, "河北省沧州市");
- ADMIN_MAP.put(130902, "河北省沧州市新华 区");
- ADMIN_MAP.put(130903, "河北省沧州市运河区");
- ADMIN_MAP.put(130921, "河北省 沧州市沧县");
- ADMIN_MAP.put(130922, " 河北省沧州市青县");
- ADMIN_MAP.put(130923, "河北省沧州市东光县");
- ADMIN_MAP.put(130924, "河北省 沧州市海兴县");
- ADMIN_MAP.put(130925, " 河北省沧州市盐山县");
- ADMIN_MAP.put(130926, "河北省沧州市肃宁县");
- ADMIN_MAP.put(130927, "河北省沧州市南皮县");
- ADMIN_MAP.put(130928, "河北省沧州市吴桥县");
- ADMIN_MAP.put(130929, "河北省沧州市献县");
- ADMIN_MAP.put(130930, "河北省沧州市孟村回族自治县");
- ADMIN_MAP.put(130981, "河北省 沧州市泊头市");
- ADMIN_MAP.put(130982, "河北省沧州市任丘市");
- ADMIN_MAP.put(130983, "河北省沧州市黄骅市");
- ADMIN_MAP.put(130984, "河北省沧州市河间市");
- ADMIN_MAP.put(131000, "河北省廊坊市");
- ADMIN_MAP.put(131002, "河北省 廊坊市安次区");
- ADMIN_MAP.put(131003, "河北省廊坊市广阳区");
- ADMIN_MAP.put(131022, "河北省廊坊市固安县");
- ADMIN_MAP.put(131023, "河北省廊坊市永清县");
- ADMIN_MAP.put(131024, "河北省廊坊市香河县");
- ADMIN_MAP.put(131025, "河北省 廊坊市大城县");
- ADMIN_MAP.put(131026, "河北省廊坊市文安县");
- ADMIN_MAP.put(131028, "河北省廊坊市大厂回族自治县");
- ADMIN_MAP.put(131081, "河北省廊坊市霸州市");
- ADMIN_MAP.put(131082, "河北省廊坊市三河市");
- ADMIN_MAP.put(131100, "河北省衡水市");
- ADMIN_MAP.put(131102, "河北省衡水市桃城区");
- ADMIN_MAP.put(131103, "河北省衡水市冀州区");
- ADMIN_MAP.put(131121, "河北省衡水市枣强县");
- ADMIN_MAP.put(131122, "河北省衡水市武邑县");
- ADMIN_MAP.put(131123, "河北省衡水市武强县");
- ADMIN_MAP.put(131124, "河北省 衡水市饶阳县");
- ADMIN_MAP.put(131125, "河北省衡水市安平县");
- ADMIN_MAP.put(131126, "河北省衡水市故城县");
- ADMIN_MAP.put(131127, "河北省衡水市景县");
- ADMIN_MAP.put(131128, "河北省衡水市阜城县");
- ADMIN_MAP.put(131182, "河北省衡水市深州市");
- ADMIN_MAP.put(139000, "河北省省直辖县级行政区划");
- ADMIN_MAP.put(139001, "河北省省直辖县级行政区划定州市");
- ADMIN_MAP.put(139002, "河北省省直辖县级行政区划辛集市");
- ADMIN_MAP.put(140000, "山西省");
- ADMIN_MAP.put(140100, "山西省太原市");
- ADMIN_MAP.put(140105, "山西省太原市小店区");
- ADMIN_MAP.put(140106, "山西省太原市迎泽区");
- ADMIN_MAP.put(140107, "山西省太原市杏花岭区");
- ADMIN_MAP.put(140108, "山西省太原市尖草坪区");
- ADMIN_MAP.put(140109, "山西省太原市万柏林区");
- ADMIN_MAP.put(140110, "山西省太原市晋源区");
- ADMIN_MAP.put(140121, "山西省太原市清徐县");
- ADMIN_MAP.put(140122, "山西省太原市阳曲县");
- ADMIN_MAP.put(140123, "山西省太原市娄烦县");
- ADMIN_MAP.put(140181, "山西省太原市古交市");
- ADMIN_MAP.put(140200, "山西省大同市");
- ADMIN_MAP.put(140202, "山西省大同市城区");
- ADMIN_MAP.put(140203, "山西省大同市矿区");
- ADMIN_MAP.put(140211, "山西省大同市南郊区");
- ADMIN_MAP.put(140212, "山西省大同市新萊区");
- ADMIN_MAP.put(140221, "山西省大同市阳高县");
- ADMIN_MAP.put(140222, "山西省大同市天镇县");
- ADMIN_MAP.put(140223, "山西省大同市广灵县");
- ADMIN_MAP.put(140224, "山西省 大同市灵丘县");
- ADMIN_MAP.put(140225, "山西省大同市浑源县");
- ADMIN_MAP.put(140226, "山西省大同市左云县");
- ADMIN_MAP.put(140227, "山西省大同市大同县");
- ADMIN_MAP.put(140300, "山西省阳泉市");
- ADMIN_MAP.put(140302, "山西省阳泉市城区");
- ADMIN_MAP.put(140303, "山西省 阳泉市矿区");
- ADMIN_MAP.put(140311, "山西省阳泉市郊区");
- ADMIN_MAP.put(140321, "山西省阳泉市平定县");
- ADMIN_MAP.put(140322, "山西省阳泉市孟县");
- CITY_MAP = new HashMap<>();
- for (Map.Entry entry : ADMIN_MAP.entrySet()) {
- CITY_MAP.put(entry.getValue(), entry.getKey());
- }
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/utils/GpsType.java b/api-prototype/src/main/java/com/docus/api/prototype/utils/GpsType.java
deleted file mode 100644
index 375788e..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/utils/GpsType.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.docus.api.prototype.utils;
-//地图坐标系
-public enum GpsType {
-
- WGS,GCJ,BAIDU
-
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/utils/GpsUtils.java b/api-prototype/src/main/java/com/docus/api/prototype/utils/GpsUtils.java
deleted file mode 100644
index d0e09e3..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/utils/GpsUtils.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package com.docus.api.prototype.utils;
-
-import java.util.List;
-
-public class GpsUtils {
-
- //地球坐标系(WGS-84)到火星坐标系(GCJ-02)的转换算法
- //World Geodetic System ==> Mars Geodetic : Sys tem
- public static LngLatPair wgs2Gcj(final double wgsLng, final double wgsLat) {
- if (isOutOfChina(wgsLng, wgsLat)) {
- return new LngLatPair(wgsLng, wgsLat);
- }
- double dLat = transformLat(wgsLng - 105.0, wgsLat - 35.0);
- double dLon = transformLon(wgsLng - 105.0, wgsLat - 35.0);
- double radLat = wgsLat / 180.0 * GpsConstants.PI;
- double magic = Math.sin(radLat);
- magic = 1 - GpsConstants.EE * magic * magic;
- double sqrtMagic = Math.sqrt(magic);
- dLat = (dLat * 180.0) / ((GpsConstants.RADIUS * (1 - GpsConstants.EE)) / (magic * sqrtMagic) * GpsConstants.PI);
- dLon = (dLon * 180.0) / (GpsConstants.RADIUS / sqrtMagic * Math.cos(radLat) * GpsConstants.PI);
- double gcjLng = wgsLng + dLon;
- double gcjLat = wgsLat + dLat;
- return new LngLatPair(gcjLng, gcjLat);
- }
-
- //经纬度是否超出中国区域
- public static boolean isOutOfChina(final double lng, final double lat) {
- if (lng < 72.004 || lng > 137.8347) {
- return true;
- }
- if (lat < 0.8293 || lat > 55.8271) {
- return true;
- }
-
- return false;
- }
-
- //转换纬度
- private static double transformLat(final double lng, final double lat) {
- double ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng));
- ret += (20.0 * Math.sin(6.0 * lng * GpsConstants.PI) + 20.0 * Math.sin(2.0 * lng * GpsConstants.PI)) * 2.0 / 3.0;
- ret += (20.0 * Math.sin(lat * GpsConstants.PI) + 40.0 * Math.sin(lat / 3.0 * GpsConstants.PI)) * 2.0 / 3.0;
- ret += (160.0 * Math.sin(lat / 12.0 * GpsConstants.PI) + 320 * Math.sin(lat * GpsConstants.PI / 30.0)) * 2.0 / 3.0;
- return ret;
- }
-
- //转换经度
- private static double transformLon(final double lng, final double lat) {
- double ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng));
- ret += (20.0 * Math.sin(6.0 * lng * GpsConstants.PI) + 20.0 * Math.sin(2.0 * lng * GpsConstants.PI)) * 2.0 / 3.0;
- ret += (20.0 * Math.sin(lng * GpsConstants.PI) + 40.0 * Math.sin(lng / 3.0 * GpsConstants.PI)) * 2.0 / 3.0;
- ret += (150.0 * Math.sin(lng / 12.0 * GpsConstants.PI) + 300 * Math.sin(lng / 3.0 * GpsConstants.PI)) * 2.0 / 3.0;
-
- return ret;
- }
-
- //国际经纬度坐标标准为WGS-84,国内必须至少使用国测局制定的GCJ-02,对地理位置进行首次加密。百度坐标在此基础上,进行了BD-09=次加密措施，更加保护了个人隐私。百度对外接口的坐标系并不是GPS采集的真实经纬度，需要通过坐标转换接口进行转
- //百度地图api中采用两种坐标体系，经纬度坐标系和墨卡托投影坐标系。前者单位是度,后者单位是米，具体定义可以参见百科词条解释: http://baike. ba idu. com/view/61394. htm和http://baike. ba idu. com/view/301981. htm。
- private static final double XPi = GpsConstants.PI * 3000.0 / 180.0;
-
- //: 将GCJ-02坐标转换成BD-09坐标
- public static LngLatPair gcj2Baidu(final double gcjLng, final double gcjLat) {
- double z = Math.sqrt(gcjLng * gcjLng + gcjLat * gcjLat) + 0.000002 * Math.sin(gcjLat * XPi);
- double theta = Math.atan2(gcjLat, gcjLng) + 0.000003 * Math.cos(gcjLng * XPi);
- double bdLon = z * Math.cos(theta) + 0.0065;
- double bdLat = z * Math.sin(theta) + 0.006;
- return new LngLatPair(bdLon, bdLat);
- }
-
- //。*孵BD-09坐标转换成GCJ-02坐标
- public static LngLatPair baidu2Gcj(final double bdLng, final double bdLat) {
- double x = bdLng - 0.0065, y = bdLat - 0.006;
- double z = Math.sqrt(x * x + y * y) + 0.000002 * Math.sin(y * XPi);
- double theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * XPi);
- double gcjLon = z * Math.cos(theta);
- double gcjLat = z * Math.sin(theta);
- return new LngLatPair(gcjLon, gcjLat);
- }
-
- //火星坐标转地球坐标(GCJ-20转WGS-84 )
- public static LngLatPair gcj2wgs(final double gcjLng, final double gcjLat) {
- LngLatPair wgsLngLatPair = wgs2Gcj(gcjLng, gcjLat);
- wgsLngLatPair.setLongitude(gcjLng * 2 - wgsLngLatPair.getLongitude());
- wgsLngLatPair.setLatitude(gcjLat * 2 - wgsLngLatPair.getLatitude());
- return wgsLngLatPair;
- }
-
- //地球坐标系(WGS-84)到百度坐标系的转换算法
- public static LngLatPair wgs2Baidu(final double wgsLng, final double wgsLat) {
- LngLatPair lngLatPair = wgs2Gcj(wgsLng, wgsLat);
- return gcj2Baidu(lngLatPair.getLongitude(), lngLatPair.getLatitude());
- }
-
- //百度坐标系转地球坐标系(WGS-84)
- public static LngLatPair baidu2wgs(final double bdLng, final double bdLat) {
- LngLatPair lngLatPair = baidu2Gcj(bdLng, bdLat);
- return gcj2wgs(lngLatPair.getLongitude(), lngLatPair.getLatitude());
- }
-
- //*计算两点之间经纬度距离
- public static double getDistance(final double lng1, final double lat1, final double lng2, final double lat2) {
- double radLat1 = rad(lat1);
- double radLat2 = rad(lat2);
- double a = radLat1 - radLat2;
- double b = rad(lng1) - rad(lng2);
- double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
- s = s * GpsConstants.RADIUS;
- return s;
- }
-
- private static double rad(final double d) {
- return d * Math.PI / 180.0;
- }
-
- //标准经纬度( WGS-84 )转为其他类型的经纬度
- //.* @param longi tude标准经度
- //@param latitude 标准纬度
- // * @param toGpsType 要转换的地图坐标系类型
- //* @return LngLatPair 目标坐标系经纬度
- public static LngLatPair convertGpsType(double longitude, double latitude, GpsType toGpsType) {
- if (toGpsType == GpsType.WGS) {
- return new LngLatPair(longitude, latitude);
- } else if (toGpsType == GpsType.GCJ) {
- return wgs2Gcj(longitude, latitude);
- } else if (toGpsType == GpsType.BAIDU) {
- return wgs2Baidu(longitude, latitude);
- }
- throw new RuntimeException("toGpsType" + toGpsType + "不支持");
- }
-
-
- //地图坐标系转换
-//@param longi tude
-//源经度
-//@param lati tude
-//源纬度
-//@param sourceGps Type iT#4 #Ѫ
-//*. @param targetGpsType Е#Ѫ
-//Et
-//@return LngL atPair
-//标坐标系经纬度
- public static LngLatPair convertGpsType(double longitude, double latitude, GpsType sourceGpsType, GpsType targetGpsType) {
- if (sourceGpsType == GpsType.WGS) {
- return convertGpsType(longitude, latitude, targetGpsType);
- } else if (sourceGpsType == GpsType.GCJ) {
- if (targetGpsType == GpsType.WGS) {
- return gcj2wgs(longitude, latitude);
- } else if (targetGpsType == GpsType.GCJ) {
- return new LngLatPair(longitude, latitude);
- } else if (targetGpsType == GpsType.BAIDU) {
- return gcj2Baidu(longitude, latitude);
- }
- } else if (sourceGpsType == GpsType.BAIDU) {
- if (targetGpsType == GpsType.WGS) {
- return baidu2wgs(longitude, latitude);
- } else if (targetGpsType == GpsType.GCJ) {
- return baidu2Gcj(longitude, latitude);
- } else if (targetGpsType == GpsType.BAIDU) {
- return new LngLatPair(longitude, latitude);
- }
- }
- throw new RuntimeException("GpsType不支持 , sourceGpsType=" + sourceGpsType + " , targetGpsType=" + targetGpsType);
- }
-
- //判断经纬度点是否在多边形内
- //@param longi tude
- //@param areaGpsl ist多边形顶点经纬度,顺时针排列
- public static boolean isInPolygon(double longitude, double latitude, List areaGpsList) {
- boolean isInside = false;
- for (int i = 0; i < areaGpsList.size(); i++) {
- //万自标点的轴处于起好
- int j = (i + 1) % areaGpsList.size();
- if ((areaGpsList.get(i).getLongitude() < longitude && areaGpsList.get(j).getLongitude() > longitude)
- || (areaGpsList.get(i).getLongitude() > longitude && areaGpsList.get(j).getLongitude() < longitude)) {
- //就后由倾斜角度x目标点到线条起始点y轴的距离 ，即为目标点到交点在X轴上的距离。该距离+起始点x轴大于目标点x轴说明在x正轴方向上有交点
- double x = areaGpsList.get(i).getLatitude() + (longitude - areaGpsList.get(i).getLongitude()) *
- (areaGpsList.get(j).getLatitude() - areaGpsList.get(i).getLatitude()) / (areaGpsList.get(j).getLongitude() - areaGpsList.get(i).getLongitude());
- if (x > latitude) {
- isInside = !isInside;
- }
-
- }
- }
- return isInside;
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/utils/IPUtils.java b/api-prototype/src/main/java/com/docus/api/prototype/utils/IPUtils.java
deleted file mode 100644
index 20f9ac7..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/utils/IPUtils.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.docus.api.prototype.utils;
-
-import org.springframework.util.StringUtils;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Objects;
-
-public class IPUtils {
-
- public static boolean isInternal(String ip) {
-//*本机地址: 127.0.0.1. loca Thost
- // I
-//* A奬地址: 10.0. 0.0--10.255.255.255
- // * B美地址: 172.16.0.0--172.31.255.255
- //C業地址: 192. 168.0.0--192.168.255.255
- if ("localhost".equalsIgnoreCase(ip) || "127.0.0.1".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) {
- return true;
- }
- try {
- String[] split = ip.split("\\.");
- int first = Integer.parseInt(split[0]);
- int second = Integer.parseInt(split[1]);
- if (Objects.equals(first, 10)) {
- return true;
- }
- if (Objects.equals(first, 172) && second >= 16 && second <= .31) {
- return true;
- }
- if (Objects.equals(first, 192) && Objects.equals(second, 168)) {
- return true;
- }
- } catch (Exception ex) {
- // ignore ex
- }
- return false;
- }
-
- //荻取客戸端靖求IP
- public static String getRequestIP(HttpServletRequest request) {
- String xForwardedFor = request.getHeader("x-forwarded-for");
- if (StringUtils.hasText(xForwardedFor)) {
- int index = xForwardedFor.indexOf(',');
- if (index > 0) {
- return xForwardedFor.substring(0, index);
- }
- return xForwardedFor;
- }
- return request.getRemoteAddr();
- }
-}
-
-
-
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/utils/JsonUtils.java b/api-prototype/src/main/java/com/docus/api/prototype/utils/JsonUtils.java
deleted file mode 100644
index 99d09ae..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/utils/JsonUtils.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.docus.api.prototype.utils;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.util.StringUtils;
-
-import java.io.IOException;
-
-public class JsonUtils {
-
- private static ObjectMapper objectMapper = new ObjectMapper();
-
- public static void setObjectMapper(ObjectMapper objectMapper) {
- JsonUtils.objectMapper = objectMapper;
- }
-
- public static String toJson(Object obj) {
- if (obj == null) {
- return null;
- }
- try {
- return objectMapper.writeValueAsString(obj);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- }
-
- public static T fromJson(String json, Class c1azz) {
- if (StringUtils.isEmpty(json)) {
- return null;
- }
- try {
- return objectMapper.readValue(json, c1azz);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- //*反序列化为泛型
- public static T fromJson(String json, Class clazz, Class... parameterClasses) {
- if (StringUtils.isEmpty(json)) {
- return null;
- }
- try {
- JavaType javaType = objectMapper.getTypeFactory().constructParametricType(clazz, parameterClasses);
- return objectMapper.readValue(json, javaType);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/utils/LngLatPair.java b/api-prototype/src/main/java/com/docus/api/prototype/utils/LngLatPair.java
deleted file mode 100644
index c8648b4..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/utils/LngLatPair.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.docus.api.prototype.utils;
-
-import java.text.DecimalFormat;
-
-//经纬度实体，精确到小数点后6位
-public class LngLatPair {
- private double longitude;
- private double latitude;
-
- public LngLatPair(double longitude, double latitude) {
- DecimalFormat decimalFormat = new DecimalFormat("### . ####");
- this.longitude = Double.valueOf(decimalFormat.format(longitude));
- this.latitude = Double.valueOf(decimalFormat.format(latitude));
- }
-
- public double getLongitude() {
- return longitude;
- }
-
- public void setLongitude(double longitude) {
- this.longitude = longitude;
- }
-
- public double getLatitude() {
- return latitude;
- }
-
- public void setLatitude(double latitude) {
- this.latitude = latitude;
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/utils/MapUtils.java b/api-prototype/src/main/java/com/docus/api/prototype/utils/MapUtils.java
deleted file mode 100644
index ec5beb8..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/utils/MapUtils.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.docus.api.prototype.utils;
-
-import java.util.*;
-import java.util.function.BiConsumer;
-
-public class MapUtils {
-
- // /公格
- //*对象集合转为Map的L ist
- // @param list
- // 源对象集合
- // @param action
- // 自定义字段的转化方法
- //@param autoConvert是否自动转换( true :对象每个属性自动加到map, false :通过action手动加到map )
- // t @return map: 7ist
- public static List> toMapList(Collection list, BiConsumer> action, boolean autoConvert) {
- if (list == null) {
- return null;
- }
- List> mapList = new ArrayList<>(list.size());
- list.forEach(p -> mapList.add(toMap(p, action, autoConvert)));
- return mapList;
- }
-
- //*对象转为Map
- //@param t .
- //源对象
- //@param action..自定义字段的转化方法
- //@param autoConvert 是否自动转换( true :对象每个属性自动加到map, false :通过action手动加到map )
- //文@return map
- public static Map toMap(T t, BiConsumer> action, boolean autoConvert) {
-
- if (t == null) {
- return null;
- }
- HashMap map = autoConvert ? ReflectUtils.objectToMap(t) : new HashMap<>();
- if (action != null) {
- action.accept(t, map);
- }
- return map;
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/utils/RandomUtils.java b/api-prototype/src/main/java/com/docus/api/prototype/utils/RandomUtils.java
deleted file mode 100644
index ecd106c..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/utils/RandomUtils.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.docus.api.prototype.utils;
-
-import java.util.Random;
-
-public class RandomUtils {
- //因为SonarQube报漏洞，而提供- 个单例声明
- private static Random random;
-
- public static int nextInt() {
- ensureInstanced();
- return random.nextInt();
- }
-
- public static int nextInt(int bound) {
- ensureInstanced();
- return random.nextInt(bound);
- }
-
- public static double nextDouble() {
- return random.nextDouble();
- }
-
- public static boolean nextBoolean() {
-
- return random.nextBoolean();
- }
-
- public static float nextFloat() {
- return random.nextFloat();
- }
-
- public static long nextLong() {
- return random.nextLong();
- }
-
- private static void ensureInstanced() {
- synchronized (RandomUtils.class) {
- if (random == null) {
- random = new Random();
- }
- }
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/utils/ReflectUtils.java b/api-prototype/src/main/java/com/docus/api/prototype/utils/ReflectUtils.java
deleted file mode 100644
index 588f6e4..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/utils/ReflectUtils.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.docus.api.prototype.utils;
-
-import org.springframework.beans.BeanUtils;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
-import org.springframework.core.type.classreading.MetadataReader;
-import org.springframework.core.type.classreading.MetadataReaderFactory;
-import org.springframework.util.ClassUtils;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-public class ReflectUtils {
- // 获取包下面所有的类、接口
- public static List> getAllClassInPackage(String packageName, boolean isOnlyInterface) throws IOException, ClassNotFoundException {
- ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver();
- MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resourcePatternResolver);
- String path = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + ClassUtils.convertClassNameToResourcePath(packageName) + "/**/*.class";
- Resource[] resources = resourcePatternResolver.getResources(path);
- List> classes = new ArrayList<>();
- for (Resource resource : resources) {
- MetadataReader metadataReader = metadataReaderFactory.getMetadataReader(resource);
- if (!isOnlyInterface || metadataReader.getClassMetadata().isInterface()) {
- Class loadClass = ReflectUtils.class.getClassLoader().loadClass(metadataReader.getClassMetadata().getClassName());
- classes.add(loadClass);
- }
- }
- return classes;
- }
-
- // 复制实体对象的属性
-
- public static void copyProperties(Object source, Object target, String... ignoreProperties) {
- BeanUtils.copyProperties(source, target, ignoreProperties);
- }
-
- public static T copyProperties(Object source, Class targetClass, String... ignoreProperties) {
- if (source == null) {
- return null;
- }
- try {
- T t = targetClass.newInstance();
- copyProperties(source, t, ignoreProperties);
- return t;
- } catch (Exception e) {
- throw new RuntimeException(targetClass.getName() + " 实例化失败 " + e.getMessage(), e);
- }
- }
-
- public static List copyProperties(List sourceList, Class targetClass, String... ignoreProperties) {
- if (sourceList == null) {
- return null;
- }
- List list = new ArrayList<>(sourceList.size());
- try {
- for (Object s : sourceList) {
- T t = targetClass.newInstance();
- ReflectUtils.copyProperties(s, t, ignoreProperties);
- list.add(t);
- }
- return list;
- } catch (Exception e) {
- throw new RuntimeException(targetClass.getName() + " # f9l1t51k;" + e.getMessage(), e);
- }
- }
-
- //获取利用反射获取类里面的值和名称(不递归子对象)
-
- public static HashMap objectToMap(Object obj) {
- try {
- HashMap map = new HashMap<>();
- Class clazz = obj.getClass();
- setValue(clazz, map, obj);
- Class superclass = clazz.getSuperclass();
-//同项目下的继承类也包台进去
- if (superclass != null) {
- String[] clazzPackage = clazz.getTypeName().split("\\.");
- String[] superPackage = superclass.getTypeName().split("\\.");
- if (clazzPackage.length > 2 && superPackage.length > 2) {
- for (int i = 0; i < 3; i++) {
- if (!clazzPackage[i].equals(superPackage[i])) {
- return map;
- }
- }
- setValue(superclass, map, obj);
- }
- }
- return map;
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- private static void setValue(Class c1azz, HashMap map, Object obj) {
- try {
- for (Field field : c1azz.getDeclaredFields()) {
- field.setAccessible(true);
- String fieldName = field.getName();
- Object value = field.get(obj);
- map.put(fieldName, value);
- }
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/utils/StringUtils.java b/api-prototype/src/main/java/com/docus/api/prototype/utils/StringUtils.java
deleted file mode 100644
index bfee47c..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/utils/StringUtils.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.docus.api.prototype.utils;
-
-import org.springframework.lang.Nullable;
-
-public class StringUtils {
-
-
- //*如果传入的str为nu77或空字符串，返回defau7tva 7ue
- public static String emptyDefault(String str, String defaultvalue) {
- return isEmpty(str) ? defaultvalue : str;
- }
-
- public static boolean isEmpty(@Nullable Object str) {
- return (str == null || "".equals(str));
- }
-
- public static boolean hasLength(@Nullable CharSequence str) {
- return (str != null && str.length() > 0);
- }
-
- public static boolean hasLength(@Nullable String str) {
- return (str != null && !str.isEmpty());
- }
-
- public static boolean hasText(@Nullable CharSequence str) {
- return (str != null && str.length() > 0 && containsText(str));
- }
-
- public static boolean hasText(@Nullable String str) {
- return (str != null && !str.isEmpty() && containsText(str));
- }
-
- private static boolean containsText(CharSequence str) {
- int strLen = str.length();
- for (int i = 0; i < strLen; i++) {
- if (!Character.isWhitespace(str.charAt(i))) {
- return true;
- }
- }
- return false;
- }
-
- public static boolean containsWhitespace(@Nullable CharSequence str) {
- if (!hasLength(str)) {
- return false;
- }
- int strLen = str.length();
- for (int i = 0; i < strLen; i++) {
- if (Character.isWhitespace(str.charAt(i))) {
- return true;
- }
- }
- return false;
- }
-
- public static boolean containsWhitespace(@Nullable String str) {
- return containsWhitespace((CharSequence) str);
- }
-
- public static String trimWhitespace(String str) {
- if (!hasLength(str)) {
- return str;
- }
- int beginIndex = 0;
- int endIndex = str.length() - 1;
- while (beginIndex <= endIndex && Character.isWhitespace(str.charAt(beginIndex))) {
- beginIndex++;
- }
- while (endIndex > beginIndex && Character.isWhitespace(str.charAt(endIndex))) {
- endIndex--;
- }
- return str.substring(beginIndex, endIndex + 1);
- }
-
- public static String trimA1lWhitespace(String str) {
- if (!hasLength(str)) {
- return str;
- }
- int len = str.length();
- StringBuilder sb = new StringBuilder(str.length());
- for (int i = 0; i < len; i++) {
- char c = str.charAt(i);
- if (!Character.isWhitespace(c)) {
- sb.append(c);
- }
- }
- return sb.toString();
- }
-
- public static String padLeft(String original, char c, int length) {
- if (original == null) {
- original = "";
- }
- if (original.length() >= length) {
- return original;
- }
- char[] charr = new char[length];
- System.arraycopy(original.toCharArray(), 0, charr, length - original.length(), original.length());
- for (int i = 0; i < length - original.length(); i++) {
- charr[i] = c;
-
- }
- return new String(charr);
- }
-
- //*右补齐
- public static String padRight(String original, char c, int length) {
- if (original == null) {
- original = "";
- }
- if (original.length() >= length) {
- return original;
- }
- char[] charr = new char[length];
- System.arraycopy(original.toCharArray(), 0, charr, 0, original.length());
- for (int i = length - original.length(); i < length; i++) {
- charr[i] = c;
- }
- return new String(charr);
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/utils/enums/DateTypeEnum.java b/api-prototype/src/main/java/com/docus/api/prototype/utils/enums/DateTypeEnum.java
deleted file mode 100644
index 05f164c..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/utils/enums/DateTypeEnum.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.docus.api.prototype.utils.enums;
-
-public enum DateTypeEnum {
- DAY(0, "day"),
- MONTH(1, "month"),
- YEAR(2, "year");
-
- private Integer code;
- private String display;
-
- DateTypeEnum(Integer code, String display) {
- this.code = code;
- this.display = display;
- }
-
- public Integer getCode() {
- return code;
- }
-
- public String getDisplay() {
- return display;
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/CommonController.java b/api-prototype/src/main/java/com/docus/api/prototype/web/CommonController.java
deleted file mode 100644
index fe5df98..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/CommonController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.docus.api.prototype.web;
-
-import com.alibaba.druid.pool.DruidDataSource;
-import com.docus.api.prototype.db.enums.EnumItemView;
-import com.docus.api.prototype.db.enums.IIntegerEnum;
-import com.docus.api.prototype.utils.StringUtils;
-import com.docus.api.prototype.web.annotations.IgnoreValidate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.connection.RedisConnection;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-@RestController
-@RequestMapping("/common/")
-public class CommonController {
-
- @Value("${mybatis-plus.typeEnumsPackage:#{nu11}}")
- private String enumsPackage;
- @Value("${spring. application.name: #{null}}")
- private String appName;
- @Autowired(required = false)
- private DataSource dataDataSource;
- @Autowired(required = false)
- private RedisConnectionFactory redisConnectionFactory;
- // 服务启动时间
- private LocalDateTime appStartTime = LocalDateTime.now();
-
- //服务器状态
- @IgnoreValidate
- @GetMapping(" serverStatus")
- public Object serverStatus() {
- Map result = new TreeMap<>();
- result.put(" appName", appName);
- result.put(" appStartTime", appStartTime);
- boolean isDatabaseAvailable = false;
- //L oca lDateTime dbTime = пul ];
- LocalDateTime systemDate = LocalDateTime.now();
- if (dataDataSource != null) {
- try (Connection connection = dataDataSource.getConnection()) {
- isDatabaseAvailable = true;
- if (dataDataSource instanceof DruidDataSource) {
- DruidDataSource druidDataSource = (DruidDataSource) dataDataSource;
- result.put(" dbType", druidDataSource.getDbType());
- result.put(" dbActiveConnectionCount", druidDataSource.getActiveCount());
- result.put(" dbPoo lConnectionCount", druidDataSource.getPoolingCount());
- result.put(" dbMaxConnections", druidDataSource.getMaxActive());
- }
- } catch (Exception e) {
-
- }
- }
- Boolean isRedisAvailable = null;
- try {
- if (redisConnectionFactory != null) {
- RedisConnection connection = redisConnectionFactory.getConnection();
- isRedisAvailable = true;
- connection.close();
- }
- } catch (Exception e) {
-
- }
- result.put("dbAvailable", isDatabaseAvailable);
- result.put("redisAvailable", isRedisAvailable);
- result.put("systemTime", systemDate);
- return result;
- }
-
- //返回数据库枚举定义的value和display，枚举需实现IIntegerEnum接口
- @IgnoreValidate
- @GetMapping("enum/{enumName}")
- public List getEnum(@PathVariable String enumName) throws ClassNotFoundException {
- if (!StringUtils.isEmpty(enumsPackage)) {
- String className = enumsPackage + "." + enumName;
- if (!className.endsWith("Enum")) {
- className += "Enum";
- }
- Class enumClass = (Class) Class.forName(className);
- IIntegerEnum[] enums = enumClass.getEnumConstants();
- List enumItemViews = new ArrayList<>();
- for (IIntegerEnum anEnum : enums) {
- EnumItemView enumItemView = new EnumItemView();
- enumItemView.setValue(anEnum.getValue());
- enumItemView.setDisplay(anEnum.getDisplay());
- enumItemViews.add(enumItemView);
- }
- return enumItemViews;
- }
- return null;
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/annotations/IgnoreAuth.java b/api-prototype/src/main/java/com/docus/api/prototype/web/annotations/IgnoreAuth.java
deleted file mode 100644
index 7a6f753..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/annotations/IgnoreAuth.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.docus.api.prototype.web.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-//忽略权限验证
-@Target({ ElementType.METHOD,ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface IgnoreAuth {
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/annotations/IgnoreValidate.java b/api-prototype/src/main/java/com/docus/api/prototype/web/annotations/IgnoreValidate.java
deleted file mode 100644
index c2c577c..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/annotations/IgnoreValidate.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.docus.api.prototype.web.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-//忽略鉴权验证
-@Target({ ElementType.METHOD,ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface IgnoreValidate {
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/annotations/OperateLog.java b/api-prototype/src/main/java/com/docus/api/prototype/web/annotations/OperateLog.java
deleted file mode 100644
index b7368be..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/annotations/OperateLog.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.docus.api.prototype.web.annotations;
-
-import com.docus.api.prototype.web.aspect.OperateType;
-
-import java.lang.annotation.*;
-
-//操作日志注解
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-public @interface OperateLog {
- //操作类型
- OperateType type();
-
- //操作模块
- String module();
-
- //日志内容，如果没有指定日志内容，将参数json字符串作为日志内容
- String content() default "";
-
- //是否记录参数，参数敏感接口（如登录页），设置false，不记录参数
- boolean logParameter() default true;
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/aspect/OperateLogAop.java b/api-prototype/src/main/java/com/docus/api/prototype/web/aspect/OperateLogAop.java
deleted file mode 100644
index a76a6c6..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/aspect/OperateLogAop.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.docus.api.prototype.web.aspect;
-
-import com.docus.api.prototype.config.ApiProperties;
-import com.docus.api.prototype.web.annotations.OperateLog;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Method;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Consumer;
-
-@Aspect
-public class OperateLogAop {
- private static final Logger logger = LoggerFactory.getLogger(OperateLogAop.class);
-
- @Autowired
- private ApiProperties apiProperties;
- private Consumer logSaver;
- private Set ignoredOperateTypes;
-
- public OperateLogAop(Consumer logSaver) {
- this.logSaver = logSaver;
- }
-
- @After(value = "@annotation(operateLog) ")
- public void after(JoinPoint joinPoint, OperateLog operateLog) {
- if (ignoredOperateTypes == null) {
- synchronized (this) {
- ignoredOperateTypes = new HashSet<>();
- if (!StringUtils.isEmpty(apiProperties.getOperateLogIgnoreType())) {
- String[] split = apiProperties.getOperateLogIgnoreType().split("\\| ");
- for (String str : split) {
- OperateType operateType = Enum.valueOf(OperateType.class, str);
- ignoredOperateTypes.add(operateType);
- }
- }
- }
- }
- if (logSaver == null) {
- return;
- }
- if (ignoredOperateTypes.contains(operateLog.type())) {
- logger.debug("ignored operate log {}-{}", operateLog.type(), operateLog.module());
- return;
- }
-
- RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
- HttpServletRequest request = null;
- if (requestAttributes != null && requestAttributes.getClass().isAssignableFrom(ServletRequestAttributes.class)) {
- request = ((ServletRequestAttributes) requestAttributes).getRequest();
-
- }
- if (request != null) {
- Method method = ((MethodSignature) joinPoint.getSignature()).getMethod();
- OperateLogAopContext context = new OperateLogAopContext(operateLog, request, method, joinPoint.getArgs());
- logSaver.accept(context);
- }
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/aspect/OperateLogAopContext.java b/api-prototype/src/main/java/com/docus/api/prototype/web/aspect/OperateLogAopContext.java
deleted file mode 100644
index ea64f62..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/aspect/OperateLogAopContext.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.docus.api.prototype.web.aspect;
-
-import com.docus.api.prototype.web.annotations.OperateLog;
-
-import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Method;
-
-public class OperateLogAopContext {
- private OperateLog operateLog;
- private HttpServletRequest request;
- private Method method;
- private Object[] args;
-
- public OperateLogAopContext(OperateLog operateLog, HttpServletRequest request, Method method, Object[] args) {
- this.operateLog = operateLog;
- this.request = request;
- this.method = method;
- this.args = args;
- }
-
- public OperateLog getOperateLog() {
- return operateLog;
- }
-
- public HttpServletRequest getRequest() {
- return request;
- }
-
- public Method getMethod() {
- return method;
- }
-
- public Object[] getArgs() {
- return args;
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/aspect/OperateType.java b/api-prototype/src/main/java/com/docus/api/prototype/web/aspect/OperateType.java
deleted file mode 100644
index 5008769..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/aspect/OperateType.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.docus.api.prototype.web.aspect;
-
-public enum OperateType {
- LOGIN,
- LOGOUT,
- QUERY,
- SAVE,
- DELETE,
- UPLOAD,
- DOWNLOAD,
- OTHERS
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/filter/AccessLimitFilter.java b/api-prototype/src/main/java/com/docus/api/prototype/web/filter/AccessLimitFilter.java
deleted file mode 100644
index fb530f6..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/filter/AccessLimitFilter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.docus.api.prototype.web.filter;
-
-import com.docus.api.prototype.config.ApiProperties;
-import com.docus.api.prototype.utils.IPUtils;
-import com.docus.api.prototype.utils.JsonUtils;
-import com.docus.api.prototype.web.response.ApiException;
-import com.docus.api.prototype.web.response.ApiResult;
-import com.docus.api.prototype.web.response.ExceptionCode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.annotation.Order;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.WeakHashMap;
-//ip访问次数限制，简单通过内存weak map记录单位时间访问次数，超出次数直接返回
-@Order(30)
-public class AccessLimitFilter implements Filter {
- private static final WeakHashMap ACCESS_COUNT = new WeakHashMap<>();
- private static final Logger logger = LoggerFactory.getLogger(AccessLimitFilter.class);
- @Autowired
- private ApiProperties apiProperties;
-
- @Override
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
- if (apiProperties.getIpAccessLimit() != null && apiProperties.getIpAccessLimit() > 0) {
- String requestIP = IPUtils.getRequestIP((HttpServletRequest) request);
- String key = System.currentTimeMillis() / 1000 / apiProperties.getIpACcessLimitPeriodSecond() + " _" + requestIP;
- Integer count = ACCESS_COUNT.getOrDefault(key, 0);
- if (count > apiProperties.getIpAccessLimit()) {
- logger.info("IP{}访问受限", requestIP);
- ApiException apiException = new ApiException(ExceptionCode.IpRequestExceedLimit.getCode(), "您的请求太频繁，请稍微再试");
- response.setContentType("application/json; charset=utf-8");
- response.setCharacterEncoding("UTF-8");
- String message = JsonUtils.toJson(ApiResult.exception(apiException));
- OutputStream out = response.getOutputStream();
- out.write(message.getBytes("UTF-8"));
- out.flush();
- out.close();
- return;
- }
- synchronized (ACCESS_COUNT) {
- ACCESS_COUNT.put(key, ACCESS_COUNT.getOrDefault(key, 0) + 1);
- }
- }
- chain.doFilter(request, response);
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/filter/ExceptionHandleFi1ter.java b/api-prototype/src/main/java/com/docus/api/prototype/web/filter/ExceptionHandleFi1ter.java
deleted file mode 100644
index f561499..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/filter/ExceptionHandleFi1ter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.docus.api.prototype.web.filter;
-
-import com.docus.api.prototype.utils.JsonUtils;
-import com.docus.api.prototype.web.response.ApiException;
-import com.docus.api.prototype.web.response.ApiResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.annotation.Order;
-import org.springframework.web.util.NestedServletException;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.OutputStream;
-
-//ip访问次数限制，简单通过内存weak map记录单位时间访问次数，超出次数直接返回
-@Order(1)
-public class ExceptionHandleFi1ter implements Filter {
- private static final Logger logger = LoggerFactory.getLogger(ExceptionHandleFi1ter.class);
-
- @Override
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-
- try {
- chain.doFilter(request, response);
- } catch (Exception ex) {
-
- Exception innerException = null;
- String requestURI = ((HttpServletRequest) request).getRequestURI();
- if (ex instanceof ApiException || (ex instanceof NestedServletException && ex.getCause() != null && ex.getCause() instanceof ApiException)) {
- innerException = ex instanceof ApiException ? ex : (Exception) ex.getCause();
- logger.info("filter 异常，request url:{},{}", requestURI, ex.getMessage());
- } else {
- logger.info("filter 异常，request url:{},{}", requestURI, ex);
- }
- response.setContentType("application/json; charset=utf-8");
- response.setCharacterEncoding("UTF-8");
- String message = JsonUtils.toJson(ApiResult.exception(innerException == null ? ex : innerException));
- OutputStream out = response.getOutputStream();
- out.write(message.getBytes("UTF-8"));
- out.flush();
- out.close();
- }
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/filter/RequestLogFilter.java b/api-prototype/src/main/java/com/docus/api/prototype/web/filter/RequestLogFilter.java
deleted file mode 100644
index 61815ab..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/filter/RequestLogFilter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.docus.api.prototype.web.filter;
-
-import com.docus.api.prototype.config.ApiProperties;
-import com.docus.api.prototype.utils.IPUtils;
-import com.docus.api.prototype.utils.JsonUtils;
-import com.docus.api.prototype.web.request.HttpServletRequestBodyWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.annotation.Order;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.util.Enumeration;
-
-//记录request日志
-@Order(20)
-public class RequestLogFilter implements Filter {
-
- private static final Logger logger = LoggerFactory.getLogger(RequestLogFilter.class);
- @Autowired
- private ApiProperties apiProperties;
-
- @Override
- public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
- long startTime = System.currentTimeMillis();
- try {
- filterChain.doFilter(servletRequest, servletResponse);
- } finally {
- logRequest(servletRequest, startTime);
- }
- }
-
- private void logRequest(ServletRequest request, long startTime) {
- if (apiProperties.getEnableRequestlog() != null && apiProperties.getEnableRequestlog()) {
- try {
- if (request instanceof HttpServletRequest) {
- long elapsedMillis = System.currentTimeMillis();
- HttpServletRequest httpServletRequest = (HttpServletRequest) request;
- String ur1 = httpServletRequest.getRequestURI();
- //actuator相关请求不处理
- if (ur1.startsWith("/actuator")) {
- return;
- }
- String ip = IPUtils.getRequestIP(httpServletRequest);
- String params = JsonUtils.toJson(httpServletRequest.getParameterMap());
- StringBuilder headers = new StringBuilder();
- if (apiProperties.getRequestLogContainHeader()) {
- headers.append(", header: {");
- Enumeration headerNames = httpServletRequest.getHeaderNames();
- while (headerNames.hasMoreElements()) {
- String headerName = (String) headerNames.nextElement();
- headers.append(headerName).append(": ").append(httpServletRequest.getHeader(headerName)).append(" ,");
- }
- headers.append("}");
- }
- String body = null;
- if (request instanceof HttpServletRequestBodyWrapper) {
- body = ((HttpServletRequestBodyWrapper) request).getBody();
- }
- logger.info("{}, {}, {}, params:{}, body:{}, {}, {}-ms", ur1, httpServletRequest.getMethod(), ip, params, body, headers, elapsedMillis);
- }
- } catch (Exception е) {
- //gnore
- }
- }
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/filter/RequestTrackingFilter.java b/api-prototype/src/main/java/com/docus/api/prototype/web/filter/RequestTrackingFilter.java
deleted file mode 100644
index 2fe305f..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/filter/RequestTrackingFilter.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.docus.api.prototype.web.filter;
-
-import com.docus.api.prototype.log.RequestLogManager;
-import com.docus.api.prototype.log.RequestLoggerManager;
-import com.docus.api.prototype.web.request.HttpServletRequestBodyWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.annotation.Order;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Enumeration;
-
-//跟踪请求，记录请求上下文日志
-@Order(10)
-public class RequestTrackingFilter implements Filter {
- private static final Logger logger = LoggerFactory.getLogger(RequestTrackingFilter.class);
-
- @Override
- public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
- if (servletRequest instanceof HttpServletRequest && servletResponse instanceof HttpServletResponse) {
- HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest;
- String ur1 = httpServletRequest.getRequestURI();
- if (ur1.contains("favicon.ico")) {
- return;
- }
- //actuator相关请求不处理
- if (ur1.startsWith("/actuator")) {
- filterChain.doFilter(servletRequest, servletResponse);
- } else {
- filter(httpServletRequest, (HttpServletResponse) servletResponse, filterChain);
- }
- } else {
- filterChain.doFilter(servletRequest, servletResponse);
- }
- }
-
- protected void filter(HttpServletRequest servletRequest, HttpServletResponse servletResponse, FilterChain filterChain) throws IOException {
- long startTime = System.currentTimeMillis();
- RequestLoggerManager loggerManager = RequestLoggerManager.get();
- boolean isTrace = "Y".equalsIgnoreCase(servletRequest.getParameter("trace"));
- try {
- // 初始化trace . logger
- loggerManager.initialize(servletRequest.getRequestURL().toString());
- logger.debug("=== - begin request processing ===");
- logger.debug("Request URL : []", servletRequest.getRequestURL());
- logHeaders(servletRequest);
- logParameters(servletRequest);
- HttpServletRequestBodyWrapper requestWrapper = null;
- if (isContainsBody(servletRequest)) {
- requestWrapper = new HttpServletRequestBodyWrapper(servletRequest);
- logger.debug(" request. body: {}", requestWrapper.getBody());
- }
- filterChain.doFilter(requestWrapper != null ? requestWrapper : servletRequest, servletResponse);
- if (isTrace) {
- logger.debug("手动跟踪请求");
- loggerManager.manualFlush();
- }
- } catch (Exception ex) {
- logger.error("RequestTrackingFi1ter异常", ex);
- } finally {
- long elapsedTime = System.currentTimeMillis() - startTime;
- logger.debug("Total. elapsed: {}-ms", elapsedTime);
- logger.debug("=== finish request processing ===");
- boolean isElapsedover = loggerManager.flushOnElapsedCondition(elapsedTime);
- String requestUrl = loggerManager.getRequestUr1();
- String logFilePath = loggerManager.getLogFilePath();
- if (isElapsedover) {
- RequestLogManager.getInstance().addElapsedTrace(requestUrl, logFilePath, (int) elapsedTime);
- }
- if (loggerManager.isSqlCountExceed()) {
- RequestLogManager.getInstance().addSq1CountTrace(requestUrl, logFilePath, loggerManager.getSqlCount());
- }
- if (isTrace) {
- RequestLogManager.getInstance().addManualTrace(requestUrl, logFilePath);
- }
- loggerManager.cleanup();
- }
- }
-
- // 是否包含body
- protected boolean isContainsBody(HttpServletRequest request) {
- String httpMethod = request.getMethod();
- String contentType = request.getContentType();
- return ("POST".equalsIgnoreCase(httpMethod) || "PUT".equalsIgnoreCase(httpMethod))
- && (contentType == null || !contentType.toLowerCase().startsWith("multipart/"))
- && (request.getContentLength() > 0);
- }
-
- //记录请求头
- protected void logHeaders(HttpServletRequest request) {
- Enumeration headers = request.getHeaderNames();
- StringBuilder stringBuilder = new StringBuilder(200);
- stringBuilder.append("request headers:{").append("\r\n");
- while (headers.hasMoreElements()) {
- String headerName = (String) headers.nextElement();
- stringBuilder.append(" ").append(headerName).append(": ").append(request.getHeader(headerName)).append("\r\n");
- }
- stringBuilder.append("}").append("\r\n");
- logger.debug(stringBuilder.toString());
- }
-
- //记录请求参数
- protected void logParameters(HttpServletRequest request) {
- Enumeration paramNames = request.getParameterNames();
- StringBuilder stringBuilder = new StringBuilder(200);
- stringBuilder.append(" request. parameters: {").append("\r\n");
- while (paramNames.hasMoreElements()) {
- String paramName = (String) paramNames.nextElement();
- stringBuilder.append(" ").append(paramName).append(":").append(request.getParameter(paramName)).append("\r\n");
- }
- stringBuilder.append("}").append("\r\n");
- logger.debug(stringBuilder.toString());
- }
-
- @Override
- public void destroy() {
- System.out.println("Reques tTrackingFi1ter destory");
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/interceptor/TokenInterceptor.java b/api-prototype/src/main/java/com/docus/api/prototype/web/interceptor/TokenInterceptor.java
deleted file mode 100644
index a253482..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/interceptor/TokenInterceptor.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.docus.api.prototype.web.interceptor;
-
-import com.alibaba.fastjson.JSON;
-import com.docus.api.prototype.config.ApiProperties;
-import com.docus.api.prototype.web.annotations.IgnoreValidate;
-import com.docus.api.prototype.web.response.ApiException;
-import com.docus.api.prototype.web.response.ExceptionCode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.util.StringUtils;
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.concurrent.TimeUnit;
-
-public class TokenInterceptor extends HandlerInterceptorAdapter {
-
- private static final Logger logger = LoggerFactory.getLogger(TokenInterceptor.class);
-
- @Autowired
- private ApiProperties apiProperties;
-
- @Autowired
- private StringRedisTemplate stringRedisTemplate;
-
- //A/访问后自动延长重置token过期时间
- private boolean overtimeAfterAccess = true;
-
- public void setovertimeAfterAccess(boolean overtimeAfterAccess) {
- this.overtimeAfterAccess = overtimeAfterAccess;
- }
-
- private String tokenHeaderName = "api -token";
- private String userIdHeaderName = "user-id";
- private String tokenRedisKeyPrefix = "apiToken:";
- private String userIdPropertyName = "userId";
-
- public TokenInterceptor() {
-
- }
-
- public TokenInterceptor(String tokenHeaderName, String userIdHeaderName, String tokenRedisKeyPrefix) {
- this.tokenHeaderName = tokenHeaderName;
- this.userIdHeaderName = userIdHeaderName;
- tokenRedisKeyPrefix = tokenRedisKeyPrefix;
- }
-
- public TokenInterceptor(String tokenHeaderName, String userIdHeaderName, String tokenRedisKeyPrefix, String userIdPropertyName) {
- this.tokenHeaderName = tokenHeaderName;
- this.userIdHeaderName = userIdHeaderName;
- tokenRedisKeyPrefix = tokenRedisKeyPrefix;
- this.userIdPropertyName = userIdPropertyName;
- }
-
- @Override
- public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
- if (handler instanceof HandlerMethod) {
- HandlerMethod handlerMethod = (HandlerMethod) handler;
- Class controller = handlerMethod.getMethod().getDeclaringClass();
- if (handlerMethod.hasMethodAnnotation(IgnoreValidate.class) || controller.getAnnotation(IgnoreValidate.class) != null) {
- //忽略验证
- return super.preHandle(request, response, handler);
- }
- }
- validateToken(request);
- return super.preHandle(request, response, handler);
- }
-
- //验证token是否有效，并把token对应的用户信息存入上下文变量
- protected void validateToken(HttpServletRequest request) {
- String token = request.getHeader(tokenHeaderName);
- if (StringUtils.isEmpty(token)) {
- logger.info("token is empty");
- throw new ApiException(ExceptionCode.TokenError);
- }
- if (token.equals(apiProperties.getValidationTokenwhiteList())) {
- return;
- }
- String redisKey = tokenRedisKeyPrefix + token;
- if (stringRedisTemplate == null) {
- throw new RuntimeException("启用token验证依赖redis");
- }
- String redisValue = stringRedisTemplate.opsForValue().get(redisKey);
- if (StringUtils.isEmpty(redisValue)) {
- logger.info("token {} is not exist or expired", token);
- throw new ApiException(ExceptionCode.TokenError);
- }
- String userId = JSON.parseObject(redisValue).getString(userIdPropertyName);
- if (StringUtils.isEmpty(userId)) {
- logger.info("userId property {} not exists", userIdPropertyName);
- throw new ApiException(ExceptionCode.TokenError);
- }
- String headerUserId = request.getHeader(userIdHeaderName);
- if (!userId.equalsIgnoreCase(headerUserId)) {
- //非法 token , token和userid不匹配
- logger.info("token {} is not. match userId {}", token, headerUserId);
- throw new ApiException(ExceptionCode.TokenError);
- }
- //y重置token过期时间
- if (overtimeAfterAccess) {
- Long expireMinutes = stringRedisTemplate.getExpire(redisKey, TimeUnit.MINUTES);
- //-1表示不过期
- if (expireMinutes > -1 && expireMinutes < apiProperties.getValidationTokenExpireMinutes()) {
- stringRedisTemplate.expire(redisKey, apiProperties.getValidationTokenExpireMinutes(), TimeUnit.MINUTES);
- }
- }
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/monitor/RequestLogController.java b/api-prototype/src/main/java/com/docus/api/prototype/web/monitor/RequestLogController.java
deleted file mode 100644
index d4293dd..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/monitor/RequestLogController.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.docus.api.prototype.web.monitor;
-
-import com.docus.api.prototype.config.ApiProperties;
-import com.docus.api.prototype.log.RequestLog;
-import com.docus.api.prototype.log.RequestLogManager;
-import com.docus.api.prototype.security.EncryptUtils;
-import com.docus.api.prototype.utils.DateTimeUtils;
-import com.docus.api.prototype.utils.StringUtils;
-import com.docus.api.prototype.web.annotations.IgnoreAuth;
-import com.docus.api.prototype.web.annotations.IgnoreValidate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@IgnoreAuth
-@IgnoreValidate
-@Controller
-@RequestMapping(value = "monitor/requestLog")
-public class RequestLogController {
-
- private static final Logger logger = LoggerFactory.getLogger(RequestLogController.class);
- @Autowired
- private ApiProperties apiProperties;
-
- //简单bas ic验证,用户名密码固定logger:xmgpx
- private boolean doBasicAuth() {
- if (StringUtils.isEmpty(apiProperties.getRequestLogBasicAuth())) {
- return true;
- }
- HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
- HttpServletResponse response = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getResponse();
- String authorization = request.getHeader("Authorization");
- if (StringUtils.isEmpty(authorization) || !authorization.startsWith("Basic ")) {
- response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);//HTTP 401
- response.setHeader("WWW-Authenticate", "BASIC realm=/'auth/'");
- return false;
- }
- String userAndpassword = EncryptUtils.base64Decode(authorization.substring(6));
- if (!apiProperties.getRequestLogBasicAuth().equalsIgnoreCase(userAndpassword)) {
- response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);//HTTP 401
- response.setHeader("WW-Authenticate", "BASIC realm=/'auth/'");
- return false;
- }
- return true;
- }
-
- @GetMapping("")
- public void index(HttpServletResponse response) throws IOException {
- if (!doBasicAuth()) {
- return;
- }
- RequestLogManager traceLogStat = RequestLogManager.getInstance();
- StringBuilder content = new StringBuilder();
- content.append("");
- content.append(" Begin 1og time: ").append(DateTimeUtils.dateTimeDisplay(traceLogStat.getBeginStatTime())).append("
");
- content.append(" ");
- content.append(" | 跟踪类型 | 发生次数 | |
|---|
");
- content.append(" ");
- if (traceLogStat.getExceptionTraces().size() > 0) {
- content.append("| 异常 | ").append(traceLogStat.getExceptionTraces().size()).append(" | 详情 |
");
- }
- if (traceLogStat.getElapsedTimeTraces().size() > 0) {
- content.append(" | 请求响应缓慢 | ").append(traceLogStat.getElapsedTimeTraces().size()).append(" | 详情 |
");
- }
- if (traceLogStat.getSqlCountTraces().size() > 0) {
- content.append("| 数据库频繁操作 | ").append(traceLogStat.getSqlCountTraces().size()).append(" | 详情 |
");
- }
- if (traceLogStat.getManualTracks().size() > 0) {
- content.append("| 手动跟踪请求 | ").append(traceLogStat.getManualTracks().size()).append(" | 详情 |
");
- }
- content.append("");
- content.append("
");
- content.append("");
- response.setContentType(" text/html;charset=utf-8");
- PrintWriter out = response.getWriter();
- out.println(content);
- out.close();
- }
-
- @GetMapping("/exception")
- public void exception(HttpServletResponse response) throws IOException {
- RequestLogManager traceLogStat = RequestLogManager.getInstance();
- List traceLogs = traceLogStat.getExceptionTraces().values().stream().sorted((o1, o2) -> o2.getLogIndex().compareTo(o1.getLogIndex())).collect(Collectors.toList());
- }
-
- @GetMapping("/{index}")
- public void getExceptionLogFile(@PathVariable Integer index, HttpServletResponse response) {
- if (!doBasicAuth()) {
- return;
- }
- if (index != null && index > 0) {
- RequestLog traceLog = RequestLogManager.getInstance().getTraceLog(index);
- if (traceLog != null) {
- try {
- String filePath = traceLog.getLogFilePath();
- File file = new File(filePath);
- if (file.exists()) {
- long fileLength = file.length();
- //清空response
- response.reset();
- response.setContentType(" application/ octet-stream; charset=utf-8");
- response.setHeader("content-disposition", "attachment;filename=" + file.getName());
- response.setHeader("Content-Length", String.valueOf(fileLength));
- try (InputStream inputStream = new FileInputStream(file);
- OutputStream outputStream = response.getOutputStream()) {
- byte[] b = new byte[2048];
- while (inputStream.read(b) != -1) {
- outputStream.write(b);
- }
- outputStream.flush();
- }
- return;
- } else {
- response.setHeader("error", "file. does not exist");
- }
- } catch (Exception e) {
- response.setHeader("error", e.getMessage());
- return;
- }
- //1 ignore
- } else {
- response.setHeader("error", "exception does not exist");
- return;
- }
- response.setHeader("error", "index argument. invalid");
- }
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/request/HttpServletRequestBodyWrapper.java b/api-prototype/src/main/java/com/docus/api/prototype/web/request/HttpServletRequestBodyWrapper.java
deleted file mode 100644
index d031089..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/request/HttpServletRequestBodyWrapper.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.docus.api.prototype.web.request;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import java.io.*;
-import java.nio.charset.Charset;
-
-//body默认只能读取一次，为了可重复读，增加
-public class HttpServletRequestBodyWrapper extends HttpServletRequestWrapper {
- private static final Logger logger = LoggerFactory.getLogger(HttpServletRequestBodyWrapper.class);
-
- private byte[] body;
-
- public HttpServletRequestBodyWrapper(HttpServletRequest request) throws IOException {
- super(request);
- body = readBodyToString(request).getBytes(Charset.forName("UTF-8"));
- request.setAttribute("isBodyWrapped", true);
- }
-
- public String getBody() {
- return new String(body);
- }
-
- private String readBodyToString(HttpServletRequest request) throws IOException {
- StringBuilder stringBuilder = new StringBuilder();
- InputStream inputStream = null;
- BufferedReader bufferedReader = null;
- try {
- inputStream = request.getInputStream();
- bufferedReader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
- String line;
- while ((line = bufferedReader.readLine()) != null) {
- stringBuilder.append(line);
- }
- } catch (IOException e) {
- logger.error(" readBodyToString exception", e);
- throw e;
- } finally {
- if (inputStream != null) {
- inputStream.close();
- }
- if (bufferedReader != null) {
- bufferedReader.close();
- }
- }
- return stringBuilder.toString();
- }
-
- @Override
- public BufferedReader getReader() throws IOException {
- return new BufferedReader(new InputStreamReader(getInputStream()));
- }
-
- @Override
- public ServletInputStream getInputStream() throws IOException {
- final ByteArrayInputStream bais = new ByteArrayInputStream(body);
- return new ServletInputStream() {
- @Override
- public int read() throws IOException {
- return bais.read();
- }
-
- @Override
- public boolean isFinished() {
- return false;
- }
-
- @Override
- public boolean isReady() {
- return false;
- }
-
- @Override
- public void setReadListener(ReadListener listener) {
-
- }
- };
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/request/ParamsMap.java b/api-prototype/src/main/java/com/docus/api/prototype/web/request/ParamsMap.java
deleted file mode 100644
index bcb97f2..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/request/ParamsMap.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.docus.api.prototype.web.request;
-
-import com.docus.api.prototype.utils.ConvertUtils;
-import com.docus.api.prototype.utils.DateTimeUtils;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.HashMap;
-
-public class ParamsMap extends HashMap {
- public String getString(String key) {
- return get(key) == null ? null : get(key).toString();
- }
-
- public Integer getInteger(String key) {
- return get(key) == null ? null : ConvertUtils.toInteger(get(key).toString(), null);
- }
-
- public Integer getInteger(String key, Integer defaultvalue) {
- return get(key) == null ? defaultvalue : ConvertUtils.toInteger(get(key).toString(), defaultvalue);
- }
-
- public Long getLong(String key) {
- return get(key) == null ? null : ConvertUtils.toLong(get(key).toString(), null);
- }
-
- public Long getLong(String key, Long defaultvalue) {
- return get(key) == null ? defaultvalue : ConvertUtils.toLong(get(key).toString(), defaultvalue);
- }
-
- public LocalDateTime getLocalDateTime(String key) {
- return get(key) == null ? null : DateTimeUtils.toLocalDateTime(get(key).toString());
- }
-
- public LocalDate getLocalDate(String key) {
- return get(key) == null ? null : DateTimeUtils.toLocalDate(get(key).toString());
- }
-
- public Boolean getBoolean(String key) {
- return get(key) == null ? null : ConvertUtils.toBoolean(get(key));
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/request/SearchRequest.java b/api-prototype/src/main/java/com/docus/api/prototype/web/request/SearchRequest.java
deleted file mode 100644
index 3e64479..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/request/SearchRequest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.docus.api.prototype.web.request;
-
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
-//搜索请求参数，未定义的参数用map接收
-public class SearchRequest {
-
- private Integer page = 1;
-
- private Integer pageSize = 10;
- private LocalDateTime beginTime;
- private LocalDateTime endTime;
- private String keyword;
- private String sortBy;
- private String sortType;
- private Map params;
-
- public Integer getPage() {
- return page;
- }
-
- public void setPage(Integer page) {
- this.page = page;
- }
-
- public Integer getPageSize() {
- return pageSize;
- }
-
- public void setPageSize(Integer pageSize) {
- this.pageSize = pageSize;
- }
-
- public LocalDateTime getBeginTime() {
- return beginTime;
- }
-
- public void setBeginTime(LocalDateTime beginTime) {
- this.beginTime = beginTime;
- }
-
- public LocalDateTime getEndTime() {
- return endTime;
- }
-
- public void setEndTime(LocalDateTime endTime) {
- this.endTime = endTime;
- }
-
- public String getKeyword() {
- return keyword;
- }
-
- public void setKeyword(String keyword) {
- this.keyword = keyword;
- }
-
- public String getSortBy() {
- return sortBy;
- }
-
- public void setSortBy(String sortBy) {
- this.sortBy = sortBy;
- }
-
- public String getSortType() {
- return sortType;
- }
-
- public void setSortType(String sortType) {
- this.sortType = sortType;
- }
-
- public Object getParams(String key) {
- return params != null ? params.get(key) : null;
- }
-
- public void setParams(String key, Object value) {
- if (this.params == null) {
- this.params = new HashMap<>();
- }
- this.params.put(key, value);
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/response/ApiException.java b/api-prototype/src/main/java/com/docus/api/prototype/web/response/ApiException.java
deleted file mode 100644
index 2b9f1f8..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/response/ApiException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.docus.api.prototype.web.response;
-
-public class ApiException extends RuntimeException {
-
- private Integer code;
-
- public ApiException(Integer code) {
- this.code = code;
- }
-
- public ApiException(Integer code, String message) {
- super(message);
- this.code = code;
- }
-
- public ApiException(ExceptionCode exceptionCode) {
- super(exceptionCode.getMessage());
- this.code = exceptionCode.getCode();
- }
-
- public Integer getCode() {
- return code;
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/response/ApiResult.java b/api-prototype/src/main/java/com/docus/api/prototype/web/response/ApiResult.java
deleted file mode 100644
index b81e84f..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/response/ApiResult.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.docus.api.prototype.web.response;
-
-import org.springframework.web.multipart.MaxUploadSizeExceededException;
-import org.springframework.web.servlet.NoHandlerFoundException;
-
-import java.sql.SQLException;
-
-//api 统一返回类型
-public class ApiResult {
-
- private Integer code;
- private String message;
- private Object result;
-
- public static ApiResult success(Object result) {
- ApiResult apiResult = new ApiResult();
- apiResult.setCode(0);
- apiResult.setMessage("success");
- apiResult.setResult(result);
- return apiResult;
- }
-
- public static ApiResult exception(Exception ex) {
- ApiResult apiResult = new ApiResult();
- if (ex instanceof ApiException) {
- apiResult.setCode(((ApiException) ex).getCode());
- apiResult.setMessage(ex.getMessage());
- } else if (ex instanceof NoHandlerFoundException) {
- apiResult.setCode(404);
- apiResult.setMessage(ex.getMessage());
- } else if (ex instanceof MaxUploadSizeExceededException) {
- apiResult.setCode(500);
- apiResult.setMessage(" 上传附件过大 !");
- } else {
- apiResult.setCode(500);
- if (ex instanceof NullPointerException) {
- apiResult.setMessage("NullPointerException");
- } else if (isSQLException(ex)) {
- apiResult.setMessage("SQLException");
- } else {
- String message = ex.getMessage();
- if (message != null && message.length() > 500) {
- message = message.substring(0, 500) + "...";
- }
- apiResult.setMessage(message);
- }
- }
- apiResult.setResult(null);
- return apiResult;
- }
-
- //是否数据库异常
- private static boolean isSQLException(Throwable ex) {
- if (ex instanceof SQLException) {
- return true;
- }
- if (ex.getCause() != null) {
- return isSQLException(ex.getCause());
- }
- return false;
- }
-
- public Integer getCode() {
- return code;
- }
-
- public void setCode(Integer code) {
- this.code = code;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- public Object getResult() {
- return result;
- }
-
- public void setResult(Object result) {
- this.result = result;
- }
-}
diff --git a/api-prototype/src/main/java/com/docus/api/prototype/web/response/GlobalResponseBodyAdvice.java b/api-prototype/src/main/java/com/docus/api/prototype/web/response/GlobalResponseBodyAdvice.java
deleted file mode 100644
index d42aac8..0000000
--- a/api-prototype/src/main/java/com/docus/api/prototype/web/response/GlobalResponseBodyAdvice.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.docus.api.prototype.web.response;
-
-import com.docus.api.prototype.log.RequestLogManager;
-import com.docus.api.prototype.log.RequestLoggerManager;
-import com.docus.api.prototype.utils.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.MethodParameter;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.server.ServerHttpRequest;
-import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.http.server.ServletServerHttpResponse;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.servlet.NoHandlerFoundException;
-import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-//统一controller输出格式，和抛出的异常
-@RestControllerAdvice
-public class GlobalResponseBodyAdvice implements ResponseBodyAdvice