diff --git a/.gitignore b/.gitignore index 7795b63..78d9129 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,4 @@ target /useful-code.iml /.idea /resources/debug.log -java-utils.iml \ No newline at end of file +*.iml \ No newline at end of file diff --git a/README.md b/README.md index b0316d6..0b065d7 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -# java-utils +# Budd [![license](https://badgen.net/badge/license/MIT/blue)](./LICENSE) -[![](https://badgen.net/github/commits/ehlxr/java-utils)](https://github.com/ehlxr/java-utils/commits/) -[![](https://badgen.net/github/last-commit/ehlxr/java-utils)]((https://github.com/ehlxr/java-utils/commits/)) -[![](https://badgen.net/github/releases/ehlxr/java-utils)](https://github.com/ehlxr/java-utils/releases) +[![](https://badgen.net/github/commits/ehlxr/budd)](https://github.com/ehlxr/budd/commits/) +[![](https://badgen.net/github/last-commit/ehlxr/budd)]((https://github.com/ehlxr/budd/commits/)) +[![](https://badgen.net/github/releases/ehlxr/budd)](https://github.com/ehlxr/budd/releases) common utils of java diff --git a/pom.xml b/pom.xml index d124631..8b93fb3 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - osc.git.eh3 - java-utils + io.github.budd + budd war 0.0.1-SNAPSHOT - java-utils + budd http://maven.apache.org @@ -323,7 +323,7 @@ - java-utils + budd diff --git a/src/main/java/com/lk/phr/dao/UserQuotaDao.java b/src/main/java/com/lk/phr/dao/UserQuotaDao.java deleted file mode 100644 index 85841c9..0000000 --- a/src/main/java/com/lk/phr/dao/UserQuotaDao.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.lk.phr.dao; - -import com.lk.phr.model.UserQuotaModel; - -public interface UserQuotaDao { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table user_quota - * - * @mbg.generated - */ - int deleteByPrimaryKey(Long id); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table user_quota - * - * @mbg.generated - */ - int insert(UserQuotaModel record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table user_quota - * - * @mbg.generated - */ - int insertSelective(UserQuotaModel record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table user_quota - * - * @mbg.generated - */ - UserQuotaModel selectByPrimaryKey(Long id); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table user_quota - * - * @mbg.generated - */ - int updateByPrimaryKeySelective(UserQuotaModel record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table user_quota - * - * @mbg.generated - */ - int updateByPrimaryKey(UserQuotaModel record); -} \ No newline at end of file diff --git a/src/main/java/com/lk/phr/dao/UserQuotaDao.xml b/src/main/java/com/lk/phr/dao/UserQuotaDao.xml deleted file mode 100644 index bf4992b..0000000 --- a/src/main/java/com/lk/phr/dao/UserQuotaDao.xml +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - id, medical, user_history_seq_no, user_id, quota_code, quota_value, min_value, max_value, - flag, updated, created, check_date, device_sn, device_no, phr_uid, device_brand - - - - - delete from user_quota - where id = #{id,jdbcType=BIGINT} - - - insert into user_quota (id, medical, user_history_seq_no, - user_id, quota_code, quota_value, - min_value, max_value, flag, - updated, created, check_date, - device_sn, device_no, phr_uid, - device_brand) - values (#{id,jdbcType=BIGINT}, #{medical,jdbcType=BIT}, #{userHistorySeqNo,jdbcType=BIGINT}, - #{userId,jdbcType=BIGINT}, #{quotaCode,jdbcType=VARCHAR}, #{quotaValue,jdbcType=VARCHAR}, - #{minValue,jdbcType=DOUBLE}, #{maxValue,jdbcType=DOUBLE}, #{flag,jdbcType=INTEGER}, - #{updated,jdbcType=TIMESTAMP}, #{created,jdbcType=TIMESTAMP}, #{checkDate,jdbcType=TIMESTAMP}, - #{deviceSn,jdbcType=VARCHAR}, #{deviceNo,jdbcType=VARCHAR}, #{phrUid,jdbcType=BIGINT}, - #{deviceBrand,jdbcType=VARCHAR}) - - - insert into user_quota - - - id, - - - medical, - - - user_history_seq_no, - - - user_id, - - - quota_code, - - - quota_value, - - - min_value, - - - max_value, - - - flag, - - - updated, - - - created, - - - check_date, - - - device_sn, - - - device_no, - - - phr_uid, - - - device_brand, - - - - - #{id,jdbcType=BIGINT}, - - - #{medical,jdbcType=BIT}, - - - #{userHistorySeqNo,jdbcType=BIGINT}, - - - #{userId,jdbcType=BIGINT}, - - - #{quotaCode,jdbcType=VARCHAR}, - - - #{quotaValue,jdbcType=VARCHAR}, - - - #{minValue,jdbcType=DOUBLE}, - - - #{maxValue,jdbcType=DOUBLE}, - - - #{flag,jdbcType=INTEGER}, - - - #{updated,jdbcType=TIMESTAMP}, - - - #{created,jdbcType=TIMESTAMP}, - - - #{checkDate,jdbcType=TIMESTAMP}, - - - #{deviceSn,jdbcType=VARCHAR}, - - - #{deviceNo,jdbcType=VARCHAR}, - - - #{phrUid,jdbcType=BIGINT}, - - - #{deviceBrand,jdbcType=VARCHAR}, - - - - - - update user_quota - - - medical = #{medical,jdbcType=BIT}, - - - user_history_seq_no = #{userHistorySeqNo,jdbcType=BIGINT}, - - - user_id = #{userId,jdbcType=BIGINT}, - - - quota_code = #{quotaCode,jdbcType=VARCHAR}, - - - quota_value = #{quotaValue,jdbcType=VARCHAR}, - - - min_value = #{minValue,jdbcType=DOUBLE}, - - - max_value = #{maxValue,jdbcType=DOUBLE}, - - - flag = #{flag,jdbcType=INTEGER}, - - - updated = #{updated,jdbcType=TIMESTAMP}, - - - created = #{created,jdbcType=TIMESTAMP}, - - - check_date = #{checkDate,jdbcType=TIMESTAMP}, - - - device_sn = #{deviceSn,jdbcType=VARCHAR}, - - - device_no = #{deviceNo,jdbcType=VARCHAR}, - - - phr_uid = #{phrUid,jdbcType=BIGINT}, - - - device_brand = #{deviceBrand,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=BIGINT} - - - - update user_quota - set medical = #{medical,jdbcType=BIT}, - user_history_seq_no = #{userHistorySeqNo,jdbcType=BIGINT}, - user_id = #{userId,jdbcType=BIGINT}, - quota_code = #{quotaCode,jdbcType=VARCHAR}, - quota_value = #{quotaValue,jdbcType=VARCHAR}, - min_value = #{minValue,jdbcType=DOUBLE}, - max_value = #{maxValue,jdbcType=DOUBLE}, - flag = #{flag,jdbcType=INTEGER}, - updated = #{updated,jdbcType=TIMESTAMP}, - created = #{created,jdbcType=TIMESTAMP}, - check_date = #{checkDate,jdbcType=TIMESTAMP}, - device_sn = #{deviceSn,jdbcType=VARCHAR}, - device_no = #{deviceNo,jdbcType=VARCHAR}, - phr_uid = #{phrUid,jdbcType=BIGINT}, - device_brand = #{deviceBrand,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/java/com/lk/phr/model/UserQuotaModel.java b/src/main/java/com/lk/phr/model/UserQuotaModel.java deleted file mode 100644 index a7efa36..0000000 --- a/src/main/java/com/lk/phr/model/UserQuotaModel.java +++ /dev/null @@ -1,570 +0,0 @@ -package com.lk.phr.model; - -import java.util.Date; - -/** - * - * This class was generated by MyBatis Generator. - * This class corresponds to the database table user_quota - */ -public class UserQuotaModel { - /** - * Database Column Remarks: - * id - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_quota.id - * - * @mbg.generated - */ - private Long id; - - /** - * Database Column Remarks: - * medical - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_quota.medical - * - * @mbg.generated - */ - private Boolean medical; - - /** - * Database Column Remarks: - * user_history序列号 - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_quota.user_history_seq_no - * - * @mbg.generated - */ - private Long userHistorySeqNo; - - /** - * Database Column Remarks: - * user_id - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_quota.user_id - * - * @mbg.generated - */ - private Long userId; - - /** - * Database Column Remarks: - * 指标Code - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_quota.quota_code - * - * @mbg.generated - */ - private String quotaCode; - - /** - * Database Column Remarks: - * 指标值 - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_quota.quota_value - * - * @mbg.generated - */ - private String quotaValue; - - /** - * Database Column Remarks: - * 指标最小值 - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_quota.min_value - * - * @mbg.generated - */ - private Double minValue; - - /** - * Database Column Remarks: - * 指标最大值 - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_quota.max_value - * - * @mbg.generated - */ - private Double maxValue; - - /** - * Database Column Remarks: - * flag - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_quota.flag - * - * @mbg.generated - */ - private Integer flag; - - /** - * Database Column Remarks: - * updated - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_quota.updated - * - * @mbg.generated - */ - private Date updated; - - /** - * Database Column Remarks: - * created - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_quota.created - * - * @mbg.generated - */ - private Date created; - - /** - * Database Column Remarks: - * 监测日期 - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_quota.check_date - * - * @mbg.generated - */ - private Date checkDate; - - /** - * Database Column Remarks: - * 设备编码 - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_quota.device_sn - * - * @mbg.generated - */ - private String deviceSn; - - /** - * Database Column Remarks: - * 设备序列号 - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_quota.device_no - * - * @mbg.generated - */ - private String deviceNo; - - /** - * Database Column Remarks: - * phr体系内用户id - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_quota.phr_uid - * - * @mbg.generated - */ - private Long phrUid; - - /** - * Database Column Remarks: - * 设备品牌 - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column user_quota.device_brand - * - * @mbg.generated - */ - private String deviceBrand; - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_quota.id - * - * @return the value of user_quota.id - * - * @mbg.generated - */ - public Long getId() { - return id; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_quota.id - * - * @param id the value for user_quota.id - * - * @mbg.generated - */ - public void setId(Long id) { - this.id = id; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_quota.medical - * - * @return the value of user_quota.medical - * - * @mbg.generated - */ - public Boolean getMedical() { - return medical; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_quota.medical - * - * @param medical the value for user_quota.medical - * - * @mbg.generated - */ - public void setMedical(Boolean medical) { - this.medical = medical; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_quota.user_history_seq_no - * - * @return the value of user_quota.user_history_seq_no - * - * @mbg.generated - */ - public Long getUserHistorySeqNo() { - return userHistorySeqNo; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_quota.user_history_seq_no - * - * @param userHistorySeqNo the value for user_quota.user_history_seq_no - * - * @mbg.generated - */ - public void setUserHistorySeqNo(Long userHistorySeqNo) { - this.userHistorySeqNo = userHistorySeqNo; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_quota.user_id - * - * @return the value of user_quota.user_id - * - * @mbg.generated - */ - public Long getUserId() { - return userId; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_quota.user_id - * - * @param userId the value for user_quota.user_id - * - * @mbg.generated - */ - public void setUserId(Long userId) { - this.userId = userId; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_quota.quota_code - * - * @return the value of user_quota.quota_code - * - * @mbg.generated - */ - public String getQuotaCode() { - return quotaCode; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_quota.quota_code - * - * @param quotaCode the value for user_quota.quota_code - * - * @mbg.generated - */ - public void setQuotaCode(String quotaCode) { - this.quotaCode = quotaCode == null ? null : quotaCode.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_quota.quota_value - * - * @return the value of user_quota.quota_value - * - * @mbg.generated - */ - public String getQuotaValue() { - return quotaValue; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_quota.quota_value - * - * @param quotaValue the value for user_quota.quota_value - * - * @mbg.generated - */ - public void setQuotaValue(String quotaValue) { - this.quotaValue = quotaValue == null ? null : quotaValue.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_quota.min_value - * - * @return the value of user_quota.min_value - * - * @mbg.generated - */ - public Double getMinValue() { - return minValue; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_quota.min_value - * - * @param minValue the value for user_quota.min_value - * - * @mbg.generated - */ - public void setMinValue(Double minValue) { - this.minValue = minValue; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_quota.max_value - * - * @return the value of user_quota.max_value - * - * @mbg.generated - */ - public Double getMaxValue() { - return maxValue; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_quota.max_value - * - * @param maxValue the value for user_quota.max_value - * - * @mbg.generated - */ - public void setMaxValue(Double maxValue) { - this.maxValue = maxValue; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_quota.flag - * - * @return the value of user_quota.flag - * - * @mbg.generated - */ - public Integer getFlag() { - return flag; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_quota.flag - * - * @param flag the value for user_quota.flag - * - * @mbg.generated - */ - public void setFlag(Integer flag) { - this.flag = flag; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_quota.updated - * - * @return the value of user_quota.updated - * - * @mbg.generated - */ - public Date getUpdated() { - return updated; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_quota.updated - * - * @param updated the value for user_quota.updated - * - * @mbg.generated - */ - public void setUpdated(Date updated) { - this.updated = updated; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_quota.created - * - * @return the value of user_quota.created - * - * @mbg.generated - */ - public Date getCreated() { - return created; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_quota.created - * - * @param created the value for user_quota.created - * - * @mbg.generated - */ - public void setCreated(Date created) { - this.created = created; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_quota.check_date - * - * @return the value of user_quota.check_date - * - * @mbg.generated - */ - public Date getCheckDate() { - return checkDate; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_quota.check_date - * - * @param checkDate the value for user_quota.check_date - * - * @mbg.generated - */ - public void setCheckDate(Date checkDate) { - this.checkDate = checkDate; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_quota.device_sn - * - * @return the value of user_quota.device_sn - * - * @mbg.generated - */ - public String getDeviceSn() { - return deviceSn; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_quota.device_sn - * - * @param deviceSn the value for user_quota.device_sn - * - * @mbg.generated - */ - public void setDeviceSn(String deviceSn) { - this.deviceSn = deviceSn == null ? null : deviceSn.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_quota.device_no - * - * @return the value of user_quota.device_no - * - * @mbg.generated - */ - public String getDeviceNo() { - return deviceNo; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_quota.device_no - * - * @param deviceNo the value for user_quota.device_no - * - * @mbg.generated - */ - public void setDeviceNo(String deviceNo) { - this.deviceNo = deviceNo == null ? null : deviceNo.trim(); - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_quota.phr_uid - * - * @return the value of user_quota.phr_uid - * - * @mbg.generated - */ - public Long getPhrUid() { - return phrUid; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_quota.phr_uid - * - * @param phrUid the value for user_quota.phr_uid - * - * @mbg.generated - */ - public void setPhrUid(Long phrUid) { - this.phrUid = phrUid; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column user_quota.device_brand - * - * @return the value of user_quota.device_brand - * - * @mbg.generated - */ - public String getDeviceBrand() { - return deviceBrand; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column user_quota.device_brand - * - * @param deviceBrand the value for user_quota.device_brand - * - * @mbg.generated - */ - public void setDeviceBrand(String deviceBrand) { - this.deviceBrand = deviceBrand == null ? null : deviceBrand.trim(); - } -} \ No newline at end of file diff --git a/src/main/java/me/ehlxr/CharToHex.java b/src/main/java/io/github/ehlxr/CharToHex.java similarity index 96% rename from src/main/java/me/ehlxr/CharToHex.java rename to src/main/java/io/github/ehlxr/CharToHex.java index 18398a3..9d7ebfa 100644 --- a/src/main/java/me/ehlxr/CharToHex.java +++ b/src/main/java/io/github/ehlxr/CharToHex.java @@ -1,4 +1,4 @@ -package me.ehlxr; +package io.github.ehlxr; /** * Created by ehlxr on 2017/8/3. @@ -68,7 +68,7 @@ public class CharToHex { } public static String toUnicode(String s) { - String as[] = new String[s.length()]; + String[] as = new String[s.length()]; StringBuilder s1 = new StringBuilder(); for (int i = 0; i < s.length(); i++) { as[i] = Integer.toHexString(s.charAt(i) & 0xffff); diff --git a/src/main/java/me/ehlxr/ContentReplace.java b/src/main/java/io/github/ehlxr/ContentReplace.java similarity index 99% rename from src/main/java/me/ehlxr/ContentReplace.java rename to src/main/java/io/github/ehlxr/ContentReplace.java index 02c5c4d..598894f 100644 --- a/src/main/java/me/ehlxr/ContentReplace.java +++ b/src/main/java/io/github/ehlxr/ContentReplace.java @@ -1,4 +1,4 @@ -package me.ehlxr; +package io.github.ehlxr; import java.io.*; diff --git a/src/main/java/me/ehlxr/ContentReplace2.java b/src/main/java/io/github/ehlxr/ContentReplace2.java similarity index 98% rename from src/main/java/me/ehlxr/ContentReplace2.java rename to src/main/java/io/github/ehlxr/ContentReplace2.java index 24c06d3..3a16358 100644 --- a/src/main/java/me/ehlxr/ContentReplace2.java +++ b/src/main/java/io/github/ehlxr/ContentReplace2.java @@ -1,4 +1,4 @@ -package me.ehlxr; +package io.github.ehlxr; import java.io.*; diff --git a/src/main/java/me/ehlxr/DemoECDSA.java b/src/main/java/io/github/ehlxr/DemoECDSA.java similarity index 99% rename from src/main/java/me/ehlxr/DemoECDSA.java rename to src/main/java/io/github/ehlxr/DemoECDSA.java index d6bb033..4be8b79 100644 --- a/src/main/java/me/ehlxr/DemoECDSA.java +++ b/src/main/java/io/github/ehlxr/DemoECDSA.java @@ -1,4 +1,4 @@ -package me.ehlxr; +package io.github.ehlxr; import org.apache.commons.codec.binary.Base64; diff --git a/src/main/java/me/ehlxr/DidSdkTest.java b/src/main/java/io/github/ehlxr/DidSdkTest.java similarity index 97% rename from src/main/java/me/ehlxr/DidSdkTest.java rename to src/main/java/io/github/ehlxr/DidSdkTest.java index 77df266..95581e7 100644 --- a/src/main/java/me/ehlxr/DidSdkTest.java +++ b/src/main/java/io/github/ehlxr/DidSdkTest.java @@ -1,4 +1,4 @@ -package me.ehlxr; +package io.github.ehlxr; // // import cn.ceres.did.client.SdkClient; // import cn.ceres.did.sdk.SdkProto; diff --git a/src/main/java/me/ehlxr/DumpStack.java b/src/main/java/io/github/ehlxr/DumpStack.java similarity index 99% rename from src/main/java/me/ehlxr/DumpStack.java rename to src/main/java/io/github/ehlxr/DumpStack.java index 9e99b99..45c8fc8 100644 --- a/src/main/java/me/ehlxr/DumpStack.java +++ b/src/main/java/io/github/ehlxr/DumpStack.java @@ -1,4 +1,4 @@ -package me.ehlxr; +package io.github.ehlxr; import java.io.*; import java.lang.management.*; diff --git a/src/main/java/me/ehlxr/FindRequestMapping.java b/src/main/java/io/github/ehlxr/FindRequestMapping.java similarity index 91% rename from src/main/java/me/ehlxr/FindRequestMapping.java rename to src/main/java/io/github/ehlxr/FindRequestMapping.java index 9aec1f8..0257244 100644 --- a/src/main/java/me/ehlxr/FindRequestMapping.java +++ b/src/main/java/io/github/ehlxr/FindRequestMapping.java @@ -1,4 +1,4 @@ -package me.ehlxr; +package io.github.ehlxr; import java.io.*; @@ -7,8 +7,8 @@ import java.io.*; * @author ehlxr */ public class FindRequestMapping { - private static int total = 0; - private static int unDeal = 0; + private static final int total = 0; + private static final int unDeal = 0; public static void main(String[] args) throws IOException { File dir = new File("/Users/ehlxr/WorkSpaces/enncloud/ceres-epns/ceres-epns-web/src/main/java/com/ceres/epns/web"); diff --git a/src/main/java/me/ehlxr/LambdaTest.java b/src/main/java/io/github/ehlxr/LambdaTest.java similarity index 98% rename from src/main/java/me/ehlxr/LambdaTest.java rename to src/main/java/io/github/ehlxr/LambdaTest.java index 7d80ada..ed1f3a1 100644 --- a/src/main/java/me/ehlxr/LambdaTest.java +++ b/src/main/java/io/github/ehlxr/LambdaTest.java @@ -1,4 +1,4 @@ -package me.ehlxr; +package io.github.ehlxr; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/me/ehlxr/MD2Json.java b/src/main/java/io/github/ehlxr/MD2Json.java similarity index 96% rename from src/main/java/me/ehlxr/MD2Json.java rename to src/main/java/io/github/ehlxr/MD2Json.java index 388b61f..0a18b61 100644 --- a/src/main/java/me/ehlxr/MD2Json.java +++ b/src/main/java/io/github/ehlxr/MD2Json.java @@ -1,4 +1,4 @@ -package me.ehlxr; +package io.github.ehlxr; import net.sf.json.JSONObject; import org.apache.commons.io.FileUtils; diff --git a/src/main/java/me/ehlxr/Modify.java b/src/main/java/io/github/ehlxr/Modify.java similarity index 95% rename from src/main/java/me/ehlxr/Modify.java rename to src/main/java/io/github/ehlxr/Modify.java index 4cf477a..945bd03 100644 --- a/src/main/java/me/ehlxr/Modify.java +++ b/src/main/java/io/github/ehlxr/Modify.java @@ -1,4 +1,4 @@ -package me.ehlxr; +package io.github.ehlxr; import java.io.*; @@ -17,7 +17,7 @@ public class Modify { private final String target; private final String newContent; - private String path; + private final String path; public Modify(String path, String target, String newContent) { // 操作目录。从该目录开始。该文件目录下及其所有子目录的文件都将被替换。 @@ -33,7 +33,7 @@ public class Modify { public static void main(String[] args) { //代码测试：假设有一个test文件夹，test文件夹下含有若干文件或者若干子目录，子目录下可能也含有若干文件或者若干子目录（意味着可以递归操作）。 //把test目录下以及所有子目录下（如果有）中文件含有"hi"的字符串行替换成新的"hello,world!"字符串行。 - new Modify("/Users/ehlxr/WorkSpaces/java-utils/src/main/java/me/ehlxr/test.txt", "hi", "hello,world!"); + new Modify("/Users/ehlxr/WorkSpaces/budd/src/main/java/me/ehlxr/test.txt", "hi", "hello,world!"); } private void operation() { diff --git a/src/main/java/me/ehlxr/PrintMatrixClockWisely.java b/src/main/java/io/github/ehlxr/PrintMatrixClockWisely.java similarity index 99% rename from src/main/java/me/ehlxr/PrintMatrixClockWisely.java rename to src/main/java/io/github/ehlxr/PrintMatrixClockWisely.java index 9444d5d..07a3420 100644 --- a/src/main/java/me/ehlxr/PrintMatrixClockWisely.java +++ b/src/main/java/io/github/ehlxr/PrintMatrixClockWisely.java @@ -1,4 +1,4 @@ -package me.ehlxr; +package io.github.ehlxr; /** * Created by ehlxr on 2018/2/13. diff --git a/src/main/java/me/ehlxr/ReferenceCountingGC.java b/src/main/java/io/github/ehlxr/ReferenceCountingGC.java similarity index 90% rename from src/main/java/me/ehlxr/ReferenceCountingGC.java rename to src/main/java/io/github/ehlxr/ReferenceCountingGC.java index e1a0612..0e53b41 100644 --- a/src/main/java/me/ehlxr/ReferenceCountingGC.java +++ b/src/main/java/io/github/ehlxr/ReferenceCountingGC.java @@ -1,4 +1,4 @@ -package me.ehlxr; +package io.github.ehlxr; /** * @author ehlxr @@ -10,7 +10,7 @@ public class ReferenceCountingGC { /** * 这个成员属性的唯一意义就是占点内存，以便在能在 GC 日志中看清楚是否有回收过 */ - private byte[] bigSize = new byte[2 * _1MB]; + private final byte[] bigSize = new byte[2 * _1MB]; public static void testGC() { ReferenceCountingGC objA = new ReferenceCountingGC(); diff --git a/src/main/java/me/ehlxr/Rename.java b/src/main/java/io/github/ehlxr/Rename.java similarity index 98% rename from src/main/java/me/ehlxr/Rename.java rename to src/main/java/io/github/ehlxr/Rename.java index a735328..4da0a27 100644 --- a/src/main/java/me/ehlxr/Rename.java +++ b/src/main/java/io/github/ehlxr/Rename.java @@ -1,4 +1,4 @@ -package me.ehlxr; +package io.github.ehlxr; import java.io.*; diff --git a/src/main/java/me/ehlxr/SnowflakeIdWorker.java b/src/main/java/io/github/ehlxr/SnowflakeIdWorker.java similarity index 98% rename from src/main/java/me/ehlxr/SnowflakeIdWorker.java rename to src/main/java/io/github/ehlxr/SnowflakeIdWorker.java index e9f3660..8201fcb 100644 --- a/src/main/java/me/ehlxr/SnowflakeIdWorker.java +++ b/src/main/java/io/github/ehlxr/SnowflakeIdWorker.java @@ -1,4 +1,4 @@ -package me.ehlxr; +package io.github.ehlxr; /** @@ -64,12 +64,12 @@ public class SnowflakeIdWorker { /** * 工作机器ID(0~31) */ - private long workerId; + private final long workerId; /** * 数据中心ID(0~31) */ - private long datacenterId; + private final long datacenterId; /** * 毫秒内序列(0~4095) diff --git a/src/main/java/me/ehlxr/VarArgsTest.java b/src/main/java/io/github/ehlxr/VarArgsTest.java similarity index 92% rename from src/main/java/me/ehlxr/VarArgsTest.java rename to src/main/java/io/github/ehlxr/VarArgsTest.java index b45b143..43d98cd 100644 --- a/src/main/java/me/ehlxr/VarArgsTest.java +++ b/src/main/java/io/github/ehlxr/VarArgsTest.java @@ -1,4 +1,4 @@ -package me.ehlxr; +package io.github.ehlxr; /** * Created by ehlxr on 2018/1/16. diff --git a/src/main/java/me/ehlxr/activemq/JMSConsumer.java b/src/main/java/io/github/ehlxr/activemq/JMSConsumer.java similarity index 88% rename from src/main/java/me/ehlxr/activemq/JMSConsumer.java rename to src/main/java/io/github/ehlxr/activemq/JMSConsumer.java index 8e6719c..32300a4 100644 --- a/src/main/java/me/ehlxr/activemq/JMSConsumer.java +++ b/src/main/java/io/github/ehlxr/activemq/JMSConsumer.java @@ -1,15 +1,9 @@ -package me.ehlxr.activemq; +package io.github.ehlxr.activemq; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.ActiveMQConnectionFactory; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.MessageConsumer; -import javax.jms.Session; -import javax.jms.TextMessage; +import javax.jms.*; /** * 消息的消费者（接受者） diff --git a/src/main/java/me/ehlxr/activemq/JMSProducer.java b/src/main/java/io/github/ehlxr/activemq/JMSProducer.java similarity index 91% rename from src/main/java/me/ehlxr/activemq/JMSProducer.java rename to src/main/java/io/github/ehlxr/activemq/JMSProducer.java index eb7fbce..fb85979 100644 --- a/src/main/java/me/ehlxr/activemq/JMSProducer.java +++ b/src/main/java/io/github/ehlxr/activemq/JMSProducer.java @@ -1,15 +1,9 @@ -package me.ehlxr.activemq; +package io.github.ehlxr.activemq; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.ActiveMQConnectionFactory; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.jms.TextMessage; +import javax.jms.*; /** * 消息的生产者（发送者） diff --git a/src/main/java/me/ehlxr/annotation/PkgAnnotation.java b/src/main/java/io/github/ehlxr/annotation/PkgAnnotation.java similarity index 89% rename from src/main/java/me/ehlxr/annotation/PkgAnnotation.java rename to src/main/java/io/github/ehlxr/annotation/PkgAnnotation.java index e42ef4d..001b904 100644 --- a/src/main/java/me/ehlxr/annotation/PkgAnnotation.java +++ b/src/main/java/io/github/ehlxr/annotation/PkgAnnotation.java @@ -1,7 +1,7 @@ /** * */ -package me.ehlxr.annotation; +package io.github.ehlxr.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/me/ehlxr/annotation/TestPkgAnnotation.java b/src/main/java/io/github/ehlxr/annotation/TestPkgAnnotation.java similarity index 93% rename from src/main/java/me/ehlxr/annotation/TestPkgAnnotation.java rename to src/main/java/io/github/ehlxr/annotation/TestPkgAnnotation.java index 3083619..638708b 100644 --- a/src/main/java/me/ehlxr/annotation/TestPkgAnnotation.java +++ b/src/main/java/io/github/ehlxr/annotation/TestPkgAnnotation.java @@ -1,4 +1,4 @@ -package me.ehlxr.annotation; +package io.github.ehlxr.annotation; import java.lang.annotation.Annotation; diff --git a/src/main/java/me/ehlxr/annotation/package-info.java b/src/main/java/io/github/ehlxr/annotation/package-info.java similarity index 89% rename from src/main/java/me/ehlxr/annotation/package-info.java rename to src/main/java/io/github/ehlxr/annotation/package-info.java index c2679a5..f8d8242 100644 --- a/src/main/java/me/ehlxr/annotation/package-info.java +++ b/src/main/java/io/github/ehlxr/annotation/package-info.java @@ -6,7 +6,7 @@ * */ @PkgAnnotation -package me.ehlxr.annotation; +package io.github.ehlxr.annotation; /** * 包内方法 diff --git a/src/main/java/me/ehlxr/cache/Cache.java b/src/main/java/io/github/ehlxr/cache/Cache.java similarity index 96% rename from src/main/java/me/ehlxr/cache/Cache.java rename to src/main/java/io/github/ehlxr/cache/Cache.java index f8a7976..32e1847 100644 --- a/src/main/java/me/ehlxr/cache/Cache.java +++ b/src/main/java/io/github/ehlxr/cache/Cache.java @@ -1,4 +1,4 @@ -package me.ehlxr.cache; +package io.github.ehlxr.cache; /** *

