Merge branch 'dev4.5.8.5' of http://192.168.3.207:8080/qmx/jy into dev4.5.8.5

# Conflicts:
#	src/db.json

src/db.json

@@ -1,72 +1,72 @@
 {
-  "mongodb": {
-    "main": {
-      "address": "192.168.3.206:27080",
-      "size": 5,
-      "dbName": "qfw",
-      "replSet": ""
-    },
-    "log": {
-      "address": "192.168.3.206:27090",
-      "size": 5,
-      "dbName": "qfw",
-      "replSet": "",
-      "userName": "admin",
-      "password": "123456"
-    },
-    "ent": {
-      "address": "192.168.3.207:27001,192.168.3.206:27002",
-      "size": 5,
-      "dbName": "mixdata",
-      "userName": "jyDevGroup",
-      "password": "jy@DevGroup"
-    },
-    "qyfw": {
-      "address": "192.168.3.206:27080",
-      "size": 5,
-      "dbName": "jyqyfw"
-    },
-    "bidding": {
-      "address": "192.168.3.207:27001,192.168.3.206:27002",
-      "size": 5,
-      "dbName": "qfw_data",
-      "replSet": "",
-      "collection": "bidding",
-      "collection_back": "bidding_back",
-      "userName": "jyDevGroup",
-      "password": "jy@DevGroup"
-    }
-  },
-  "elasticsearch": {
-    "main": {
-      "address": "http://192.168.3.206:9800",
-      "size": 5
-    }
+	"mongodb": {
+		"main": {
+			"address": "192.168.3.206:27080",
+	 		"size": 5,
+	 		"dbName": "qfw",
+			"replSet": ""
+		},
+		"log": {
+			"address": "192.168.3.206:27090",
+	 		"size": 5,
+	 		"dbName": "qfw",
+			"replSet": "",
+			"userName": "admin",
+			"password": "123456"
+		},
+		"ent": {
+			"address": "192.168.3.207:27001,192.168.3.206:27002",
+	 		"size": 5,
+	 		"dbName": "mixdata",
+			"userName": "jyDevGroup",
+			"password": "jy@DevGroup"
+		},
+		"qyfw": {
+			"address": "192.168.3.206:27080",
+	 		"size": 5,
+	 		"dbName": "jyqyfw"
+		},
+		"bidding": {
+			"address": "192.168.3.207:27001,192.168.3.206:27002",
+	 		"size": 5,
+	 		"dbName": "qfw_data",
+			"replSet": "",
+			"collection": "bidding",
+			"collection_back": "bidding_back",
+			"userName": "jyDevGroup",
+			"password": "jy@DevGroup"
+		}
+	},
+	"elasticsearch": {
+		"main": {
+			"address": "http://192.168.3.206:9800",
+	    	"size": 5
+		}
     },
     "redis": {
-      "main":{
-      "address": "other=192.168.3.206:1712,push=192.168.3.206:1712,pushcache_1=192.168.3.206:5000,pushcache_2_a=192.168.3.206:5001,pushcache_2_b=192.168.3.206:5002,sso=192.168.3.206:1712,session=192.168.3.206:1712,recovery=192.168.3.206:1712,merge=192.168.3.206:1712"
-    },
-    "login": {
-      "address": "login=192.168.3.206:1712"
-    }
+    	"main":{
+			"address": "other=192.168.3.206:1712,push=192.168.3.206:1712,pushcache_1=192.168.3.206:5000,pushcache_2_a=192.168.3.206:5001,pushcache_2_b=192.168.3.206:5002,sso=192.168.3.206:1712,session=192.168.3.206:1712,recovery=192.168.3.206:1712,merge=192.168.3.206:1712"
+		},
+		"login": {
+			"address": "login=192.168.3.206:1712"
+		}
     },
     "mysql": {
-      "main": {
-          "dbName": "jianyu",
-          "address": "192.168.3.11:3366",
-          "userName": "root",
-          "passWord": "Topnet123",
-      "maxOpenConns": 5,
-      "maxIdleConns": 5
-      },
-    "push": {
-          "dbName": "jianyu",
-          "address": "192.168.3.11:3366",
-          "userName": "root",
-          "passWord": "Topnet123",
-      "maxOpenConns": 5,
-      "maxIdleConns": 5
-      }
+	    "main": {
+	        "dbName": "jianyu",
+	        "address": "192.168.3.11:3366",
+	        "userName": "root",
+	        "passWord": "Topnet123",
+			"maxOpenConns": 5,
+			"maxIdleConns": 5
+	    },
+		"push": {
+	        "dbName": "jianyu",
+	        "address": "192.168.3.11:3366",
+	        "userName": "root",
+	        "passWord": "Topnet123",
+			"maxOpenConns": 5,
+			"maxIdleConns": 5
+	    }
     }
 }

src/jfw/modules/subscribepay/src/service/dataexportPack.go

@@ -90,6 +90,7 @@ func (this *DataExportPack) CreateOrder() {
 			"service_status": 0,
 			"user_nickname":  nickname,
 			"user_openid":    openId,
+			"user_phone":     this.GetString("order_phone"),
 			"order_code":     orderCode,
 			"product_type":   "数据流量包",
 			"create_time":    qutil.FormatDate(&now, qutil.Date_Full_Layout),

src/jfw/public/public.go

@@ -274,14 +274,3 @@ func isEmail(value string) bool {
 	var emailPattern = regexp.MustCompile("^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$")
 	return emailPattern.MatchString(value)
 }
-
-func GetDataPkgPhone(userId string) string {
-	lastPhone := ""
-	userData, _ := MQFW.FindById("user", userId, `{"s_phone":1,"s_m_phone":1}`)
-	if userData != nil && len(*userData) > 0 {
-		if lastPhone == "" {
-			lastPhone, _ = util.If((*userData)["s_phone"] != nil, (*userData)["s_phone"], (*userData)["s_m_phone"]).(string)
-		}
-	}
-	return lastPhone
-}