Merge branch 'develop' of http://git.dev.yoho.cn/web/yohood into develop

@@ -352,7 +352,7 @@ define('yohood', function(require, exports) {
 			$(".search-btn").trigger("click.search");
 		});
 		$(".search-btn").bind("click.search", function() {
-			var brand = encodeURIComponent($.trim($("input[type=text]").val()));
+			var brand = $.trim($("input[type=text]").val());
 			var template = '<ul class="brand-list cooperation-list clearfix">{li}</ul>';
 			var noSearchTemplate = '<div class="no-search" style="display:block;"><p>未搜索到“{brand}”的相关品牌</p><a href="javascript:;" class="all_brand"><查看全部品牌</a></div>';
 			var html = '';
@@ -360,7 +360,7 @@ define('yohood', function(require, exports) {
 				type: "post",
 				url: "/brand/getbrand",
 				data: {
-					brand: brand
+					brand: encodeURIComponent(brand)
 				},
 				success: function(data) {
 					var brands = data.data;
@@ -372,7 +372,7 @@ define('yohood', function(require, exports) {
 						});
 						$(".brand-content").html(template.replace('{li}', html));
 					} else {
-						$(".brand-content").html(noSearchTemplate.replace('{brand}', decodeURIComponent(brand)));
+						$(".brand-content").html(noSearchTemplate.replace('{brand}', tools.escapeHTML(brand) ));
 					}
 				}
 			});

 [mysql]  
-pre_yohood.username = yohodb
-pre_yohood.password = yohonj_9646_mysql
-pre_yohood.writers  = 10.170.183.158:5510
-pre_yohood.readers  = 10.170.183.158:5510
+yohood.username = yohodb
+yohood.password = yohonj_9646_mysql
+yohood.writers  = 127.0.0.1:3310
+yohood.readers  = 127.0.0.1:3310