Merge branch 'dm_dev' of http://gitlab.ioubuy.cn/yaobenzhang/dm_project into dm_dev

jz-dm-common/src/main/java/com/jz/common/utils/DateUtils.java

@@ -340,14 +340,14 @@ public class DateUtils {
 
 
 
-    public static void main(String[] args) {
-        try {
-            System.out.println("本周一" + parseDate2String(getThisWeekMonday()));
-            System.out.println("本月一日" + parseDate2String(getFirstDay4ThisMonth()));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
+//    public static void main(String[] args) {
+//        try {
+//            System.out.println("本周一" + parseDate2String(getThisWeekMonday()));
+//            System.out.println("本月一日" + parseDate2String(getFirstDay4ThisMonth()));
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
 
     //获取一年后时间
     public static Date getAfterYear(Date now) {

jz-dm-common/src/main/java/com/jz/common/utils/NumberUtils.java

@@ -89,9 +89,9 @@ public class NumberUtils {
 
     }
 
-    public static void main(String[] args) {
-
-        System.out.println(getOrderNumber("00001"));
-        System.out.println(getDealNum());
-    }
+//    public static void main(String[] args) {
+//
+//        System.out.println(getOrderNumber("00001"));
+//        System.out.println(getDealNum());
+//    }
 }
\ No newline at end of file

jz-dm-common/src/main/java/com/jz/common/utils/RandomUtil.java

@@ -289,15 +289,15 @@ public class RandomUtil {
        return builder.toString();
     }
 
-    public static void main(String[] args) {
-        //System.out.println(getStringRandom(8));
-        // System.out.println("获取拼音首字母："+getAllFirstLetter("大中国南昌中大china"));
-        //System.out.println(isChineseWord("大中国南昌中大"));
-        //System.out.println(generateOrgCoding("九章数据","INT"));
-        // System.out.println(generateTokenCode("", ""));
-        //System.out.println(addZeroForNum("1", 8));
-        //System.out.println("内部授权码:" + generateTokenCode("INT", "NEIJZSJ900hx", ""));//内部授权码
-        //System.out.println("外部授权码:" + generateTokenCode("OUT", "", "199"));//内部授权码
-        System.out.println(generateVersion("v1.99"));
-    }
+//    public static void main(String[] args) {
+//        //System.out.println(getStringRandom(8));
+//        // System.out.println("获取拼音首字母："+getAllFirstLetter("大中国南昌中大china"));
+//        //System.out.println(isChineseWord("大中国南昌中大"));
+//        //System.out.println(generateOrgCoding("九章数据","INT"));
+//        // System.out.println(generateTokenCode("", ""));
+//        //System.out.println(addZeroForNum("1", 8));
+//        //System.out.println("内部授权码:" + generateTokenCode("INT", "NEIJZSJ900hx", ""));//内部授权码
+//        //System.out.println("外部授权码:" + generateTokenCode("OUT", "", "199"));//内部授权码
+//        System.out.println(generateVersion("v1.99"));
+//    }
 }

jz-dm-common/src/main/java/com/jz/common/utils/SMSUtils.java

@@ -23,9 +23,9 @@ public class SMSUtils {
     private static final String ACCESS_KEY="LTAI4GKPoTkrT6n2fSV7ePEG"; //你的AccessKey ID
     private static final String SECRET_KEY="k8HcW3TxZzGxAetEpyDInZehip9MAE"; //你的AccessKey Secret
 
-    public static void main(String[] args) throws ClientException {
-        SMSUtils.sendShortMessage(VALIDATE_CODE,"19979232865","55555555");
-    }
+//    public static void main(String[] args) throws ClientException {
+//        SMSUtils.sendShortMessage(VALIDATE_CODE,"19979232865","55555555");
+//    }
 
     /**
      *

jz-dm-manage/src/main/java/com/jz/manage/moduls/controller/goods/bean/request/DataApiUpReq.java

@@ -33,7 +33,7 @@ public class DataApiUpReq implements Serializable {
     @ApiModelProperty(value = "接口地址")
     private String apiUrl;
 
-    @ApiModelProperty(value = "api请求协议")
+    @ApiModelProperty(value = "api请求协议 HTTP/HTTPS")
     private String apiProtocl;
 
     @ApiModelProperty(value = "api返回数据样例")
@@ -45,9 +45,6 @@ public class DataApiUpReq implements Serializable {
     @ApiModelProperty(value = "加密方式  MD5/RSA")
     private String encryMode;
 
-    @ApiModelProperty(value = "传输方式  HTTP/HTTPS")
-    private String transMode;
-
     @ApiModelProperty(value = "功能")
     private String apiFunction;
 
@@ -69,8 +66,6 @@ public class DataApiUpReq implements Serializable {
     @ApiModelProperty(value = "目标地址",required = false)
     private String targetUrl;
 
-    @ApiModelProperty(value = "超时时间")
-    private Date overTime;
     /**
      * goods表
      */

jz-dm-manage/src/main/java/com/jz/manage/moduls/service/impl/DataGoodsServiceImpl.java

@@ -249,10 +249,7 @@ public class DataGoodsServiceImpl implements DataGoodsService {
         if (!StringUtils.isNotEmpty(dataApiUpReq.getJoinType())) {
             return Result.error("接入类型不存在！");
         }
-        if (!StringUtils.isNotEmpty(dataApiUpReq.getApiType())) {
-            return Result.error("api类型不存在！");
-        }
-        if (!StringUtils.isNotEmpty(dataApiUpReq.getTransMode())) {
+        if (!StringUtils.isNotEmpty(dataApiUpReq.getApiProtocl())) {
             return Result.error("传输方式不能为空！");
         }
         if (!StringUtils.isNotEmpty(dataApiUpReq.getEncryMode())) {
@@ -271,7 +268,7 @@ public class DataGoodsServiceImpl implements DataGoodsService {
         apiReq.setOutputType(dataApiUpReq.getReturnType());
 //        apiReq.setPage(); // TODO
         apiReq.setFileId(1L);
-        apiReq.setTimeout(dataApiUpReq.getOverTime() + "");
+//        apiReq.setTimeout(dataApiUpReq.getOverTime() + "");
         for (DataGoodsApiParams params : dataApiUpReq.getInboxParam()) {
             apiReq.setInboxParam(JSON.toJSONString(params));
         }
@@ -293,7 +290,6 @@ public class DataGoodsServiceImpl implements DataGoodsService {
 //        String url= "http://127.0.0.1:8088/api/producer/addDataBankApiInfo";
 
         String post = httpsUtils.submitPost(url, JSON.toJSONString(apiReq));
-        System.out.println(post);
         JSONObject result = JSON.parseObject(post);
         if (!result.get("code").equals(200) || org.springframework.util.StringUtils.isEmpty(result.get("data"))){
             return Result.of_error("制作失败！");