修复打包问题

jz-dm-common/pom.xml

@@ -19,7 +19,6 @@
     </properties>
 
     <dependencies>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -86,7 +85,11 @@
             <version>RELEASE</version>
             <scope>compile</scope>
         </dependency>
-
+        <!--链接FTP服务-->
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

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

+package com.jz.common.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * MD5加密算法
+ * 
+ * @author Admin
+ * @version $Id: Md5Utils.java 2014年9月3日 下午4:01:08 $
+ */
+public class Md5 {
+	private static Logger log = LoggerFactory.getLogger(Md5.class);
+	private static final String SIGN_TYPE = "MD5";
+	private static final String CHARSET_NAME = "UTF-8";
+	private static final String salt = "3zsAa6W9gfSMMhPSlQTdWFUSHY3LS8Vb";
+
+	/**
+	 * MD5加密
+	 * 
+	 * @param data
+	 * @return
+	 * @throws NoSuchAlgorithmException
+	 */
+	public static String encrypt(byte[] data) {
+		try {
+			MessageDigest md5 = MessageDigest.getInstance(SIGN_TYPE);
+			md5.update(data);
+			return byte2hex(md5.digest());
+		} catch (NoSuchAlgorithmException e) {
+			log.debug("md5 加密异常", e);
+		}
+		return "";
+	}
+
+	/**
+	 * MD5加密
+	 * 
+	 * @param str
+	 * @return
+	 * @throws NoSuchAlgorithmException
+	 */
+	public static String encrypt(String str) {
+		try {
+			MessageDigest md5 = MessageDigest.getInstance(SIGN_TYPE);
+			md5.update((str + salt).getBytes(CHARSET_NAME));
+			return byte2hex(md5.digest());
+		} catch (Exception e) {
+			log.debug("md5 加密异常", e);
+		}
+		return null;
+	}
+
+	/**
+	 * MD5加盐加密
+	 * 
+	 * @param str
+	 * @param salt
+	 * @return
+	 * @throws NoSuchAlgorithmException
+	 */
+	public static String encrypt(String str, String salt) {
+		try {
+			MessageDigest md5 = MessageDigest.getInstance(SIGN_TYPE);
+			md5.update((str + salt).getBytes(CHARSET_NAME));
+			return byte2hex(md5.digest());
+		} catch (Exception e) {
+			if (log.isDebugEnabled()) {
+				log.debug("md5 加密异常", e);
+			}
+		}
+		return "";
+	}
+
+	public static String encrypt(String str, String salt, String charset) {
+		try {
+			MessageDigest md5 = MessageDigest.getInstance(SIGN_TYPE);
+			md5.update((str + salt).getBytes(charset));
+			return byte2hex(md5.digest());
+		} catch (Exception e) {
+			if (log.isDebugEnabled()) {
+				log.debug("md5 加密异常", e);
+			}
+		}
+		return "";
+	}
+
+	public static String byte2hex(byte[] bytes) {
+		StringBuilder sign = new StringBuilder();
+		for (int i = 0; i < bytes.length; i++) {
+			String hex = Integer.toHexString(bytes[i] & 0xFF);
+			if (hex.length() == 1) {
+				sign.append("0");
+			}
+			sign.append(hex.toUpperCase());
+		}
+
+		return sign.toString();
+	}
+
+	public static byte[] hex2byte(String str) {
+		if (str == null) {
+			return null;
+		}
+		str = str.trim();
+		int len = str.length();
+		if (len <= 0 || len % 2 == 1) {
+			return null;
+		}
+		byte[] b = new byte[len / 2];
+		try {
+			for (int i = 0; i < str.length(); i += 2) {
+				b[(i / 2)] = (byte) Integer.decode("0x" + str.substring(i, i + 2)).intValue();
+			}
+			return b;
+		} catch (Exception e) {
+		}
+		return null;
+	}
+
+	/**
+	 * 给TOP请求做MD5签名。
+	 * 
+	 * @param sortedParams 所有字符型的TOP请求参数
+	 * @param secret       签名密钥
+	 * @return 签名
+	 * @throws IOException
+	 */
+	public static String signRequestNew(Map<String, String> sortedParams, String secret) throws IOException {
+		// 第一步：把字典按Key的字母顺序排序
+		List<String> keys = new ArrayList<String>(sortedParams.keySet());
+		Collections.sort(keys);
+
+		// 第二步：把所有参数名和参数值串在一起
+		StringBuilder query = new StringBuilder();
+		for (int i = 0; i < keys.size(); i++) {
+			String key = keys.get(i);
+			String value = sortedParams.get(key);
+			if (!StringUtils.isEmpty(key) && !StringUtils.isEmpty(value) && !"sign".equals(key)) {
+				query.append(key).append("=").append(value);
+			}
+		}
+		log.info("获取当APP请求参数，签名前值为：" + query.toString());
+		return Md5.encrypt(query.toString(), secret);
+	}
+
+	public static void main(String[] args) {
+		System.out.println(encrypt("200128008012abc@123", ""));
+	}
+}

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

