Procházet zdrojové kódy

修改删除jar包

syh před 5 roky
rodič
revize
522a83aef6
18 změnil soubory, kde provedl 308 přidání a 327 odebrání
  1. 0 19
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java
  2. 1 1
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/LoadFileUtil.java
  3. 1 1
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java
  4. 3 3
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/JsonSchemaDescrip.java
  5. 2 2
      jeecg-boot-module-system/pom.xml
  6. 114 114
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertisePlan.java
  7. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CreateInternalServiceImpl.java
  8. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/FileInfoServiceImpl.java
  9. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ReportServiceImpl.java
  10. 148 148
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/sign/pdf/RSACertHelper.java
  11. 2 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouImageServiceImpl.java
  12. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouVideoServiceImpl.java
  13. 3 3
      jeecg-boot-module-system/src/main/resources/application-dev.yml
  14. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/Base64Utils.java
  15. 4 4
      module-common/src/main/java/cn/com/ctop/common/utils/CsvUtils.java
  16. 12 12
      module-common/src/main/java/cn/com/ctop/common/utils/HttpUtils.java
  17. 5 4
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/core/util/FateadmHttpUtil.java
  18. 4 4
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/core/util/FateadmUtil.java

+ 0 - 19
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -125,18 +125,6 @@ public class DateUtils extends PropertyEditorSupport {
 
     /**
      * 日期转换为字符串
-     * @param date   日期
-     * @return 字符串
-     */
-    public static String date2Str(Date date, SimpleDateFormat dateSdf) {
-        if (null == date) {
-            return null;
-        }
-        return dateSdf.format(date);
-    }
-
-    /**
-     * 日期转换为字符串
      * @param format 日期格式
      * @return 字符串
      */
@@ -288,13 +276,6 @@ public class DateUtils extends PropertyEditorSupport {
     }
 
     /**
-     * 获取时间字符串
-     */
-    public static String getDataString(SimpleDateFormat formatstr) {
-        return formatstr.format(getCalendar().getTime());
-    }
-
-    /**
      * 指定日期的默认显示,具体格式:年-月-日
      *
      * @param cal 指定的日期

+ 1 - 1
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/LoadFileUtil.java

@@ -28,7 +28,7 @@ public class LoadFileUtil {
      * @throws IOException
      */
     public static String downLoadFromUrl(String urlStr, String savePath) throws IOException {
-        String fileName = AesEncryptUtil.getURLDecoderString(urlStr.substring(urlStr.lastIndexOf("/") + 1));
+        String fileName = AesEncryptUtil.getUrlDecoderString(urlStr.substring(urlStr.lastIndexOf("/") + 1));
         URL url = new URL(urlStr);
 
         System.setProperty("https.protocols", "TLSv1,TLSv1.1,TLSv1.2,SSLv3");

+ 1 - 1
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java

@@ -108,7 +108,7 @@ public class AesEncryptUtil {
     }
 
 
-    public static String getURLDecoderString(String str) {
+    public static String getUrlDecoderString(String str) {
         String result = "";
         if (null == str) {
             return "";

+ 3 - 3
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/JsonSchemaDescrip.java

@@ -15,7 +15,7 @@ public class JsonSchemaDescrip implements Serializable{
 	private static final long serialVersionUID = 7682073117441544718L;
 
 
-    private String SCHEMA = "http://json-schema.org/draft-07/schema#";
+	private String schema = "http://json-schema.org/draft-07/schema#";
 	
 	/**
 	 * 用它给我们的模式提供了标题。
@@ -44,11 +44,11 @@ public class JsonSchemaDescrip implements Serializable{
 	}
 
     public String getSchema() {
-        return SCHEMA;
+		return schema;
     }
 
     public void setSchema(String schema) {
-        this.SCHEMA = schema;
+		this.schema = schema;
 	}
 
 	public String getTitle() {

+ 2 - 2
jeecg-boot-module-system/pom.xml

@@ -89,11 +89,11 @@
             <artifactId>itextpdf</artifactId>
             <version>5.5.13</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>e-iceblue</groupId>
             <artifactId>spire.pdf</artifactId>
             <version>2.7.8</version>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
     <build>

+ 114 - 114
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertisePlan.java

@@ -172,29 +172,29 @@ public class ByteDanceAdvertisePlan {
 			this.campaignId =campaignId;
 		}
 
-		String budget_mode = dataObject.getString("budget_mode");
-		if (null!=budget_mode&&!"".equals(budget_mode.trim())){
-			this.budgetMode =budget_mode;
+        String budgetMode = dataObject.getString("budget_mode");
+        if (null != budgetMode && !"".equals(budgetMode.trim())) {
+            this.budgetMode = budgetMode;
 		}
 
-        String open_url = dataObject.getString("open_url");
-        if (null != open_url && !"".equals(open_url.trim())) {
-            this.openUrl = open_url;
+        String openUrl = dataObject.getString("open_url");
+        if (null != openUrl && !"".equals(openUrl.trim())) {
+            this.openUrl = openUrl;
         }
 
-        String ad_create_time = dataObject.getString("ad_create_time");
-        if (null != ad_create_time && !"".equals(ad_create_time.trim())) {
-            this.adCreateTime = ad_create_time;
+        String adCreateTime = dataObject.getString("ad_create_time");
+        if (null != adCreateTime && !"".equals(adCreateTime.trim())) {
+            this.adCreateTime = adCreateTime;
         }
 
-        String ad_modify_time = dataObject.getString("ad_modify_time");
-        if (null != ad_modify_time && !"".equals(ad_modify_time.trim())) {
-            this.adModifyTime = ad_modify_time;
+        String adModifyTime = dataObject.getString("ad_modify_time");
+        if (null != adModifyTime && !"".equals(adModifyTime.trim())) {
+            this.adModifyTime = adModifyTime;
         }
 
-        String audit_reject_reason = dataObject.getString("audit_reject_reason");
-        if (null != audit_reject_reason && !"".equals(audit_reject_reason.trim())) {
-            this.auditRejectReason = audit_reject_reason;
+        String auditRejectReason = dataObject.getString("audit_reject_reason");
+        if (null != auditRejectReason && !"".equals(auditRejectReason.trim())) {
+            this.auditRejectReason = auditRejectReason;
         }
 
 //        String dpa_open_url_field = dataObject.getString("dpa_open_url_field");
@@ -222,9 +222,9 @@ public class ByteDanceAdvertisePlan {
 //            this.dpaCategories =dpa_categories;
 //        }
 
-        Integer hide_if_exists = dataObject.getInteger("hide_if_exists");
-        if (null != hide_if_exists) {
-            this.hideIfExists = hide_if_exists;
+        Integer hideIfExists = dataObject.getInteger("hide_if_exists");
+        if (null != hideIfExists) {
+            this.hideIfExists = hideIfExists;
         }
 
 //        String open_url_params = dataObject.getString("open_url_params");
@@ -242,14 +242,14 @@ public class ByteDanceAdvertisePlan {
 //            this.deepCpaaid =deep_cpabid;
 //        }
 
-        String app_type = dataObject.getString("app_type");
-        if (null != app_type && !"".equals(app_type.trim())) {
-            this.appType = app_type;
+        String appType = dataObject.getString("app_type");
+        if (null != appType && !"".equals(appType.trim())) {
+            this.appType = appType;
         }
 
-        String flow_control_mode = dataObject.getString("flow_control_mode");
-        if (null != flow_control_mode && !"".equals(flow_control_mode.trim())) {
-            this.flowControlMode = flow_control_mode;
+        String flowControlMode = dataObject.getString("flow_control_mode");
+        if (null != flowControlMode && !"".equals(flowControlMode.trim())) {
+            this.flowControlMode = flowControlMode;
         }
 
 //        String union_video_type = dataObject.getString("union_video_type");
@@ -262,9 +262,9 @@ public class ByteDanceAdvertisePlan {
 //            this.downloadUrl =download_url;
 //        }
 
-        BigDecimal cpa_bid = dataObject.getBigDecimal("cpa_bid");
-        if (null != cpa_bid) {
-            this.cpaBid = cpa_bid;
+        BigDecimal cpaBid = dataObject.getBigDecimal("cpa_bid");
+        if (null != cpaBid) {
+            this.cpaBid = cpaBid;
         }
 
 //        String dpa_products = dataObject.getString("dpa_products");
@@ -292,19 +292,19 @@ public class ByteDanceAdvertisePlan {
 //            this.dpaExternalUrls =dpa_external_urls;
 //        }
 
-        String start_time = dataObject.getString("start_time");
-        if (null != start_time && !"".equals(start_time.trim())) {
-            this.startTime = start_time;
+        String startTime = dataObject.getString("start_time");
+        if (null != startTime && !"".equals(startTime.trim())) {
+            this.startTime = startTime;
         }
 
-        String opt_status = dataObject.getString("opt_status");
-        if (null != opt_status && !"".equals(opt_status.trim())) {
-            this.optStatus = opt_status;
+        String optStatus = dataObject.getString("opt_status");
+        if (null != optStatus && !"".equals(optStatus.trim())) {
+            this.optStatus = optStatus;
         }
 
-        String end_time = dataObject.getString("end_time");
-        if (null != end_time && !"".equals(end_time.trim())) {
-            this.endTime = end_time;
+        String endTime = dataObject.getString("end_time");
+        if (null != endTime && !"".equals(endTime.trim())) {
+            this.endTime = endTime;
         }
 
         String status = dataObject.getString("status");
@@ -322,9 +322,9 @@ public class ByteDanceAdvertisePlan {
 //            this.openUrl =open_url;
 //        }
 
-        Long convert_id = dataObject.getLong("convert_id");
-        if (null != convert_id) {
-            this.convertId = convert_id;
+        Long convertId = dataObject.getLong("convert_id");
+        if (null != convertId) {
+            this.convertId = convertId;
         }
 
 //        String adjust_cpa = dataObject.getString("adjust_cpa");
@@ -357,9 +357,9 @@ public class ByteDanceAdvertisePlan {
 //            this.externalActions =external_actions;
 //        }
 
-        String hide_if_converted = dataObject.getString("hide_if_converted");
-        if (null != hide_if_converted && !"".equals(hide_if_converted.trim())) {
-            this.hideIfConverted = hide_if_converted;
+        String hideIfConverted = dataObject.getString("hide_if_converted");
+        if (null != hideIfConverted && !"".equals(hideIfConverted.trim())) {
+            this.hideIfConverted = hideIfConverted;
         }
 
         String toutiaoPackage = dataObject.getString("package");
@@ -367,9 +367,9 @@ public class ByteDanceAdvertisePlan {
             this.toutiaoPackage = toutiaoPackage;
         }
 
-        String delivery_range = dataObject.getString("delivery_range");
-        if (null != delivery_range && !"".equals(delivery_range.trim())) {
-            this.deliveryRange = delivery_range;
+        String deliveryRange = dataObject.getString("delivery_range");
+        if (null != deliveryRange && !"".equals(deliveryRange.trim())) {
+            this.deliveryRange = deliveryRange;
         }
 
 //        String params_type = dataObject.getString("params_type");
@@ -382,14 +382,14 @@ public class ByteDanceAdvertisePlan {
             this.budget = budget;
         }
 
-        String schedule_type = dataObject.getString("schedule_type");
-        if (null != schedule_type && !"".equals(schedule_type.trim())) {
-            this.scheduleType = schedule_type;
+        String scheduleType = dataObject.getString("schedule_type");
+        if (null != scheduleType && !"".equals(scheduleType.trim())) {
+            this.scheduleType = scheduleType;
         }
 
-        String schedule_time = dataObject.getString("schedule_time");
-        if (null != schedule_time && !"".equals(schedule_time.trim())) {
-            this.scheduleTime = schedule_time;
+        String scheduleTime = dataObject.getString("schedule_time");
+        if (null != scheduleTime && !"".equals(scheduleTime.trim())) {
+            this.scheduleTime = scheduleTime;
         }
 //
 //        String modify_time = dataObject.getString("modify_time");
@@ -407,14 +407,14 @@ public class ByteDanceAdvertisePlan {
 //            this.productPlatformId =product_platform_id;
 //        }
 
-        String download_type = dataObject.getString("download_type");
-        if (null != download_type && !"".equals(download_type.trim())) {
-            this.downloadType = download_type;
+        String downloadType = dataObject.getString("download_type");
+        if (null != downloadType && !"".equals(downloadType.trim())) {
+            this.downloadType = downloadType;
         }
 
-        String external_url = dataObject.getString("external_url");
-        if (null != external_url && !"".equals(external_url.trim())) {
-            this.externalUrl = external_url;
+        String externalUrl = dataObject.getString("external_url");
+        if (null != externalUrl && !"".equals(externalUrl.trim())) {
+            this.externalUrl = externalUrl;
         }
     }
 
@@ -435,29 +435,29 @@ public class ByteDanceAdvertisePlan {
             this.campaignId = campaignId;
         }
 
-        String budget_mode = params.getString("budget_mode");
-        if (null != budget_mode && !"".equals(budget_mode.trim())) {
-            this.budgetMode = budget_mode;
+        String budgetMode = params.getString("budget_mode");
+        if (null != budgetMode && !"".equals(budgetMode.trim())) {
+            this.budgetMode = budgetMode;
         }
 
-        String open_url = params.getString("open_url");
-        if (null != open_url && !"".equals(open_url.trim())) {
-            this.openUrl = open_url;
+        String openUrl = params.getString("open_url");
+        if (null != openUrl && !"".equals(openUrl.trim())) {
+            this.openUrl = openUrl;
         }
 
-        String ad_create_time = params.getString("ad_create_time");
-        if (null != ad_create_time && !"".equals(ad_create_time.trim())) {
-            this.adCreateTime = ad_create_time;
+        String adCreateTime = params.getString("ad_create_time");
+        if (null != adCreateTime && !"".equals(adCreateTime.trim())) {
+            this.adCreateTime = adCreateTime;
         }
 
-        String ad_modify_time = params.getString("ad_modify_time");
-        if (null != ad_modify_time && !"".equals(ad_modify_time.trim())) {
-            this.adModifyTime = ad_modify_time;
+        String adModifyTime = params.getString("ad_modify_time");
+        if (null != adModifyTime && !"".equals(adModifyTime.trim())) {
+            this.adModifyTime = adModifyTime;
         }
 
-        String audit_reject_reason = params.getString("audit_reject_reason");
-        if (null != audit_reject_reason && !"".equals(audit_reject_reason.trim())) {
-            this.auditRejectReason = audit_reject_reason;
+        String auditRejectReason = params.getString("audit_reject_reason");
+        if (null != auditRejectReason && !"".equals(auditRejectReason.trim())) {
+            this.auditRejectReason = auditRejectReason;
         }
 
 //        String dpa_open_url_field = dataObject.getString("dpa_open_url_field");
@@ -485,9 +485,9 @@ public class ByteDanceAdvertisePlan {
 //            this.dpaCategories =dpa_categories;
 //        }
 
-        Integer hide_if_exists = params.getInteger("hide_if_exists");
-        if (null != hide_if_exists) {
-            this.hideIfExists = hide_if_exists;
+        Integer hideIfExists = params.getInteger("hide_if_exists");
+        if (null != hideIfExists) {
+            this.hideIfExists = hideIfExists;
         }
 
 //        String open_url_params = dataObject.getString("open_url_params");
@@ -505,14 +505,14 @@ public class ByteDanceAdvertisePlan {
 //            this.deepCpaaid =deep_cpabid;
 //        }
 
-        String app_type = params.getString("app_type");
-        if (null != app_type && !"".equals(app_type.trim())) {
-            this.appType = app_type;
+        String appType = params.getString("app_type");
+        if (null != appType && !"".equals(appType.trim())) {
+            this.appType = appType;
         }
 
-        String flow_control_mode = params.getString("flow_control_mode");
-        if (null != flow_control_mode && !"".equals(flow_control_mode.trim())) {
-            this.flowControlMode = flow_control_mode;
+        String flowControlMode = params.getString("flow_control_mode");
+        if (null != flowControlMode && !"".equals(flowControlMode.trim())) {
+            this.flowControlMode = flowControlMode;
         }
 
 //        String union_video_type = dataObject.getString("union_video_type");
@@ -525,9 +525,9 @@ public class ByteDanceAdvertisePlan {
 //            this.downloadUrl =download_url;
 //        }
 
-        BigDecimal cpa_bid = params.getBigDecimal("cpa_bid");
-        if (null != cpa_bid) {
-            this.cpaBid = cpa_bid;
+        BigDecimal cpaBid = params.getBigDecimal("cpa_bid");
+        if (null != cpaBid) {
+            this.cpaBid = cpaBid;
         }
 
 //        String dpa_products = dataObject.getString("dpa_products");
@@ -555,19 +555,19 @@ public class ByteDanceAdvertisePlan {
 //            this.dpaExternalUrls =dpa_external_urls;
 //        }
 
-        String start_time = params.getString("start_time");
-        if (null != start_time && !"".equals(start_time.trim())) {
-            this.startTime = start_time;
+        String startTime = params.getString("start_time");
+        if (null != startTime && !"".equals(startTime.trim())) {
+            this.startTime = startTime;
         }
 
-        String opt_status = params.getString("opt_status");
-        if (null != opt_status && !"".equals(opt_status.trim())) {
-            this.optStatus = opt_status;
+        String optStatus = params.getString("opt_status");
+        if (null != optStatus && !"".equals(optStatus.trim())) {
+            this.optStatus = optStatus;
         }
 
-        String end_time = params.getString("end_time");
-        if (null != end_time && !"".equals(end_time.trim())) {
-            this.endTime = end_time;
+        String endTime = params.getString("end_time");
+        if (null != endTime && !"".equals(endTime.trim())) {
+            this.endTime = endTime;
         }
 
         String status = params.getString("status");
@@ -585,9 +585,9 @@ public class ByteDanceAdvertisePlan {
 //            this.openUrl =open_url;
 //        }
 
-        Long convert_id = params.getLong("convert_id");
-        if (null != convert_id) {
-            this.convertId = convert_id;
+        Long convertId = params.getLong("convert_id");
+        if (null != convertId) {
+            this.convertId = convertId;
         }
 
 //        String adjust_cpa = dataObject.getString("adjust_cpa");
@@ -620,9 +620,9 @@ public class ByteDanceAdvertisePlan {
 //            this.externalActions =external_actions;
 //        }
 
-        String hide_if_converted = params.getString("hide_if_converted");
-        if (null != hide_if_converted && !"".equals(hide_if_converted.trim())) {
-            this.hideIfConverted = hide_if_converted;
+        String hideIfConverted = params.getString("hide_if_converted");
+        if (null != hideIfConverted && !"".equals(hideIfConverted.trim())) {
+            this.hideIfConverted = hideIfConverted;
         }
 
         String toutiaoPackage = params.getString("package");
@@ -630,9 +630,9 @@ public class ByteDanceAdvertisePlan {
             this.toutiaoPackage = toutiaoPackage;
         }
 
-        String delivery_range = params.getString("delivery_range");
-        if (null != delivery_range && !"".equals(delivery_range.trim())) {
-            this.deliveryRange = delivery_range;
+        String deliveryRange = params.getString("delivery_range");
+        if (null != deliveryRange && !"".equals(deliveryRange.trim())) {
+            this.deliveryRange = deliveryRange;
         }
 
 //        String params_type = dataObject.getString("params_type");
@@ -645,14 +645,14 @@ public class ByteDanceAdvertisePlan {
             this.budget = budget;
         }
 
-        String schedule_type = params.getString("schedule_type");
-        if (null != schedule_type && !"".equals(schedule_type.trim())) {
-            this.scheduleType = schedule_type;
+        String scheduleType = params.getString("schedule_type");
+        if (null != scheduleType && !"".equals(scheduleType.trim())) {
+            this.scheduleType = scheduleType;
         }
 
-        String schedule_time = params.getString("schedule_time");
-        if (null != schedule_time && !"".equals(schedule_time.trim())) {
-            this.scheduleTime = schedule_time;
+        String scheduleTime = params.getString("schedule_time");
+        if (null != scheduleTime && !"".equals(scheduleTime.trim())) {
+            this.scheduleTime = scheduleTime;
         }
 //
 //        String modify_time = dataObject.getString("modify_time");
@@ -670,14 +670,14 @@ public class ByteDanceAdvertisePlan {
 //            this.productPlatformId =product_platform_id;
 //        }
 
-        String download_type = params.getString("download_type");
-        if (null != download_type && !"".equals(download_type.trim())) {
-            this.downloadType = download_type;
+        String downloadType = params.getString("download_type");
+        if (null != downloadType && !"".equals(downloadType.trim())) {
+            this.downloadType = downloadType;
         }
 
-        String external_url = params.getString("external_url");
-        if (null != external_url && !"".equals(external_url.trim())) {
-            this.externalUrl = external_url;
+        String externalUrl = params.getString("external_url");
+        if (null != externalUrl && !"".equals(externalUrl.trim())) {
+            this.externalUrl = externalUrl;
         }
     }
 

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CreateInternalServiceImpl.java

@@ -138,8 +138,8 @@ public class CreateInternalServiceImpl implements ICreateInternalService {
             //清除所有的缓存
             webDriver.manage().deleteAllCookies();
             webDriver.quit();
-            return resultMap;
         }
+        return resultMap;
     }
     @Override
     public Map<String, Object> createInternal(JSONObject requestJson) {

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/FileInfoServiceImpl.java

@@ -259,7 +259,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
     public JSONObject uploadAdImage(CtopOauthToken token, String imageUrl, String advertiserId) {
         JSONObject result = new JSONObject();
         //1:下载文件到本地
-        String imagePath = downLoadByURL(imageUrl);
+        String imagePath = downLoadByUrl(imageUrl);
         //2: 获取MD5值
         String md5Hex = null;
         try {
@@ -347,7 +347,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
     }
 
 
-    public String downLoadByURL(String fileUrl) {
+    public String downLoadByUrl(String fileUrl) {
         //获取文件名,文件名实际上在URL中可以找到
         String fileName = fileUrl.substring(fileUrl.lastIndexOf("/") + 1);
         //这里服务器上要将此图保存的路径
@@ -381,7 +381,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
     public JSONObject uploadAdvideo(CtopOauthToken token, String videoUrl, String advertiserId) {
         JSONObject result = new JSONObject();
         //1:下载文件到本地
-        String videoPath = downLoadByURL(videoUrl);
+        String videoPath = downLoadByUrl(videoUrl);
         //2: 获取MD5值
         String md5Hex = null;
         try {

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ReportServiceImpl.java

@@ -176,7 +176,7 @@ public class ReportServiceImpl implements IReportService {
     @Override
     public void insertCustomerInfo(String csvPath, String charset) {
         try {
-            List<String[]> data = CsvUtils.readCSV(csvPath, charset);
+            List<String[]> data = CsvUtils.readCsv(csvPath, charset);
             if (null != data && data.size() > 1) {
                 for (int i = 1; i < data.size(); i++) {
                     String[] record = data.get(i);
@@ -192,7 +192,7 @@ public class ReportServiceImpl implements IReportService {
     @Override
     public void insertPlatformInfo(String csvPath, String charset, Long accountId) {
         try {
-            List<String[]> data = CsvUtils.readCSV(csvPath, charset);
+            List<String[]> data = CsvUtils.readCsv(csvPath, charset);
             if (null != data && data.size() > 1) {
                 for (int i = 1; i < data.size(); i++) {
                     String[] record = data.get(i);

+ 148 - 148
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/sign/pdf/RSACertHelper.java

@@ -1,148 +1,148 @@
-package org.jeecg.modules.ctop.sign.pdf;
-
-import cn.hutool.core.codec.Base64;
-import com.spire.pdf.PdfDocument;
-import com.spire.pdf.graphics.PdfImage;
-import com.spire.pdf.security.GraphicMode;
-import com.spire.pdf.security.PdfCertificate;
-import com.spire.pdf.security.PdfCertificationFlags;
-import com.spire.pdf.security.PdfSignature;
-
-import java.awt.*;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.security.Key;
-import java.security.KeyStore;
-import java.security.PublicKey;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-
-/**
- * @Author: zhangsong
- * @Date: 2019/5/28 20:21
- * @Version 1.0
- * 首先需要通过jdk的keytool生成秘钥库等,需确保机器中安装有jdk
- * 0.在本代码环境下,执行1命令时,秘钥库的密码和证书的密码须一致,请自行修改路径
- * 请确保路径下无名为mykeystore.keystore的文件,否则可能会报密码错等
- * 1.keytool -genkey -alias mykey -keyalg RSA -keystore D:/mykeystore.keystore -keysize 1024 -validity 3650
- * 123456 songyh hcst hcst bj bj CH   秘钥口令  123456
- * 2.keytool -export -alias mykey -keystore C:/mykeystore.keystore -file  C:/mykey.cer
- * 3.代码中的秘钥库密码为keystore,请自行修改
- */
-public class RSACertHelper {
-    public static void main(String[] args) {
-        //定义输入、输出文件和数字签名文件
-        String inputFile = "C:\\Users\\宋英豪\\Desktop\\sign\\test.pdf";
-        String outputFile = "C:\\Users\\宋英豪\\Desktop\\sign\\signed.pdf";
-        String pfxPath = "C:\\Users\\宋英豪\\Desktop\\sign\\mykey.pfx";
-        //加载PDF文件
-        PdfDocument doc = new PdfDocument();
-        doc.loadFromFile(inputFile);
-        //加载证书
-        PdfCertificate cert = new PdfCertificate(pfxPath, "123456");
-        PdfSignature signature = new PdfSignature(doc, doc.getPages().get(0), cert, "signature0");
-        Rectangle2D rect = new Rectangle2D.Float();
-        rect.setFrame(new Point2D.Float(90, 550), new Dimension(270, 90));
-        signature.setBounds(rect);
-        //设置图形显示模式,如果不设置图形显示模式,则应用默认的图形显示模式
-        signature.setGraphicMode(GraphicMode.Sign_Image_Only);
-        signature.setNameLabel("Signer:");
-        signature.setName("Gary");
-        signature.setContactInfoLabel("ContactInfo:");
-        signature.setContactInfo("136558284211");
-        signature.setDateLabel("Date:");
-        signature.setDate(new java.util.Date());
-        signature.setLocationInfoLabel("Location:");
-        signature.setLocationInfo("Chengdu");
-        signature.setReasonLabel("Reason: ");
-        signature.setReason("The certificate of this document");
-        signature.setDistinguishedNameLabel("DN: ");
-        signature.setDistinguishedName(signature.getCertificate().get_IssuerName().getName());
-        signature.setSignImageSource(PdfImage.fromFile("C:\\Users\\宋英豪\\Desktop\\sign\\sign.jpg"));
-        signature.setDocumentPermissions(PdfCertificationFlags.Forbid_Changes);
-        signature.setCertificated(true);
-        //保存文件
-        doc.saveToFile(outputFile);
-        doc.close();
-    }
-
-    public static void getPfxFile() {
-        String path = "D:/";
-        String keyStoreFile = "mykeystore.keystore";
-        String passwd = "123456";
-        String keyAlias = "mykey";
-        String pfxFile = "mykey.pfx";
-        String cerFile = "mykey.cer";
-
-        System.out.println("请确保已执行完注释中的两条命令再执行本代码\n\n");
-        System.out.println("1.开始生成PFX文件");
-        coverToPfx(path + keyStoreFile, passwd, keyAlias, path + pfxFile);
-        System.out.println("===============================================================");
-        System.out.println("2.开始提取.cer中的公钥字符串");
-        String cerStr = getPubStr(path + cerFile);
-        System.out.println("从.cer文件中提取的公钥字符串如下:");
-        System.out.println(cerStr);
-    }
-
-    /**
-     * 生成pfx文件
-     */
-    public static void coverToPfx(String keyStoreFile, String passwd, String keyAlias, String pfxFile) {
-        try {
-            KeyStore inputKeyStore = KeyStore.getInstance("JKS");
-            FileInputStream fis = new FileInputStream(keyStoreFile);
-            char[] nPassword = null;
-            if ((passwd == null)
-                    || passwd.trim().equals("")) {
-                nPassword = null;
-            } else {
-                nPassword = passwd.toCharArray();
-            }
-            inputKeyStore.load(fis, nPassword);
-            fis.close();
-            KeyStore outputKeyStore = KeyStore.getInstance("PKCS12");
-            outputKeyStore.load(null, passwd.toCharArray());
-
-//            System.out.println("alias=[" + keyAlias + "]");
-            if (inputKeyStore.isKeyEntry(keyAlias)) {
-                Key key = inputKeyStore.getKey(keyAlias, passwd.toCharArray());
-                Certificate[] certChain = inputKeyStore
-                        .getCertificateChain(keyAlias);
-                outputKeyStore.setKeyEntry(keyAlias, key, passwd
-                        .toCharArray(), certChain);
-            }
-            FileOutputStream out = new FileOutputStream(pfxFile);
-            outputKeyStore.store(out, nPassword);
-            out.close();
-            System.out.println("已生成PFX文件" + pfxFile);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 获取公钥字符串
-     */
-    public static String getPubStr(String cerFile) {
-        String key = "";
-        // 读取证书文件
-        try {
-            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            FileInputStream in = new FileInputStream(cerFile);
-
-            //生成一个证书对象并使用从输入流 inStream 中读取的数据对它进行初始化。
-            Certificate c = cf.generateCertificate(in);
-            PublicKey publicKey = c.getPublicKey();
-            key = Base64.encode(publicKey.getEncoded());
-        } catch (CertificateException e) {
-            e.printStackTrace();
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        }
-        return key;
-    }
-}
+//package org.jeecg.modules.ctop.sign.pdf;
+//
+//import cn.hutool.core.codec.Base64;
+//import com.spire.pdf.PdfDocument;
+//import com.spire.pdf.graphics.PdfImage;
+//import com.spire.pdf.security.GraphicMode;
+//import com.spire.pdf.security.PdfCertificate;
+//import com.spire.pdf.security.PdfCertificationFlags;
+//import com.spire.pdf.security.PdfSignature;
+//
+//import java.awt.*;
+//import java.awt.geom.Point2D;
+//import java.awt.geom.Rectangle2D;
+//import java.io.FileInputStream;
+//import java.io.FileNotFoundException;
+//import java.io.FileOutputStream;
+//import java.security.Key;
+//import java.security.KeyStore;
+//import java.security.PublicKey;
+//import java.security.cert.Certificate;
+//import java.security.cert.CertificateException;
+//import java.security.cert.CertificateFactory;
+//
+///**
+// * @Author: zhangsong
+// * @Date: 2019/5/28 20:21
+// * @Version 1.0
+// * 首先需要通过jdk的keytool生成秘钥库等,需确保机器中安装有jdk
+// * 0.在本代码环境下,执行1命令时,秘钥库的密码和证书的密码须一致,请自行修改路径
+// * 请确保路径下无名为mykeystore.keystore的文件,否则可能会报密码错等
+// * 1.keytool -genkey -alias mykey -keyalg RSA -keystore D:/mykeystore.keystore -keysize 1024 -validity 3650
+// * 123456 songyh hcst hcst bj bj CH   秘钥口令  123456
+// * 2.keytool -export -alias mykey -keystore C:/mykeystore.keystore -file  C:/mykey.cer
+// * 3.代码中的秘钥库密码为keystore,请自行修改
+// */
+//public class RSACertHelper {
+//    public static void main(String[] args) {
+//        //定义输入、输出文件和数字签名文件
+//        String inputFile = "C:\\Users\\宋英豪\\Desktop\\sign\\test.pdf";
+//        String outputFile = "C:\\Users\\宋英豪\\Desktop\\sign\\signed.pdf";
+//        String pfxPath = "C:\\Users\\宋英豪\\Desktop\\sign\\mykey.pfx";
+//        //加载PDF文件
+//        PdfDocument doc = new PdfDocument();
+//        doc.loadFromFile(inputFile);
+//        //加载证书
+//        PdfCertificate cert = new PdfCertificate(pfxPath, "123456");
+//        PdfSignature signature = new PdfSignature(doc, doc.getPages().get(0), cert, "signature0");
+//        Rectangle2D rect = new Rectangle2D.Float();
+//        rect.setFrame(new Point2D.Float(90, 550), new Dimension(270, 90));
+//        signature.setBounds(rect);
+//        //设置图形显示模式,如果不设置图形显示模式,则应用默认的图形显示模式
+//        signature.setGraphicMode(GraphicMode.Sign_Image_Only);
+//        signature.setNameLabel("Signer:");
+//        signature.setName("Gary");
+//        signature.setContactInfoLabel("ContactInfo:");
+//        signature.setContactInfo("136558284211");
+//        signature.setDateLabel("Date:");
+//        signature.setDate(new java.util.Date());
+//        signature.setLocationInfoLabel("Location:");
+//        signature.setLocationInfo("Chengdu");
+//        signature.setReasonLabel("Reason: ");
+//        signature.setReason("The certificate of this document");
+//        signature.setDistinguishedNameLabel("DN: ");
+//        signature.setDistinguishedName(signature.getCertificate().get_IssuerName().getName());
+//        signature.setSignImageSource(PdfImage.fromFile("C:\\Users\\宋英豪\\Desktop\\sign\\sign.jpg"));
+//        signature.setDocumentPermissions(PdfCertificationFlags.Forbid_Changes);
+//        signature.setCertificated(true);
+//        //保存文件
+//        doc.saveToFile(outputFile);
+//        doc.close();
+//    }
+//
+//    public static void getPfxFile() {
+//        String path = "D:/";
+//        String keyStoreFile = "mykeystore.keystore";
+//        String passwd = "123456";
+//        String keyAlias = "mykey";
+//        String pfxFile = "mykey.pfx";
+//        String cerFile = "mykey.cer";
+//
+//        System.out.println("请确保已执行完注释中的两条命令再执行本代码\n\n");
+//        System.out.println("1.开始生成PFX文件");
+//        coverToPfx(path + keyStoreFile, passwd, keyAlias, path + pfxFile);
+//        System.out.println("===============================================================");
+//        System.out.println("2.开始提取.cer中的公钥字符串");
+//        String cerStr = getPubStr(path + cerFile);
+//        System.out.println("从.cer文件中提取的公钥字符串如下:");
+//        System.out.println(cerStr);
+//    }
+//
+//    /**
+//     * 生成pfx文件
+//     */
+//    public static void coverToPfx(String keyStoreFile, String passwd, String keyAlias, String pfxFile) {
+//        try {
+//            KeyStore inputKeyStore = KeyStore.getInstance("JKS");
+//            FileInputStream fis = new FileInputStream(keyStoreFile);
+//            char[] nPassword = null;
+//            if ((passwd == null)
+//                    || "".equals(passwd.trim())) {
+//                nPassword = null;
+//            } else {
+//                nPassword = passwd.toCharArray();
+//            }
+//            inputKeyStore.load(fis, nPassword);
+//            fis.close();
+//            KeyStore outputKeyStore = KeyStore.getInstance("PKCS12");
+//            outputKeyStore.load(null, passwd.toCharArray());
+//
+////            System.out.println("alias=[" + keyAlias + "]");
+//            if (inputKeyStore.isKeyEntry(keyAlias)) {
+//                Key key = inputKeyStore.getKey(keyAlias, passwd.toCharArray());
+//                Certificate[] certChain = inputKeyStore
+//                        .getCertificateChain(keyAlias);
+//                outputKeyStore.setKeyEntry(keyAlias, key, passwd
+//                        .toCharArray(), certChain);
+//            }
+//            FileOutputStream out = new FileOutputStream(pfxFile);
+//            outputKeyStore.store(out, nPassword);
+//            out.close();
+//            System.out.println("已生成PFX文件" + pfxFile);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
+//
+//    /**
+//     * 获取公钥字符串
+//     */
+//    public static String getPubStr(String cerFile) {
+//        String key = "";
+//        // 读取证书文件
+//        try {
+//            CertificateFactory cf = CertificateFactory.getInstance("X.509");
+//            FileInputStream in = new FileInputStream(cerFile);
+//
+//            //生成一个证书对象并使用从输入流 inStream 中读取的数据对它进行初始化。
+//            Certificate c = cf.generateCertificate(in);
+//            PublicKey publicKey = c.getPublicKey();
+//            key = Base64.encode(publicKey.getEncoded());
+//        } catch (CertificateException e) {
+//            e.printStackTrace();
+//        } catch (FileNotFoundException e) {
+//            e.printStackTrace();
+//        }
+//        return key;
+//    }
+//}

+ 2 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouImageServiceImpl.java

@@ -56,7 +56,7 @@ public class KuaiShouImageServiceImpl extends ServiceImpl<KuaiShouImageMapper, K
                     String[] split = fileName.split("-");
                     fileNameStr = split[0];
                 }
-                image.setImageName(AesEncryptUtil.getURLDecoderString(fileNameStr));
+                image.setImageName(AesEncryptUtil.getUrlDecoderString(fileNameStr));
                 image.setLoginId(requestJson.getString("loginId"));
                 image.setMaterialType(requestJson.getString("materialType"));
                 image.setPositionType(requestJson.getString("positionType"));
@@ -108,13 +108,12 @@ public class KuaiShouImageServiceImpl extends ServiceImpl<KuaiShouImageMapper, K
                 fileNameStr = split[0];
             }
             image.setLoginId(loginId);
-            image.setImageName(AesEncryptUtil.getURLDecoderString(fileNameStr));
+            image.setImageName(AesEncryptUtil.getUrlDecoderString(fileNameStr));
             image.setMaterialType(videoUploadType);
             image.setPositionType(positionType);
             if (!url.contains("https:")) {
                 String imageUrl = KuaishouInterfaceConstant.HTTPS_PREFIX + url;
                 image.setLocalUrl(imageUrl);
-
             } else {
                 image.setLocalUrl(url);
             }

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouVideoServiceImpl.java

@@ -56,7 +56,7 @@ public class KuaiShouVideoServiceImpl extends ServiceImpl<KuaiShouVideoMapper, K
                 }
                 video.setLoginId(requestJson.getString("loginId"));
                 video.setAccountId(accountId);
-                video.setVideoName(AesEncryptUtil.getURLDecoderString(fileNameStr));
+                video.setVideoName(AesEncryptUtil.getUrlDecoderString(fileNameStr));
                 String urlStr;
                 if (!url.contains(KuaishouInterfaceConstant.HTTPS_PREFIX)) {
                     urlStr = KuaishouInterfaceConstant.HTTPS_PREFIX + url;
@@ -114,7 +114,7 @@ public class KuaiShouVideoServiceImpl extends ServiceImpl<KuaiShouVideoMapper, K
                 video.setMaterialType(requestJson.getString("videoType"));
                 video.setAccountId(accountId);
                 video.setPositionType(requestJson.getString("positionType"));
-                video.setVideoName(AesEncryptUtil.getURLDecoderString(fileNameStr));
+                video.setVideoName(AesEncryptUtil.getUrlDecoderString(fileNameStr));
                 kuaiShouVideoMapper.insert(video);
                 return video.getLocalUrl().toString();
             }

+ 3 - 3
jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -94,9 +94,9 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://39.106.184.70:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-          username: hcst
-          password: hcst2019
+          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          username: root
+          password: root
           driver-class-name: com.mysql.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/utils/Base64Utils.java

@@ -63,7 +63,7 @@ public class Base64Utils {
         return null;
     }
 
-    public static String ImageToBase64(String imgPath) {
+    public static String imageToBase64(String imgPath) {
         byte[] data = null;
         // 读取图片字节数组
         try {

+ 4 - 4
module-common/src/main/java/cn/com/ctop/common/utils/CsvUtils.java

@@ -24,7 +24,7 @@ public class CsvUtils {
         }
     }
 
-    public static List<String[]> readCSV(String inPath, String charset) throws IOException {
+    public static List<String[]> readCsv(String inPath, String charset) throws IOException {
         List<String[]> list = new ArrayList<>();
         CsvReader reader = new CsvReader(inPath, ',', Charset.forName(charset));
         reader.readHeaders();
@@ -45,7 +45,7 @@ public class CsvUtils {
         return list;
     }
 
-    public static void writeCSV(String outPath, List<String[]> data) throws IOException {
+    public static void writeCsv(String outPath, List<String[]> data) throws IOException {
         CsvUtils.checkandCreateFile(outPath);
         CsvWriter wr = new CsvWriter(outPath, ',', Charset.forName("gb2312"));
         String[] header = {"Name", "Province", "City", "Address", "Tel", "Website", "Server_content", "Jigou_cengji", "Type", "Parent_level1", "Parent_level2", "Branch_level"};
@@ -61,8 +61,8 @@ public class CsvUtils {
         String[] header = new String[]{"日期", "plan", "广告组", "花费", "曝光数", "点击数", "行为数", "点击率", "行为率", "平均千次曝光花费", "平均点击单价", "平均行为单价", "提交按钮点击", "表单提交率", "表单提交单价"};
         String inPath = "D:\\工作文件\\360借条\\effect_unit_2019-08-02-00_2019-08-02-00.csv";
         String outPath = "D:\\工作文件\\360借条\\effect_unit_2019-08-02-00_2019-08-02-00_bak.csv";
-        List<String[]> list = CsvUtils.readCSV(inPath, "utf8");
-        CsvUtils.writeCSV(outPath, list);
+        List<String[]> list = CsvUtils.readCsv(inPath, "utf8");
+        CsvUtils.writeCsv(outPath, list);
 
     }
 }

+ 12 - 12
module-common/src/main/java/cn/com/ctop/common/utils/HttpUtils.java

@@ -106,7 +106,7 @@ public class HttpUtils {
     public static Map<String, Map<String, String>> fontsMap = new HashMap<String, Map<String, String>>();
     public static String USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.100 Safari/537.36";
 
-    public static CloseableHttpClient createSSLClientDefault() {
+    public static CloseableHttpClient createSslClientDefault() {
         try {
             SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
                 //信任所有证书
@@ -125,7 +125,7 @@ public class HttpUtils {
     }
 
     public static String httpPostParamRequest(String url, Map<String, Object> param, Map<String, String> headers) {
-        HttpClient httpClient = createSSLClientDefault();
+        HttpClient httpClient = createSslClientDefault();
         String strReturn = "";
         try {
             HttpPost httppost = new HttpPost(url);
@@ -173,7 +173,7 @@ public class HttpUtils {
 
     public static String httpPostRequest(String url, Map<String, Object> param, Map<String, String> headers) {
 //        HttpClient httpclient = HttpClientBuilder.create().setRedirectStrategy(new LaxRedirectStrategy()).build();
-        HttpClient httpClient = createSSLClientDefault();
+        HttpClient httpClient = createSslClientDefault();
         String strReturn = "";
         try {
             HttpPost httppost = new HttpPost(url);
@@ -210,7 +210,7 @@ public class HttpUtils {
 
     public static String httpPostRequestTest(String url, String body, Map<String, String> headers) {
 //        HttpClient httpclient = HttpClientBuilder.create().setRedirectStrategy(new LaxRedirectStrategy()).build();
-        HttpClient httpClient = createSSLClientDefault();
+        HttpClient httpClient = createSslClientDefault();
         String strReturn = "";
         try {
             HttpPost httppost = new HttpPost(url);
@@ -247,7 +247,7 @@ public class HttpUtils {
 
     public static String kuaiShouhttpPostRequest(String url, String body, Map<String, String> headers) {
         System.err.println(body);
-        HttpClient httpClient = createSSLClientDefault();
+        HttpClient httpClient = createSslClientDefault();
         String strReturn = "";
         try {
             HttpPost httppost = new HttpPost(url);
@@ -279,7 +279,7 @@ public class HttpUtils {
 
     public static String httpPostRequest(String url, JSONObject params, Map<String, String> headers) {
 //        HttpClient httpclient = HttpClientBuilder.create().setRedirectStrategy(new LaxRedirectStrategy()).build();
-        HttpClient httpClient = createSSLClientDefault();
+        HttpClient httpClient = createSslClientDefault();
         String strReturn = "";
         try {
             HttpPost httppost = new HttpPost(url);
@@ -314,7 +314,7 @@ public class HttpUtils {
     }
 
     public static String httpGetRequest(String url) {
-        HttpClient httpClient = createSSLClientDefault();
+        HttpClient httpClient = createSslClientDefault();
         HttpResponse response = null;
         HttpGet httpGet = new HttpGet(url);
 //        httpPost.setHeader("Content-Type", "application/json");
@@ -352,7 +352,7 @@ public class HttpUtils {
 
     public static String httpRequest(String url, String strParams) throws Exception {
 //        HttpClient httpclient = HttpClientBuilder.create().build();
-        HttpClient httpClient = createSSLClientDefault();
+        HttpClient httpClient = createSslClientDefault();
         String strReturn = "";
         try {
 
@@ -374,7 +374,7 @@ public class HttpUtils {
 
     public static String httpRequest(String url, CookieStore cookies, Map<String, String> parameterMap) throws Exception {
 //        HttpClient httpclient = getHttpclient();
-        HttpClient httpClient = createSSLClientDefault();
+        HttpClient httpClient = createSslClientDefault();
         String strReturn = "";
         try {
             HttpPost httppost = new HttpPost(url);
@@ -412,7 +412,7 @@ public class HttpUtils {
     }
 
     public static String callingGraph(String url, String json) {
-        HttpClient httpClient = createSSLClientDefault();
+        HttpClient httpClient = createSslClientDefault();
         HttpResponse response = null;
         HttpPost httpPost = new HttpPost(url);
         List<Cookie> list = cookieStore.getCookies();
@@ -545,7 +545,7 @@ public class HttpUtils {
 
 
     public static String httpGetRequest(String url, Map<String, String> headers, TreeMap<String, Object> params) {
-        HttpClient httpClient = createSSLClientDefault();
+        HttpClient httpClient = createSslClientDefault();
         String strReturn = "";
         try {
             String uri = url + "?" + mapParamsSortToStringBySeperator(params, "&");
@@ -571,7 +571,7 @@ public class HttpUtils {
     }
 
     public static String httpGetRequest(String url, Map<String, String> headers, JSONObject params) {
-        HttpClient httpClient = createSSLClientDefault();
+        HttpClient httpClient = createSslClientDefault();
         String strReturn = "";
         try {
             HttpGetWithBodyEntity httpGet = new HttpGetWithBodyEntity(url);

+ 5 - 4
module-crawler/src/main/java/cn/com/ctop/crawler/modules/core/util/FateadmHttpUtil.java

@@ -310,10 +310,11 @@ public class FateadmHttpUtil {
 		while((rc = is.read(buff, 0, 128)) > 0 ) {
 			baos.write(buff,0,rc);
 		}
-		byte[] img_data = baos.toByteArray();
-		return img_data;
-	}
-    public static String HttpPost(String url, String params){
+        byte[] imgData = baos.toByteArray();
+        return imgData;
+    }
+
+    public static String httpPost(String url, String params) {
         PrintWriter out = null;
         BufferedReader in = null;
         String result = "";

+ 4 - 4
module-crawler/src/main/java/cn/com/ctop/crawler/modules/core/util/FateadmUtil.java

@@ -37,7 +37,7 @@ public class FateadmUtil {
         String sign     = FateadmHttpUtil.CalcSign( pd_id, pd_key, stm);
         String url      = this.pred_url + "/api/custval";
         String params   = "user_id="+this.pd_id + "&timestamp=" + stm + "&sign=" + sign;
-        String pres     = FateadmHttpUtil.HttpPost(url, params);
+        String pres = FateadmHttpUtil.httpPost(url, params);
         FateadmHttpUtil.HttpResp resp = FateadmHttpUtil.ParseHttpResp( pres);
         return resp;
     }
@@ -63,10 +63,10 @@ public class FateadmUtil {
         long cur_tm = System.currentTimeMillis() / 1000;    // 时间戳精确到秒。所以除以1000
         String stm      = String.valueOf(cur_tm);
         String sign     = FateadmHttpUtil.CalcSign( pd_id, pd_key, stm);
-        String csign    = FateadmHttpUtil.CalcMd5(pd_key + stm + cardid + cardkey);
+        String csign = FateadmHttpUtil.calcMd5(pd_key + stm + cardid + cardkey);
         String url      = this.pred_url + "/api/charge";
         String params   = "user_id=" + pd_id + "&timestamp=" + stm + "&sign=" + sign + "&cardid=" + cardid + "&csign=" + csign;
-        String pres     = FateadmHttpUtil.HttpPost(url, params);
+        String pres = FateadmHttpUtil.httpPost(url, params);
         FateadmHttpUtil.HttpResp resp  = FateadmHttpUtil.ParseHttpResp(pres);
         return resp;
     }
@@ -165,7 +165,7 @@ public class FateadmUtil {
         String sign     = FateadmHttpUtil.CalcSign( pd_id, pd_key, stm);
         String url      = pred_url + "/api/capjust";
         String params   = "user_id=" + pd_id + "&timestamp="+stm + "&sign=" + sign + "&request_id=" + req_id;
-        String pres     = FateadmHttpUtil.HttpPost(url, params);
+        String pres = FateadmHttpUtil.httpPost(url, params);
         FateadmHttpUtil.HttpResp resp  = FateadmHttpUtil.ParseHttpResp( pres);
         return resp;
     }