Merge remote-tracking branch 'origin/dev' into test

src/main/resources/project.properties

@@ -272,7 +272,7 @@ oauthService_handlers::map=java.util.HashMap
oauthService_handlers.map-key-1=weixin
oauthService_handlers.map-val-1-ref=com_ekexiu_portal_oauth_weixin_WeiXinHandler
com_ekexiu_push_service_PushService.enable::boolean=true
com_ekexiu_push_service_PushService.secret=U96j677DHoA1Pv5X0mxMU9
com_ekexiu_push_service_PushService.appKey=48nq7d7yHu8dgbzVHuisp6
com_ekexiu_push_service_PushService.appId=TUdvbnxu1c97r6Fb6cUy57
com_ekexiu_push_service_PushService.secret=QewoTEuuOGAkWnBKqrbfj8
com_ekexiu_push_service_PushService.appKey=xXqSF9Gmb69SG37XVT3lL2
com_ekexiu_push_service_PushService.appId=vGS5OBXtmV6SrDVJDQ8dGA