调整文件结构

src/app/app.component.ts

@@ -5,13 +5,13 @@ import {SplashScreen} from '@ionic-native/splash-screen';
 import {Storage} from "@ionic/storage";
 import {LoginPage} from '../pages/login/login';
 import {AppVersion} from '@ionic-native/app-version';
-import {AppUpdateService} from '../service/appUpdateService';
+import {AppUpdateService} from "../service/appUpdate.service";
 import {Keyboard} from '@ionic-native/keyboard';
 import {Badge} from '@ionic-native/badge';
 import {Response} from "@angular/http";
 import {TabsPage} from "../pages/tabs/tabs";
 import {Geolocation} from "@ionic-native/geolocation";
-import {AppService} from "../service/appHttpService";
+import {AppService} from "../service/http.service";
 
 @Component({
     templateUrl: 'app.html'

src/app/app.module.ts

@@ -11,8 +11,8 @@ import {Calendar} from '@ionic-native/calendar';
 import {TabsModule} from '../pages/tabs/tabs.module';
 import {LoginModule} from '../pages/login/login.module';
 import {HttpModule, JsonpModule} from '@angular/http';
-import {AppService} from '../service/appHttpService';
-import {AppUpdateService} from '../service/appUpdateService';
+import {AppService} from '../service/http.service';
+import {AppUpdateService} from "../service/appUpdate.service";
 import {AppVersion} from '@ionic-native/app-version';
 import {FileOpener} from '@ionic-native/file-opener';
 import {FileTransfer, FileTransferObject} from '@ionic-native/file-transfer';

src/pages/contact/add-block/add-block.ts

@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams, ModalController, App, ToastController} from 'ionic-angular';
 import {SelectBlockPage} from "../select-block/select-block";
 import {Response} from "@angular/http";
-import {AppService} from "../../../service/appHttpService";
+import {AppService} from "../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/contact/block-list/block-list.ts

 import {Component} from '@angular/core';
 import {IonicPage, ModalController, NavController, NavParams, ToastController} from 'ionic-angular';
-import {AppGlobal, AppService} from "../../../service/appHttpService";
+import {AppGlobal, AppService} from "../../../service/http.service";
 import {ContactModalPage} from "../contact-modal/contact-modal";
 import {PersonListPage} from "../person-list/person-list";
 import {message} from "../../../app/main";

src/pages/contact/contactList/contactList.ts

@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams, ToastController, Content} from 'ionic-angular';
 import {Response} from '@angular/http';
 import {Storage} from '@ionic/storage';
-import {AppGlobal, AppService} from '../../../service/appHttpService';
+import {AppGlobal, AppService} from '../../../service/http.service';
 
 import {ContractPersoninfoPage} from '../contract-personinfo/contract-personinfo';
 

src/pages/contact/contract-personinfo/contract-personinfo.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {Response} from '@angular/http';
-import {AppGlobal, AppService} from '../../../service/appHttpService';
+import {AppGlobal, AppService} from '../../../service/http.service';
 import { Storage } from "@ionic/storage";
 import {ContactListPage} from '../contactList/contactList';
 import {MyBlockPage} from "../my-block/my-block";

src/pages/contact/my-block/my-block.ts

 import { Component } from '@angular/core';
 import {IonicPage, NavController, NavParams, ToastController} from 'ionic-angular';
 import {Response} from "@angular/http";
-import {AppService} from "../../../service/appHttpService";
+import {AppService} from "../../../service/http.service";
 import {message} from "../../../app/main";
 
 

