Merge branch 'feature-cloud' into dev

applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/service/impl/WxPushServiceImpl.java

@@ -38,7 +38,6 @@ public class WxPushServiceImpl implements WxPushService{
                 String content=httpRequest.body();
                 System.err.println("getWxAccessTokenContent======"+content);
                 String token= JSON.parseObject(content).getString("access_token");
-                //System.err.println("getWxAccessTokenToken====="+ token);
                 HttpRequest hRequest=  HttpRequest.post("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token)
                         .header("Content-Type", "application/json")
                         .send(json.getBytes());

frontend/wechat-web/src/configs/regexp.config.js

@@ -5,10 +5,10 @@
 
 export const regExpConfig = {
     IDcard: /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/, // 身份证
-    mobile: /^1([3|4|5|7|8|])\d{9}$/, // 手机号码
+    mobile: /^1([3|4|5|7|8|9|])\d{9}$/, // 手机号码
     telephone: /^(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$/, // 固定电话
     num: /^[0-9]*$/, // 数字
-    phoneNo: /(^1([3|4|5|7|8|])\d{9}$)|(^(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$)/, // 电话或者手机
+    phoneNo: /(^1([3|4|5|7|8|9|])\d{9}$)|(^(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$)/, // 电话或者手机
     policeNo: /^[0-9A-Za-z]{4,10}$/, // 账号4-10位数字或字母组成
     pwd: /^[0-9A-Za-z]{6,16}$/, // 密码由6-16位数字或者字母组成
     isNumAlpha: /^[0-9A-Za-z]*$/, // 字母或数字