Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Data/update.sql

@@ -157,4 +157,7 @@ CREATE TABLE `tab_protect_log_read` (
   `promote_id` int(11) NOT NULL DEFAULT '0' COMMENT '推广员id',
   `create_time` int(11) DEFAULT '0' COMMENT '创建时间',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=25 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
+) ENGINE=MyISAM AUTO_INCREMENT=25 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
+-- 增加用户Token 验证用户
+ALTER TABLE `tab_user`
+ADD COLUMN `user_token`  char(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '用户token 登入时下发' AFTER `token`;