src/pages/contact/person-list/person-list.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams, ViewController} from 'ionic-angular';
-import {AppGlobal, AppService} from "../../../service/appHttpService";
+import {AppGlobal, AppService} from "../../../service/http.service";
 
 @Component({
     selector: 'page-person-list',

src/pages/contact/search/search.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {Response} from '@angular/http';
-import {AppGlobal, AppService} from '../../../service/appHttpService';
+import {AppGlobal, AppService} from '../../../service/http.service';
 
 @IonicPage()
 @Component({

src/pages/contact/select-block/select-block.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams, ModalController } from 'ionic-angular';
 import {ContactModalPage} from "../contact-modal/contact-modal";
 import {Response} from "@angular/http";
-import { AppService } from "../../../service/appHttpService";
+import { AppService } from "../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/activity-track/activity-search/activity-search.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import {Response} from "@angular/http";
-import {AppService,AppGlobal} from "../../../../service/appHttpService";
+import {AppService,AppGlobal} from "../../../../service/http.service";
 import {message} from "../../../../app/main";
 
 

src/pages/home/activity-track/activityTrack/activityTrack.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { IonicPage, NavController } from 'ionic-angular';
 import {  Response } from '@angular/http';
 import { JoinDetailPage } from '../joinDetail/joinDetail';
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/activity-track/block-modal/block-modal.ts

 import {Component} from '@angular/core';
 import {NavController, NavParams, ViewController} from 'ionic-angular';
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 @Component({
     selector: 'page-block-modal',

src/pages/home/activity-track/joinDetail/joinDetail.ts

@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams, AlertController, ToastController, LoadingController} from 'ionic-angular';
 
 import {Http, Response,} from '@angular/http';
-import {AppService,AppGlobal} from "../../../../service/appHttpService";
+import {AppService,AppGlobal} from "../../../../service/http.service";
 import {ReplaceApplyPage} from "../replace-apply/replace-apply";
 import {ActivitySearchPage} from "../activity-search/activity-search";
 import {message} from "../../../../app/main";

src/pages/home/activity-track/replace-apply/replace-apply.ts

@@ -4,7 +4,7 @@ import {Response} from "@angular/http";
 import {PersonPage} from "../../surveyManage/modal/person/person";
 import {BlockModalPage} from "../block-modal/block-modal";
 import {MinePage} from "../../../tabs/mine/mine";
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 
 @IonicPage()

src/pages/home/activity/activityApply/activityApply.ts

@@ -4,7 +4,7 @@ import {IonicPage, NavController, NavParams, AlertController, ToastController, E
 import { MyActivityListPage } from "../../../mine/myActivityList/myActivityList";
 import {Http, Response} from '@angular/http';
 import {Storage} from '@ionic/storage';
-import {AppService,AppGlobal} from "../../../../service/appHttpService";
+import {AppService,AppGlobal} from "../../../../service/http.service";
 import {ActivityConfirmPage} from "../activityConfirm/activityConfirm";
 import { MinePage } from "../../../tabs/mine/mine";
 import {ActivityDetailPage} from "../activityDetail/activityDetail";

src/pages/home/activity/activityConfirm/activityConfirm.ts

@@ -3,7 +3,7 @@ import {IonicPage, NavController, NavParams, AlertController, ToastController} f
 
 import {Http, Response,} from '@angular/http';
 
-import {AppService,AppGlobal} from "../../../../service/appHttpService";
+import {AppService,AppGlobal} from "../../../../service/http.service";
 import {MyActivityListPage} from "../../../mine/myActivityList/myActivityList";
 import {MinePage} from "../../../tabs/mine/mine";
 import {JoinPersonsPage} from "../../../joinPersons/joinPersons";

src/pages/home/activity/activityDetail/activityDetail.ts

@@ -3,7 +3,7 @@ import {IonicPage, NavController, NavParams, AlertController, ToastController} f
 
 import {Http, Response} from '@angular/http';
 
-import {AppService, AppGlobal} from "../../../../service/appHttpService";
+import {AppService, AppGlobal} from "../../../../service/http.service";
 import {JoinDetailPage} from '../../activity-track/joinDetail/joinDetail';
 import {BatchDetailPage} from "../batch-detail/batch-detail";
 import {TabsService} from "../../../tabs/tabs.service";

src/pages/home/activity/activityList/activityList.ts

@@ -5,7 +5,7 @@ import { Http,Response } from '@angular/http';
 import { ActivityApplyPage } from '../activityApply/activityApply'
 import { ActivityConfirmPage } from '../activityConfirm/activityConfirm';
 import {ActivityDetailPage} from "../activityDetail/activityDetail";
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 import {TabsService} from "../../../tabs/tabs.service";
 import {CommonService} from "../../../../provide/common.service";
 

src/pages/home/activity/batch-detail/batch-detail.ts

@@ -4,7 +4,7 @@ import {ActivityApplyPage} from "../activityApply/activityApply";
 import {Response} from "@angular/http";
 import { DomSanitizer } from "@angular/platform-browser";
 import {ActivityConfirmPage} from "../activityConfirm/activityConfirm";
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 declare var Swiper;
 @IonicPage()

src/pages/home/activity/order-detail/order-detail.ts

@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {Response} from "@angular/http";
 import {DomSanitizer} from "@angular/platform-browser";
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 
 @IonicPage()

src/pages/home/activity/order-edit/order-edit.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import {Response} from "@angular/http";
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 
 @IonicPage()

src/pages/home/announcement/announcementList/announcement.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {Response} from '@angular/http';
-import {AppGlobal, AppService} from '../../../../service/appHttpService';
+import {AppGlobal, AppService} from '../../../../service/http.service';
 import {AnnouncementViewPage} from '../announcementView/announcementView';
 
 @IonicPage()

src/pages/home/announcement/announcementView/announcementView.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import {  Response } from '@angular/http';
-import { AppService } from '../../../../service/appHttpService';
-import { AppGlobal } from "../../../../service/appHttpService";
+import { AppService } from '../../../../service/http.service';
+import { AppGlobal } from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/dutyAll/duty-apply/duty-apply.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/dutyAll/duty-detail/duty-detail.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/dutyAll/duty-sign-up/duty-sign-up.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 import {Geolocation} from "@ionic-native/geolocation";
 import * as moment from "moment";
 

src/pages/home/dutyAll/duty/duty.ts

@@ -5,7 +5,7 @@ import {DutyApplyPage} from "../duty-apply/duty-apply";
 import {DutyDetailPage} from "../duty-detail/duty-detail";
 import {DutySignUpPage} from "../duty-sign-up/duty-sign-up";
 import { DayConfig } from "ion2-calendar";
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 import {monthCh,weekDay} from "../../../../app/main";
 
 declare var Swiper;

src/pages/home/learn-manage/learnManage.service.ts

 import {HttpClient} from "@angular/common/http";
 import {Injectable} from "@angular/core";
 import {Observable} from "rxjs/Observable";
-import {AppGlobal} from "../../../service/appHttpService";
+import {AppGlobal} from "../../../service/http.service";
 
 @Injectable()
 export class LearnManageService{

src/pages/home/learn-manage/read-learn/read-learn.ts

 import {Component, ViewChild} from '@angular/core';
 import {IonicPage, Navbar, NavController, NavParams} from 'ionic-angular';
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/learning/learn.service.ts

 import {HttpClient} from "@angular/common/http";
 import {Injectable} from "@angular/core";
 import {Observable} from "rxjs/Observable";
-import {AppGlobal} from "../../../service/appHttpService";
+import {AppGlobal} from "../../../service/http.service";
 import {CommonService} from "../../../provide/common.service";
 
 @Injectable()

src/pages/home/learning/learning-do/learning-do.ts

 import {Component, EventEmitter, Output, ViewChild} from '@angular/core';
 import {IonicPage, Nav, Navbar, NavController, NavParams, Slides, ToastController} from 'ionic-angular';
 import {message} from "../../../../app/main";
-import {AppGlobal, AppService} from "../../../../service/appHttpService";
+import {AppGlobal, AppService} from "../../../../service/http.service";
 import {LearningResultPage} from "../learning-result/learning-result";
 import {LearnService} from "../learn.service";
 import {DatePipe} from "@angular/common";

src/pages/home/learning/learning-explain/learning-explain.ts

@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {LearningDoPage} from "../learning-do/learning-do";
 import {LearnService} from "../learn.service";
-import {AppGlobal, AppService} from "../../../../service/appHttpService";
+import {AppGlobal, AppService} from "../../../../service/http.service";
 import {CommonService} from "../../../../provide/common.service";
 
 @IonicPage()

src/pages/home/learning/review-learn/review-learn.ts

 import {Component, ViewChild} from '@angular/core';
 import {IonicPage, NavController, NavParams, Slides, ToastController} from 'ionic-angular';
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 import {message} from "../../../../app/main";
 import {LearnService} from "../learn.service";
 import {CommonService} from "../../../../provide/common.service";

src/pages/home/learning/review-result/review-result.ts

@@ -2,7 +2,7 @@ import {Component, ViewChild} from '@angular/core';
 import {IonicPage, Navbar, NavController, NavParams, Slides, ToastController} from 'ionic-angular';
 import {message} from "../../../../app/main";
 import {LearnService} from "../learn.service";
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 import {EmitService} from "../../../../provide/emit.service";
 
 @IonicPage()

src/pages/home/manageDuty/change-apply-list/change-apply-list.ts

@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {DutyApplyHandlePage} from "../duty-apply-handle/duty-apply-handle";
 import {DutyChangeDetailPage} from "../duty-change-detail/duty-change-detail";
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/manageDuty/change-apply-sure/change-apply-sure.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {ChangeApplyListPage} from "../change-apply-list/change-apply-list";
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/manageDuty/duty-apply-handle/duty-apply-handle.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import {SelectChangePersonPage} from "../select-change-person/select-change-person";
 import {SelectRelayPersonPage} from "../select-relay-person/select-relay-person";
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/manageDuty/duty-change-detail/duty-change-detail.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/manageDuty/select-change-person/select-change-person.ts

@@ -4,7 +4,7 @@ import {ChangeApplySurePage} from "../change-apply-sure/change-apply-sure";
 import {CalendarComponentOptions, DayConfig} from "ion2-calendar";
 import {DatePipe} from "@angular/common";
 import {monthCh,weekDay} from "../../../../app/main";
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/manageDuty/select-relay-person/select-relay-person.ts

@@ -3,7 +3,7 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import {ChangeApplySurePage} from "../change-apply-sure/change-apply-sure";
 import { Storage } from "@ionic/storage";
 import { DatePipe } from "@angular/common";
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/more-app/more-app.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import {Response} from "@angular/http";
-import {AppService} from "../../../service/appHttpService";
+import {AppService} from "../../../service/http.service";
 import {ListPage} from "../surveyManage/list/list";
 import {ChangeApplyListPage} from "../manageDuty/change-apply-list/change-apply-list";
 import {MySurveyPage} from "../mySurvey/my-survey/my-survey";

src/pages/home/mySurvey/my-survey/my-survey.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
-import { AppService } from "../../../../service/appHttpService";
+import { AppService } from "../../../../service/http.service";
 import { Storage } from "@ionic/storage";
 import {SurveyWritePage} from "../survey-write/survey-write";
 import {SurveyResultPage} from "../survey-result/survey-result";

src/pages/home/mySurvey/question-detail/question-detail.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams, ViewController} from 'ionic-angular';
-import { AppService } from "../../../../service/appHttpService";
+import { AppService } from "../../../../service/http.service";
 
 @Component({
     selector: 'page-question-detail',

src/pages/home/mySurvey/survery/survery.ts

 import {Component} from '@angular/core';
 import {IonicPage, LoadingController, NavController, NavParams} from 'ionic-angular';
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 import {Storage} from "@ionic/storage";
 import {Response} from "@angular/http";
 

src/pages/home/mySurvey/survey-preview/survey-preview.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 import {Storage} from "@ionic/storage";
 import {SurveyResultPage} from "../survey-result/survey-result";
 

src/pages/home/mySurvey/survey-result/survey-result.ts

 import { Component } from '@angular/core';
 import {IonicPage, ModalController, NavController, NavParams} from 'ionic-angular';
-import { AppService } from "../../../../service/appHttpService";
+import { AppService } from "../../../../service/http.service";
 import { message } from "../../../../app/main";
 import { PersonListPage } from "../../../contact/person-list/person-list";
 import {QuestionDetailPage} from "../question-detail/question-detail";

src/pages/home/mySurvey/survey-write/survey-write.ts

 import {Component, ViewChild} from '@angular/core';
 import {IonicPage, Navbar, NavController, NavParams} from 'ionic-angular';
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 
 @IonicPage()

src/pages/home/report/chooseAddress/chooseAddress.ts

@@ -2,7 +2,7 @@ import { Component, ViewChild } from '@angular/core';
 import { IonicPage, NavController, NavParams,  Content, Slides } from 'ionic-angular';
 import {  Response } from '@angular/http';
 import { Storage } from '@ionic/storage';
-import { AppService } from '../../../../service/appHttpService';
+import { AppService } from '../../../../service/http.service';
 
 import {OutGoingReportDetailPage} from "../outGoingReportDetail/outGoingReportDetail";
 

src/pages/home/report/outGoingReport/outGoingReport.ts

@@ -3,7 +3,7 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import {  Response } from '@angular/http';
 import { Storage } from '@ionic/storage';
 import { OutGoingReportEditPage } from '../outGoingReportEdit/outGoingReportEdit';
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/report/outGoingReportDetail/outGoingReportDetail.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import { Response } from '@angular/http';
 import { Storage } from '@ionic/storage';
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 import {ChooseAddressPage} from "../chooseAddress/chooseAddress";
 import { OutGoingReportEditPage } from '../outGoingReportEdit/outGoingReportEdit';
 

src/pages/home/report/outGoingReportEdit/outGoingReportEdit.ts

@@ -3,7 +3,7 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {Response} from '@angular/http';
 import {Storage} from '@ionic/storage';
 import {OutGoingReportDetailPage} from '../outGoingReportDetail/outGoingReportDetail';
-import {AppService,AppGlobal} from "../../../../service/appHttpService";
+import {AppService,AppGlobal} from "../../../../service/http.service";
 import {MyReportPage} from "../../../mine/myReport/myReport";
 import {MinePage} from "../../../tabs/mine/mine";
 

src/pages/home/report/outGoingReportView/outGoingReportView.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams} from 'ionic-angular';
 import { Response } from '@angular/http';
 import { Storage } from '@ionic/storage';
-import {AppService,AppGlobal} from "../../../../service/appHttpService";
+import {AppService,AppGlobal} from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/report/report-search/report-search.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {Storage} from "@ionic/storage";
-import {AppService,AppGlobal} from "../../../../service/appHttpService";
+import {AppService,AppGlobal} from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/report/reportDetail/reportDetail.ts

@@ -4,7 +4,7 @@ import {IonicPage, NavController, NavParams, AlertController, ToastController} f
 import {Http, Response} from '@angular/http';
 import {Storage} from '@ionic/storage';
 import {ReportSearchPage} from "../report-search/report-search";
-import {AppService,AppGlobal} from "../../../../service/appHttpService";
+import {AppService,AppGlobal} from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/report/reportTrack/reportTrack.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { IonicPage, NavController } from 'ionic-angular';
 import { Response } from '@angular/http';
 import { ReportDetailPage } from '../reportDetail/reportDetail';
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/surveyManage/item/create/create.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams, ToastController} from 'ionic-angular';
 import {EditPage} from "../edit/edit";
-import {AppService} from "../../../../../service/appHttpService";
+import {AppService} from "../../../../../service/http.service";
 import {message} from "../../../../../app/main";
 
 @IonicPage()

src/pages/home/surveyManage/item/desicr/desicr.ts

@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {IonicPage, ModalController, NavController, NavParams, ToastController} from 'ionic-angular';
 import {EditPage} from "../edit/edit";
 import {PersonPage} from "../../modal/person/person";
-import {AppService} from "../../../../../service/appHttpService";
+import {AppService} from "../../../../../service/http.service";
 import {message} from "../../../../../app/main";
 
 

src/pages/home/surveyManage/item/detail/detail.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
-import {AppService} from "../../../../../service/appHttpService";
+import {AppService} from "../../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/surveyManage/item/edit/edit.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams, ModalController, ToastController, AlertController} from 'ionic-angular';
 import {SelectTypePage} from "../select-type/select-type";
-import {AppService} from "../../../../../service/appHttpService";
+import {AppService} from "../../../../../service/http.service";
 import {message} from "../../../../../app/main";
 import {CreatePage} from "../create/create";
 import {DesicrPage} from "../desicr/desicr";

src/pages/home/surveyManage/item/select-type/select-type.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import {CreatePage} from "../create/create";
-import {AppService} from "../../../../../service/appHttpService";
+import {AppService} from "../../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/surveyManage/item/set/set.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
-import {AppService} from "../../../../../service/appHttpService";
+import {AppService} from "../../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/home/surveyManage/list/list.ts

@@ -3,7 +3,7 @@ import {AlertController, IonicPage, NavController, NavParams, Slides} from 'ioni
 import {DesicrPage} from "../item/desicr/desicr";
 import {EditPage} from "../item/edit/edit";
 import {DetailPage} from "../item/detail/detail";
-import {AppService} from "../../../../service/appHttpService";
+import {AppService} from "../../../../service/http.service";
 import {SurveyResultPage} from "../../mySurvey/survey-result/survey-result";
 
 declare var Swiper;

src/pages/home/surveyManage/modal/person/person.ts

 import { Component } from '@angular/core';
 import {IonicPage, NavController, NavParams, ViewController} from 'ionic-angular';
 import {Response} from "@angular/http";
-import {AppService} from "../../../../../service/appHttpService";
+import {AppService} from "../../../../../service/http.service";
 
 @Component({
   selector: 'page-person',

src/pages/joinPersons/joinPersons.ts

@@ -2,8 +2,7 @@ import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams, AlertController, ToastController } from 'ionic-angular';
 
 import { Http, Response } from '@angular/http';
-
-import { AppService } from '../../service/appHttpService';
+import { AppService } from "../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/login/login.service.ts

 import {HttpClient} from "@angular/common/http";
 import {Injectable} from "@angular/core";
 import {Observable} from "rxjs/Observable";
-import {AppGlobal} from "../../service/appHttpService";
+import {AppGlobal} from "../../service/http.service";
 
 @Injectable()
 export class LoginService{

src/pages/login/login.ts

@@ -5,7 +5,7 @@ import { TabsPage } from '../tabs/tabs';
 import { Http, Response } from '@angular/http';
 import { Storage } from '@ionic/storage';
 
-import { AppService } from '../../service/appHttpService';
+import { AppService } from '../../service/http.service';
 import {LoginService} from "./login.service";
 
 

src/pages/mine/my-duty/my-duty.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
-import {AppService} from "../../../service/appHttpService";
+import {AppService} from "../../../service/http.service";
 
 
 @IonicPage()

src/pages/mine/myActivityList/myActivityList.ts

@@ -3,7 +3,7 @@ import { IonicPage, NavController, Slides } from 'ionic-angular';
 
 import {  Response } from '@angular/http';
 
-import { AppService } from '../../../service/appHttpService';
+import { AppService } from '../../../service/http.service';
 import { ActivityConfirmPage } from "../../home/activity/activityConfirm/activityConfirm";
 import { OrderDetailPage } from "../../home/activity/order-detail/order-detail";
 import { OrderEditPage } from "../../home/activity/order-edit/order-edit";

src/pages/mine/myReport/myReport.ts

@@ -3,7 +3,7 @@ import {IonicPage, NavController, NavParams, Slides} from 'ionic-angular';
 
 import {Response} from '@angular/http';
 
-import {AppService} from '../../../service/appHttpService';
+import {AppService} from '../../../service/http.service';
 import {OutGoingReportEditPage} from "../../home/report/outGoingReportEdit/outGoingReportEdit";
 import {OutGoingReportViewPage} from "../../home/report/outGoingReportView/outGoingReportView";
 

src/pages/mine/operation-list/operation-list.ts

 
 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
-import { AppService } from '../../../service/appHttpService';
+import { AppService } from '../../../service/http.service';
 import { Response } from '@angular/http';
 
 @IonicPage()

src/pages/mine/person/editPersonInfo/editPersonInfo.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams, ToastController } from 'ionic-angular';
 
 import { Storage } from '@ionic/storage';
-import { AppService } from "../../../../service/appHttpService";
+import { AppService } from "../../../../service/http.service";
 
 @IonicPage()
 @Component({

src/pages/mine/person/modifyPassword/modifyPassword.ts

@@ -4,7 +4,7 @@ import { IonicPage, NavController, NavParams, AlertController, LoadingController
 import { Http, Response } from '@angular/http';
 import { Storage } from '@ionic/storage';
 
-import { AppService } from '../../../../service/appHttpService';
+import { AppService } from '../../../../service/http.service';
 
 
 import { LoginPage } from '../../../login/login';

src/pages/mine/person/personInfo/personInfo.ts

@@ -3,7 +3,7 @@ import {IonicPage, NavController, ToastController} from 'ionic-angular';
 
 import {ModifyPasswordPage} from "../modifyPassword/modifyPassword";
 import {Storage} from '@ionic/storage';
-import {AppGlobal, AppService} from "../../../../service/appHttpService";
+import {AppGlobal, AppService} from "../../../../service/http.service";
 import {EditPersonInfoPage} from '../editPersonInfo/editPersonInfo';
 
 @IonicPage()

src/pages/tabs/contact/contact.ts

@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {AlertController, NavController, NavParams, ToastController} from 'ionic-angular';
 import {Response} from '@angular/http';
 import {Storage} from '@ionic/storage';
-import {AppService} from '../../../service/appHttpService';
+import {AppService} from '../../../service/http.service';
 
 import {SearchPage} from '../../contact/search/search';
 import {ContactListPage} from '../../contact/contactList/contactList';

src/pages/tabs/home/home.ts

@@ -2,7 +2,7 @@ import {Component, ViewChild} from '@angular/core';
 import {NavController, IonicPage, Slides} from 'ionic-angular';
 import {ActivityListPage} from "../../home/activity/activityList/activityList";
 import {Http, Response} from '@angular/http';
-import {AppService, AppGlobal} from '../../../service/appHttpService';
+import {AppService, AppGlobal} from '../../../service/http.service';
 import {Calendar} from '@ionic-native/calendar';
 import {ActivityApplyPage} from "../../home/activity/activityApply/activityApply";
 import {ActivityDetailPage} from "../../home/activity/activityDetail/activityDetail";

src/pages/tabs/mine/mine.ts

 import {Component} from '@angular/core';
 import {App, NavController, AlertController, NavParams} from 'ionic-angular';
 import {LoginPage} from '../../login/login';
-import {AppGlobal, AppService} from '../../../service/appHttpService';
+import {AppGlobal, AppService} from '../../../service/http.service';
 import {PersonInfoPage} from '../../mine/person/personInfo/personInfo';
 import {MyActivityListPage} from '../../mine/myActivityList/myActivityList';
 import {MyReportPage} from '../../mine/myReport/myReport';
@@ -11,7 +11,7 @@ import {Response} from '@angular/http';
 import {Storage} from '@ionic/storage';
 
 import {AppVersion} from '@ionic-native/app-version';
-import {AppUpdateService} from '../../../service/appUpdateService';
+import {AppUpdateService} from "../../../service/appUpdate.service";
 import {MyDutyPage} from "../../mine/my-duty/my-duty";
 import {MySurveyPage} from "../../home/mySurvey/my-survey/my-survey";
 

src/pages/tabs/notice/notice.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import {Response} from "@angular/http";
-import {AppService} from "../../../service/appHttpService";
+import {AppService} from "../../../service/http.service";
 import {Badge} from "@ionic-native/badge";
 
 

src/pages/tabs/tabs.service.ts

@@ -2,7 +2,7 @@ import {Injectable} from "@angular/core";
 import {HttpClient} from "@angular/common/http";
 import {Http} from "@angular/http";
 import {Observable} from "rxjs/Observable";
-import {AppGlobal} from "../../service/appHttpService";
+import {AppGlobal} from "../../service/http.service";
 import {CommonService} from "../../provide/common.service";
 
 @Injectable()

src/pages/tabs/tabs.ts

@@ -6,7 +6,7 @@ import { HomePage } from './home/home';
 import { MinePage } from './mine/mine';
 
 import { Storage } from '@ionic/storage';
-import { AppService, AppGlobal } from '../../service/appHttpService';
+import { AppService, AppGlobal } from '../../service/http.service';
 import {NoticePage} from "./notice/notice";
 import {BackButtonService} from "../../provide/backButton.service";
 

src/pages/version/version.ts

 import {Component} from '@angular/core';
 import {AlertController, IonicPage, NavController, NavParams} from 'ionic-angular';
-import {AppService} from '../../service/appHttpService';
+import {AppService} from '../../service/http.service';
 import {AppVersion} from '@ionic-native/app-version';
-import {AppUpdateService} from '../../service/appUpdateService';
+import {AppUpdateService} from "../../service/appUpdate.service";
 import {Storage} from "@ionic/storage";
 import {LoginPage} from "../login/login";
 import {HomePage} from "../tabs/home/home";

src/provide/common.service.ts

 import {Injectable} from "@angular/core";
 import {AlertController, ToastController} from "ionic-angular";
-import {AppGlobal} from "../service/appHttpService";
+import {AppGlobal} from "../service/http.service";
 import {File} from "@ionic-native/file";
 import {FileOpener} from "@ionic-native/file-opener";
 

src/service/appUpdate.service.ts

@@ -4,7 +4,7 @@ import { FileTransfer, FileTransferObject } from '@ionic-native/file-transfer';
 import { File } from '@ionic-native/file';
 import { Injectable } from '@angular/core';
 import { AlertController } from 'ionic-angular';
-import { AppService, AppGlobal } from './appHttpService'
+import { AppService, AppGlobal } from './http.service'
 
 @Injectable()
 export class AppUpdateService {