fix refund

zhongzheng-common/src/main/java/com/zhongzheng/common/config/WxSmallConfig.java

@@ -64,7 +64,7 @@ public class WxSmallConfig extends WXPayConfig {
     @Override
     public InputStream getCertStream() {
         try {
-            InputStream certStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("config/apiclient_cert.p12");
+            InputStream certStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("config/"+getMchID()+"/apiclient_cert.p12");
             this.certData = IOUtils.toByteArray(certStream);
             certStream.close();
         } catch (Exception e) {

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/ToolsUtils.java

@@ -325,18 +325,17 @@ public class ToolsUtils {
         if(Validator.isEmpty(passWord)){
             return false;
         }
-        if(passWord.length()<8||passWord.length()>18){
+        /*if(passWord.length()<8||passWord.length()>18){
             return false;
-        }
-       /* String regExp = "^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\W_!@#$%^&*`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\\W_!@#$%^&*`~()-+=]+$)(?![0-9\\W_!@#$%^&*`~()-+=]+$)(?![a-zA-Z0-9]+$)(?![a-zA-Z\\W_!@#$%^&*`~()-+=]+$)(?![a-z0-9\\W_!@#$%^&*`~()-+=]+$)(?![0-9A-Z\\W_!@#$%^&*`~()-+=]+$)[a-zA-Z0-9\\W_!@#$%^&*`~()-+=]{6,16}$";
+        }*/
+        String regExp = "^(?=.*?[a-z])(?=.*?[A-Z])(?=.*?\\d)(?=.*?[!#@*&.])[a-zA-Z\\d!#@*&.]{8,16}$";
         Pattern p = Pattern.compile(regExp);
         Matcher m = p.matcher(passWord);
         if (m.matches()){
             return true;
         } else {
             return false;
-        }*/
-        return true;
+        }
     }
 
 }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -697,7 +697,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             throw new CustomException("密码不能为空");
         }
         if(!ToolsUtils.verifPwd(bo.getPwd())){
-            throw new CustomException("密码长度为6-18个字符");
+            throw new CustomException("密码应由8-16位数字、大小写字母、符号组成");
         }
         String key = Constants.REGISTER_SMS + bo.getTel();
         String code =  redisCache.getCacheObject(key);

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -732,7 +732,6 @@ public class WxPayServiceImpl implements IWxPayService {
             result.put("signType", "MD5");
             result.put("sign", WXPayUtil.generateSignature(result, key, WXPayConstants.SignType.MD5));
             Map rMap = wxpay.refund(data);
-            System.out.println(rMap);
             return rMap;
         } catch (Exception e) {
             e.printStackTrace();