Merge remote-tracking branch 'origin/develop' into develop

project-order/src/main/java/com/dituhui/pea/order/utils/EncryptionUtil.java

@@ -41,6 +41,8 @@ public class EncryptionUtil {
      *         此处使用AES-128-CBC加密模式，key需要为16位。
      * */
     public String AESEncrypt(String sSrc) {
+    	System.out.println("passWord:"+passWord);
+    	System.out.println("IV:"+IV);
         try {
             if (passWord == null) {
                 log.error("password 未加载");

project-order/src/main/resources/application.yaml

@@ -65,7 +65,7 @@ SaaS:
   ak: 64e1cde3f9144bfb850b7d37c51af559
   userAccount: sMvf3yZWA69lKcvlgKcOHQ==
   userPassword: qjOHxpQPXLnJP+Jq1CZGBQ==
-  encryptionPassWord: bsh@2013!@
+  encryptionPassWord: 64e1cde3f9144bfb
 bean:
   server: https://bean-test.bshg.com.cn
   app-key: eDZEhTCxAcM9paRfwPjAM7RGkfmbf15S_PEA