diff --git a/src/main/java/me/ehlxr/cache/CacheManager.java b/src/main/java/io/github/ehlxr/cache/CacheManager.java similarity index 99% rename from src/main/java/me/ehlxr/cache/CacheManager.java rename to src/main/java/io/github/ehlxr/cache/CacheManager.java index 735a808..0a87177 100644 --- a/src/main/java/me/ehlxr/cache/CacheManager.java +++ b/src/main/java/io/github/ehlxr/cache/CacheManager.java @@ -1,4 +1,4 @@ -package me.ehlxr.cache; +package io.github.ehlxr.cache; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/me/ehlxr/cache/SimpleCache.java b/src/main/java/io/github/ehlxr/cache/SimpleCache.java similarity index 96% rename from src/main/java/me/ehlxr/cache/SimpleCache.java rename to src/main/java/io/github/ehlxr/cache/SimpleCache.java index d03ad60..91ccda3 100644 --- a/src/main/java/me/ehlxr/cache/SimpleCache.java +++ b/src/main/java/io/github/ehlxr/cache/SimpleCache.java @@ -1,4 +1,4 @@ -package me.ehlxr.cache; +package io.github.ehlxr.cache; import java.util.Map; import java.util.WeakHashMap; diff --git a/src/main/java/me/ehlxr/cache/SimpleCacheUtil.java b/src/main/java/io/github/ehlxr/cache/SimpleCacheUtil.java similarity index 98% rename from src/main/java/me/ehlxr/cache/SimpleCacheUtil.java rename to src/main/java/io/github/ehlxr/cache/SimpleCacheUtil.java index 1105935..8fda9cc 100644 --- a/src/main/java/me/ehlxr/cache/SimpleCacheUtil.java +++ b/src/main/java/io/github/ehlxr/cache/SimpleCacheUtil.java @@ -1,4 +1,4 @@ -package me.ehlxr.cache; +package io.github.ehlxr.cache; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/me/ehlxr/cache/Test.java b/src/main/java/io/github/ehlxr/cache/Test.java similarity index 86% rename from src/main/java/me/ehlxr/cache/Test.java rename to src/main/java/io/github/ehlxr/cache/Test.java index 820b0e1..4e705ba 100644 --- a/src/main/java/me/ehlxr/cache/Test.java +++ b/src/main/java/io/github/ehlxr/cache/Test.java @@ -1,4 +1,4 @@ -package me.ehlxr.cache; +package io.github.ehlxr.cache; public class Test { diff --git a/src/main/java/me/ehlxr/cache/TestCache.java b/src/main/java/io/github/ehlxr/cache/TestCache.java similarity index 97% rename from src/main/java/me/ehlxr/cache/TestCache.java rename to src/main/java/io/github/ehlxr/cache/TestCache.java index 65b79ff..b0ff581 100644 --- a/src/main/java/me/ehlxr/cache/TestCache.java +++ b/src/main/java/io/github/ehlxr/cache/TestCache.java @@ -1,4 +1,4 @@ -package me.ehlxr.cache; +package io.github.ehlxr.cache; import java.util.ArrayList; diff --git a/src/main/java/me/ehlxr/cache/TestFutureCahe.java b/src/main/java/io/github/ehlxr/cache/TestFutureCahe.java similarity index 98% rename from src/main/java/me/ehlxr/cache/TestFutureCahe.java rename to src/main/java/io/github/ehlxr/cache/TestFutureCahe.java index c723ee4..729e740 100644 --- a/src/main/java/me/ehlxr/cache/TestFutureCahe.java +++ b/src/main/java/io/github/ehlxr/cache/TestFutureCahe.java @@ -1,4 +1,4 @@ -package me.ehlxr.cache; +package io.github.ehlxr.cache; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/me/ehlxr/dfd.java b/src/main/java/io/github/ehlxr/dfd.java similarity index 98% rename from src/main/java/me/ehlxr/dfd.java rename to src/main/java/io/github/ehlxr/dfd.java index 52a762b..b4775d8 100644 --- a/src/main/java/me/ehlxr/dfd.java +++ b/src/main/java/io/github/ehlxr/dfd.java @@ -1,4 +1,4 @@ -package me.ehlxr; +package io.github.ehlxr; /** * Created by ehlxr on 2016/12/23. diff --git a/src/main/java/me/ehlxr/hashing/Cluster.java b/src/main/java/io/github/ehlxr/hashing/Cluster.java similarity index 83% rename from src/main/java/me/ehlxr/hashing/Cluster.java rename to src/main/java/io/github/ehlxr/hashing/Cluster.java index e1738db..984e00f 100644 --- a/src/main/java/me/ehlxr/hashing/Cluster.java +++ b/src/main/java/io/github/ehlxr/hashing/Cluster.java @@ -1,9 +1,9 @@ -package me.ehlxr.hashing; +package io.github.ehlxr.hashing; public class Cluster { private static final int SERVER_SIZE_MAX = 1024; - private Server[] servers = new Server[SERVER_SIZE_MAX]; + private final Server[] servers = new Server[SERVER_SIZE_MAX]; private int size = 0; public void put(Entry e) { diff --git a/src/main/java/me/ehlxr/hashing/Entry.java b/src/main/java/io/github/ehlxr/hashing/Entry.java similarity index 69% rename from src/main/java/me/ehlxr/hashing/Entry.java rename to src/main/java/io/github/ehlxr/hashing/Entry.java index d940724..74947c7 100644 --- a/src/main/java/me/ehlxr/hashing/Entry.java +++ b/src/main/java/io/github/ehlxr/hashing/Entry.java @@ -1,7 +1,7 @@ -package me.ehlxr.hashing; +package io.github.ehlxr.hashing; public class Entry { - private String key; + private final String key; Entry(String key) { this.key = key; diff --git a/src/main/java/me/ehlxr/hashing/Main.java b/src/main/java/io/github/ehlxr/hashing/Main.java similarity index 97% rename from src/main/java/me/ehlxr/hashing/Main.java rename to src/main/java/io/github/ehlxr/hashing/Main.java index b60769d..c0663d9 100644 --- a/src/main/java/me/ehlxr/hashing/Main.java +++ b/src/main/java/io/github/ehlxr/hashing/Main.java @@ -1,4 +1,4 @@ -package me.ehlxr.hashing; +package io.github.ehlxr.hashing; public class Main { diff --git a/src/main/java/me/ehlxr/hashing/Server.java b/src/main/java/io/github/ehlxr/hashing/Server.java similarity index 61% rename from src/main/java/me/ehlxr/hashing/Server.java rename to src/main/java/io/github/ehlxr/hashing/Server.java index ce0418c..509e5d1 100644 --- a/src/main/java/me/ehlxr/hashing/Server.java +++ b/src/main/java/io/github/ehlxr/hashing/Server.java @@ -1,10 +1,11 @@ -package me.ehlxr.hashing; +package io.github.ehlxr.hashing; -import java.util.*; +import java.util.HashMap; +import java.util.Map; public class Server { - private String name; - private Map entries; + private final String name; + private final Map entries; Server(String name) { this.name = name; diff --git a/src/main/java/me/ehlxr/hashing/consistent/Cluster.java b/src/main/java/io/github/ehlxr/hashing/consistent/Cluster.java similarity index 88% rename from src/main/java/me/ehlxr/hashing/consistent/Cluster.java rename to src/main/java/io/github/ehlxr/hashing/consistent/Cluster.java index b6f7c9e..982f265 100644 --- a/src/main/java/me/ehlxr/hashing/consistent/Cluster.java +++ b/src/main/java/io/github/ehlxr/hashing/consistent/Cluster.java @@ -1,4 +1,4 @@ -package me.ehlxr.hashing.consistent; +package io.github.ehlxr.hashing.consistent; import java.util.SortedMap; import java.util.TreeMap; @@ -6,7 +6,7 @@ import java.util.TreeMap; public class Cluster { private static final int SERVER_SIZE_MAX = 1024; - private SortedMap servers = new TreeMap<>(); + private final SortedMap servers = new TreeMap<>(); private int size = 0; public void put(Entry e) { diff --git a/src/main/java/me/ehlxr/hashing/consistent/Entry.java b/src/main/java/io/github/ehlxr/hashing/consistent/Entry.java similarity index 74% rename from src/main/java/me/ehlxr/hashing/consistent/Entry.java rename to src/main/java/io/github/ehlxr/hashing/consistent/Entry.java index ebc478f..dae298f 100644 --- a/src/main/java/me/ehlxr/hashing/consistent/Entry.java +++ b/src/main/java/io/github/ehlxr/hashing/consistent/Entry.java @@ -1,7 +1,7 @@ -package me.ehlxr.hashing.consistent; +package io.github.ehlxr.hashing.consistent; public class Entry { - private String key; + private final String key; Entry(String key) { this.key = key; diff --git a/src/main/java/me/ehlxr/hashing/consistent/Main.java b/src/main/java/io/github/ehlxr/hashing/consistent/Main.java similarity index 96% rename from src/main/java/me/ehlxr/hashing/consistent/Main.java rename to src/main/java/io/github/ehlxr/hashing/consistent/Main.java index 68320e8..708d6c8 100644 --- a/src/main/java/me/ehlxr/hashing/consistent/Main.java +++ b/src/main/java/io/github/ehlxr/hashing/consistent/Main.java @@ -1,4 +1,4 @@ -package me.ehlxr.hashing.consistent; +package io.github.ehlxr.hashing.consistent; public class Main { public static void main(String[] args) { diff --git a/src/main/java/me/ehlxr/hashing/consistent/Server.java b/src/main/java/io/github/ehlxr/hashing/consistent/Server.java similarity index 65% rename from src/main/java/me/ehlxr/hashing/consistent/Server.java rename to src/main/java/io/github/ehlxr/hashing/consistent/Server.java index 03e6529..b8efe8f 100644 --- a/src/main/java/me/ehlxr/hashing/consistent/Server.java +++ b/src/main/java/io/github/ehlxr/hashing/consistent/Server.java @@ -1,10 +1,11 @@ -package me.ehlxr.hashing.consistent; +package io.github.ehlxr.hashing.consistent; -import java.util.*; +import java.util.HashMap; +import java.util.Map; public class Server { - private String name; - private Map entries; + private final String name; + private final Map entries; Server(String name) { this.name = name; diff --git a/src/main/java/me/ehlxr/hbase/HBaseUtils.java b/src/main/java/io/github/ehlxr/hbase/HBaseUtils.java similarity index 99% rename from src/main/java/me/ehlxr/hbase/HBaseUtils.java rename to src/main/java/io/github/ehlxr/hbase/HBaseUtils.java index be723a7..9648f54 100644 --- a/src/main/java/me/ehlxr/hbase/HBaseUtils.java +++ b/src/main/java/io/github/ehlxr/hbase/HBaseUtils.java @@ -1,6 +1,6 @@ -package me.ehlxr.hbase; +package io.github.ehlxr.hbase; -import me.ehlxr.utils.Pair; +import io.github.ehlxr.utils.Pair; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HColumnDescriptor; diff --git a/src/main/java/me/ehlxr/hbase/Main.java b/src/main/java/io/github/ehlxr/hbase/Main.java similarity index 98% rename from src/main/java/me/ehlxr/hbase/Main.java rename to src/main/java/io/github/ehlxr/hbase/Main.java index 9f925c6..0731b8e 100644 --- a/src/main/java/me/ehlxr/hbase/Main.java +++ b/src/main/java/io/github/ehlxr/hbase/Main.java @@ -1,6 +1,6 @@ -package me.ehlxr.hbase; +package io.github.ehlxr.hbase; -import me.ehlxr.utils.Pair; +import io.github.ehlxr.utils.Pair; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.filter.CompareFilter; diff --git a/src/main/java/me/ehlxr/leetcode/Solution4.java b/src/main/java/io/github/ehlxr/leetcode/Solution4.java similarity index 98% rename from src/main/java/me/ehlxr/leetcode/Solution4.java rename to src/main/java/io/github/ehlxr/leetcode/Solution4.java index 4e3b4e6..afd225f 100644 --- a/src/main/java/me/ehlxr/leetcode/Solution4.java +++ b/src/main/java/io/github/ehlxr/leetcode/Solution4.java @@ -1,4 +1,4 @@ -package me.ehlxr.leetcode; +package io.github.ehlxr.leetcode; /** * 4. 寻找两个正序数组的中位数 diff --git a/src/main/java/me/ehlxr/leetcode/Solution5.java b/src/main/java/io/github/ehlxr/leetcode/Solution5.java similarity index 94% rename from src/main/java/me/ehlxr/leetcode/Solution5.java rename to src/main/java/io/github/ehlxr/leetcode/Solution5.java index 15d24cc..a15eeae 100644 --- a/src/main/java/me/ehlxr/leetcode/Solution5.java +++ b/src/main/java/io/github/ehlxr/leetcode/Solution5.java @@ -1,7 +1,6 @@ -package me.ehlxr.leetcode; +package io.github.ehlxr.leetcode; import java.util.Arrays; -import java.util.Comparator; import java.util.PriorityQueue; /** diff --git a/src/main/java/me/ehlxr/pack/FileUtil.java b/src/main/java/io/github/ehlxr/pack/FileUtil.java similarity index 99% rename from src/main/java/me/ehlxr/pack/FileUtil.java rename to src/main/java/io/github/ehlxr/pack/FileUtil.java index 50098b9..c891f1c 100644 --- a/src/main/java/me/ehlxr/pack/FileUtil.java +++ b/src/main/java/io/github/ehlxr/pack/FileUtil.java @@ -1,4 +1,4 @@ -package me.ehlxr.pack; +package io.github.ehlxr.pack; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/me/ehlxr/pack/PackView.java b/src/main/java/io/github/ehlxr/pack/PackView.java similarity index 99% rename from src/main/java/me/ehlxr/pack/PackView.java rename to src/main/java/io/github/ehlxr/pack/PackView.java index a24397c..d1f2907 100644 --- a/src/main/java/me/ehlxr/pack/PackView.java +++ b/src/main/java/io/github/ehlxr/pack/PackView.java @@ -1,4 +1,4 @@ -package me.ehlxr.pack; +package io.github.ehlxr.pack; import javax.swing.*; import javax.swing.filechooser.FileFilter; diff --git a/src/main/java/me/ehlxr/powermock/ClassDependency.java b/src/main/java/io/github/ehlxr/powermock/ClassDependency.java similarity index 90% rename from src/main/java/me/ehlxr/powermock/ClassDependency.java rename to src/main/java/io/github/ehlxr/powermock/ClassDependency.java index c68b299..38afc2f 100644 --- a/src/main/java/me/ehlxr/powermock/ClassDependency.java +++ b/src/main/java/io/github/ehlxr/powermock/ClassDependency.java @@ -1,4 +1,4 @@ -package me.ehlxr.powermock; +package io.github.ehlxr.powermock; /** * Created by ehlxr on 2017/11/3. diff --git a/src/main/java/me/ehlxr/powermock/ClassUnderTest.java b/src/main/java/io/github/ehlxr/powermock/ClassUnderTest.java similarity index 94% rename from src/main/java/me/ehlxr/powermock/ClassUnderTest.java rename to src/main/java/io/github/ehlxr/powermock/ClassUnderTest.java index 1fe06e0..43398f8 100644 --- a/src/main/java/me/ehlxr/powermock/ClassUnderTest.java +++ b/src/main/java/io/github/ehlxr/powermock/ClassUnderTest.java @@ -1,4 +1,4 @@ -package me.ehlxr.powermock; +package io.github.ehlxr.powermock; /** * Created by ehlxr on 2017/11/3. @@ -10,7 +10,7 @@ import java.io.File; * Created by ehlxr on 2017/7/21. */ public class ClassUnderTest { - private String f1 = "test"; + private final String f1 = "test"; public boolean callArgumentInstance(File file) { return file.exists(); diff --git a/src/main/java/me/ehlxr/powermock/TestClassUnderTest.java b/src/main/java/io/github/ehlxr/powermock/TestClassUnderTest.java similarity index 89% rename from src/main/java/me/ehlxr/powermock/TestClassUnderTest.java rename to src/main/java/io/github/ehlxr/powermock/TestClassUnderTest.java index 52c4e46..36ff8da 100644 --- a/src/main/java/me/ehlxr/powermock/TestClassUnderTest.java +++ b/src/main/java/io/github/ehlxr/powermock/TestClassUnderTest.java @@ -1,4 +1,4 @@ -package me.ehlxr.powermock; +package io.github.ehlxr.powermock; import org.junit.Assert; import org.junit.Test; @@ -41,7 +41,7 @@ public class TestClassUnderTest { public void testCallFinalMethod() { ClassDependency depencency = mock(ClassDependency.class); ClassUnderTest underTest = new ClassUnderTest(); - PowerMockito.when(depencency.isAlive()).thenReturn(true); + when(depencency.isAlive()).thenReturn(true); Assert.assertTrue(underTest.callFinalMethod(depencency)); } @@ -59,7 +59,7 @@ public class TestClassUnderTest { public void testCallStaticMethod() { ClassUnderTest underTest = new ClassUnderTest(); PowerMockito.mockStatic(ClassDependency.class); - PowerMockito.when(ClassDependency.isExist()).thenReturn(true); + when(ClassDependency.isExist()).thenReturn(true); Assert.assertTrue(underTest.callStaticMethod()); } @@ -76,8 +76,8 @@ public class TestClassUnderTest { @PrepareForTest(ClassUnderTest.class) public void testCallPrivateMethod() throws Exception { ClassUnderTest underTest = mock(ClassUnderTest.class); - PowerMockito.when(underTest.callPrivateMethod()).thenCallRealMethod(); - PowerMockito.when(underTest, "isExist").thenReturn(true); + when(underTest.callPrivateMethod()).thenCallRealMethod(); + when(underTest, "isExist").thenReturn(true); Assert.assertTrue(underTest.callPrivateMethod()); } @@ -85,7 +85,7 @@ public class TestClassUnderTest { @PrepareForTest(ClassUnderTest.class) public void testCallVoidPrivateMethod() throws Exception { ClassUnderTest underTest = mock(ClassUnderTest.class); - PowerMockito.when(underTest.callVoidPrivateMethod()).thenCallRealMethod(); + when(underTest.callVoidPrivateMethod()).thenCallRealMethod(); PowerMockito.doNothing().when(underTest, "testVoid"); Assert.assertTrue(underTest.callVoidPrivateMethod()); } @@ -107,7 +107,7 @@ public class TestClassUnderTest { @Test @PrepareForTest(ClassUnderTest.class) public void testInvokPrivate() throws Exception { - ClassUnderTest underTest = spy(new ClassUnderTest()); + ClassUnderTest underTest = PowerMockito.spy(new ClassUnderTest()); Whitebox.invokeMethod(underTest, "isExist"); verifyPrivate(underTest).invoke("isExist"); diff --git a/src/main/java/me/ehlxr/proxy/Bird.java b/src/main/java/io/github/ehlxr/proxy/Bird.java similarity index 93% rename from src/main/java/me/ehlxr/proxy/Bird.java rename to src/main/java/io/github/ehlxr/proxy/Bird.java index f7e15cb..99efaad 100644 --- a/src/main/java/me/ehlxr/proxy/Bird.java +++ b/src/main/java/io/github/ehlxr/proxy/Bird.java @@ -1,4 +1,4 @@ -package me.ehlxr.proxy; +package io.github.ehlxr.proxy; import java.util.Random; diff --git a/src/main/java/me/ehlxr/proxy/Flyable.java b/src/main/java/io/github/ehlxr/proxy/Flyable.java similarity index 78% rename from src/main/java/me/ehlxr/proxy/Flyable.java rename to src/main/java/io/github/ehlxr/proxy/Flyable.java index 058161b..a1186df 100644 --- a/src/main/java/me/ehlxr/proxy/Flyable.java +++ b/src/main/java/io/github/ehlxr/proxy/Flyable.java @@ -1,4 +1,4 @@ -package me.ehlxr.proxy; +package io.github.ehlxr.proxy; /** * @author ehlxr diff --git a/src/main/java/me/ehlxr/proxy/Main.java b/src/main/java/io/github/ehlxr/proxy/Main.java similarity index 97% rename from src/main/java/me/ehlxr/proxy/Main.java rename to src/main/java/io/github/ehlxr/proxy/Main.java index 598ed28..be7ea5c 100644 --- a/src/main/java/me/ehlxr/proxy/Main.java +++ b/src/main/java/io/github/ehlxr/proxy/Main.java @@ -1,4 +1,4 @@ -package me.ehlxr.proxy; +package io.github.ehlxr.proxy; import java.lang.reflect.Proxy; diff --git a/src/main/java/me/ehlxr/proxy/MyInvocationHandler.java b/src/main/java/io/github/ehlxr/proxy/MyInvocationHandler.java similarity index 92% rename from src/main/java/me/ehlxr/proxy/MyInvocationHandler.java rename to src/main/java/io/github/ehlxr/proxy/MyInvocationHandler.java index 044a67a..0a29166 100644 --- a/src/main/java/me/ehlxr/proxy/MyInvocationHandler.java +++ b/src/main/java/io/github/ehlxr/proxy/MyInvocationHandler.java @@ -1,4 +1,4 @@ -package me.ehlxr.proxy; +package io.github.ehlxr.proxy; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; @@ -9,7 +9,7 @@ import java.lang.reflect.Method; * @since 2019-06-28. */ public class MyInvocationHandler implements InvocationHandler { - private Bird bird; + private final Bird bird; public MyInvocationHandler(Bird bird) { this.bird = bird; diff --git a/src/main/java/me/ehlxr/rabbitmq/ConnectionUtil.java b/src/main/java/io/github/ehlxr/rabbitmq/ConnectionUtil.java similarity index 97% rename from src/main/java/me/ehlxr/rabbitmq/ConnectionUtil.java rename to src/main/java/io/github/ehlxr/rabbitmq/ConnectionUtil.java index 9179732..5db7513 100644 --- a/src/main/java/me/ehlxr/rabbitmq/ConnectionUtil.java +++ b/src/main/java/io/github/ehlxr/rabbitmq/ConnectionUtil.java @@ -1,4 +1,4 @@ -package me.ehlxr.rabbitmq; +package io.github.ehlxr.rabbitmq; import com.rabbitmq.client.Connection; import com.rabbitmq.client.ConnectionFactory; diff --git a/src/main/java/me/ehlxr/rabbitmq/routing/Receiver1.java b/src/main/java/io/github/ehlxr/rabbitmq/routing/Receiver1.java similarity index 94% rename from src/main/java/me/ehlxr/rabbitmq/routing/Receiver1.java rename to src/main/java/io/github/ehlxr/rabbitmq/routing/Receiver1.java index 1dc8c01..d792b9e 100755 --- a/src/main/java/me/ehlxr/rabbitmq/routing/Receiver1.java +++ b/src/main/java/io/github/ehlxr/rabbitmq/routing/Receiver1.java @@ -1,9 +1,9 @@ -package me.ehlxr.rabbitmq.routing; +package io.github.ehlxr.rabbitmq.routing; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; import com.rabbitmq.client.QueueingConsumer; -import me.ehlxr.rabbitmq.ConnectionUtil; +import io.github.ehlxr.rabbitmq.ConnectionUtil; import java.io.IOException; import java.util.concurrent.TimeoutException; diff --git a/src/main/java/me/ehlxr/rabbitmq/routing/Receiver2.java b/src/main/java/io/github/ehlxr/rabbitmq/routing/Receiver2.java similarity index 94% rename from src/main/java/me/ehlxr/rabbitmq/routing/Receiver2.java rename to src/main/java/io/github/ehlxr/rabbitmq/routing/Receiver2.java index c304ab8..ff37a07 100755 --- a/src/main/java/me/ehlxr/rabbitmq/routing/Receiver2.java +++ b/src/main/java/io/github/ehlxr/rabbitmq/routing/Receiver2.java @@ -1,9 +1,9 @@ -package me.ehlxr.rabbitmq.routing; +package io.github.ehlxr.rabbitmq.routing; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; import com.rabbitmq.client.QueueingConsumer; -import me.ehlxr.rabbitmq.ConnectionUtil; +import io.github.ehlxr.rabbitmq.ConnectionUtil; import java.io.IOException; import java.util.concurrent.TimeoutException; diff --git a/src/main/java/me/ehlxr/rabbitmq/routing/Sender.java b/src/main/java/io/github/ehlxr/rabbitmq/routing/Sender.java similarity index 91% rename from src/main/java/me/ehlxr/rabbitmq/routing/Sender.java rename to src/main/java/io/github/ehlxr/rabbitmq/routing/Sender.java index 137b740..62a2d03 100755 --- a/src/main/java/me/ehlxr/rabbitmq/routing/Sender.java +++ b/src/main/java/io/github/ehlxr/rabbitmq/routing/Sender.java @@ -1,8 +1,8 @@ -package me.ehlxr.rabbitmq.routing; +package io.github.ehlxr.rabbitmq.routing; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; -import me.ehlxr.rabbitmq.ConnectionUtil; +import io.github.ehlxr.rabbitmq.ConnectionUtil; import java.io.IOException; import java.util.concurrent.TimeoutException; diff --git a/src/main/java/me/ehlxr/rabbitmq/simple/Receiver.java b/src/main/java/io/github/ehlxr/rabbitmq/simple/Receiver.java similarity index 92% rename from src/main/java/me/ehlxr/rabbitmq/simple/Receiver.java rename to src/main/java/io/github/ehlxr/rabbitmq/simple/Receiver.java index c1eaf60..bd0afc8 100644 --- a/src/main/java/me/ehlxr/rabbitmq/simple/Receiver.java +++ b/src/main/java/io/github/ehlxr/rabbitmq/simple/Receiver.java @@ -1,9 +1,9 @@ -package me.ehlxr.rabbitmq.simple; +package io.github.ehlxr.rabbitmq.simple; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; import com.rabbitmq.client.QueueingConsumer; -import me.ehlxr.rabbitmq.ConnectionUtil; +import io.github.ehlxr.rabbitmq.ConnectionUtil; import java.io.IOException; import java.util.concurrent.TimeoutException; diff --git a/src/main/java/me/ehlxr/rabbitmq/simple/Sender.java b/src/main/java/io/github/ehlxr/rabbitmq/simple/Sender.java similarity index 94% rename from src/main/java/me/ehlxr/rabbitmq/simple/Sender.java rename to src/main/java/io/github/ehlxr/rabbitmq/simple/Sender.java index 9f15f7d..2c38130 100644 --- a/src/main/java/me/ehlxr/rabbitmq/simple/Sender.java +++ b/src/main/java/io/github/ehlxr/rabbitmq/simple/Sender.java @@ -1,8 +1,8 @@ -package me.ehlxr.rabbitmq.simple; +package io.github.ehlxr.rabbitmq.simple; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; -import me.ehlxr.rabbitmq.ConnectionUtil; +import io.github.ehlxr.rabbitmq.ConnectionUtil; import java.io.IOException; import java.util.concurrent.TimeoutException; diff --git a/src/main/java/me/ehlxr/rabbitmq/topic/Receiver1.java b/src/main/java/io/github/ehlxr/rabbitmq/topic/Receiver1.java similarity index 94% rename from src/main/java/me/ehlxr/rabbitmq/topic/Receiver1.java rename to src/main/java/io/github/ehlxr/rabbitmq/topic/Receiver1.java index 8cc0606..83e3ebb 100755 --- a/src/main/java/me/ehlxr/rabbitmq/topic/Receiver1.java +++ b/src/main/java/io/github/ehlxr/rabbitmq/topic/Receiver1.java @@ -1,9 +1,9 @@ -package me.ehlxr.rabbitmq.topic; +package io.github.ehlxr.rabbitmq.topic; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; import com.rabbitmq.client.QueueingConsumer; -import me.ehlxr.rabbitmq.ConnectionUtil; +import io.github.ehlxr.rabbitmq.ConnectionUtil; import java.io.IOException; import java.util.concurrent.TimeoutException; diff --git a/src/main/java/me/ehlxr/rabbitmq/topic/Receiver2.java b/src/main/java/io/github/ehlxr/rabbitmq/topic/Receiver2.java similarity index 94% rename from src/main/java/me/ehlxr/rabbitmq/topic/Receiver2.java rename to src/main/java/io/github/ehlxr/rabbitmq/topic/Receiver2.java index 8782abb..b96f093 100755 --- a/src/main/java/me/ehlxr/rabbitmq/topic/Receiver2.java +++ b/src/main/java/io/github/ehlxr/rabbitmq/topic/Receiver2.java @@ -1,9 +1,9 @@ -package me.ehlxr.rabbitmq.topic; +package io.github.ehlxr.rabbitmq.topic; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; import com.rabbitmq.client.QueueingConsumer; -import me.ehlxr.rabbitmq.ConnectionUtil; +import io.github.ehlxr.rabbitmq.ConnectionUtil; import java.io.IOException; import java.util.concurrent.TimeoutException; diff --git a/src/main/java/me/ehlxr/rabbitmq/topic/Sender.java b/src/main/java/io/github/ehlxr/rabbitmq/topic/Sender.java similarity index 92% rename from src/main/java/me/ehlxr/rabbitmq/topic/Sender.java rename to src/main/java/io/github/ehlxr/rabbitmq/topic/Sender.java index bd46c89..3ceb040 100755 --- a/src/main/java/me/ehlxr/rabbitmq/topic/Sender.java +++ b/src/main/java/io/github/ehlxr/rabbitmq/topic/Sender.java @@ -1,8 +1,8 @@ -package me.ehlxr.rabbitmq.topic; +package io.github.ehlxr.rabbitmq.topic; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; -import me.ehlxr.rabbitmq.ConnectionUtil; +import io.github.ehlxr.rabbitmq.ConnectionUtil; import java.io.IOException; import java.util.concurrent.TimeoutException; diff --git a/src/main/java/me/ehlxr/rabbitmq/worker/Receiver1.java b/src/main/java/io/github/ehlxr/rabbitmq/worker/Receiver1.java similarity index 94% rename from src/main/java/me/ehlxr/rabbitmq/worker/Receiver1.java rename to src/main/java/io/github/ehlxr/rabbitmq/worker/Receiver1.java index a3e1eef..d124227 100644 --- a/src/main/java/me/ehlxr/rabbitmq/worker/Receiver1.java +++ b/src/main/java/io/github/ehlxr/rabbitmq/worker/Receiver1.java @@ -1,9 +1,9 @@ -package me.ehlxr.rabbitmq.worker; +package io.github.ehlxr.rabbitmq.worker; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; import com.rabbitmq.client.QueueingConsumer; -import me.ehlxr.rabbitmq.ConnectionUtil; +import io.github.ehlxr.rabbitmq.ConnectionUtil; import java.io.IOException; import java.util.concurrent.TimeoutException; diff --git a/src/main/java/me/ehlxr/rabbitmq/worker/Receiver2.java b/src/main/java/io/github/ehlxr/rabbitmq/worker/Receiver2.java similarity index 93% rename from src/main/java/me/ehlxr/rabbitmq/worker/Receiver2.java rename to src/main/java/io/github/ehlxr/rabbitmq/worker/Receiver2.java index 8aada2f..413bceb 100644 --- a/src/main/java/me/ehlxr/rabbitmq/worker/Receiver2.java +++ b/src/main/java/io/github/ehlxr/rabbitmq/worker/Receiver2.java @@ -1,9 +1,9 @@ -package me.ehlxr.rabbitmq.worker; +package io.github.ehlxr.rabbitmq.worker; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; import com.rabbitmq.client.QueueingConsumer; -import me.ehlxr.rabbitmq.ConnectionUtil; +import io.github.ehlxr.rabbitmq.ConnectionUtil; import java.io.IOException; import java.util.concurrent.TimeoutException; diff --git a/src/main/java/me/ehlxr/rabbitmq/worker/Sender.java b/src/main/java/io/github/ehlxr/rabbitmq/worker/Sender.java similarity index 91% rename from src/main/java/me/ehlxr/rabbitmq/worker/Sender.java rename to src/main/java/io/github/ehlxr/rabbitmq/worker/Sender.java index 9f6bbfc..915f40c 100644 --- a/src/main/java/me/ehlxr/rabbitmq/worker/Sender.java +++ b/src/main/java/io/github/ehlxr/rabbitmq/worker/Sender.java @@ -1,8 +1,8 @@ -package me.ehlxr.rabbitmq.worker; +package io.github.ehlxr.rabbitmq.worker; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; -import me.ehlxr.rabbitmq.ConnectionUtil; +import io.github.ehlxr.rabbitmq.ConnectionUtil; import java.io.IOException; import java.util.concurrent.TimeoutException; diff --git a/src/main/java/me/ehlxr/rate/Main.java b/src/main/java/io/github/ehlxr/rate/Main.java similarity index 97% rename from src/main/java/me/ehlxr/rate/Main.java rename to src/main/java/io/github/ehlxr/rate/Main.java index 9d2c5a6..a89c212 100644 --- a/src/main/java/me/ehlxr/rate/Main.java +++ b/src/main/java/io/github/ehlxr/rate/Main.java @@ -1,4 +1,4 @@ -package me.ehlxr.rate; +package io.github.ehlxr.rate; /** * @author ehlxr diff --git a/src/main/java/me/ehlxr/rate/RateBarrier.java b/src/main/java/io/github/ehlxr/rate/RateBarrier.java similarity index 96% rename from src/main/java/me/ehlxr/rate/RateBarrier.java rename to src/main/java/io/github/ehlxr/rate/RateBarrier.java index b4fb284..dfe16c1 100644 --- a/src/main/java/me/ehlxr/rate/RateBarrier.java +++ b/src/main/java/io/github/ehlxr/rate/RateBarrier.java @@ -1,4 +1,4 @@ -package me.ehlxr.rate; +package io.github.ehlxr.rate; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/me/ehlxr/reactive/HelloRxJava.java b/src/main/java/io/github/ehlxr/reactive/HelloRxJava.java similarity index 96% rename from src/main/java/me/ehlxr/reactive/HelloRxJava.java rename to src/main/java/io/github/ehlxr/reactive/HelloRxJava.java index 5b4f82b..10502a2 100644 --- a/src/main/java/me/ehlxr/reactive/HelloRxJava.java +++ b/src/main/java/io/github/ehlxr/reactive/HelloRxJava.java @@ -1,4 +1,4 @@ -package me.ehlxr.reactive; +package io.github.ehlxr.reactive; import rx.Observable; import rx.Subscriber; diff --git a/src/main/java/me/ehlxr/reactive/SchedulerTest.java b/src/main/java/io/github/ehlxr/reactive/SchedulerTest.java similarity index 94% rename from src/main/java/me/ehlxr/reactive/SchedulerTest.java rename to src/main/java/io/github/ehlxr/reactive/SchedulerTest.java index 95f89e7..598b1eb 100644 --- a/src/main/java/me/ehlxr/reactive/SchedulerTest.java +++ b/src/main/java/io/github/ehlxr/reactive/SchedulerTest.java @@ -1,4 +1,4 @@ -package me.ehlxr.reactive; +package io.github.ehlxr.reactive; import io.reactivex.Flowable; diff --git a/src/main/java/me/ehlxr/reactive/TestFuture.java b/src/main/java/io/github/ehlxr/reactive/TestFuture.java similarity index 96% rename from src/main/java/me/ehlxr/reactive/TestFuture.java rename to src/main/java/io/github/ehlxr/reactive/TestFuture.java index fbc7a4e..6d4f7c5 100644 --- a/src/main/java/me/ehlxr/reactive/TestFuture.java +++ b/src/main/java/io/github/ehlxr/reactive/TestFuture.java @@ -1,4 +1,4 @@ -package me.ehlxr.reactive; +package io.github.ehlxr.reactive; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -17,7 +17,7 @@ import java.util.concurrent.Future; */ public class TestFuture { // https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Executor.html - private static ExecutorService executor = Executors.newCachedThreadPool(); + private static final ExecutorService executor = Executors.newCachedThreadPool(); public static void main(String[] args) { TestFuture test = new TestFuture(); diff --git a/src/main/java/me/ehlxr/reactive/TestLambda.java b/src/main/java/io/github/ehlxr/reactive/TestLambda.java similarity index 93% rename from src/main/java/me/ehlxr/reactive/TestLambda.java rename to src/main/java/io/github/ehlxr/reactive/TestLambda.java index fcc9a36..f5291e3 100644 --- a/src/main/java/me/ehlxr/reactive/TestLambda.java +++ b/src/main/java/io/github/ehlxr/reactive/TestLambda.java @@ -1,4 +1,4 @@ -package me.ehlxr.reactive; +package io.github.ehlxr.reactive; /** * Created by ehlxr on 2018/1/16. diff --git a/src/main/java/me/ehlxr/reactive/TestRx.java b/src/main/java/io/github/ehlxr/reactive/TestRx.java similarity index 99% rename from src/main/java/me/ehlxr/reactive/TestRx.java rename to src/main/java/io/github/ehlxr/reactive/TestRx.java index 2209af3..4f6cf25 100644 --- a/src/main/java/me/ehlxr/reactive/TestRx.java +++ b/src/main/java/io/github/ehlxr/reactive/TestRx.java @@ -1,4 +1,4 @@ -package me.ehlxr.reactive; +package io.github.ehlxr.reactive; import rx.Observable; import rx.schedulers.Schedulers; diff --git a/src/main/java/me/ehlxr/reactive/TestRx01.java b/src/main/java/io/github/ehlxr/reactive/TestRx01.java similarity index 98% rename from src/main/java/me/ehlxr/reactive/TestRx01.java rename to src/main/java/io/github/ehlxr/reactive/TestRx01.java index 3e3158d..a4d6820 100644 --- a/src/main/java/me/ehlxr/reactive/TestRx01.java +++ b/src/main/java/io/github/ehlxr/reactive/TestRx01.java @@ -1,4 +1,4 @@ -package me.ehlxr.reactive; +package io.github.ehlxr.reactive; import rx.Observable; diff --git a/src/main/java/me/ehlxr/reactive/TimeConsumingService.java b/src/main/java/io/github/ehlxr/reactive/TimeConsumingService.java similarity index 80% rename from src/main/java/me/ehlxr/reactive/TimeConsumingService.java rename to src/main/java/io/github/ehlxr/reactive/TimeConsumingService.java index deae733..231bfcc 100644 --- a/src/main/java/me/ehlxr/reactive/TimeConsumingService.java +++ b/src/main/java/io/github/ehlxr/reactive/TimeConsumingService.java @@ -1,4 +1,4 @@ -package me.ehlxr.reactive; +package io.github.ehlxr.reactive; import java.util.Arrays; import java.util.concurrent.Callable; @@ -8,9 +8,9 @@ import java.util.concurrent.Callable; */ public class TimeConsumingService implements Callable { - private String service_name; - private int wait_ms; - private Object[] depandencies; + private final String service_name; + private final int wait_ms; + private final Object[] depandencies; TimeConsumingService(String name, Integer waiting, Object[] depandencies) { this.service_name = name; diff --git a/src/main/java/io/github/ehlxr/readlogs/IReadLogs.java b/src/main/java/io/github/ehlxr/readlogs/IReadLogs.java new file mode 100644 index 0000000..77d96b2 --- /dev/null +++ b/src/main/java/io/github/ehlxr/readlogs/IReadLogs.java @@ -0,0 +1,9 @@ +package io.github.ehlxr.readlogs; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +public interface IReadLogs { + String readFile(Date startDate, Date endDate, List mapids, String groupid, Map adxs); +} \ No newline at end of file diff --git a/src/main/java/me/ehlxr/redis/JRedisPoolConfig.java b/src/main/java/io/github/ehlxr/redis/JRedisPoolConfig.java similarity index 97% rename from src/main/java/me/ehlxr/redis/JRedisPoolConfig.java rename to src/main/java/io/github/ehlxr/redis/JRedisPoolConfig.java index 013ffb6..68415dd 100644 --- a/src/main/java/me/ehlxr/redis/JRedisPoolConfig.java +++ b/src/main/java/io/github/ehlxr/redis/JRedisPoolConfig.java @@ -1,4 +1,4 @@ -package me.ehlxr.redis; +package io.github.ehlxr.redis; import java.io.InputStream; import java.util.Properties; diff --git a/src/main/java/me/ehlxr/redis/JedisUtil.java b/src/main/java/io/github/ehlxr/redis/JedisUtil.java similarity index 99% rename from src/main/java/me/ehlxr/redis/JedisUtil.java rename to src/main/java/io/github/ehlxr/redis/JedisUtil.java index db4b155..7f53cfa 100644 --- a/src/main/java/me/ehlxr/redis/JedisUtil.java +++ b/src/main/java/io/github/ehlxr/redis/JedisUtil.java @@ -1,4 +1,9 @@ -package me.ehlxr.redis; +package io.github.ehlxr.redis; + +import org.springframework.util.StringUtils; +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisPool; +import redis.clients.jedis.JedisPoolConfig; import java.util.ArrayList; import java.util.List; @@ -6,12 +11,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.springframework.util.StringUtils; - -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPool; -import redis.clients.jedis.JedisPoolConfig; - public class JedisUtil { diff --git a/src/main/java/me/ehlxr/redis/SerializeUtil.java b/src/main/java/io/github/ehlxr/redis/SerializeUtil.java similarity index 96% rename from src/main/java/me/ehlxr/redis/SerializeUtil.java rename to src/main/java/io/github/ehlxr/redis/SerializeUtil.java index 851db9f..f9750ab 100644 --- a/src/main/java/me/ehlxr/redis/SerializeUtil.java +++ b/src/main/java/io/github/ehlxr/redis/SerializeUtil.java @@ -1,4 +1,4 @@ -package me.ehlxr.redis; +package io.github.ehlxr.redis; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/main/java/me/ehlxr/redis/redis.properties b/src/main/java/io/github/ehlxr/redis/redis.properties similarity index 100% rename from src/main/java/me/ehlxr/redis/redis.properties rename to src/main/java/io/github/ehlxr/redis/redis.properties diff --git a/src/main/java/me/ehlxr/sftp/SFTPUtil.java b/src/main/java/io/github/ehlxr/sftp/SFTPUtil.java similarity index 99% rename from src/main/java/me/ehlxr/sftp/SFTPUtil.java rename to src/main/java/io/github/ehlxr/sftp/SFTPUtil.java index 3402cd4..6869e24 100644 --- a/src/main/java/me/ehlxr/sftp/SFTPUtil.java +++ b/src/main/java/io/github/ehlxr/sftp/SFTPUtil.java @@ -1,4 +1,4 @@ -package me.ehlxr.sftp; +package io.github.ehlxr.sftp; import com.jcraft.jsch.*; import org.apache.commons.logging.Log; diff --git a/src/main/java/me/ehlxr/sftp/sftp.properties b/src/main/java/io/github/ehlxr/sftp/sftp.properties similarity index 100% rename from src/main/java/me/ehlxr/sftp/sftp.properties rename to src/main/java/io/github/ehlxr/sftp/sftp.properties diff --git a/src/main/java/me/ehlxr/shiro/LoginLogoutTest.java b/src/main/java/io/github/ehlxr/shiro/LoginLogoutTest.java similarity index 97% rename from src/main/java/me/ehlxr/shiro/LoginLogoutTest.java rename to src/main/java/io/github/ehlxr/shiro/LoginLogoutTest.java index ab6f55c..9e0386d 100644 --- a/src/main/java/me/ehlxr/shiro/LoginLogoutTest.java +++ b/src/main/java/io/github/ehlxr/shiro/LoginLogoutTest.java @@ -1,4 +1,4 @@ -package me.ehlxr.shiro; +package io.github.ehlxr.shiro; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; diff --git a/src/main/java/me/ehlxr/sort/BubbleSort.java b/src/main/java/io/github/ehlxr/sort/BubbleSort.java similarity index 98% rename from src/main/java/me/ehlxr/sort/BubbleSort.java rename to src/main/java/io/github/ehlxr/sort/BubbleSort.java index da4ea51..13b93c7 100644 --- a/src/main/java/me/ehlxr/sort/BubbleSort.java +++ b/src/main/java/io/github/ehlxr/sort/BubbleSort.java @@ -1,4 +1,4 @@ -package me.ehlxr.sort; +package io.github.ehlxr.sort; import java.util.Arrays; diff --git a/src/main/java/me/ehlxr/sort/HeapSort.java b/src/main/java/io/github/ehlxr/sort/HeapSort.java similarity index 99% rename from src/main/java/me/ehlxr/sort/HeapSort.java rename to src/main/java/io/github/ehlxr/sort/HeapSort.java index 0cd0e0b..5614027 100644 --- a/src/main/java/me/ehlxr/sort/HeapSort.java +++ b/src/main/java/io/github/ehlxr/sort/HeapSort.java @@ -1,4 +1,4 @@ -package me.ehlxr.sort; +package io.github.ehlxr.sort; import java.util.Arrays; import java.util.PriorityQueue; diff --git a/src/main/java/me/ehlxr/sort/InsertSort.java b/src/main/java/io/github/ehlxr/sort/InsertSort.java similarity index 98% rename from src/main/java/me/ehlxr/sort/InsertSort.java rename to src/main/java/io/github/ehlxr/sort/InsertSort.java index 79a5798..5351ff5 100644 --- a/src/main/java/me/ehlxr/sort/InsertSort.java +++ b/src/main/java/io/github/ehlxr/sort/InsertSort.java @@ -1,4 +1,4 @@ -package me.ehlxr.sort; +package io.github.ehlxr.sort; import java.util.Arrays; diff --git a/src/main/java/me/ehlxr/sort/MergeSort.java b/src/main/java/io/github/ehlxr/sort/MergeSort.java similarity index 98% rename from src/main/java/me/ehlxr/sort/MergeSort.java rename to src/main/java/io/github/ehlxr/sort/MergeSort.java index dca833b..5dc9baa 100644 --- a/src/main/java/me/ehlxr/sort/MergeSort.java +++ b/src/main/java/io/github/ehlxr/sort/MergeSort.java @@ -1,4 +1,4 @@ -package me.ehlxr.sort; +package io.github.ehlxr.sort; import java.util.Arrays; diff --git a/src/main/java/me/ehlxr/sort/QuickSort.java b/src/main/java/io/github/ehlxr/sort/QuickSort.java similarity index 99% rename from src/main/java/me/ehlxr/sort/QuickSort.java rename to src/main/java/io/github/ehlxr/sort/QuickSort.java index ccf8cd6..0842b82 100644 --- a/src/main/java/me/ehlxr/sort/QuickSort.java +++ b/src/main/java/io/github/ehlxr/sort/QuickSort.java @@ -1,4 +1,4 @@ -package me.ehlxr.sort; +package io.github.ehlxr.sort; import java.util.Arrays; diff --git a/src/main/java/me/ehlxr/sort/SelectSort.java b/src/main/java/io/github/ehlxr/sort/SelectSort.java similarity index 98% rename from src/main/java/me/ehlxr/sort/SelectSort.java rename to src/main/java/io/github/ehlxr/sort/SelectSort.java index 2cb8ed8..549a739 100644 --- a/src/main/java/me/ehlxr/sort/SelectSort.java +++ b/src/main/java/io/github/ehlxr/sort/SelectSort.java @@ -1,4 +1,4 @@ -package me.ehlxr.sort; +package io.github.ehlxr.sort; import java.util.Arrays; diff --git a/src/main/java/me/ehlxr/sort/ShellSort.java b/src/main/java/io/github/ehlxr/sort/ShellSort.java similarity index 98% rename from src/main/java/me/ehlxr/sort/ShellSort.java rename to src/main/java/io/github/ehlxr/sort/ShellSort.java index 4077491..c24d341 100644 --- a/src/main/java/me/ehlxr/sort/ShellSort.java +++ b/src/main/java/io/github/ehlxr/sort/ShellSort.java @@ -1,4 +1,4 @@ -package me.ehlxr.sort; +package io.github.ehlxr.sort; import java.util.Arrays; diff --git a/src/main/java/me/ehlxr/springamq/controller/ActivemqController.java b/src/main/java/io/github/ehlxr/springamq/controller/ActivemqController.java similarity index 88% rename from src/main/java/me/ehlxr/springamq/controller/ActivemqController.java rename to src/main/java/io/github/ehlxr/springamq/controller/ActivemqController.java index 44cdd1a..98ada85 100644 --- a/src/main/java/me/ehlxr/springamq/controller/ActivemqController.java +++ b/src/main/java/io/github/ehlxr/springamq/controller/ActivemqController.java @@ -1,11 +1,11 @@ -package me.ehlxr.springamq.controller; +package io.github.ehlxr.springamq.controller; +import io.github.ehlxr.springamq.mq.producer.queue.QueueSender; +import io.github.ehlxr.springamq.mq.producer.topic.TopicSender; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import me.ehlxr.springamq.mq.producer.queue.QueueSender; -import me.ehlxr.springamq.mq.producer.topic.TopicSender; import javax.annotation.Resource; diff --git a/src/main/java/me/ehlxr/springamq/mq/consumer/queue/QueueReceiver1.java b/src/main/java/io/github/ehlxr/springamq/mq/consumer/queue/QueueReceiver1.java similarity index 90% rename from src/main/java/me/ehlxr/springamq/mq/consumer/queue/QueueReceiver1.java rename to src/main/java/io/github/ehlxr/springamq/mq/consumer/queue/QueueReceiver1.java index 68100c5..7d93982 100644 --- a/src/main/java/me/ehlxr/springamq/mq/consumer/queue/QueueReceiver1.java +++ b/src/main/java/io/github/ehlxr/springamq/mq/consumer/queue/QueueReceiver1.java @@ -1,5 +1,5 @@ -package me.ehlxr.springamq.mq.consumer.queue; +package io.github.ehlxr.springamq.mq.consumer.queue; import org.springframework.stereotype.Component; diff --git a/src/main/java/me/ehlxr/springamq/mq/consumer/queue/QueueReceiver2.java b/src/main/java/io/github/ehlxr/springamq/mq/consumer/queue/QueueReceiver2.java similarity index 90% rename from src/main/java/me/ehlxr/springamq/mq/consumer/queue/QueueReceiver2.java rename to src/main/java/io/github/ehlxr/springamq/mq/consumer/queue/QueueReceiver2.java index 4e9b60a..5eb4f63 100644 --- a/src/main/java/me/ehlxr/springamq/mq/consumer/queue/QueueReceiver2.java +++ b/src/main/java/io/github/ehlxr/springamq/mq/consumer/queue/QueueReceiver2.java @@ -1,5 +1,5 @@ -package me.ehlxr.springamq.mq.consumer.queue; +package io.github.ehlxr.springamq.mq.consumer.queue; import org.springframework.stereotype.Component; diff --git a/src/main/java/me/ehlxr/springamq/mq/consumer/topic/TopicReceiver1.java b/src/main/java/io/github/ehlxr/springamq/mq/consumer/topic/TopicReceiver1.java similarity index 90% rename from src/main/java/me/ehlxr/springamq/mq/consumer/topic/TopicReceiver1.java rename to src/main/java/io/github/ehlxr/springamq/mq/consumer/topic/TopicReceiver1.java index d02853c..e289d25 100644 --- a/src/main/java/me/ehlxr/springamq/mq/consumer/topic/TopicReceiver1.java +++ b/src/main/java/io/github/ehlxr/springamq/mq/consumer/topic/TopicReceiver1.java @@ -1,4 +1,4 @@ -package me.ehlxr.springamq.mq.consumer.topic; +package io.github.ehlxr.springamq.mq.consumer.topic; import org.springframework.stereotype.Component; diff --git a/src/main/java/me/ehlxr/springamq/mq/consumer/topic/TopicReceiver2.java b/src/main/java/io/github/ehlxr/springamq/mq/consumer/topic/TopicReceiver2.java similarity index 90% rename from src/main/java/me/ehlxr/springamq/mq/consumer/topic/TopicReceiver2.java rename to src/main/java/io/github/ehlxr/springamq/mq/consumer/topic/TopicReceiver2.java index 126075b..71ca1a2 100644 --- a/src/main/java/me/ehlxr/springamq/mq/consumer/topic/TopicReceiver2.java +++ b/src/main/java/io/github/ehlxr/springamq/mq/consumer/topic/TopicReceiver2.java @@ -1,4 +1,4 @@ -package me.ehlxr.springamq.mq.consumer.topic; +package io.github.ehlxr.springamq.mq.consumer.topic; import org.springframework.stereotype.Component; diff --git a/src/main/java/me/ehlxr/springamq/mq/producer/queue/QueueSender.java b/src/main/java/io/github/ehlxr/springamq/mq/producer/queue/QueueSender.java similarity index 94% rename from src/main/java/me/ehlxr/springamq/mq/producer/queue/QueueSender.java rename to src/main/java/io/github/ehlxr/springamq/mq/producer/queue/QueueSender.java index fa4f027..eee22ef 100644 --- a/src/main/java/me/ehlxr/springamq/mq/producer/queue/QueueSender.java +++ b/src/main/java/io/github/ehlxr/springamq/mq/producer/queue/QueueSender.java @@ -1,4 +1,4 @@ -package me.ehlxr.springamq.mq.producer.queue; +package io.github.ehlxr.springamq.mq.producer.queue; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/main/java/me/ehlxr/springamq/mq/producer/topic/TopicSender.java b/src/main/java/io/github/ehlxr/springamq/mq/producer/topic/TopicSender.java similarity index 95% rename from src/main/java/me/ehlxr/springamq/mq/producer/topic/TopicSender.java rename to src/main/java/io/github/ehlxr/springamq/mq/producer/topic/TopicSender.java index 903973e..620de0a 100644 --- a/src/main/java/me/ehlxr/springamq/mq/producer/topic/TopicSender.java +++ b/src/main/java/io/github/ehlxr/springamq/mq/producer/topic/TopicSender.java @@ -1,4 +1,4 @@ -package me.ehlxr.springamq.mq.producer.topic; +package io.github.ehlxr.springamq.mq.producer.topic; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/src/main/java/me/ehlxr/test.txt b/src/main/java/io/github/ehlxr/test.txt similarity index 100% rename from src/main/java/me/ehlxr/test.txt rename to src/main/java/io/github/ehlxr/test.txt diff --git a/src/main/java/me/ehlxr/test/DirList.java b/src/main/java/io/github/ehlxr/test/DirList.java similarity index 95% rename from src/main/java/me/ehlxr/test/DirList.java rename to src/main/java/io/github/ehlxr/test/DirList.java index 2dbd4cd..2607b53 100644 --- a/src/main/java/me/ehlxr/test/DirList.java +++ b/src/main/java/io/github/ehlxr/test/DirList.java @@ -1,4 +1,4 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; import java.io.File; import java.io.FilenameFilter; diff --git a/src/main/java/me/ehlxr/test/ExecBaics50Log.java b/src/main/java/io/github/ehlxr/test/ExecBaics50Log.java similarity index 98% rename from src/main/java/me/ehlxr/test/ExecBaics50Log.java rename to src/main/java/io/github/ehlxr/test/ExecBaics50Log.java index 669369d..f497fe3 100644 --- a/src/main/java/me/ehlxr/test/ExecBaics50Log.java +++ b/src/main/java/io/github/ehlxr/test/ExecBaics50Log.java @@ -1,4 +1,4 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; import java.io.BufferedReader; import java.io.FileReader; diff --git a/src/main/java/me/ehlxr/test/IChargeCounter.java b/src/main/java/io/github/ehlxr/test/IChargeCounter.java similarity index 93% rename from src/main/java/me/ehlxr/test/IChargeCounter.java rename to src/main/java/io/github/ehlxr/test/IChargeCounter.java index b78aa6a..f0b97c8 100644 --- a/src/main/java/me/ehlxr/test/IChargeCounter.java +++ b/src/main/java/io/github/ehlxr/test/IChargeCounter.java @@ -1,4 +1,4 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; import java.math.BigDecimal; diff --git a/src/main/java/me/ehlxr/test/Main.java b/src/main/java/io/github/ehlxr/test/Main.java similarity index 76% rename from src/main/java/me/ehlxr/test/Main.java rename to src/main/java/io/github/ehlxr/test/Main.java index ec74445..e92adce 100644 --- a/src/main/java/me/ehlxr/test/Main.java +++ b/src/main/java/io/github/ehlxr/test/Main.java @@ -1,6 +1,6 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; -import me.ehlxr.redis.JedisUtil; +import io.github.ehlxr.redis.JedisUtil; /** * Created by ehlxr on 2016/6/14. diff --git a/src/main/java/me/ehlxr/test/OperateKPIBudgetRedisData.java b/src/main/java/io/github/ehlxr/test/OperateKPIBudgetRedisData.java similarity index 95% rename from src/main/java/me/ehlxr/test/OperateKPIBudgetRedisData.java rename to src/main/java/io/github/ehlxr/test/OperateKPIBudgetRedisData.java index 0fae727..fa52500 100644 --- a/src/main/java/me/ehlxr/test/OperateKPIBudgetRedisData.java +++ b/src/main/java/io/github/ehlxr/test/OperateKPIBudgetRedisData.java @@ -1,16 +1,16 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; + +import io.github.ehlxr.redis.JedisUtil; import java.io.IOException; import java.math.BigDecimal; -import me.ehlxr.redis.JedisUtil; - public class OperateKPIBudgetRedisData { - - + + public static void main(String[] args) throws IOException { showSom("58d355d7-4c66-461c-b63c-146c149bdcac"); -// delete("c46b8885-4c1d-48f9-befb-3ba3a0f33d4a"); + // delete("c46b8885-4c1d-48f9-befb-3ba3a0f33d4a"); } public static void showSom(String groupid){ diff --git a/src/main/java/me/ehlxr/test/StatisByHourModel.java b/src/main/java/io/github/ehlxr/test/StatisByHourModel.java similarity index 98% rename from src/main/java/me/ehlxr/test/StatisByHourModel.java rename to src/main/java/io/github/ehlxr/test/StatisByHourModel.java index 30391b1..9a5b72f 100644 --- a/src/main/java/me/ehlxr/test/StatisByHourModel.java +++ b/src/main/java/io/github/ehlxr/test/StatisByHourModel.java @@ -1,4 +1,4 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; import java.math.BigDecimal; import java.util.Date; diff --git a/src/main/java/me/ehlxr/test/Test.java b/src/main/java/io/github/ehlxr/test/Test.java similarity index 94% rename from src/main/java/me/ehlxr/test/Test.java rename to src/main/java/io/github/ehlxr/test/Test.java index eb19c02..3e81399 100644 --- a/src/main/java/me/ehlxr/test/Test.java +++ b/src/main/java/io/github/ehlxr/test/Test.java @@ -1,4 +1,4 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; /** * Created by ehlxr on 2016/12/15. diff --git a/src/main/java/me/ehlxr/test/TestAudiQ2.java b/src/main/java/io/github/ehlxr/test/TestAudiQ2.java similarity index 76% rename from src/main/java/me/ehlxr/test/TestAudiQ2.java rename to src/main/java/io/github/ehlxr/test/TestAudiQ2.java index 914589a..34b5eb2 100644 --- a/src/main/java/me/ehlxr/test/TestAudiQ2.java +++ b/src/main/java/io/github/ehlxr/test/TestAudiQ2.java @@ -1,6 +1,6 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; -import me.ehlxr.utils.HttpClientUtil; +import io.github.ehlxr.utils.HttpClientUtil; public class TestAudiQ2 { public static String URL = "http://127.0.0.1:8080/Audi2016Q2Wap/getUserInfo"; diff --git a/src/main/java/me/ehlxr/test/TestCalendar.java b/src/main/java/io/github/ehlxr/test/TestCalendar.java similarity index 96% rename from src/main/java/me/ehlxr/test/TestCalendar.java rename to src/main/java/io/github/ehlxr/test/TestCalendar.java index 33ccc26..4981617 100644 --- a/src/main/java/me/ehlxr/test/TestCalendar.java +++ b/src/main/java/io/github/ehlxr/test/TestCalendar.java @@ -1,4 +1,4 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; import java.util.Calendar; import java.util.TimeZone; diff --git a/src/main/java/me/ehlxr/test/TestCode.java b/src/main/java/io/github/ehlxr/test/TestCode.java similarity index 99% rename from src/main/java/me/ehlxr/test/TestCode.java rename to src/main/java/io/github/ehlxr/test/TestCode.java index 708f549..a54dea0 100644 --- a/src/main/java/me/ehlxr/test/TestCode.java +++ b/src/main/java/io/github/ehlxr/test/TestCode.java @@ -1,4 +1,4 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/src/main/java/me/ehlxr/test/TestCountDownLatch.java b/src/main/java/io/github/ehlxr/test/TestCountDownLatch.java similarity index 90% rename from src/main/java/me/ehlxr/test/TestCountDownLatch.java rename to src/main/java/io/github/ehlxr/test/TestCountDownLatch.java index 73120e7..7190cd8 100644 --- a/src/main/java/me/ehlxr/test/TestCountDownLatch.java +++ b/src/main/java/io/github/ehlxr/test/TestCountDownLatch.java @@ -1,13 +1,14 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; + public class TestCountDownLatch { private static final int N = 10; - private static Map cache = new ConcurrentHashMap(); + private static final Map cache = new ConcurrentHashMap(); public static void main(String[] args) throws InterruptedException { CountDownLatch doneSignal = new CountDownLatch(N); diff --git a/src/main/java/me/ehlxr/test/TestCounter.java b/src/main/java/io/github/ehlxr/test/TestCounter.java similarity index 88% rename from src/main/java/me/ehlxr/test/TestCounter.java rename to src/main/java/io/github/ehlxr/test/TestCounter.java index 9c716eb..bcf94af 100644 --- a/src/main/java/me/ehlxr/test/TestCounter.java +++ b/src/main/java/io/github/ehlxr/test/TestCounter.java @@ -1,4 +1,4 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; public class TestCounter { public static void main(String[] args) throws Exception { diff --git a/src/main/java/me/ehlxr/test/TestDecodeHex.java b/src/main/java/io/github/ehlxr/test/TestDecodeHex.java similarity index 95% rename from src/main/java/me/ehlxr/test/TestDecodeHex.java rename to src/main/java/io/github/ehlxr/test/TestDecodeHex.java index a744f06..fe40551 100644 --- a/src/main/java/me/ehlxr/test/TestDecodeHex.java +++ b/src/main/java/io/github/ehlxr/test/TestDecodeHex.java @@ -1,4 +1,4 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; import org.apache.commons.codec.binary.Hex; diff --git a/src/main/java/me/ehlxr/test/TestException.java b/src/main/java/io/github/ehlxr/test/TestException.java similarity index 84% rename from src/main/java/me/ehlxr/test/TestException.java rename to src/main/java/io/github/ehlxr/test/TestException.java index 7257072..b0c99b7 100644 --- a/src/main/java/me/ehlxr/test/TestException.java +++ b/src/main/java/io/github/ehlxr/test/TestException.java @@ -1,4 +1,4 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; /** * Created by ehlxr on 2016/8/31. diff --git a/src/main/java/me/ehlxr/test/TestFile.java b/src/main/java/io/github/ehlxr/test/TestFile.java similarity index 97% rename from src/main/java/me/ehlxr/test/TestFile.java rename to src/main/java/io/github/ehlxr/test/TestFile.java index 657e110..b33679c 100644 --- a/src/main/java/me/ehlxr/test/TestFile.java +++ b/src/main/java/io/github/ehlxr/test/TestFile.java @@ -1,4 +1,4 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; import java.io.BufferedReader; import java.io.File; diff --git a/src/main/java/me/ehlxr/test/TestGeoHash.java b/src/main/java/io/github/ehlxr/test/TestGeoHash.java similarity index 94% rename from src/main/java/me/ehlxr/test/TestGeoHash.java rename to src/main/java/io/github/ehlxr/test/TestGeoHash.java index ce58f64..b3fa2fd 100644 --- a/src/main/java/me/ehlxr/test/TestGeoHash.java +++ b/src/main/java/io/github/ehlxr/test/TestGeoHash.java @@ -1,6 +1,6 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; -import me.ehlxr.utils.GeoHash; +import io.github.ehlxr.utils.GeoHash; public class TestGeoHash { diff --git a/src/main/java/me/ehlxr/test/TestJdbc.java b/src/main/java/io/github/ehlxr/test/TestJdbc.java similarity index 98% rename from src/main/java/me/ehlxr/test/TestJdbc.java rename to src/main/java/io/github/ehlxr/test/TestJdbc.java index f0e2893..e4a43e3 100644 --- a/src/main/java/me/ehlxr/test/TestJdbc.java +++ b/src/main/java/io/github/ehlxr/test/TestJdbc.java @@ -1,6 +1,6 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; -import me.ehlxr.redis.JedisUtil; +import io.github.ehlxr.redis.JedisUtil; import net.sf.json.JSONObject; import java.sql.*; diff --git a/src/main/java/me/ehlxr/test/TestJdbc143.java b/src/main/java/io/github/ehlxr/test/TestJdbc143.java similarity index 98% rename from src/main/java/me/ehlxr/test/TestJdbc143.java rename to src/main/java/io/github/ehlxr/test/TestJdbc143.java index c0058ad..69ae9d3 100644 --- a/src/main/java/me/ehlxr/test/TestJdbc143.java +++ b/src/main/java/io/github/ehlxr/test/TestJdbc143.java @@ -1,4 +1,4 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; import java.sql.Connection; import java.sql.DriverManager; diff --git a/src/main/java/me/ehlxr/test/TestJdbc26.java b/src/main/java/io/github/ehlxr/test/TestJdbc26.java similarity index 98% rename from src/main/java/me/ehlxr/test/TestJdbc26.java rename to src/main/java/io/github/ehlxr/test/TestJdbc26.java index 70cbeb4..94130a7 100644 --- a/src/main/java/me/ehlxr/test/TestJdbc26.java +++ b/src/main/java/io/github/ehlxr/test/TestJdbc26.java @@ -1,4 +1,4 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; import java.sql.Connection; import java.sql.DriverManager; diff --git a/src/main/java/me/ehlxr/test/TestReadFile.java b/src/main/java/io/github/ehlxr/test/TestReadFile.java similarity index 99% rename from src/main/java/me/ehlxr/test/TestReadFile.java rename to src/main/java/io/github/ehlxr/test/TestReadFile.java index 606336a..7d6aa0c 100644 --- a/src/main/java/me/ehlxr/test/TestReadFile.java +++ b/src/main/java/io/github/ehlxr/test/TestReadFile.java @@ -1,4 +1,4 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; import java.io.BufferedReader; import java.io.File; diff --git a/src/main/java/me/ehlxr/test/TestReference.java b/src/main/java/io/github/ehlxr/test/TestReference.java similarity index 97% rename from src/main/java/me/ehlxr/test/TestReference.java rename to src/main/java/io/github/ehlxr/test/TestReference.java index d3d6808..855cff7 100644 --- a/src/main/java/me/ehlxr/test/TestReference.java +++ b/src/main/java/io/github/ehlxr/test/TestReference.java @@ -1,4 +1,4 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; /** * Created by ehlxr on 2017/4/14. diff --git a/src/main/java/me/ehlxr/test/TestSyncLogData.java b/src/main/java/io/github/ehlxr/test/TestSyncLogData.java similarity index 99% rename from src/main/java/me/ehlxr/test/TestSyncLogData.java rename to src/main/java/io/github/ehlxr/test/TestSyncLogData.java index 1dc6445..31f1cb9 100644 --- a/src/main/java/me/ehlxr/test/TestSyncLogData.java +++ b/src/main/java/io/github/ehlxr/test/TestSyncLogData.java @@ -1,7 +1,7 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; import com.caucho.hessian.client.HessianProxyFactory; -import me.ehlxr.readlogs.IReadLogs; +import io.github.ehlxr.readlogs.IReadLogs; import net.sf.json.JSONArray; import net.sf.json.JSONObject; diff --git a/src/main/java/me/ehlxr/test/TestThread.java b/src/main/java/io/github/ehlxr/test/TestThread.java similarity index 95% rename from src/main/java/me/ehlxr/test/TestThread.java rename to src/main/java/io/github/ehlxr/test/TestThread.java index 23f85bf..b9f16d1 100644 --- a/src/main/java/me/ehlxr/test/TestThread.java +++ b/src/main/java/io/github/ehlxr/test/TestThread.java @@ -1,6 +1,6 @@ -package me.ehlxr.test; +package io.github.ehlxr.test; -import me.ehlxr.utils.HttpClientUtil; +import io.github.ehlxr.utils.HttpClientUtil; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/me/ehlxr/testminisite/TestMinisite.java b/src/main/java/io/github/ehlxr/testminisite/TestMinisite.java similarity index 88% rename from src/main/java/me/ehlxr/testminisite/TestMinisite.java rename to src/main/java/io/github/ehlxr/testminisite/TestMinisite.java index 35fd10c..ac1822f 100644 --- a/src/main/java/me/ehlxr/testminisite/TestMinisite.java +++ b/src/main/java/io/github/ehlxr/testminisite/TestMinisite.java @@ -1,16 +1,16 @@ -package me.ehlxr.testminisite; +package io.github.ehlxr.testminisite; + +import io.github.ehlxr.utils.HttpClientUtil; import java.util.HashMap; import java.util.Map; -import me.ehlxr.utils.HttpClientUtil; - public class TestMinisite { public static String URL = "http://127.0.0.1:8080/dsp-minisite/Audi2016Q2/getProvinces"; public static void main(String[] args) throws Exception { Map params = new HashMap<>(); - params.put("project","1"); + params.put("project", "1"); params.put("bid","1"); params.put("mapid","1"); params.put("name","1"); diff --git a/src/main/java/me/ehlxr/testopen/SignatureUtil.java b/src/main/java/io/github/ehlxr/testopen/SignatureUtil.java similarity index 94% rename from src/main/java/me/ehlxr/testopen/SignatureUtil.java rename to src/main/java/io/github/ehlxr/testopen/SignatureUtil.java index ce60eaf..d5f4c01 100644 --- a/src/main/java/me/ehlxr/testopen/SignatureUtil.java +++ b/src/main/java/io/github/ehlxr/testopen/SignatureUtil.java @@ -1,6 +1,7 @@ -package me.ehlxr.testopen; +package io.github.ehlxr.testopen; +import org.apache.commons.lang.StringUtils; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -8,18 +9,15 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.commons.lang.StringUtils; - /** * 签名工具类 - * */ -public class SignatureUtil { - - +public class SignatureUtil { + + private static final char[] hexArray = "0123456789ABCDEF".toCharArray(); - private static String encryptionAlgorithm = "SHA-1"; + private static final String encryptionAlgorithm = "SHA-1"; public static String bytesToHexString(byte[] bytes) { char[] hexChars = new char[bytes.length * 2]; @@ -112,14 +110,10 @@ public class SignatureUtil { */ public static boolean isValid(String signature, String appid,String token, String lol, long millis) { String calculatedSignature = generateSignature(appid, token, lol, millis); - if (StringUtils.equals(calculatedSignature, signature)) { - return true; - } else { - return false; - } + return StringUtils.equals(calculatedSignature, signature); } - + public static void main(String[] args) { String xmlString = "testtesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttest"; System.out.println(xmlString.getBytes().length); diff --git a/src/main/java/me/ehlxr/testopen/TestOpenPuton.java b/src/main/java/io/github/ehlxr/testopen/TestOpenPuton.java similarity index 93% rename from src/main/java/me/ehlxr/testopen/TestOpenPuton.java rename to src/main/java/io/github/ehlxr/testopen/TestOpenPuton.java index 6521a0d..6ba91c0 100644 --- a/src/main/java/me/ehlxr/testopen/TestOpenPuton.java +++ b/src/main/java/io/github/ehlxr/testopen/TestOpenPuton.java @@ -1,27 +1,28 @@ -package me.ehlxr.testopen; +package io.github.ehlxr.testopen; +import io.github.ehlxr.utils.AESTool; +import io.github.ehlxr.utils.Base64; +import io.github.ehlxr.utils.HttpClientUtil; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import me.ehlxr.utils.AESTool; -import me.ehlxr.utils.Base64; -import me.ehlxr.utils.HttpClientUtil; - public class TestOpenPuton { - private static String URL = "http://127.0.0.1:8080/dsp-open/pxene/dsp.do"; - private static String key = "adjdjfjfjfjdkdkd";// - private static String appid = "t123456";// 用户 - private static String token = "cst123456";// 令牌 + private static final String URL = "http://127.0.0.1:8080/dsp-open/pxene/dsp.do"; + private static final String key = "adjdjfjfjfjdkdkd";// + private static final String appid = "t123456";// 用户 + private static final String token = "cst123456";// 令牌 public static void main(String[] args) throws Exception { -// String sendPostParam = HttpClientUtil.sendPostParam(URL, getPostParam("setAdxProp"));// 获得数据并且发送请求 -// String data = getData(sendPostParam); -// System.out.println(JSONObject.fromObject(data)); - - + // String sendPostParam = HttpClientUtil.sendPostParam(URL, getPostParam("setAdxProp"));// 获得数据并且发送请求 + // String data = getData(sendPostParam); + // System.out.println(JSONObject.fromObject(data)); + + JSONObject json = new JSONObject(); json.put("param", "中午"); String str = "{\"order_info\":{\"put_time\":[],\"cost_type\":1,\"order_budget\":{\"budget_all\":100.0},\"cost_single\":100.0,\"type\":1,\"order_id\":14575,\"landing_page\":\"www.baidu.com\",\"order_name\":\"tony-test-31\",\"brand_en\":null,\"plat\":1,\"end_time\":\"2016-05-03\",\"creative_group\":[{\"group_name\":\"test_五一\",\"plat\":1,\"ratio\":\"-\",\"group_id\":405,\"click_code\":null,\"impression_code\":null,\"landing_page\":\"www.baidu.com\"}],\"buy_type\":1,\"order_freq\":{\"imp_day_req\":5,\"click_total_freq\":5,\"imp_total_req\":10,\"click_day_freq\":1},\"ad_owner\":{\"owner_qualification\":[],\"owner_name\":\"ABI\",\"organization_code\":null,\"owner_id\":107,\"owner_category\":\"食品饮料>健康饮料，运动饮料，功能性饮料\",\"website_url\":\"http://sedrin.reloadbuzz.com/food2/xueJin/index.php/home/user/index\"},\"start_time\":\"2016-05-03\",\"order_goal\":{\"order_total_show\":1},\"brand_zh\":\"Sedrin\",\"industry\":\"食品饮料>健康饮料，运动饮料，功能性饮料\",\"note\":\"媒体类型定向：\\nnull\\n\\n关键词定向：\\n123\\n\\n广告素材轮播：\\n平均\\n\\n备注：\\n备注1(资源设置)：\\n321\\n\\n\\n\"}}"; @@ -31,7 +32,7 @@ public class TestOpenPuton { public static String getData(String encryptString) throws Exception { byte[] decode = Base64.decode(encryptString.getBytes()); - String aString = new String(decode, "utf-8"); + String aString = new String(decode, StandardCharsets.UTF_8); String decrypt = AESTool.decrypt(aString, key); return decrypt; } diff --git a/src/main/java/me/ehlxr/thread/TestSingleThreadExecutor.java b/src/main/java/io/github/ehlxr/thread/TestSingleThreadExecutor.java similarity index 93% rename from src/main/java/me/ehlxr/thread/TestSingleThreadExecutor.java rename to src/main/java/io/github/ehlxr/thread/TestSingleThreadExecutor.java index 2396f61..9a2aefc 100644 --- a/src/main/java/me/ehlxr/thread/TestSingleThreadExecutor.java +++ b/src/main/java/io/github/ehlxr/thread/TestSingleThreadExecutor.java @@ -1,10 +1,10 @@ -package me.ehlxr.thread; +package io.github.ehlxr.thread; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; class MyThread extends Thread { - private String name; + private final String name; public MyThread(String name) { diff --git a/src/main/java/me/ehlxr/thread/ThreadPoolExecutorTest.java b/src/main/java/io/github/ehlxr/thread/ThreadPoolExecutorTest.java similarity index 96% rename from src/main/java/me/ehlxr/thread/ThreadPoolExecutorTest.java rename to src/main/java/io/github/ehlxr/thread/ThreadPoolExecutorTest.java index cfd0b07..c6f3497 100644 --- a/src/main/java/me/ehlxr/thread/ThreadPoolExecutorTest.java +++ b/src/main/java/io/github/ehlxr/thread/ThreadPoolExecutorTest.java @@ -1,4 +1,4 @@ -package me.ehlxr.thread; +package io.github.ehlxr.thread; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/src/main/java/me/ehlxr/token/Base62.java b/src/main/java/io/github/ehlxr/token/Base62.java similarity index 90% rename from src/main/java/me/ehlxr/token/Base62.java rename to src/main/java/io/github/ehlxr/token/Base62.java index cb1cc17..324d83e 100644 --- a/src/main/java/me/ehlxr/token/Base62.java +++ b/src/main/java/io/github/ehlxr/token/Base62.java @@ -1,4 +1,4 @@ -package me.ehlxr.token; +package io.github.ehlxr.token; import java.io.ByteArrayOutputStream; @@ -8,9 +8,9 @@ import java.io.ByteArrayOutputStream; */ public class Base62 { - private static char[] encodes = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" + private static final char[] encodes = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" .toCharArray(); - private static byte[] decodes = new byte[256]; + private static final byte[] decodes = new byte[256]; static { for (int i = 0; i < encodes.length; i++) { diff --git a/src/main/java/me/ehlxr/token/TokenCommonUtil.java b/src/main/java/io/github/ehlxr/token/TokenCommonUtil.java similarity index 94% rename from src/main/java/me/ehlxr/token/TokenCommonUtil.java rename to src/main/java/io/github/ehlxr/token/TokenCommonUtil.java index 5ebe3f7..38d2591 100644 --- a/src/main/java/me/ehlxr/token/TokenCommonUtil.java +++ b/src/main/java/io/github/ehlxr/token/TokenCommonUtil.java @@ -1,4 +1,4 @@ -package me.ehlxr.token; +package io.github.ehlxr.token; import java.security.MessageDigest; import java.util.Date; @@ -6,7 +6,7 @@ import java.util.Date; public class TokenCommonUtil { //使用ThreadLocal变量，防止线程冲突 - private static ThreadLocal mdThreadLocal = new ThreadLocal(); + private static final ThreadLocal mdThreadLocal = new ThreadLocal(); /** @@ -16,7 +16,7 @@ public class TokenCommonUtil { * @return */ public static byte[] calculateMD5(byte[] bytes) { - byte b[]; + byte[] b; MessageDigest md = getMD(); md.reset(); md.update(bytes); @@ -107,7 +107,7 @@ public class TokenCommonUtil { public static byte[] long2Bytes(long value) { int binaryLength = getBytesLength(value); long temp = value; - byte b[] = new byte[binaryLength]; + byte[] b = new byte[binaryLength]; for (int i = binaryLength - 1; i > -1; i--) { b[i] = new Long(temp & 0xff).byteValue(); temp = temp >> 8; diff --git a/src/main/java/me/ehlxr/token/TokenServerUtil.java b/src/main/java/io/github/ehlxr/token/TokenServerUtil.java similarity index 98% rename from src/main/java/me/ehlxr/token/TokenServerUtil.java rename to src/main/java/io/github/ehlxr/token/TokenServerUtil.java index 5ccdc26..7b705d1 100644 --- a/src/main/java/me/ehlxr/token/TokenServerUtil.java +++ b/src/main/java/io/github/ehlxr/token/TokenServerUtil.java @@ -1,4 +1,4 @@ -package me.ehlxr.token; +package io.github.ehlxr.token; @@ -142,7 +142,7 @@ public class TokenServerUtil { private static byte[] generate8MD5ByVersion(int version, Long uid, String create_token_key) { if (version == TokenVersionEnum.VERSION_1.getValue()) { String udidBuilder = uid + create_token_key + System.currentTimeMillis(); - byte[] udidBytes = TokenCommonUtil.calculateMD5(udidBuilder.toString().getBytes()); + byte[] udidBytes = TokenCommonUtil.calculateMD5(udidBuilder.getBytes()); byte[] udidHalfBytes = new byte[8]; System.arraycopy(udidBytes, 0, udidHalfBytes, 0, udidHalfBytes.length); return udidHalfBytes; @@ -155,7 +155,7 @@ public class TokenServerUtil { byte[] sidBytes = TokenCommonUtil.byteMerger(new byte[]{lengthBinary}, uByte); //{7 - binaryLength字节MD5的串} String udidBuilder = create_token_key + System.currentTimeMillis(); - byte[] udidBytes = TokenCommonUtil.calculateMD5(udidBuilder.toString().getBytes()); + byte[] udidBytes = TokenCommonUtil.calculateMD5(udidBuilder.getBytes()); byte[] udidHalfBytes = new byte[7 - binaryLength]; System.arraycopy(udidBytes, 0, udidHalfBytes, 0, udidHalfBytes.length); diff --git a/src/main/java/me/ehlxr/token/TokenVersionConfig.java b/src/main/java/io/github/ehlxr/token/TokenVersionConfig.java similarity index 97% rename from src/main/java/me/ehlxr/token/TokenVersionConfig.java rename to src/main/java/io/github/ehlxr/token/TokenVersionConfig.java index 2f720e2..e1b1368 100644 --- a/src/main/java/me/ehlxr/token/TokenVersionConfig.java +++ b/src/main/java/io/github/ehlxr/token/TokenVersionConfig.java @@ -1,4 +1,4 @@ -package me.ehlxr.token; +package io.github.ehlxr.token; /** * token版本相关的配置 diff --git a/src/main/java/me/ehlxr/token/TokenVersionEnum.java b/src/main/java/io/github/ehlxr/token/TokenVersionEnum.java similarity index 73% rename from src/main/java/me/ehlxr/token/TokenVersionEnum.java rename to src/main/java/io/github/ehlxr/token/TokenVersionEnum.java index 490178d..9fa04e2 100644 --- a/src/main/java/me/ehlxr/token/TokenVersionEnum.java +++ b/src/main/java/io/github/ehlxr/token/TokenVersionEnum.java @@ -1,4 +1,4 @@ -package me.ehlxr.token; +package io.github.ehlxr.token; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -9,14 +9,14 @@ public enum TokenVersionEnum { VERSION_2(2); // provider数字与字符串映射字典表 - private static BiMap VERSION_MAPPING_DICT = HashBiMap.create(); + private static final BiMap VERSION_MAPPING_DICT = HashBiMap.create(); static { VERSION_MAPPING_DICT.put("1", VERSION_1.getValue()); VERSION_MAPPING_DICT.put("2", VERSION_2.getValue()); } - private int value; + private final int value; TokenVersionEnum(int value) { this.value = value; @@ -31,10 +31,7 @@ public enum TokenVersionEnum { } public static boolean checkKeyIsExist(String version) { - if (VERSION_MAPPING_DICT.containsKey(version)) { - return true; - } - return false; + return VERSION_MAPPING_DICT.containsKey(version); } } diff --git a/src/main/java/me/ehlxr/token/TokenVersionFactory.java b/src/main/java/io/github/ehlxr/token/TokenVersionFactory.java similarity index 92% rename from src/main/java/me/ehlxr/token/TokenVersionFactory.java rename to src/main/java/io/github/ehlxr/token/TokenVersionFactory.java index f1f68b0..c86b04f 100644 --- a/src/main/java/me/ehlxr/token/TokenVersionFactory.java +++ b/src/main/java/io/github/ehlxr/token/TokenVersionFactory.java @@ -1,4 +1,4 @@ -package me.ehlxr.token; +package io.github.ehlxr.token; import com.google.common.base.Strings; @@ -17,8 +17,8 @@ import java.util.concurrent.ConcurrentMap; */ public class TokenVersionFactory { - private static String TOKEN_VERSION = "tokenVersion"; - private static String RESOURCE_NAME = "token_version.properties"; + private static final String TOKEN_VERSION = "tokenVersion"; + private static final String RESOURCE_NAME = "token_version.properties"; private static Props properties = null; diff --git a/src/main/java/me/ehlxr/utils/AESTool.java b/src/main/java/io/github/ehlxr/utils/AESTool.java similarity index 99% rename from src/main/java/me/ehlxr/utils/AESTool.java rename to src/main/java/io/github/ehlxr/utils/AESTool.java index 0bcfdc7..08ea457 100644 --- a/src/main/java/me/ehlxr/utils/AESTool.java +++ b/src/main/java/io/github/ehlxr/utils/AESTool.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; import org.bouncycastle.crypto.CipherParameters; import org.bouncycastle.crypto.engines.AESFastEngine; diff --git a/src/main/java/me/ehlxr/utils/Base64.java b/src/main/java/io/github/ehlxr/utils/Base64.java similarity index 99% rename from src/main/java/me/ehlxr/utils/Base64.java rename to src/main/java/io/github/ehlxr/utils/Base64.java index bb87ac1..0946d89 100644 --- a/src/main/java/me/ehlxr/utils/Base64.java +++ b/src/main/java/io/github/ehlxr/utils/Base64.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; import java.util.Arrays; diff --git a/src/main/java/me/ehlxr/utils/CCRDFile.java b/src/main/java/io/github/ehlxr/utils/CCRDFile.java similarity index 96% rename from src/main/java/me/ehlxr/utils/CCRDFile.java rename to src/main/java/io/github/ehlxr/utils/CCRDFile.java index a1e91a7..3ef2e85 100644 --- a/src/main/java/me/ehlxr/utils/CCRDFile.java +++ b/src/main/java/io/github/ehlxr/utils/CCRDFile.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; /** * Created by ehlxr on 2017/3/18. @@ -12,7 +12,7 @@ import java.io.IOException; */ public class CCRDFile { // 验证字符串是否为正确路径名的正则表达式 - private static String matches = "[A-Za-z]:\\\\[^:?\"><*]*"; + private static final String matches = "[A-Za-z]:\\\\[^:?\"><*]*"; // 通过 sPath.matches(matches) 方法的返回值判断是否正确 // sPath 为路径字符串 boolean flag = false; @@ -161,10 +161,7 @@ public class CCRDFile { } if (!flag) return false; - if (dirFile.delete()) {// 删除当前目录 - return true; - } else { - return false; - } + // 删除当前目录 + return dirFile.delete(); } } \ No newline at end of file diff --git a/src/main/java/me/ehlxr/utils/Code.java b/src/main/java/io/github/ehlxr/utils/Code.java similarity index 97% rename from src/main/java/me/ehlxr/utils/Code.java rename to src/main/java/io/github/ehlxr/utils/Code.java index a954759..aa799a4 100644 --- a/src/main/java/me/ehlxr/utils/Code.java +++ b/src/main/java/io/github/ehlxr/utils/Code.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; /** * 自定义状态码 diff --git a/src/main/java/me/ehlxr/utils/CommonUtils.java b/src/main/java/io/github/ehlxr/utils/CommonUtils.java similarity index 98% rename from src/main/java/me/ehlxr/utils/CommonUtils.java rename to src/main/java/io/github/ehlxr/utils/CommonUtils.java index adbc270..86dd705 100644 --- a/src/main/java/me/ehlxr/utils/CommonUtils.java +++ b/src/main/java/io/github/ehlxr/utils/CommonUtils.java @@ -1,5 +1,6 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; +import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.net.InetAddress; @@ -9,14 +10,12 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - public class CommonUtils { - private static double EARTH_RADIUS = 6371; // 默认地球半径(单位km) + private static final double EARTH_RADIUS = 6371; // 默认地球半径(单位km) /** * 转化为弧度(rad) - * + * * @param d * @return */ diff --git a/src/main/java/me/ehlxr/utils/DateUtil.java b/src/main/java/io/github/ehlxr/utils/DateUtil.java similarity index 99% rename from src/main/java/me/ehlxr/utils/DateUtil.java rename to src/main/java/io/github/ehlxr/utils/DateUtil.java index 6ebfe42..3056aaa 100644 --- a/src/main/java/me/ehlxr/utils/DateUtil.java +++ b/src/main/java/io/github/ehlxr/utils/DateUtil.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/src/main/java/me/ehlxr/utils/ExecShell.java b/src/main/java/io/github/ehlxr/utils/ExecShell.java similarity index 98% rename from src/main/java/me/ehlxr/utils/ExecShell.java rename to src/main/java/io/github/ehlxr/utils/ExecShell.java index 6fd8202..a64ef7e 100644 --- a/src/main/java/me/ehlxr/utils/ExecShell.java +++ b/src/main/java/io/github/ehlxr/utils/ExecShell.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/me/ehlxr/utils/FormType.java b/src/main/java/io/github/ehlxr/utils/FormType.java similarity index 83% rename from src/main/java/me/ehlxr/utils/FormType.java rename to src/main/java/io/github/ehlxr/utils/FormType.java index ce3645e..12ea562 100644 --- a/src/main/java/me/ehlxr/utils/FormType.java +++ b/src/main/java/io/github/ehlxr/utils/FormType.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; /** * FORM 表单提交类型 diff --git a/src/main/java/me/ehlxr/utils/GeoHash.java b/src/main/java/io/github/ehlxr/utils/GeoHash.java similarity index 84% rename from src/main/java/me/ehlxr/utils/GeoHash.java rename to src/main/java/io/github/ehlxr/utils/GeoHash.java index 7916944..a72f19d 100644 --- a/src/main/java/me/ehlxr/utils/GeoHash.java +++ b/src/main/java/io/github/ehlxr/utils/GeoHash.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; import java.util.BitSet; import java.util.HashMap; @@ -6,17 +6,16 @@ import java.util.HashMap; /** * GeoHash算法实现 - * - * @author ehlxr - * - * 1、GeoHash将经纬度转换成一个可以排序，可以比较的字符串编码 - * 2、GeoHash表示的并不是一个点，而是一个矩形区域。比如编码wx4g0ec19，它表示的是一个矩形区域 * + * @author ehlxr + *

+ * 1、GeoHash将经纬度转换成一个可以排序，可以比较的字符串编码 + * 2、GeoHash表示的并不是一个点，而是一个矩形区域。比如编码wx4g0ec19，它表示的是一个矩形区域 */ public class GeoHash { - private static int numbits = 6 * 5; - final static char[] digits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'k', 'm', 'n', - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' }; + private static final int numbits = 6 * 5; + final static char[] digits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'k', 'm', 'n', + 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'}; final static HashMap lookup = new HashMap(); diff --git a/src/main/java/me/ehlxr/utils/HttpClientUtil.java b/src/main/java/io/github/ehlxr/utils/HttpClientUtil.java similarity index 97% rename from src/main/java/me/ehlxr/utils/HttpClientUtil.java rename to src/main/java/io/github/ehlxr/utils/HttpClientUtil.java index 9e7be98..cdb65e2 100644 --- a/src/main/java/me/ehlxr/utils/HttpClientUtil.java +++ b/src/main/java/io/github/ehlxr/utils/HttpClientUtil.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +40,7 @@ import java.util.Map; public class HttpClientUtil { private static final int TIME_OUT = 300000; private static final int BUFFERSIZE = 2048; - private static Log log = LogFactory.getLog(HttpClientUtil.class); + private static final Log log = LogFactory.getLog(HttpClientUtil.class); private static Registry getRegistry() { return RegistryBuilder.create().register(CookieSpecs.BEST_MATCH, new BestMatchSpecFactory()) @@ -164,7 +164,7 @@ public class HttpClientUtil { if (statusCode == HttpStatus.SC_OK) { entity = response.getEntity(); inputStream = entity.getContent(); - isr = new InputStreamReader(inputStream, "UTF-8"); + isr = new InputStreamReader(inputStream, StandardCharsets.UTF_8); br = new BufferedReader(isr); int count = 0; char[] b = new char[BUFFERSIZE]; @@ -222,7 +222,7 @@ public class HttpClientUtil { requestConfig = RequestConfig.custom().setConnectionRequestTimeout(TIME_OUT).setConnectTimeout(TIME_OUT).setSocketTimeout(TIME_OUT) .build(); postmethod.setConfig(requestConfig); - strentity = new StringEntity(URLEncoder.encode(json.toString(), "UTF-8")); + strentity = new StringEntity(URLEncoder.encode(json, "UTF-8")); postmethod.addHeader("Content-Type", "application/json"); postmethod.setEntity(strentity); response = httpclient.execute(postmethod); @@ -231,7 +231,7 @@ public class HttpClientUtil { if (statusCode == HttpStatus.SC_OK) { entity = response.getEntity(); inputStream = entity.getContent(); - isr = new InputStreamReader(inputStream, "UTF-8"); + isr = new InputStreamReader(inputStream, StandardCharsets.UTF_8); br = new BufferedReader(isr); int count = 0; char[] b = new char[BUFFERSIZE]; diff --git a/src/main/java/me/ehlxr/utils/HttpContentType.java b/src/main/java/io/github/ehlxr/utils/HttpContentType.java similarity index 93% rename from src/main/java/me/ehlxr/utils/HttpContentType.java rename to src/main/java/io/github/ehlxr/utils/HttpContentType.java index 18692df..4cd0604 100644 --- a/src/main/java/me/ehlxr/utils/HttpContentType.java +++ b/src/main/java/io/github/ehlxr/utils/HttpContentType.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; /** * @author ehlxr diff --git a/src/main/java/me/ehlxr/utils/HttpUtil.java b/src/main/java/io/github/ehlxr/utils/HttpUtil.java similarity index 99% rename from src/main/java/me/ehlxr/utils/HttpUtil.java rename to src/main/java/io/github/ehlxr/utils/HttpUtil.java index 95b8818..a91b686 100644 --- a/src/main/java/me/ehlxr/utils/HttpUtil.java +++ b/src/main/java/io/github/ehlxr/utils/HttpUtil.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; import com.google.common.collect.Maps; import okhttp3.*; diff --git a/src/main/java/me/ehlxr/utils/JsonUtils.java b/src/main/java/io/github/ehlxr/utils/JsonUtils.java similarity index 99% rename from src/main/java/me/ehlxr/utils/JsonUtils.java rename to src/main/java/io/github/ehlxr/utils/JsonUtils.java index 5d29c4f..d69d07b 100644 --- a/src/main/java/me/ehlxr/utils/JsonUtils.java +++ b/src/main/java/io/github/ehlxr/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/me/ehlxr/utils/MD5.java b/src/main/java/io/github/ehlxr/utils/MD5.java similarity index 91% rename from src/main/java/me/ehlxr/utils/MD5.java rename to src/main/java/io/github/ehlxr/utils/MD5.java index bbc12d7..36cb360 100644 --- a/src/main/java/me/ehlxr/utils/MD5.java +++ b/src/main/java/io/github/ehlxr/utils/MD5.java @@ -1,15 +1,15 @@ -package me.ehlxr.utils; - -import java.io.UnsupportedEncodingException; +package io.github.ehlxr.utils; import org.apache.commons.codec.digest.DigestUtils; +import java.io.UnsupportedEncodingException; + public class MD5 { - + public static String sign(String text, String key) { return sign(text, key, "UTF-8"); } - + public static String sign(String text, String key, String input_charset) { text = text + key; return DigestUtils.md5Hex(getContentBytes(text, input_charset)); @@ -22,11 +22,7 @@ public class MD5 { public static boolean verify(String text, String sign, String key, String input_charset) { text = text + key; String mysign = DigestUtils.md5Hex(getContentBytes(text, input_charset)); - if (mysign.equals(sign)) { - return true; - } else { - return false; - } + return mysign.equals(sign); } private static byte[] getContentBytes(String content, String charset) { diff --git a/src/main/java/me/ehlxr/utils/MyUrlDemo.java b/src/main/java/io/github/ehlxr/utils/MyUrlDemo.java similarity index 98% rename from src/main/java/me/ehlxr/utils/MyUrlDemo.java rename to src/main/java/io/github/ehlxr/utils/MyUrlDemo.java index 834296e..9ae6a9f 100644 --- a/src/main/java/me/ehlxr/utils/MyUrlDemo.java +++ b/src/main/java/io/github/ehlxr/utils/MyUrlDemo.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; import java.io.File; import java.io.IOException; diff --git a/src/main/java/me/ehlxr/utils/Pair.java b/src/main/java/io/github/ehlxr/utils/Pair.java similarity index 93% rename from src/main/java/me/ehlxr/utils/Pair.java rename to src/main/java/io/github/ehlxr/utils/Pair.java index 6a8a0aa..1493c01 100644 --- a/src/main/java/me/ehlxr/utils/Pair.java +++ b/src/main/java/io/github/ehlxr/utils/Pair.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; import java.io.Serializable; @@ -13,7 +13,7 @@ public class Pair implements Serializable { /** * Key of this Pair. */ - private K key; + private final K key; /** * Gets the key for this pair. @@ -27,7 +27,7 @@ public class Pair implements Serializable { /** * Value of this this Pair. */ - private V value; + private final V value; /** * Gets the value for this pair. @@ -104,9 +104,7 @@ public class Pair implements Serializable { Pair pair = (Pair) o; if (key != null ? !key.equals(pair.key) : pair.key != null) return false; - if (value != null ? !value.equals(pair.value) : pair.value != null) - return false; - return true; + return value != null ? value.equals(pair.value) : pair.value == null; } return false; } diff --git a/src/main/java/me/ehlxr/utils/Result.java b/src/main/java/io/github/ehlxr/utils/Result.java similarity index 99% rename from src/main/java/me/ehlxr/utils/Result.java rename to src/main/java/io/github/ehlxr/utils/Result.java index 484a162..4435481 100644 --- a/src/main/java/me/ehlxr/utils/Result.java +++ b/src/main/java/io/github/ehlxr/utils/Result.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/me/ehlxr/utils/StringAlign.java b/src/main/java/io/github/ehlxr/utils/StringAlign.java similarity index 99% rename from src/main/java/me/ehlxr/utils/StringAlign.java rename to src/main/java/io/github/ehlxr/utils/StringAlign.java index d6587f8..bac27fc 100644 --- a/src/main/java/me/ehlxr/utils/StringAlign.java +++ b/src/main/java/io/github/ehlxr/utils/StringAlign.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; /** * Created by ehlxr on 2017/8/17. diff --git a/src/main/java/me/ehlxr/utils/SystemConstants.java b/src/main/java/io/github/ehlxr/utils/SystemConstants.java similarity index 92% rename from src/main/java/me/ehlxr/utils/SystemConstants.java rename to src/main/java/io/github/ehlxr/utils/SystemConstants.java index a8fbba4..2af483c 100644 --- a/src/main/java/me/ehlxr/utils/SystemConstants.java +++ b/src/main/java/io/github/ehlxr/utils/SystemConstants.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; public class SystemConstants { public final static String RES_CODE = "rescode"; diff --git a/src/main/java/me/ehlxr/utils/Try.java b/src/main/java/io/github/ehlxr/utils/Try.java similarity index 99% rename from src/main/java/me/ehlxr/utils/Try.java rename to src/main/java/io/github/ehlxr/utils/Try.java index 3f6351c..8db4137 100644 --- a/src/main/java/me/ehlxr/utils/Try.java +++ b/src/main/java/io/github/ehlxr/utils/Try.java @@ -1,4 +1,4 @@ -package me.ehlxr.utils; +package io.github.ehlxr.utils; import java.util.ArrayList; import java.util.Objects; diff --git a/src/main/java/me/ehlxr/viplugin/CheckLicenseFile.java b/src/main/java/io/github/ehlxr/viplugin/CheckLicenseFile.java similarity index 96% rename from src/main/java/me/ehlxr/viplugin/CheckLicenseFile.java rename to src/main/java/io/github/ehlxr/viplugin/CheckLicenseFile.java index ac2631c..e1a093a 100644 --- a/src/main/java/me/ehlxr/viplugin/CheckLicenseFile.java +++ b/src/main/java/io/github/ehlxr/viplugin/CheckLicenseFile.java @@ -1,18 +1,19 @@ -package me.ehlxr.viplugin; +package io.github.ehlxr.viplugin; +import org.apache.commons.codec.binary.Base64; + +import javax.crypto.Cipher; +import javax.crypto.spec.SecretKeySpec; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; -import javax.crypto.Cipher; -import javax.crypto.spec.SecretKeySpec; -import org.apache.commons.codec.binary.Base64; public class CheckLicenseFile { private static final String publicKey = "308201b83082012d"; private static SecretKeySpec key; private static Cipher cipher; - private static byte[] linebreak = new byte[0]; + private static final byte[] linebreak = new byte[0]; private static Base64 coder; static { diff --git a/src/main/java/me/ehlxr/viplugin/CreateLicense.java b/src/main/java/io/github/ehlxr/viplugin/CreateLicense.java similarity index 90% rename from src/main/java/me/ehlxr/viplugin/CreateLicense.java rename to src/main/java/io/github/ehlxr/viplugin/CreateLicense.java index 61521df..4894950 100644 --- a/src/main/java/me/ehlxr/viplugin/CreateLicense.java +++ b/src/main/java/io/github/ehlxr/viplugin/CreateLicense.java @@ -1,4 +1,4 @@ -package me.ehlxr.viplugin; +package io.github.ehlxr.viplugin; public class CreateLicense { diff --git a/src/main/java/me/ehlxr/readlogs/IReadLogs.java b/src/main/java/me/ehlxr/readlogs/IReadLogs.java deleted file mode 100644 index 7417fff..0000000 --- a/src/main/java/me/ehlxr/readlogs/IReadLogs.java +++ /dev/null @@ -1,9 +0,0 @@ -package me.ehlxr.readlogs; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -public interface IReadLogs { - public String readFile(Date startDate, Date endDate, List mapids, String groupid,Map adxs); -} \ No newline at end of file diff --git a/src/main/webapp/resume b/src/main/webapp/resume deleted file mode 160000 index 8767da7..0000000 --- a/src/main/webapp/resume +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8767da787d2a927e8e84304cfb757d7e0a1428ef