Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/js/jsyb_controller.go

@@ -11,6 +11,7 @@ import (
 	"github.com/astaxie/beego"
 	"github.com/axgle/mahonia"
 	"io/ioutil"
+	"regexp"
 	"strings"
 	"syscall"
 	"unsafe"
@@ -555,7 +556,7 @@ func (c *JSybController) GetBasBaseInfo() (string, string) {
 	if ret2 != 0 {
 		return "", ""
 	}
-	return strings.Replace(string(pCardInfo), " ", "", -1), strings.Replace(string(pBusiCardInfo), " ", "", -1)
+	return DeleteExtraSpace(string(pCardInfo)), DeleteExtraSpace(string(pBusiCardInfo))
 }
 
 func IntPtr(n int) uintptr {
@@ -581,3 +582,18 @@ func ConvertToString(src string, srcCode string, tagCode string) string {
 	result := string(cdata)
 	return result
 }
+
+func DeleteExtraSpace(s string) string {
+	//删除字符串中的多余空格，有多个空格时，仅保留一个空格
+	s1 := strings.Replace(s, "  ", " ", -1)      //替换tab为空格
+	regstr := "\\s{2,}"                          //两个及两个以上空格的正则表达式
+	reg, _ := regexp.Compile(regstr)             //编译正则表达式
+	s2 := make([]byte, len(s1))                  //定义字符数组切片
+	copy(s2, s1)                                 //将字符串复制到切片
+	spc_index := reg.FindStringIndex(string(s2)) //在字符串中搜索
+	for len(spc_index) > 0 {                     //找到适配项
+		s2 = append(s2[:spc_index[0]+1], s2[spc_index[1]:]...) //删除多余空格
+		spc_index = reg.FindStringIndex(string(s2))            //继续在字符串中搜索
+	}
+	return string(s2)
+}