Merge remote-tracking branch 'remotes/origin/developer' into developerA

src/main/resources/config/beta/caimei.properties

@@ -33,9 +33,9 @@ jdbc.testSql=SELECT 'x' FROM DUAL
 
 #redis settings
 redis.keyPrefix=caimei
-redis.host=10.104.50.235
+redis.host=172.31.165.27
 redis.port=6379
-redis.pass=123456
+redis.pass=6#xsI%b4o@5c3RoE
 redis.timeout=100000
 #\u6700\u5927\u8FDE\u63A5\u6570
 redis.pool.maxActive=300

src/main/webapp/WEB-INF/views/modules/zplm/cmBrandAuthForm.jsp

@@ -281,6 +281,7 @@
 						"\t\t\t\t\t\t<img src=\"http://192.168.2.100/group1/M00/00/05/wKgCZGBdlSyAHzPDAAJDl8RXwhI006.png\" url=\"http://192.168.2.100/group1/M00/00/05/wKgCZGBdlSyAHzPDAAJDl8RXwhI006.png\" style=\"max-width:100px;max-height:100px;_height:100px;border:0;padding:3px;\">\n" +
 						"\t\t\t\t\t\t</a>&nbsp;&nbsp;\n" +
 						"\t\t\t\t\t\t<a href=\"javascript:\" onclick=\"authLogoDel(this);\">×</a>")
+				$("#authLogo").attr('value', url);
 				$("#authLogoPreview a").attr('href', url);
 				$("#authLogoPreview img").attr('src', url);
 				$("#authLogoPreview img").attr('url', url);