@@ -4,7 +4,6 @@ import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.IAcsClient;
 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest;
 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
-import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
@@ -32,9 +31,9 @@ public class SMSUtils {
      * @param templateCode
      * @param phoneNumbers
      * @param param
-     * @throws ClientException
+     * @throws
      */
-    public static void sendShortMessage(String templateCode,String phoneNumbers,String param) throws ClientException{
+    public static void sendShortMessage(String templateCode,String phoneNumbers,String param) throws Exception{
         // 设置超时时间-可自行调整
         System.setProperty("sun.net.client.defaultConnectTimeout", "10000");
         System.setProperty("sun.net.client.defaultReadTimeout", "10000");

jz-dm-mall/pom.xml

@@ -121,6 +121,10 @@
 			<groupId>com.github.xiaoymin</groupId>
 			<artifactId>swagger-bootstrap-ui</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
 		<!-- common公共模块 -->
 		<dependency>
 			<groupId>com.jz.common</groupId>

jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/controller/company/CompanyAuthController.java

 package com.jz.dm.mall.moduls.controller.company;
 
-import com.aliyuncs.http.HttpRequest;
-import com.jz.common.entity.Department;
 import com.jz.common.utils.Result;
 import com.jz.dm.mall.moduls.controller.company.bean.CompanyAddReq;
 import com.jz.dm.mall.moduls.controller.company.bean.CompanyUpdateReq;
-import com.jz.dm.mall.moduls.entity.MallCustomer;
 import com.jz.dm.mall.moduls.service.CompanyAuthService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/controller/customer/ValidateCodeController.java

 package com.jz.dm.mall.moduls.controller.customer;
 
-import com.aliyuncs.exceptions.ClientException;
+
 import com.jz.common.constant.RedisMessageConstant;
 import com.jz.common.utils.Result;
-import com.jz.common.utils.SMSUtils;
 import com.jz.common.utils.StatusCode;
 import com.jz.common.utils.ValidateCodeUtils;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.concurrent.TimeUnit;
 
@@ -50,8 +50,8 @@ public class ValidateCodeController {
             String code = ValidateCodeUtils.generateValidateCode(6) + "";
             // 发送
             try {
-                SMSUtils.sendShortMessage(SMSUtils.VALIDATE_CODE, telephone, code);
-            } catch (ClientException e) {
+             //   SMSUtils.sendShortMessage(SMSUtils.VALIDATE_CODE, telephone, code);
+            } catch (Exception e) {
                 e.printStackTrace();
                 return new Result(false, "验证码发送失败！", StatusCode.ERROR);
             }
@@ -81,8 +81,8 @@ public class ValidateCodeController {
             String code = ValidateCodeUtils.generateValidateCode(6) + "";
             // 发送
             try {
-                SMSUtils.sendShortMessage(SMSUtils.VALIDATE_CODE, telephone, code);
-            } catch (ClientException e) {
+               // SMSUtils.sendShortMessage(SMSUtils.VALIDATE_CODE, telephone, code);
+            } catch (Exception e) {
                 e.printStackTrace();
                 return new Result(false, "验证码发送失败！", StatusCode.ERROR);
             }

jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/controller/goods/DataGoodsApiController.java

@@ -5,11 +5,9 @@ import com.jz.common.base.BaseController;
 import com.jz.common.utils.Result;
 import com.jz.common.utils.StatusCode;
 import com.jz.dm.mall.moduls.controller.goods.bean.dto.DataGoodsApiDto;
-import com.jz.dm.mall.moduls.entity.DataGoodsApi;
 import com.jz.dm.mall.moduls.service.DataGoodsApiService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

jz-dm-manage/src/main/java/com/jz/manage/moduls/controller/sys/ValidateCodeController.java

 package com.jz.manage.moduls.controller.sys;
 
-import com.aliyuncs.exceptions.ClientException;
 import com.jz.common.constant.RedisMessageConstant;
 import com.jz.common.utils.Result;
 import com.jz.common.utils.SMSUtils;
@@ -41,7 +40,7 @@ public class ValidateCodeController {
             // 发送
             try {
                 SMSUtils.sendShortMessage(SMSUtils.VALIDATE_CODE, telephone, code);
-            } catch (ClientException e) {
+            } catch (Exception e) {
                 e.printStackTrace();
                 return new Result(false, "验证码发送失败！");
             }

pom.xml

@@ -47,6 +47,7 @@
         <swagger-bootstrap-ui.version>1.9.6</swagger-bootstrap-ui.version>
         <lombok.version>1.18.16</lombok.version>
         <spring-cloud.version>Finchley.SR1</spring-cloud.version>
+        <commons-net.version>3.5</commons-net.version>
     </properties>
 
     <dependencyManagement>
@@ -216,6 +217,11 @@
                 <artifactId>lombok</artifactId>
                 <version>${lombok.version}</version>
             </dependency>
+            <dependency>
+                <groupId>commons-net</groupId>
+                <artifactId>commons-net</artifactId>
+                <version>${commons-net.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>