Merge remote-tracking branch 'origin/test'

src/main/resources/project.properties

@@ -281,4 +281,4 @@ com_ekexiu_portal_oauth_BaseOAuthHandler=com.ekexiu.portal.oauth.BaseOAuthHandle
com_ekexiu_portal_oauth_BaseOAuthHandler.type=weixinxiaochengxu
oauthService_handlers.map-key-2=weixinxiaochengxu
oauthService_handlers.map-val-2-ref=com_ekexiu_portal_oauth_BaseOAuthHandler
com_ekexiu_portal_question_Service.imgPath::java.io.File=/kexiu/webdata/data/question;
com_ekexiu_portal_question_Service.imgPath::java.io.File=/kexiu/webdata/data/question