修改了支付秘钥

817c63b0 · 张光耀 · 4fe374be · 817c63b0 · 817c63b0 · 817c63b0
--- a/src/main/java/com/diaoyun/zion/master/util/AESUtils.java
+++ b/src/main/java/com/diaoyun/zion/master/util/AESUtils.java
@@ -62,9 +62,9 @@ public class AESUtils {
 		return null;
 	}

-	/*public static void main(String[] args) {
-		String key = "``11qqaazzxxccvv"; // 128 bit key
-		System.out.println(encrypt(key, "123"));
-		System.out.println(decrypt(key, encrypt(key, "123")));
-	}*/
+	public static void main(String[] args) {
+//		String key = "``11qqaazzxxccvv"; // 128 bit key
+//		System.out.println(encrypt(key, "123"));
+//		System.out.println(decrypt(key, encrypt(key, "123")));
+	}
 }
--- a/src/main/resources/properties/domain.properties
+++ b/src/main/resources/properties/domain.properties
@@ -36,8 +36,8 @@ tencent.wordpos.app_url=https://api.ai.qq.com/fcgi-bin/nlp/nlp_wordpos
 ################腾讯翻译配置 END###################

 ##################stripe公钥(不加密)和私钥(已用 AESUtils 加密)################################
-stripe.pk=pk_test_rXUSgU8Kw7DLhDzMbHM0r55O00JAzVBBJR
-stripe.sk=3ff57yz9S5INBexBOnzi/ZaxClXkXlJ+FZ6XLc/f2vpESScG7YOaQaG2YNRic3HF
+stripe.pk=pk_live_5MdXU4N1cvmU1yatYp5v0E0n00C7tAXpGB
+stripe.sk=d87UqTQ6QUjuNkXrjH51Gl/Zqnfy98HRl23xljism2hpaXjSNTwdl6pv6FM7D4tT
 ######################outlook的账户公钥密钥#####################
 #stripe.pk=pk_test_uljWJWUuD8fzZXPlGtDZ1fxx00o1ZKr7QL
 #stripe.sk=BbLXgo+ohgrAP7p3tB52YTqNwhAiTYzYWAX0W+/1PES6kOupxwc/7xpAR8QsG6gP

--- a/src/main/resources/templates/email-template.ftl
+++ b/src/main/resources/templates/email-template.ftl
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>Chinafrica Verification</title>
+    <title>Afrishop Verification</title>
 </head>

 <body>
@@ -49,7 +49,7 @@
                    <td width="24">&nbsp;</td>
                    <td colspan="2"
                        style="color:#858585; font-family:Arial, Helvetica, sans-serif; font-size:14px; line-height:20px; padding-top:18px;">
-                    ${nick},welcome to Chinafrica!Before we get started, we need to quickly verify your email address.
+                        ${nick},welcome to Afrishop!Before we get started, we need to quickly verify your email address.
                    </td>
                    <td width="24">&nbsp;</td>
                </tr>
@@ -74,7 +74,7 @@
                    <td width="24">&nbsp;</td>
                    <td colspan="2"
                        style="color:#858585; font-family:Arial, Helvetica, sans-serif; font-size:14px; line-height:20px; padding-top:18px; padding-bottom:32px; border-bottom:1px solid #e1e1e1;">
-                        By Chinafrica
+                        By Afrishop
                    </td>

                </tr>
@@ -95,7 +95,7 @@


 <style type="text/css">.qmbox style, .qmbox script, .qmbox head, .qmbox link, .qmbox meta {
-    display: none !important;
-}</style>
+        display: none !important;
+    }</style>
 </body>
 </html>
--- a/src/test/java/com/diaoyun/zion/ZionApplicationTests.java
+++ b/src/test/java/com/diaoyun/zion/ZionApplicationTests.java
@@ -367,7 +367,7 @@ public class ZionApplicationTests {
     *
     * @param usableSibUrl
     * @return
-     */
+
    private String deleteLoginModule(String usableSibUrl) {
        usableSibUrl = usableSibUrl.replaceAll("couponActivity", "");
        usableSibUrl = usableSibUrl.replaceAll("soldQuantity", "");
@@ -378,7 +378,8 @@ public class ZionApplicationTests {
        usableSibUrl = usableSibUrl.replaceAll("delivery", "");
        return usableSibUrl;
    }
-
+     */
+    /*
    //使用序列化的方式保存CookieStore到本地文件，方便后续的读取使用
    private static void saveCookieStore(CookieStore cookieStore, String savePath) throws IOException {

@@ -387,8 +388,8 @@ public class ZionApplicationTests {
        os.writeObject(cookieStore);
        os.close();

-    }
-
+    }*/
+    /*
    //读取Cookie的序列化文件，读取后可以直接使用
    private static CookieStore readCookieStore(String savePath) throws IOException, ClassNotFoundException {

@@ -399,8 +400,8 @@ public class ZionApplicationTests {
        return cookieStore;


-    }
-
+    }*/
+    /*
    private List<NameValuePair> setHttpParams(Map<String, Object> paramsMap) {
        List<NameValuePair> list = new ArrayList<NameValuePair>();
        for (String key : paramsMap.keySet()) {
@@ -408,7 +409,8 @@ public class ZionApplicationTests {
        }
        return list;
    }
-
+*/
+    /*
    @Test
    public void testDate() throws ParseException {

@@ -419,8 +421,8 @@ public class ZionApplicationTests {
        String s = String.valueOf(it);
        System.out.println(s);

-    }
-
+    }*/
+    /*
    @Test
   public void testP(){

@@ -428,6 +430,12 @@ public class ZionApplicationTests {
        BigDecimal de=new BigDecimal("100");
        decimal.divide(de,2,BigDecimal.ROUND_HALF_UP);

-    }
+    }*/

+    @Test
+    public  void testAesut(){
+
+     String a =  AESUtils.encrypt(KeyConstant.AES_KEY,"sk_live_YbAVymUjl4ZEVGfzeyHyRTKM00JviD18nI");
+        System.out.println(a);
+    }
 }