IOS端公众号app相关，更改401错误码message，更改getAccessToken方法，银盛部分相关，四要素新增错误码

pluss-common-bundle/src/main/java/cn/pluss/platform/config/ParameterConfig.java

@@ -96,6 +96,17 @@ public class ParameterConfig {
      */
     @Value("${parameter.APPSECRET}")
     public String APPSECRET;
+
+    /**
+     * IOS公众号ID
+     */
+    @Value("${parameter.APPID_IOS}")
+    public String APPID_IOS;
+    /**
+     * IOS公众号密钥
+     */
+    @Value("${parameter.APP_SECRET_IOS}")
+    public String APP_SECRET_IOS;
     /**
      * 商户号
      */
@@ -276,6 +287,8 @@ public class ParameterConfig {
         ParametersUtil.APPLETS_APPID = APPLETS_APPID;
         ParametersUtil.APPLETS_SECRET = APPLETS_SECRET;
         ParametersUtil.APPSECRET = APPSECRET;
+        ParametersUtil.APPID_IOS = APPID_IOS;
+        ParametersUtil.APP_SECRET_IOS = APP_SECRET_IOS;
         ParametersUtil.PID = PID;
         ParametersUtil.KEY = KEY;
         ParametersUtil.wechatCallback = wechatCallback;

pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtilIOS.java

@@ -37,9 +37,9 @@ import java.util.Map;
 @Slf4j
 public class MobV2PushUtilIOS {
 
-    public static final String appKey = "lLZ0nPNJZ29CcEgkzxTkj7";
-    public static final String appId = "uygciF2fKU8KYGAuLghjQ7";
-    public static final String masterSecret = "T2xS8yXA6SAVg1Ns8wYdZ";
+    public static final String appKey = "QwyHsKpc0I9BQMk9Xysx74";
+    public static final String appId = "yuBG87yWEt6SXrwBSSvjy1 ";
+    public static final String masterSecret = "QwyHsKpc0I9BQMk9Xysx74";
 
     public String getToken() throws IOException, NoSuchAlgorithmException {
 

pluss-common-bundle/src/main/java/cn/pluss/platform/util/ParametersUtil.java

@@ -53,6 +53,15 @@ public class ParametersUtil {
 	 * AppSecret
 	 */
 	public static String APPSECRET;
+	/**
+	 * IOS公众号ID
+	 */
+	public static String APPID_IOS;
+	/**
+	 * IOS公众号密钥
+	 */
+	public static String APP_SECRET_IOS;
+
 	/**
 	 *商户号
 	 */

pluss-common-bundle/src/main/java/cn/pluss/platform/util/WechatSignUtil.java

@@ -1,16 +1,10 @@
 package cn.pluss.platform.util;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
-import com.alibaba.fastjson.JSONObject;
-
 public class WechatSignUtil {
 
 	
@@ -95,4 +89,30 @@ public class WechatSignUtil {
 		signParam.append("&key=").append(payKey);
 		return signParam.toString();
 	}
+	/**
+	 * 加密模式
+	 * @return
+	 */
+	public static String createNonceStr() {
+		return UUID.randomUUID().toString();
+	}
+
+	/**
+	 * 时间戳
+	 * @return
+	 */
+	public static String createTimestamp() {
+		return Long.toString(System.currentTimeMillis() / 1000);
+	}
+	public static String byteToHex(final byte[] hash) {
+		Formatter formatter = new Formatter();
+		for (byte b : hash)
+		{
+			formatter.format("%02x", b);
+		}
+		String result = formatter.toString();
+		formatter.close();
+		return result;
+	}
+	
 }

pluss-common-bundle/src/main/resources/config/application-common.yml

@@ -105,6 +105,9 @@ parameter:
   APPLETS_SECRET: 625cbce8772629312e42e8278a8d6889
   APPSECRET: 4e00bbf3fc75a1ff68ce866fd13f2bcc
   # b84ee0efaa0d9a649746ac65525f8e10
+  #IOS端公众号
+  APPID_IOS: wx212769170d2c6b2a
+  APP_SECRET_IOS: 8492a7e8d55bbb1b57f5c8276ea1add0
   KEY: 微信原生加密用的KEY
   LESHUALIU: 乐刷、未接入可不管
   LESHUA_API:

pluss-common-bundle/src/main/resources/config/application-ys.yml

@@ -10,7 +10,7 @@ ys:
   ## 其他网关接口
   otherDomain: https://commonapi.ysepay.com/gateway.do
   ## 代理商编号
-  agentNo:
+  agentNo: 801521000002WJW
   ## 交易发起方编号 武汉融商创银科技有限公司
   srcMerchantNo: 826521773920170
 
@@ -49,7 +49,7 @@ ys-extension:
   ## 机构号ID
   src:
     ## 代理商编号
-  agentNoV2:
+  agentNoV2: 801521000002WJW
   ## 进件私钥v2
   priKeyV2:
     ## 进件公钥v2