Merge commit '24a6cf70' into SANDBOX

f21b49f4 · strong · db8e9e92 · 24a6cf70 · f21b49f4
Commit f21b49f4 authored Dec 11, 2015 by strong
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

forumUser.js app/controllers/admin/forumUser.js +8 -1

No files found.
--- a/app/controllers/admin/forumUser.js
+++ b/app/controllers/admin/forumUser.js
@@ -27,7 +27,14 @@ router.post('/user/updateByUid', function(req, res, next) {
 			entity.nickName = nickName;
 		}
 		if(icon){
-			entity.icon = icon;
+			if (icon && icon.indexOf('http://') == -1) {
+		        if (process.env.NODE_ENV === 'production') {
+		            icon = 'http://fs.wxpai.cn/' + icon;
+		        } else {
+		            icon = 'http://dev.fs.wxpai.cn/' + icon;
+		        }
+		    }
+		    entity.icon = icon;
 		}
 		forumUserService.updateUserByUIdAndEntCode(uid,ent_code,entity,function(err,result){