From d8ae182023b3308cb0850dd4907ec5082faf18f4 Mon Sep 17 00:00:00 2001
From: jiangyuwei666 <739843128@qq.com>
Date: Fri, 2 Nov 2018 20:44:47 +0800
Subject: [PATCH] web server done

---
 .gitignore => NutritionMaster/.gitignore      |   0
 .../.idea}/codeStyles/Project.xml             |   0
 .../.idea}/runConfigurations.xml              |   0
 README.md => NutritionMaster/README.md        |   0
 {app => NutritionMaster/app}/.gitignore       |   0
 {app => NutritionMaster/app}/build.gradle     |   0
 .../app}/libs/YoudaoBase.jar                  | Bin
 .../app}/libs/YoudaoCnDictOffline.jar         | Bin
 .../app}/libs/YoudaoTranslateOffline.jar      | Bin
 .../app}/libs/YoudaoTranslateOnline.jar       | Bin
 .../app}/libs/arm64-v8a/libdict-parser.so     | Bin
 .../app}/libs/armeabi-v7a/libdict-parser.so   | Bin
 .../app}/libs/armeabi/libdict-parser.so       | Bin
 .../app}/libs/mips/libdict-parser.so          | Bin
 .../app}/libs/mips64/libdict-parser.so        | Bin
 .../app}/libs/x86/libdict-parser.so           | Bin
 .../app}/libs/x86_64/libdict-parser.so        | Bin
 .../app}/proguard-rules.pro                   |   0
 .../ExampleInstrumentedTest.java              |   0
 .../app}/src/main/AndroidManifest.xml         |   0
 .../nutritionmaster/NutritionMaster.java      |   0
 .../nutritionmaster/adapter/CardAdapter.java  |   0
 .../nutritionmaster/adapter/CardHolder.java   |   0
 .../adapter/CustomizationAdapter.java         |   0
 .../adapter/CustomizationHolder.java          |   0
 .../nutritionmaster/adapter/DishHolder.java   |   0
 .../adapter/HistoryAdapter.java               |   0
 .../adapter/HistoryHolder.java                |   0
 .../adapter/HomePagerAdapter.java             |   0
 .../nutritionmaster/adapter/IllAdapter.java   |   0
 .../adapter/IllnessHolder.java                |   0
 .../adapter/MakeStepAdapter.java              |   0
 .../adapter/MakeStepHolder.java               |   0
 .../adapter/MaterialAdapter.java              |   0
 .../adapter/MaterialHolder.java               |   0
 .../adapter/MaterialResultAdapter.java        |   0
 .../adapter/MaterialResultHolder.java         |   0
 .../adapter/PickerAdapter.java                |   0
 .../nutritionmaster/adapter/PickerHolder.java |   0
 .../adapter/RecommendAdapter.java             |   0
 .../adapter/ResultListAdapter.java            |   0
 .../adapter/ResultListHolder.java             |   0
 .../nutritionmaster/base/BaseActivity.java    |   0
 .../nutritionmaster/base/BaseDialog.java      |   0
 .../nutritionmaster/base/BaseFragment.java    |   0
 .../nutritionmaster/bean/ClassifyResult.java  |   0
 .../nutritionmaster/bean/DailyCard.java       |   0
 .../nutritionmaster/bean/Element.java         |   0
 .../nutritionmaster/bean/FoodMaterial.java    |   0
 .../nutritionmaster/bean/FoodMenu.java        |   0
 .../nutritionmaster/bean/FoodMenuLight.java   |   0
 .../nutritionmaster/bean/History.java         |   0
 .../nutritionmaster/bean/Illness.java         |   0
 .../nutritionmaster/bean/Material.java        |   0
 .../bean/MenuClassification.java              |   0
 .../nutritionmaster/bean/MyUser.java          |   0
 .../nutritionmaster/bean/Occupation.java      |   0
 .../nutritionmaster/bean/Physique.java        |   0
 .../nutritionmaster/bean/RecommendFood.java   |   0
 .../nutritionmaster/bean/ResultList.java      |   0
 .../nutritionmaster/bean/Trick.java           |   0
 .../nutritionmaster/camera/CameraPreview.java |   0
 .../camera/ClassifierCamera.java              |   0
 .../cardconfig/CardConfig.java                |   0
 .../cardconfig/CardItemTouchCallBack.java     |   0
 .../cardconfig/SwipeCardLayoutManager.java    |   0
 .../nutritionmaster/modules/MainActivity.java |   0
 .../RecipeActivity/RecipeActivity.java        |   0
 .../AddInformationActivity.java               |   0
 .../addinformation/AddPhysiqueActivity.java   |   0
 .../classifyresult/DishResultActivity.java    |   0
 .../MaterialResultActivity.java               |   0
 .../historysearch/HistoryActivity.java        |   0
 .../information/InformationActivity.java      |   0
 .../modules/login/LoginActivity.java          |   0
 .../BodyInformationFragment.java              |   0
 .../bodyinformation/ElementDialog.java        |   0
 .../customization/CustomizationActivity.java  |   0
 .../customization/CustomizationFragment.java  |   0
 .../recommend/RecommendFragment.java          |   0
 .../nutritionmaster/step/StepStarter.java     |   0
 .../nutritionmaster/ui/InformationDialog.java |   0
 .../nutritionmaster/ui/NoScrollViewPager.java |   0
 .../nutritionmaster/utils/CalculateUtils.java |   0
 .../nutritionmaster/utils/ChartDrawer.java    |   0
 .../nutritionmaster/utils/ConstantUtils.java  |   0
 .../utils/MaterialClassifier.java             |   0
 .../nutritionmaster/utils/MessageUtils.java   |   0
 .../utils/PermissionUtils.java                |   0
 .../nutritionmaster/utils/UiUtils.java        |   0
 .../nutritionmaster/utils/WebUtil.java        |   0
 .../main/res/drawable-v24/ic_drawer_home.png  | Bin
 .../drawable-v24/ic_launcher_foreground.xml   |   0
 .../src/main/res/drawable-v24/selector.xml    |   0
 .../app}/src/main/res/drawable/body_bg.png    | Bin
 .../app}/src/main/res/drawable/camera_bg.jpg  | Bin
 .../src/main/res/drawable/food_material.jpg   | Bin
 .../app}/src/main/res/drawable/food_test.jpg  | Bin
 .../app}/src/main/res/drawable/foods.jpg      | Bin
 .../app}/src/main/res/drawable/friday.jpg     | Bin
 .../app}/src/main/res/drawable/ic.png         | Bin
 .../src/main/res/drawable/ic_add_recipe.xml   |   0
 .../src/main/res/drawable/ic_back_button.xml  |   0
 .../res/drawable/ic_back_button_white.xml     |   0
 .../app}/src/main/res/drawable/ic_bmi.xml     |   0
 .../app}/src/main/res/drawable/ic_calorie.xml |   0
 .../app}/src/main/res/drawable/ic_copy.xml    |   0
 .../src/main/res/drawable/ic_data_add.xml     |   0
 .../main/res/drawable/ic_defualt_avatar.xml   |   0
 .../src/main/res/drawable/ic_dialog_age.xml   |   0
 .../main/res/drawable/ic_dialog_height.xml    |   0
 .../src/main/res/drawable/ic_dialog_sex.xml   |   0
 .../main/res/drawable/ic_dialog_weight.xml    |   0
 .../src/main/res/drawable/ic_exchange.xml     |   0
 .../drawable/ic_exchange_customization.xml    |   0
 .../app}/src/main/res/drawable/ic_fat.xml     |   0
 .../app}/src/main/res/drawable/ic_flavour.xml |   0
 .../main/res/drawable/ic_fortune_cookie.xml   |   0
 .../app}/src/main/res/drawable/ic_height.xml  |   0
 .../app}/src/main/res/drawable/ic_ill.xml     |   0
 .../main/res/drawable/ic_ill_add_button.xml   |   0
 .../src/main/res/drawable/ic_infor_weight.xml |   0
 .../res/drawable/ic_launcher_background.xml   |   0
 .../src/main/res/drawable/ic_occupation.xml   |   0
 .../app}/src/main/res/drawable/ic_ok.xml      |   0
 .../app}/src/main/res/drawable/ic_power.xml   |   0
 .../app}/src/main/res/drawable/ic_protein.xml |   0
 .../app}/src/main/res/drawable/ic_record.xml  |   0
 .../src/main/res/drawable/ic_right_arch.xml   |   0
 .../app}/src/main/res/drawable/ic_score.xml   |   0
 .../app}/src/main/res/drawable/ic_search.xml  |   0
 .../app}/src/main/res/drawable/ic_step.xml    |   0
 .../app}/src/main/res/drawable/ic_sugar.xml   |   0
 .../src/main/res/drawable/ic_take_photo.xml   |   0
 .../app}/src/main/res/drawable/ic_weight.xml  |   0
 .../app}/src/main/res/drawable/icon_black.xml |   0
 .../src/main/res/drawable/icon_colorful.png   | Bin
 .../app}/src/main/res/drawable/monday.jpg     | Bin
 .../src/main/res/drawable/recommend_bg.jpg    | Bin
 .../app}/src/main/res/drawable/result_bg.png  | Bin
 .../app}/src/main/res/drawable/saturday.jpg   | Bin
 .../app}/src/main/res/drawable/sunday.jpg     | Bin
 .../src/main/res/drawable/test_avatar.jpg     | Bin
 .../app}/src/main/res/drawable/thursday.jpg   | Bin
 .../app}/src/main/res/drawable/tuesday.jpg    | Bin
 .../app}/src/main/res/drawable/wednesday.jpg  | Bin
 .../app}/src/main/res/layout/activity_add.xml |   0
 .../res/layout/activity_add_information.xml   |   0
 .../res/layout/activity_customization.xml     |   0
 .../main/res/layout/activity_dish_result.xml  |   0
 .../src/main/res/layout/activity_history.xml  |   0
 .../main/res/layout/activity_information.xml  |   0
 .../src/main/res/layout/activity_login.xml    |   0
 .../src/main/res/layout/activity_main.xml     |   0
 .../res/layout/activity_material_result.xml   |   0
 .../src/main/res/layout/activity_recipe.xml   |   0
 .../res/layout/add_information_activity.xml   |   0
 .../app}/src/main/res/layout/add_item.xml     |   0
 .../res/layout/body_information_fragment.xml  |   0
 .../src/main/res/layout/cameras_layout.xml    |   0
 .../app}/src/main/res/layout/card_item.xml    |   0
 .../src/main/res/layout/customization.xml     |   0
 .../main/res/layout/customization_item.xml    |   0
 .../app}/src/main/res/layout/dish_item.xml    |   0
 .../src/main/res/layout/dish_result_item.xml  |   0
 .../src/main/res/layout/element_dialog.xml    |   0
 .../app}/src/main/res/layout/ill_item.xml     |   0
 .../src/main/res/layout/make_step_item.xml    |   0
 .../src/main/res/layout/material_item.xml     |   0
 .../main/res/layout/material_result_item.xml  |   0
 .../normal_recommend_fragment_layout.xml      |   0
 .../app}/src/main/res/layout/picker_item.xml  |   0
 .../src/main/res/layout/recommend_head.xml    |   0
 .../main/res/layout/recommend_item_detail.xml |   0
 .../main/res/layout/recommend_item_middle.xml |   0
 .../app}/src/main/res/layout/score.xml        |   0
 .../app}/src/main/res/menu/menu_main.xml      |   0
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   0
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   0
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin
 .../main/res/mipmap-xxhdpi/camera_button.png  | Bin
 .../mipmap-xxhdpi/camera_button_pressed.png   | Bin
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin
 .../app}/src/main/res/mipmap-xxxhdpi/ic.png   | Bin
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin
 .../app}/src/main/res/values/arrays.xml       |   0
 .../app}/src/main/res/values/colors.xml       |   0
 .../app}/src/main/res/values/dimens.xml       |   0
 .../app}/src/main/res/values/strings.xml      |   0
 .../app}/src/main/res/values/styles.xml       |   0
 .../nutritionmaster/ExampleUnitTest.java      |   0
 build.gradle => NutritionMaster/build.gradle  |   0
 {datas => NutritionMaster/datas}/11111.csv    |   0
 .../datas}/menu_classification (1).csv        |   0
 .../datas}/menu_classification.csv            |   0
 .../datas}/new_menu_names.csv                 |   0
 .../datas}/occupation_classification.csv      | Bin
 .../datas}/physique (1).xlsx                  | Bin
 {datas => NutritionMaster/datas}/元素效果.txt |   0
 {datas => NutritionMaster/datas}/早中晚餐.rar | Bin
 {datas => NutritionMaster/datas}/病).csv      |   0
 .../datas}/职业 （bmi分类）.xlsx              | Bin
 {datas => NutritionMaster/datas}/职业.xlsx    | Bin
 {datas => NutritionMaster/datas}/营养.txt     |   0
 .../datas}/营养标准.xlsx                      | Bin
 .../gradle.properties                         |   0
 .../gradle}/wrapper/gradle-wrapper.jar        | Bin
 .../gradle}/wrapper/gradle-wrapper.properties |   0
 gradlew => NutritionMaster/gradlew            |   0
 gradlew.bat => NutritionMaster/gradlew.bat    |   0
 .../settings.gradle                           |   0
 .../todaystepcounterlib}/.gitignore           |   0
 .../todaystepcounterlib}/build.gradle         |   0
 .../libs/microlog4android-1.0.0.jar           | Bin
 .../todaystepcounterlib}/proguard-rules.pro   |   0
 .../src/main/AndroidManifest.xml              |   0
 .../today/step/lib/ISportStepInterface.aidl   |   0
 .../src/main/assets/microlog.properties       |   0
 .../today/step/lib/BaseClickBroadcast.java    |   0
 .../java/com/today/step/lib/DateUtils.java    |   0
 .../today/step/lib/ITodayStepDBHelper.java    |   0
 .../today/step/lib/JobSchedulerService.java   |   0
 .../main/java/com/today/step/lib/Logger.java  |   0
 .../com/today/step/lib/Microlog4Android.java  |   0
 .../today/step/lib/OnStepCounterListener.java |   0
 .../com/today/step/lib/PreferencesHelper.java |   0
 .../today/step/lib/SportStepJsonUtils.java    |   0
 .../today/step/lib/StepAlertManagerUtils.java |   0
 .../today/step/lib/TodayStepAlertReceive.java |   0
 .../lib/TodayStepBootCompleteReceiver.java    |   0
 .../com/today/step/lib/TodayStepCounter.java  |   0
 .../com/today/step/lib/TodayStepDBHelper.java |   0
 .../com/today/step/lib/TodayStepData.java     |   0
 .../com/today/step/lib/TodayStepDetector.java |   0
 .../com/today/step/lib/TodayStepManager.java  |   0
 .../com/today/step/lib/TodayStepService.java  |   0
 .../step/lib/TodayStepShutdownReceiver.java   |   0
 .../com/today/step/lib/WakeLockUtils.java     |   0
 .../ic_notification_default.png               | Bin
 .../src/main/res/values/strings.xml           |   0
 .../MyRobolectricTestRunner.java              |   0
 .../TodayStepDBHelperTest.java                |   0
 文档.md => NutritionMaster/文档.md            |   0
 .../服务器文档.md                             |   0
 .../.idea/NutritionMasterSpider.iml           |  12 +
 NutritionMasterSpider/.idea/misc.xml          |   4 +
 NutritionMasterSpider/.idea/modules.xml       |   8 +
 NutritionMasterSpider/.idea/workspace.xml     | 648 ++++++++++++++++++
 NutritionMasterSpider/bao_cheat.py            |  44 ++
 NutritionMasterSpider/baobspider.py           | 133 ++++
 NutritionMasterSpider/baospider.py            |  61 ++
 NutritionMasterSpider/bbspider.py             |  92 +++
 NutritionMasterSpider/demo/__init__.py        |   0
 NutritionMasterSpider/demo/get_name.py        |  13 +
 NutritionMasterSpider/demo/test.py            |   0
 .../demo/xinshipu_selenium.py                 |  32 +
 NutritionMasterSpider/demo/食材.py            | 102 +++
 NutritionMasterSpider/functions/__init__.py   |   0
 .../__pycache__/__init__.cpython-36.pyc       | Bin 0 -> 162 bytes
 .../__pycache__/baidu_api.cpython-36.pyc      | Bin 0 -> 1955 bytes
 .../__pycache__/get_proxy.cpython-36.pyc      | Bin 0 -> 1933 bytes
 .../__pycache__/get_selector.cpython-36.pyc   | Bin 0 -> 436 bytes
 .../__pycache__/send_request.cpython-36.pyc   | Bin 0 -> 2427 bytes
 .../__pycache__/wtrte_csv.cpython-36.pyc      | Bin 0 -> 865 bytes
 NutritionMasterSpider/functions/baidu_api.py  |  82 +++
 NutritionMasterSpider/functions/get_proxy.py  |  51 ++
 .../functions/get_selector.py                 |   9 +
 .../functions/send_request.py                 |  87 +++
 NutritionMasterSpider/functions/wtrte_csv.py  |  19 +
 NutritionMasterSpider/info_add.py             |  72 ++
 NutritionMasterSpider/nutrition_add.py        |  75 ++
 NutritionMasterSpider/reget_image_url.py      |  87 +++
 NutritionMasterSpider/test.py                 |   0
 NutritionMasterSpider/ttmeishi.py             | 162 +++++
 NutritionMasterSpider/write_calorie.py        |  73 ++
 NutritionMasterSpider/xinshipu.py             |  86 +++
 NutritionMasterSpider/xzs/__init__.py         |   0
 NutritionMasterSpider/xzs/get_trick.py        |  93 +++
 NutritionMasterWeb                            |   1 +
 286 files changed, 2046 insertions(+)
 rename .gitignore => NutritionMaster/.gitignore (100%)
 rename {.idea => NutritionMaster/.idea}/codeStyles/Project.xml (100%)
 rename {.idea => NutritionMaster/.idea}/runConfigurations.xml (100%)
 rename README.md => NutritionMaster/README.md (100%)
 rename {app => NutritionMaster/app}/.gitignore (100%)
 rename {app => NutritionMaster/app}/build.gradle (100%)
 rename {app => NutritionMaster/app}/libs/YoudaoBase.jar (100%)
 rename {app => NutritionMaster/app}/libs/YoudaoCnDictOffline.jar (100%)
 rename {app => NutritionMaster/app}/libs/YoudaoTranslateOffline.jar (100%)
 rename {app => NutritionMaster/app}/libs/YoudaoTranslateOnline.jar (100%)
 rename {app => NutritionMaster/app}/libs/arm64-v8a/libdict-parser.so (100%)
 rename {app => NutritionMaster/app}/libs/armeabi-v7a/libdict-parser.so (100%)
 rename {app => NutritionMaster/app}/libs/armeabi/libdict-parser.so (100%)
 rename {app => NutritionMaster/app}/libs/mips/libdict-parser.so (100%)
 rename {app => NutritionMaster/app}/libs/mips64/libdict-parser.so (100%)
 rename {app => NutritionMaster/app}/libs/x86/libdict-parser.so (100%)
 rename {app => NutritionMaster/app}/libs/x86_64/libdict-parser.so (100%)
 rename {app => NutritionMaster/app}/proguard-rules.pro (100%)
 rename {app => NutritionMaster/app}/src/androidTest/java/com/example/ninefourone/nutritionmaster/ExampleInstrumentedTest.java (100%)
 rename {app => NutritionMaster/app}/src/main/AndroidManifest.xml (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationAdapter.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationHolder.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/DishHolder.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryAdapter.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryHolder.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllAdapter.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllnessHolder.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepAdapter.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepHolder.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialAdapter.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialHolder.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultAdapter.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultHolder.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerAdapter.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerHolder.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListAdapter.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListHolder.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseDialog.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/ClassifyResult.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/DailyCard.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/Element.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMaterial.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenu.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenuLight.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/History.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/Illness.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/MenuClassification.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/Occupation.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/Physique.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/ResultList.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/Trick.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/camera/CameraPreview.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardConfig.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardItemTouchCallBack.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/SwipeCardLayoutManager.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddInformationActivity.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/DishResultActivity.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/MaterialResultActivity.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/historysearch/HistoryActivity.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/information/InformationActivity.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/login/LoginActivity.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/ElementDialog.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/step/StepStarter.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/ui/InformationDialog.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/ui/NoScrollViewPager.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/utils/ChartDrawer.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/utils/MaterialClassifier.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/utils/MessageUtils.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/utils/PermissionUtils.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/utils/UiUtils.java (100%)
 rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable-v24/ic_drawer_home.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable-v24/selector.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/body_bg.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/camera_bg.jpg (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/food_material.jpg (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/food_test.jpg (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/foods.jpg (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/friday.jpg (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_add_recipe.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_back_button.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_back_button_white.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_bmi.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_calorie.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_copy.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_data_add.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_defualt_avatar.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_dialog_age.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_dialog_height.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_dialog_sex.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_dialog_weight.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_exchange.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_exchange_customization.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_fat.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_flavour.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_fortune_cookie.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_height.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_ill.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_ill_add_button.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_infor_weight.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_launcher_background.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_occupation.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_ok.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_power.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_protein.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_record.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_right_arch.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_score.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_search.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_step.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_sugar.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_take_photo.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/ic_weight.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/icon_black.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/icon_colorful.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/monday.jpg (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/recommend_bg.jpg (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/result_bg.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/saturday.jpg (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/sunday.jpg (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/test_avatar.jpg (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/thursday.jpg (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/tuesday.jpg (100%)
 rename {app => NutritionMaster/app}/src/main/res/drawable/wednesday.jpg (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/activity_add.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/activity_add_information.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/activity_customization.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/activity_dish_result.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/activity_history.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/activity_information.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/activity_login.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/activity_main.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/activity_material_result.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/activity_recipe.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/add_information_activity.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/add_item.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/body_information_fragment.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/cameras_layout.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/card_item.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/customization.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/customization_item.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/dish_item.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/dish_result_item.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/element_dialog.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/ill_item.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/make_step_item.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/material_item.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/material_result_item.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/normal_recommend_fragment_layout.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/picker_item.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/recommend_head.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/recommend_item_detail.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/recommend_item_middle.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/layout/score.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/menu/menu_main.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/mipmap-hdpi/ic_launcher.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/mipmap-mdpi/ic_launcher.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/mipmap-xxhdpi/camera_button.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/mipmap-xxhdpi/camera_button_pressed.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/mipmap-xxxhdpi/ic.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%)
 rename {app => NutritionMaster/app}/src/main/res/values/arrays.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/values/colors.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/values/dimens.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/values/strings.xml (100%)
 rename {app => NutritionMaster/app}/src/main/res/values/styles.xml (100%)
 rename {app => NutritionMaster/app}/src/test/java/com/example/ninefourone/nutritionmaster/ExampleUnitTest.java (100%)
 rename build.gradle => NutritionMaster/build.gradle (100%)
 rename {datas => NutritionMaster/datas}/11111.csv (100%)
 rename {datas => NutritionMaster/datas}/menu_classification (1).csv (100%)
 rename {datas => NutritionMaster/datas}/menu_classification.csv (100%)
 rename {datas => NutritionMaster/datas}/new_menu_names.csv (100%)
 rename {datas => NutritionMaster/datas}/occupation_classification.csv (100%)
 rename {datas => NutritionMaster/datas}/physique (1).xlsx (100%)
 rename {datas => NutritionMaster/datas}/元素效果.txt (100%)
 rename {datas => NutritionMaster/datas}/早中晚餐.rar (100%)
 rename {datas => NutritionMaster/datas}/病).csv (100%)
 rename {datas => NutritionMaster/datas}/职业 （bmi分类）.xlsx (100%)
 rename {datas => NutritionMaster/datas}/职业.xlsx (100%)
 rename {datas => NutritionMaster/datas}/营养.txt (100%)
 rename {datas => NutritionMaster/datas}/营养标准.xlsx (100%)
 rename gradle.properties => NutritionMaster/gradle.properties (100%)
 rename {gradle => NutritionMaster/gradle}/wrapper/gradle-wrapper.jar (100%)
 rename {gradle => NutritionMaster/gradle}/wrapper/gradle-wrapper.properties (100%)
 rename gradlew => NutritionMaster/gradlew (100%)
 rename gradlew.bat => NutritionMaster/gradlew.bat (100%)
 rename settings.gradle => NutritionMaster/settings.gradle (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/.gitignore (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/build.gradle (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/libs/microlog4android-1.0.0.jar (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/proguard-rules.pro (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/AndroidManifest.xml (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/aidl/com/today/step/lib/ISportStepInterface.aidl (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/assets/microlog.properties (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/BaseClickBroadcast.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/DateUtils.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/ITodayStepDBHelper.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/JobSchedulerService.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/Logger.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/Microlog4Android.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/OnStepCounterListener.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/PreferencesHelper.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/SportStepJsonUtils.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/StepAlertManagerUtils.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepAlertReceive.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepBootCompleteReceiver.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepCounter.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepDBHelper.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepData.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepDetector.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepManager.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepService.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepShutdownReceiver.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/WakeLockUtils.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/res/mipmap-xxxhdpi/ic_notification_default.png (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/res/values/strings.xml (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/test/java/com.today.step.lib/MyRobolectricTestRunner.java (100%)
 rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/test/java/com.today.step.lib/TodayStepDBHelperTest.java (100%)
 rename 文档.md => NutritionMaster/文档.md (100%)
 rename 服务器文档.md => NutritionMaster/服务器文档.md (100%)
 create mode 100644 NutritionMasterSpider/.idea/NutritionMasterSpider.iml
 create mode 100644 NutritionMasterSpider/.idea/misc.xml
 create mode 100644 NutritionMasterSpider/.idea/modules.xml
 create mode 100644 NutritionMasterSpider/.idea/workspace.xml
 create mode 100644 NutritionMasterSpider/bao_cheat.py
 create mode 100644 NutritionMasterSpider/baobspider.py
 create mode 100644 NutritionMasterSpider/baospider.py
 create mode 100644 NutritionMasterSpider/bbspider.py
 create mode 100644 NutritionMasterSpider/demo/__init__.py
 create mode 100644 NutritionMasterSpider/demo/get_name.py
 create mode 100644 NutritionMasterSpider/demo/test.py
 create mode 100644 NutritionMasterSpider/demo/xinshipu_selenium.py
 create mode 100644 NutritionMasterSpider/demo/食材.py
 create mode 100644 NutritionMasterSpider/functions/__init__.py
 create mode 100644 NutritionMasterSpider/functions/__pycache__/__init__.cpython-36.pyc
 create mode 100644 NutritionMasterSpider/functions/__pycache__/baidu_api.cpython-36.pyc
 create mode 100644 NutritionMasterSpider/functions/__pycache__/get_proxy.cpython-36.pyc
 create mode 100644 NutritionMasterSpider/functions/__pycache__/get_selector.cpython-36.pyc
 create mode 100644 NutritionMasterSpider/functions/__pycache__/send_request.cpython-36.pyc
 create mode 100644 NutritionMasterSpider/functions/__pycache__/wtrte_csv.cpython-36.pyc
 create mode 100644 NutritionMasterSpider/functions/baidu_api.py
 create mode 100644 NutritionMasterSpider/functions/get_proxy.py
 create mode 100644 NutritionMasterSpider/functions/get_selector.py
 create mode 100644 NutritionMasterSpider/functions/send_request.py
 create mode 100644 NutritionMasterSpider/functions/wtrte_csv.py
 create mode 100644 NutritionMasterSpider/info_add.py
 create mode 100644 NutritionMasterSpider/nutrition_add.py
 create mode 100644 NutritionMasterSpider/reget_image_url.py
 create mode 100644 NutritionMasterSpider/test.py
 create mode 100644 NutritionMasterSpider/ttmeishi.py
 create mode 100644 NutritionMasterSpider/write_calorie.py
 create mode 100644 NutritionMasterSpider/xinshipu.py
 create mode 100644 NutritionMasterSpider/xzs/__init__.py
 create mode 100644 NutritionMasterSpider/xzs/get_trick.py
 create mode 160000 NutritionMasterWeb

diff --git a/.gitignore b/NutritionMaster/.gitignore
similarity index 100%
rename from .gitignore
rename to NutritionMaster/.gitignore
diff --git a/.idea/codeStyles/Project.xml b/NutritionMaster/.idea/codeStyles/Project.xml
similarity index 100%
rename from .idea/codeStyles/Project.xml
rename to NutritionMaster/.idea/codeStyles/Project.xml
diff --git a/.idea/runConfigurations.xml b/NutritionMaster/.idea/runConfigurations.xml
similarity index 100%
rename from .idea/runConfigurations.xml
rename to NutritionMaster/.idea/runConfigurations.xml
diff --git a/README.md b/NutritionMaster/README.md
similarity index 100%
rename from README.md
rename to NutritionMaster/README.md
diff --git a/app/.gitignore b/NutritionMaster/app/.gitignore
similarity index 100%
rename from app/.gitignore
rename to NutritionMaster/app/.gitignore
diff --git a/app/build.gradle b/NutritionMaster/app/build.gradle
similarity index 100%
rename from app/build.gradle
rename to NutritionMaster/app/build.gradle
diff --git a/app/libs/YoudaoBase.jar b/NutritionMaster/app/libs/YoudaoBase.jar
similarity index 100%
rename from app/libs/YoudaoBase.jar
rename to NutritionMaster/app/libs/YoudaoBase.jar
diff --git a/app/libs/YoudaoCnDictOffline.jar b/NutritionMaster/app/libs/YoudaoCnDictOffline.jar
similarity index 100%
rename from app/libs/YoudaoCnDictOffline.jar
rename to NutritionMaster/app/libs/YoudaoCnDictOffline.jar
diff --git a/app/libs/YoudaoTranslateOffline.jar b/NutritionMaster/app/libs/YoudaoTranslateOffline.jar
similarity index 100%
rename from app/libs/YoudaoTranslateOffline.jar
rename to NutritionMaster/app/libs/YoudaoTranslateOffline.jar
diff --git a/app/libs/YoudaoTranslateOnline.jar b/NutritionMaster/app/libs/YoudaoTranslateOnline.jar
similarity index 100%
rename from app/libs/YoudaoTranslateOnline.jar
rename to NutritionMaster/app/libs/YoudaoTranslateOnline.jar
diff --git a/app/libs/arm64-v8a/libdict-parser.so b/NutritionMaster/app/libs/arm64-v8a/libdict-parser.so
similarity index 100%
rename from app/libs/arm64-v8a/libdict-parser.so
rename to NutritionMaster/app/libs/arm64-v8a/libdict-parser.so
diff --git a/app/libs/armeabi-v7a/libdict-parser.so b/NutritionMaster/app/libs/armeabi-v7a/libdict-parser.so
similarity index 100%
rename from app/libs/armeabi-v7a/libdict-parser.so
rename to NutritionMaster/app/libs/armeabi-v7a/libdict-parser.so
diff --git a/app/libs/armeabi/libdict-parser.so b/NutritionMaster/app/libs/armeabi/libdict-parser.so
similarity index 100%
rename from app/libs/armeabi/libdict-parser.so
rename to NutritionMaster/app/libs/armeabi/libdict-parser.so
diff --git a/app/libs/mips/libdict-parser.so b/NutritionMaster/app/libs/mips/libdict-parser.so
similarity index 100%
rename from app/libs/mips/libdict-parser.so
rename to NutritionMaster/app/libs/mips/libdict-parser.so
diff --git a/app/libs/mips64/libdict-parser.so b/NutritionMaster/app/libs/mips64/libdict-parser.so
similarity index 100%
rename from app/libs/mips64/libdict-parser.so
rename to NutritionMaster/app/libs/mips64/libdict-parser.so
diff --git a/app/libs/x86/libdict-parser.so b/NutritionMaster/app/libs/x86/libdict-parser.so
similarity index 100%
rename from app/libs/x86/libdict-parser.so
rename to NutritionMaster/app/libs/x86/libdict-parser.so
diff --git a/app/libs/x86_64/libdict-parser.so b/NutritionMaster/app/libs/x86_64/libdict-parser.so
similarity index 100%
rename from app/libs/x86_64/libdict-parser.so
rename to NutritionMaster/app/libs/x86_64/libdict-parser.so
diff --git a/app/proguard-rules.pro b/NutritionMaster/app/proguard-rules.pro
similarity index 100%
rename from app/proguard-rules.pro
rename to NutritionMaster/app/proguard-rules.pro
diff --git a/app/src/androidTest/java/com/example/ninefourone/nutritionmaster/ExampleInstrumentedTest.java b/NutritionMaster/app/src/androidTest/java/com/example/ninefourone/nutritionmaster/ExampleInstrumentedTest.java
similarity index 100%
rename from app/src/androidTest/java/com/example/ninefourone/nutritionmaster/ExampleInstrumentedTest.java
rename to NutritionMaster/app/src/androidTest/java/com/example/ninefourone/nutritionmaster/ExampleInstrumentedTest.java
diff --git a/app/src/main/AndroidManifest.xml b/NutritionMaster/app/src/main/AndroidManifest.xml
similarity index 100%
rename from app/src/main/AndroidManifest.xml
rename to NutritionMaster/app/src/main/AndroidManifest.xml
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/DishHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/DishHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/DishHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/DishHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllnessHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllnessHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllnessHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllnessHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseDialog.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseDialog.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseDialog.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseDialog.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ClassifyResult.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ClassifyResult.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ClassifyResult.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ClassifyResult.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/DailyCard.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/DailyCard.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/DailyCard.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/DailyCard.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Element.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Element.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Element.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Element.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMaterial.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMaterial.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMaterial.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMaterial.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenu.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenu.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenu.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenu.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenuLight.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenuLight.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenuLight.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenuLight.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/History.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/History.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/History.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/History.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Illness.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Illness.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Illness.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Illness.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MenuClassification.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MenuClassification.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MenuClassification.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MenuClassification.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Occupation.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Occupation.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Occupation.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Occupation.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Physique.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Physique.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Physique.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Physique.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ResultList.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ResultList.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ResultList.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ResultList.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Trick.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Trick.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Trick.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Trick.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/CameraPreview.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/CameraPreview.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/camera/CameraPreview.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/CameraPreview.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardConfig.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardConfig.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardConfig.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardConfig.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardItemTouchCallBack.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardItemTouchCallBack.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardItemTouchCallBack.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardItemTouchCallBack.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/SwipeCardLayoutManager.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/SwipeCardLayoutManager.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/SwipeCardLayoutManager.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/SwipeCardLayoutManager.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddInformationActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddInformationActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddInformationActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddInformationActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/DishResultActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/DishResultActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/DishResultActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/DishResultActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/MaterialResultActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/MaterialResultActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/MaterialResultActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/MaterialResultActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/historysearch/HistoryActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/historysearch/HistoryActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/historysearch/HistoryActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/historysearch/HistoryActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/information/InformationActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/information/InformationActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/information/InformationActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/information/InformationActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/login/LoginActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/login/LoginActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/login/LoginActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/login/LoginActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/ElementDialog.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/ElementDialog.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/ElementDialog.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/ElementDialog.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/step/StepStarter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/step/StepStarter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/step/StepStarter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/step/StepStarter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/ui/InformationDialog.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/ui/InformationDialog.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/ui/InformationDialog.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/ui/InformationDialog.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/ui/NoScrollViewPager.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/ui/NoScrollViewPager.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/ui/NoScrollViewPager.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/ui/NoScrollViewPager.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ChartDrawer.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ChartDrawer.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ChartDrawer.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ChartDrawer.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MaterialClassifier.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MaterialClassifier.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MaterialClassifier.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MaterialClassifier.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MessageUtils.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MessageUtils.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MessageUtils.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MessageUtils.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/PermissionUtils.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/PermissionUtils.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/utils/PermissionUtils.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/PermissionUtils.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/UiUtils.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/UiUtils.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/utils/UiUtils.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/UiUtils.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java
diff --git a/app/src/main/res/drawable-v24/ic_drawer_home.png b/NutritionMaster/app/src/main/res/drawable-v24/ic_drawer_home.png
similarity index 100%
rename from app/src/main/res/drawable-v24/ic_drawer_home.png
rename to NutritionMaster/app/src/main/res/drawable-v24/ic_drawer_home.png
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/NutritionMaster/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to NutritionMaster/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/app/src/main/res/drawable-v24/selector.xml b/NutritionMaster/app/src/main/res/drawable-v24/selector.xml
similarity index 100%
rename from app/src/main/res/drawable-v24/selector.xml
rename to NutritionMaster/app/src/main/res/drawable-v24/selector.xml
diff --git a/app/src/main/res/drawable/body_bg.png b/NutritionMaster/app/src/main/res/drawable/body_bg.png
similarity index 100%
rename from app/src/main/res/drawable/body_bg.png
rename to NutritionMaster/app/src/main/res/drawable/body_bg.png
diff --git a/app/src/main/res/drawable/camera_bg.jpg b/NutritionMaster/app/src/main/res/drawable/camera_bg.jpg
similarity index 100%
rename from app/src/main/res/drawable/camera_bg.jpg
rename to NutritionMaster/app/src/main/res/drawable/camera_bg.jpg
diff --git a/app/src/main/res/drawable/food_material.jpg b/NutritionMaster/app/src/main/res/drawable/food_material.jpg
similarity index 100%
rename from app/src/main/res/drawable/food_material.jpg
rename to NutritionMaster/app/src/main/res/drawable/food_material.jpg
diff --git a/app/src/main/res/drawable/food_test.jpg b/NutritionMaster/app/src/main/res/drawable/food_test.jpg
similarity index 100%
rename from app/src/main/res/drawable/food_test.jpg
rename to NutritionMaster/app/src/main/res/drawable/food_test.jpg
diff --git a/app/src/main/res/drawable/foods.jpg b/NutritionMaster/app/src/main/res/drawable/foods.jpg
similarity index 100%
rename from app/src/main/res/drawable/foods.jpg
rename to NutritionMaster/app/src/main/res/drawable/foods.jpg
diff --git a/app/src/main/res/drawable/friday.jpg b/NutritionMaster/app/src/main/res/drawable/friday.jpg
similarity index 100%
rename from app/src/main/res/drawable/friday.jpg
rename to NutritionMaster/app/src/main/res/drawable/friday.jpg
diff --git a/app/src/main/res/drawable/ic.png b/NutritionMaster/app/src/main/res/drawable/ic.png
similarity index 100%
rename from app/src/main/res/drawable/ic.png
rename to NutritionMaster/app/src/main/res/drawable/ic.png
diff --git a/app/src/main/res/drawable/ic_add_recipe.xml b/NutritionMaster/app/src/main/res/drawable/ic_add_recipe.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_add_recipe.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_add_recipe.xml
diff --git a/app/src/main/res/drawable/ic_back_button.xml b/NutritionMaster/app/src/main/res/drawable/ic_back_button.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_back_button.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_back_button.xml
diff --git a/app/src/main/res/drawable/ic_back_button_white.xml b/NutritionMaster/app/src/main/res/drawable/ic_back_button_white.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_back_button_white.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_back_button_white.xml
diff --git a/app/src/main/res/drawable/ic_bmi.xml b/NutritionMaster/app/src/main/res/drawable/ic_bmi.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_bmi.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_bmi.xml
diff --git a/app/src/main/res/drawable/ic_calorie.xml b/NutritionMaster/app/src/main/res/drawable/ic_calorie.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_calorie.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_calorie.xml
diff --git a/app/src/main/res/drawable/ic_copy.xml b/NutritionMaster/app/src/main/res/drawable/ic_copy.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_copy.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_copy.xml
diff --git a/app/src/main/res/drawable/ic_data_add.xml b/NutritionMaster/app/src/main/res/drawable/ic_data_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_data_add.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_data_add.xml
diff --git a/app/src/main/res/drawable/ic_defualt_avatar.xml b/NutritionMaster/app/src/main/res/drawable/ic_defualt_avatar.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_defualt_avatar.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_defualt_avatar.xml
diff --git a/app/src/main/res/drawable/ic_dialog_age.xml b/NutritionMaster/app/src/main/res/drawable/ic_dialog_age.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_dialog_age.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_dialog_age.xml
diff --git a/app/src/main/res/drawable/ic_dialog_height.xml b/NutritionMaster/app/src/main/res/drawable/ic_dialog_height.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_dialog_height.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_dialog_height.xml
diff --git a/app/src/main/res/drawable/ic_dialog_sex.xml b/NutritionMaster/app/src/main/res/drawable/ic_dialog_sex.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_dialog_sex.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_dialog_sex.xml
diff --git a/app/src/main/res/drawable/ic_dialog_weight.xml b/NutritionMaster/app/src/main/res/drawable/ic_dialog_weight.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_dialog_weight.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_dialog_weight.xml
diff --git a/app/src/main/res/drawable/ic_exchange.xml b/NutritionMaster/app/src/main/res/drawable/ic_exchange.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_exchange.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_exchange.xml
diff --git a/app/src/main/res/drawable/ic_exchange_customization.xml b/NutritionMaster/app/src/main/res/drawable/ic_exchange_customization.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_exchange_customization.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_exchange_customization.xml
diff --git a/app/src/main/res/drawable/ic_fat.xml b/NutritionMaster/app/src/main/res/drawable/ic_fat.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fat.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_fat.xml
diff --git a/app/src/main/res/drawable/ic_flavour.xml b/NutritionMaster/app/src/main/res/drawable/ic_flavour.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_flavour.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_flavour.xml
diff --git a/app/src/main/res/drawable/ic_fortune_cookie.xml b/NutritionMaster/app/src/main/res/drawable/ic_fortune_cookie.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fortune_cookie.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_fortune_cookie.xml
diff --git a/app/src/main/res/drawable/ic_height.xml b/NutritionMaster/app/src/main/res/drawable/ic_height.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_height.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_height.xml
diff --git a/app/src/main/res/drawable/ic_ill.xml b/NutritionMaster/app/src/main/res/drawable/ic_ill.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_ill.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_ill.xml
diff --git a/app/src/main/res/drawable/ic_ill_add_button.xml b/NutritionMaster/app/src/main/res/drawable/ic_ill_add_button.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_ill_add_button.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_ill_add_button.xml
diff --git a/app/src/main/res/drawable/ic_infor_weight.xml b/NutritionMaster/app/src/main/res/drawable/ic_infor_weight.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_infor_weight.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_infor_weight.xml
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/NutritionMaster/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_launcher_background.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/app/src/main/res/drawable/ic_occupation.xml b/NutritionMaster/app/src/main/res/drawable/ic_occupation.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_occupation.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_occupation.xml
diff --git a/app/src/main/res/drawable/ic_ok.xml b/NutritionMaster/app/src/main/res/drawable/ic_ok.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_ok.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_ok.xml
diff --git a/app/src/main/res/drawable/ic_power.xml b/NutritionMaster/app/src/main/res/drawable/ic_power.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_power.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_power.xml
diff --git a/app/src/main/res/drawable/ic_protein.xml b/NutritionMaster/app/src/main/res/drawable/ic_protein.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_protein.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_protein.xml
diff --git a/app/src/main/res/drawable/ic_record.xml b/NutritionMaster/app/src/main/res/drawable/ic_record.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_record.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_record.xml
diff --git a/app/src/main/res/drawable/ic_right_arch.xml b/NutritionMaster/app/src/main/res/drawable/ic_right_arch.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_right_arch.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_right_arch.xml
diff --git a/app/src/main/res/drawable/ic_score.xml b/NutritionMaster/app/src/main/res/drawable/ic_score.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_score.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_score.xml
diff --git a/app/src/main/res/drawable/ic_search.xml b/NutritionMaster/app/src/main/res/drawable/ic_search.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_search.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_search.xml
diff --git a/app/src/main/res/drawable/ic_step.xml b/NutritionMaster/app/src/main/res/drawable/ic_step.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_step.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_step.xml
diff --git a/app/src/main/res/drawable/ic_sugar.xml b/NutritionMaster/app/src/main/res/drawable/ic_sugar.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_sugar.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_sugar.xml
diff --git a/app/src/main/res/drawable/ic_take_photo.xml b/NutritionMaster/app/src/main/res/drawable/ic_take_photo.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_take_photo.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_take_photo.xml
diff --git a/app/src/main/res/drawable/ic_weight.xml b/NutritionMaster/app/src/main/res/drawable/ic_weight.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_weight.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_weight.xml
diff --git a/app/src/main/res/drawable/icon_black.xml b/NutritionMaster/app/src/main/res/drawable/icon_black.xml
similarity index 100%
rename from app/src/main/res/drawable/icon_black.xml
rename to NutritionMaster/app/src/main/res/drawable/icon_black.xml
diff --git a/app/src/main/res/drawable/icon_colorful.png b/NutritionMaster/app/src/main/res/drawable/icon_colorful.png
similarity index 100%
rename from app/src/main/res/drawable/icon_colorful.png
rename to NutritionMaster/app/src/main/res/drawable/icon_colorful.png
diff --git a/app/src/main/res/drawable/monday.jpg b/NutritionMaster/app/src/main/res/drawable/monday.jpg
similarity index 100%
rename from app/src/main/res/drawable/monday.jpg
rename to NutritionMaster/app/src/main/res/drawable/monday.jpg
diff --git a/app/src/main/res/drawable/recommend_bg.jpg b/NutritionMaster/app/src/main/res/drawable/recommend_bg.jpg
similarity index 100%
rename from app/src/main/res/drawable/recommend_bg.jpg
rename to NutritionMaster/app/src/main/res/drawable/recommend_bg.jpg
diff --git a/app/src/main/res/drawable/result_bg.png b/NutritionMaster/app/src/main/res/drawable/result_bg.png
similarity index 100%
rename from app/src/main/res/drawable/result_bg.png
rename to NutritionMaster/app/src/main/res/drawable/result_bg.png
diff --git a/app/src/main/res/drawable/saturday.jpg b/NutritionMaster/app/src/main/res/drawable/saturday.jpg
similarity index 100%
rename from app/src/main/res/drawable/saturday.jpg
rename to NutritionMaster/app/src/main/res/drawable/saturday.jpg
diff --git a/app/src/main/res/drawable/sunday.jpg b/NutritionMaster/app/src/main/res/drawable/sunday.jpg
similarity index 100%
rename from app/src/main/res/drawable/sunday.jpg
rename to NutritionMaster/app/src/main/res/drawable/sunday.jpg
diff --git a/app/src/main/res/drawable/test_avatar.jpg b/NutritionMaster/app/src/main/res/drawable/test_avatar.jpg
similarity index 100%
rename from app/src/main/res/drawable/test_avatar.jpg
rename to NutritionMaster/app/src/main/res/drawable/test_avatar.jpg
diff --git a/app/src/main/res/drawable/thursday.jpg b/NutritionMaster/app/src/main/res/drawable/thursday.jpg
similarity index 100%
rename from app/src/main/res/drawable/thursday.jpg
rename to NutritionMaster/app/src/main/res/drawable/thursday.jpg
diff --git a/app/src/main/res/drawable/tuesday.jpg b/NutritionMaster/app/src/main/res/drawable/tuesday.jpg
similarity index 100%
rename from app/src/main/res/drawable/tuesday.jpg
rename to NutritionMaster/app/src/main/res/drawable/tuesday.jpg
diff --git a/app/src/main/res/drawable/wednesday.jpg b/NutritionMaster/app/src/main/res/drawable/wednesday.jpg
similarity index 100%
rename from app/src/main/res/drawable/wednesday.jpg
rename to NutritionMaster/app/src/main/res/drawable/wednesday.jpg
diff --git a/app/src/main/res/layout/activity_add.xml b/NutritionMaster/app/src/main/res/layout/activity_add.xml
similarity index 100%
rename from app/src/main/res/layout/activity_add.xml
rename to NutritionMaster/app/src/main/res/layout/activity_add.xml
diff --git a/app/src/main/res/layout/activity_add_information.xml b/NutritionMaster/app/src/main/res/layout/activity_add_information.xml
similarity index 100%
rename from app/src/main/res/layout/activity_add_information.xml
rename to NutritionMaster/app/src/main/res/layout/activity_add_information.xml
diff --git a/app/src/main/res/layout/activity_customization.xml b/NutritionMaster/app/src/main/res/layout/activity_customization.xml
similarity index 100%
rename from app/src/main/res/layout/activity_customization.xml
rename to NutritionMaster/app/src/main/res/layout/activity_customization.xml
diff --git a/app/src/main/res/layout/activity_dish_result.xml b/NutritionMaster/app/src/main/res/layout/activity_dish_result.xml
similarity index 100%
rename from app/src/main/res/layout/activity_dish_result.xml
rename to NutritionMaster/app/src/main/res/layout/activity_dish_result.xml
diff --git a/app/src/main/res/layout/activity_history.xml b/NutritionMaster/app/src/main/res/layout/activity_history.xml
similarity index 100%
rename from app/src/main/res/layout/activity_history.xml
rename to NutritionMaster/app/src/main/res/layout/activity_history.xml
diff --git a/app/src/main/res/layout/activity_information.xml b/NutritionMaster/app/src/main/res/layout/activity_information.xml
similarity index 100%
rename from app/src/main/res/layout/activity_information.xml
rename to NutritionMaster/app/src/main/res/layout/activity_information.xml
diff --git a/app/src/main/res/layout/activity_login.xml b/NutritionMaster/app/src/main/res/layout/activity_login.xml
similarity index 100%
rename from app/src/main/res/layout/activity_login.xml
rename to NutritionMaster/app/src/main/res/layout/activity_login.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/NutritionMaster/app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from app/src/main/res/layout/activity_main.xml
rename to NutritionMaster/app/src/main/res/layout/activity_main.xml
diff --git a/app/src/main/res/layout/activity_material_result.xml b/NutritionMaster/app/src/main/res/layout/activity_material_result.xml
similarity index 100%
rename from app/src/main/res/layout/activity_material_result.xml
rename to NutritionMaster/app/src/main/res/layout/activity_material_result.xml
diff --git a/app/src/main/res/layout/activity_recipe.xml b/NutritionMaster/app/src/main/res/layout/activity_recipe.xml
similarity index 100%
rename from app/src/main/res/layout/activity_recipe.xml
rename to NutritionMaster/app/src/main/res/layout/activity_recipe.xml
diff --git a/app/src/main/res/layout/add_information_activity.xml b/NutritionMaster/app/src/main/res/layout/add_information_activity.xml
similarity index 100%
rename from app/src/main/res/layout/add_information_activity.xml
rename to NutritionMaster/app/src/main/res/layout/add_information_activity.xml
diff --git a/app/src/main/res/layout/add_item.xml b/NutritionMaster/app/src/main/res/layout/add_item.xml
similarity index 100%
rename from app/src/main/res/layout/add_item.xml
rename to NutritionMaster/app/src/main/res/layout/add_item.xml
diff --git a/app/src/main/res/layout/body_information_fragment.xml b/NutritionMaster/app/src/main/res/layout/body_information_fragment.xml
similarity index 100%
rename from app/src/main/res/layout/body_information_fragment.xml
rename to NutritionMaster/app/src/main/res/layout/body_information_fragment.xml
diff --git a/app/src/main/res/layout/cameras_layout.xml b/NutritionMaster/app/src/main/res/layout/cameras_layout.xml
similarity index 100%
rename from app/src/main/res/layout/cameras_layout.xml
rename to NutritionMaster/app/src/main/res/layout/cameras_layout.xml
diff --git a/app/src/main/res/layout/card_item.xml b/NutritionMaster/app/src/main/res/layout/card_item.xml
similarity index 100%
rename from app/src/main/res/layout/card_item.xml
rename to NutritionMaster/app/src/main/res/layout/card_item.xml
diff --git a/app/src/main/res/layout/customization.xml b/NutritionMaster/app/src/main/res/layout/customization.xml
similarity index 100%
rename from app/src/main/res/layout/customization.xml
rename to NutritionMaster/app/src/main/res/layout/customization.xml
diff --git a/app/src/main/res/layout/customization_item.xml b/NutritionMaster/app/src/main/res/layout/customization_item.xml
similarity index 100%
rename from app/src/main/res/layout/customization_item.xml
rename to NutritionMaster/app/src/main/res/layout/customization_item.xml
diff --git a/app/src/main/res/layout/dish_item.xml b/NutritionMaster/app/src/main/res/layout/dish_item.xml
similarity index 100%
rename from app/src/main/res/layout/dish_item.xml
rename to NutritionMaster/app/src/main/res/layout/dish_item.xml
diff --git a/app/src/main/res/layout/dish_result_item.xml b/NutritionMaster/app/src/main/res/layout/dish_result_item.xml
similarity index 100%
rename from app/src/main/res/layout/dish_result_item.xml
rename to NutritionMaster/app/src/main/res/layout/dish_result_item.xml
diff --git a/app/src/main/res/layout/element_dialog.xml b/NutritionMaster/app/src/main/res/layout/element_dialog.xml
similarity index 100%
rename from app/src/main/res/layout/element_dialog.xml
rename to NutritionMaster/app/src/main/res/layout/element_dialog.xml
diff --git a/app/src/main/res/layout/ill_item.xml b/NutritionMaster/app/src/main/res/layout/ill_item.xml
similarity index 100%
rename from app/src/main/res/layout/ill_item.xml
rename to NutritionMaster/app/src/main/res/layout/ill_item.xml
diff --git a/app/src/main/res/layout/make_step_item.xml b/NutritionMaster/app/src/main/res/layout/make_step_item.xml
similarity index 100%
rename from app/src/main/res/layout/make_step_item.xml
rename to NutritionMaster/app/src/main/res/layout/make_step_item.xml
diff --git a/app/src/main/res/layout/material_item.xml b/NutritionMaster/app/src/main/res/layout/material_item.xml
similarity index 100%
rename from app/src/main/res/layout/material_item.xml
rename to NutritionMaster/app/src/main/res/layout/material_item.xml
diff --git a/app/src/main/res/layout/material_result_item.xml b/NutritionMaster/app/src/main/res/layout/material_result_item.xml
similarity index 100%
rename from app/src/main/res/layout/material_result_item.xml
rename to NutritionMaster/app/src/main/res/layout/material_result_item.xml
diff --git a/app/src/main/res/layout/normal_recommend_fragment_layout.xml b/NutritionMaster/app/src/main/res/layout/normal_recommend_fragment_layout.xml
similarity index 100%
rename from app/src/main/res/layout/normal_recommend_fragment_layout.xml
rename to NutritionMaster/app/src/main/res/layout/normal_recommend_fragment_layout.xml
diff --git a/app/src/main/res/layout/picker_item.xml b/NutritionMaster/app/src/main/res/layout/picker_item.xml
similarity index 100%
rename from app/src/main/res/layout/picker_item.xml
rename to NutritionMaster/app/src/main/res/layout/picker_item.xml
diff --git a/app/src/main/res/layout/recommend_head.xml b/NutritionMaster/app/src/main/res/layout/recommend_head.xml
similarity index 100%
rename from app/src/main/res/layout/recommend_head.xml
rename to NutritionMaster/app/src/main/res/layout/recommend_head.xml
diff --git a/app/src/main/res/layout/recommend_item_detail.xml b/NutritionMaster/app/src/main/res/layout/recommend_item_detail.xml
similarity index 100%
rename from app/src/main/res/layout/recommend_item_detail.xml
rename to NutritionMaster/app/src/main/res/layout/recommend_item_detail.xml
diff --git a/app/src/main/res/layout/recommend_item_middle.xml b/NutritionMaster/app/src/main/res/layout/recommend_item_middle.xml
similarity index 100%
rename from app/src/main/res/layout/recommend_item_middle.xml
rename to NutritionMaster/app/src/main/res/layout/recommend_item_middle.xml
diff --git a/app/src/main/res/layout/score.xml b/NutritionMaster/app/src/main/res/layout/score.xml
similarity index 100%
rename from app/src/main/res/layout/score.xml
rename to NutritionMaster/app/src/main/res/layout/score.xml
diff --git a/app/src/main/res/menu/menu_main.xml b/NutritionMaster/app/src/main/res/menu/menu_main.xml
similarity index 100%
rename from app/src/main/res/menu/menu_main.xml
rename to NutritionMaster/app/src/main/res/menu/menu_main.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/NutritionMaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to NutritionMaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/NutritionMaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to NutritionMaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/NutritionMaster/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to NutritionMaster/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/NutritionMaster/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to NutritionMaster/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/NutritionMaster/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to NutritionMaster/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/NutritionMaster/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to NutritionMaster/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/NutritionMaster/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to NutritionMaster/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/NutritionMaster/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to NutritionMaster/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/camera_button.png b/NutritionMaster/app/src/main/res/mipmap-xxhdpi/camera_button.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/camera_button.png
rename to NutritionMaster/app/src/main/res/mipmap-xxhdpi/camera_button.png
diff --git a/app/src/main/res/mipmap-xxhdpi/camera_button_pressed.png b/NutritionMaster/app/src/main/res/mipmap-xxhdpi/camera_button_pressed.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/camera_button_pressed.png
rename to NutritionMaster/app/src/main/res/mipmap-xxhdpi/camera_button_pressed.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/NutritionMaster/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to NutritionMaster/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/NutritionMaster/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to NutritionMaster/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic.png b/NutritionMaster/app/src/main/res/mipmap-xxxhdpi/ic.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic.png
rename to NutritionMaster/app/src/main/res/mipmap-xxxhdpi/ic.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/NutritionMaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to NutritionMaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/NutritionMaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to NutritionMaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/values/arrays.xml b/NutritionMaster/app/src/main/res/values/arrays.xml
similarity index 100%
rename from app/src/main/res/values/arrays.xml
rename to NutritionMaster/app/src/main/res/values/arrays.xml
diff --git a/app/src/main/res/values/colors.xml b/NutritionMaster/app/src/main/res/values/colors.xml
similarity index 100%
rename from app/src/main/res/values/colors.xml
rename to NutritionMaster/app/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/dimens.xml b/NutritionMaster/app/src/main/res/values/dimens.xml
similarity index 100%
rename from app/src/main/res/values/dimens.xml
rename to NutritionMaster/app/src/main/res/values/dimens.xml
diff --git a/app/src/main/res/values/strings.xml b/NutritionMaster/app/src/main/res/values/strings.xml
similarity index 100%
rename from app/src/main/res/values/strings.xml
rename to NutritionMaster/app/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/styles.xml b/NutritionMaster/app/src/main/res/values/styles.xml
similarity index 100%
rename from app/src/main/res/values/styles.xml
rename to NutritionMaster/app/src/main/res/values/styles.xml
diff --git a/app/src/test/java/com/example/ninefourone/nutritionmaster/ExampleUnitTest.java b/NutritionMaster/app/src/test/java/com/example/ninefourone/nutritionmaster/ExampleUnitTest.java
similarity index 100%
rename from app/src/test/java/com/example/ninefourone/nutritionmaster/ExampleUnitTest.java
rename to NutritionMaster/app/src/test/java/com/example/ninefourone/nutritionmaster/ExampleUnitTest.java
diff --git a/build.gradle b/NutritionMaster/build.gradle
similarity index 100%
rename from build.gradle
rename to NutritionMaster/build.gradle
diff --git a/datas/11111.csv b/NutritionMaster/datas/11111.csv
similarity index 100%
rename from datas/11111.csv
rename to NutritionMaster/datas/11111.csv
diff --git a/datas/menu_classification (1).csv b/NutritionMaster/datas/menu_classification (1).csv
similarity index 100%
rename from datas/menu_classification (1).csv
rename to NutritionMaster/datas/menu_classification (1).csv
diff --git a/datas/menu_classification.csv b/NutritionMaster/datas/menu_classification.csv
similarity index 100%
rename from datas/menu_classification.csv
rename to NutritionMaster/datas/menu_classification.csv
diff --git a/datas/new_menu_names.csv b/NutritionMaster/datas/new_menu_names.csv
similarity index 100%
rename from datas/new_menu_names.csv
rename to NutritionMaster/datas/new_menu_names.csv
diff --git a/datas/occupation_classification.csv b/NutritionMaster/datas/occupation_classification.csv
similarity index 100%
rename from datas/occupation_classification.csv
rename to NutritionMaster/datas/occupation_classification.csv
diff --git a/datas/physique (1).xlsx b/NutritionMaster/datas/physique (1).xlsx
similarity index 100%
rename from datas/physique (1).xlsx
rename to NutritionMaster/datas/physique (1).xlsx
diff --git a/datas/元素效果.txt b/NutritionMaster/datas/元素效果.txt
similarity index 100%
rename from datas/元素效果.txt
rename to NutritionMaster/datas/元素效果.txt
diff --git a/datas/早中晚餐.rar b/NutritionMaster/datas/早中晚餐.rar
similarity index 100%
rename from datas/早中晚餐.rar
rename to NutritionMaster/datas/早中晚餐.rar
diff --git a/datas/病).csv b/NutritionMaster/datas/病).csv
similarity index 100%
rename from datas/病).csv
rename to NutritionMaster/datas/病).csv
diff --git a/datas/职业 （bmi分类）.xlsx b/NutritionMaster/datas/职业 （bmi分类）.xlsx
similarity index 100%
rename from datas/职业 （bmi分类）.xlsx
rename to NutritionMaster/datas/职业 （bmi分类）.xlsx
diff --git a/datas/职业.xlsx b/NutritionMaster/datas/职业.xlsx
similarity index 100%
rename from datas/职业.xlsx
rename to NutritionMaster/datas/职业.xlsx
diff --git a/datas/营养.txt b/NutritionMaster/datas/营养.txt
similarity index 100%
rename from datas/营养.txt
rename to NutritionMaster/datas/营养.txt
diff --git a/datas/营养标准.xlsx b/NutritionMaster/datas/营养标准.xlsx
similarity index 100%
rename from datas/营养标准.xlsx
rename to NutritionMaster/datas/营养标准.xlsx
diff --git a/gradle.properties b/NutritionMaster/gradle.properties
similarity index 100%
rename from gradle.properties
rename to NutritionMaster/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/NutritionMaster/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.jar
rename to NutritionMaster/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/NutritionMaster/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.properties
rename to NutritionMaster/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/NutritionMaster/gradlew
similarity index 100%
rename from gradlew
rename to NutritionMaster/gradlew
diff --git a/gradlew.bat b/NutritionMaster/gradlew.bat
similarity index 100%
rename from gradlew.bat
rename to NutritionMaster/gradlew.bat
diff --git a/settings.gradle b/NutritionMaster/settings.gradle
similarity index 100%
rename from settings.gradle
rename to NutritionMaster/settings.gradle
diff --git a/todaystepcounterlib/.gitignore b/NutritionMaster/todaystepcounterlib/.gitignore
similarity index 100%
rename from todaystepcounterlib/.gitignore
rename to NutritionMaster/todaystepcounterlib/.gitignore
diff --git a/todaystepcounterlib/build.gradle b/NutritionMaster/todaystepcounterlib/build.gradle
similarity index 100%
rename from todaystepcounterlib/build.gradle
rename to NutritionMaster/todaystepcounterlib/build.gradle
diff --git a/todaystepcounterlib/libs/microlog4android-1.0.0.jar b/NutritionMaster/todaystepcounterlib/libs/microlog4android-1.0.0.jar
similarity index 100%
rename from todaystepcounterlib/libs/microlog4android-1.0.0.jar
rename to NutritionMaster/todaystepcounterlib/libs/microlog4android-1.0.0.jar
diff --git a/todaystepcounterlib/proguard-rules.pro b/NutritionMaster/todaystepcounterlib/proguard-rules.pro
similarity index 100%
rename from todaystepcounterlib/proguard-rules.pro
rename to NutritionMaster/todaystepcounterlib/proguard-rules.pro
diff --git a/todaystepcounterlib/src/main/AndroidManifest.xml b/NutritionMaster/todaystepcounterlib/src/main/AndroidManifest.xml
similarity index 100%
rename from todaystepcounterlib/src/main/AndroidManifest.xml
rename to NutritionMaster/todaystepcounterlib/src/main/AndroidManifest.xml
diff --git a/todaystepcounterlib/src/main/aidl/com/today/step/lib/ISportStepInterface.aidl b/NutritionMaster/todaystepcounterlib/src/main/aidl/com/today/step/lib/ISportStepInterface.aidl
similarity index 100%
rename from todaystepcounterlib/src/main/aidl/com/today/step/lib/ISportStepInterface.aidl
rename to NutritionMaster/todaystepcounterlib/src/main/aidl/com/today/step/lib/ISportStepInterface.aidl
diff --git a/todaystepcounterlib/src/main/assets/microlog.properties b/NutritionMaster/todaystepcounterlib/src/main/assets/microlog.properties
similarity index 100%
rename from todaystepcounterlib/src/main/assets/microlog.properties
rename to NutritionMaster/todaystepcounterlib/src/main/assets/microlog.properties
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/BaseClickBroadcast.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/BaseClickBroadcast.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/BaseClickBroadcast.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/BaseClickBroadcast.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/DateUtils.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/DateUtils.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/DateUtils.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/DateUtils.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/ITodayStepDBHelper.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/ITodayStepDBHelper.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/ITodayStepDBHelper.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/ITodayStepDBHelper.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/JobSchedulerService.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/JobSchedulerService.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/JobSchedulerService.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/JobSchedulerService.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/Logger.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/Logger.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/Logger.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/Logger.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/Microlog4Android.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/Microlog4Android.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/Microlog4Android.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/Microlog4Android.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/OnStepCounterListener.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/OnStepCounterListener.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/OnStepCounterListener.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/OnStepCounterListener.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/PreferencesHelper.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/PreferencesHelper.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/PreferencesHelper.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/PreferencesHelper.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/SportStepJsonUtils.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/SportStepJsonUtils.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/SportStepJsonUtils.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/SportStepJsonUtils.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/StepAlertManagerUtils.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/StepAlertManagerUtils.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/StepAlertManagerUtils.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/StepAlertManagerUtils.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepAlertReceive.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepAlertReceive.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepAlertReceive.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepAlertReceive.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepBootCompleteReceiver.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepBootCompleteReceiver.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepBootCompleteReceiver.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepBootCompleteReceiver.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepCounter.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepCounter.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepCounter.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepCounter.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepDBHelper.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepDBHelper.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepDBHelper.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepDBHelper.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepData.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepData.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepData.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepData.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepDetector.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepDetector.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepDetector.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepDetector.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepManager.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepManager.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepManager.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepManager.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepService.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepService.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepService.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepService.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepShutdownReceiver.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepShutdownReceiver.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepShutdownReceiver.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepShutdownReceiver.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/WakeLockUtils.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/WakeLockUtils.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/WakeLockUtils.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/WakeLockUtils.java
diff --git a/todaystepcounterlib/src/main/res/mipmap-xxxhdpi/ic_notification_default.png b/NutritionMaster/todaystepcounterlib/src/main/res/mipmap-xxxhdpi/ic_notification_default.png
similarity index 100%
rename from todaystepcounterlib/src/main/res/mipmap-xxxhdpi/ic_notification_default.png
rename to NutritionMaster/todaystepcounterlib/src/main/res/mipmap-xxxhdpi/ic_notification_default.png
diff --git a/todaystepcounterlib/src/main/res/values/strings.xml b/NutritionMaster/todaystepcounterlib/src/main/res/values/strings.xml
similarity index 100%
rename from todaystepcounterlib/src/main/res/values/strings.xml
rename to NutritionMaster/todaystepcounterlib/src/main/res/values/strings.xml
diff --git a/todaystepcounterlib/src/test/java/com.today.step.lib/MyRobolectricTestRunner.java b/NutritionMaster/todaystepcounterlib/src/test/java/com.today.step.lib/MyRobolectricTestRunner.java
similarity index 100%
rename from todaystepcounterlib/src/test/java/com.today.step.lib/MyRobolectricTestRunner.java
rename to NutritionMaster/todaystepcounterlib/src/test/java/com.today.step.lib/MyRobolectricTestRunner.java
diff --git a/todaystepcounterlib/src/test/java/com.today.step.lib/TodayStepDBHelperTest.java b/NutritionMaster/todaystepcounterlib/src/test/java/com.today.step.lib/TodayStepDBHelperTest.java
similarity index 100%
rename from todaystepcounterlib/src/test/java/com.today.step.lib/TodayStepDBHelperTest.java
rename to NutritionMaster/todaystepcounterlib/src/test/java/com.today.step.lib/TodayStepDBHelperTest.java
diff --git a/文档.md b/NutritionMaster/文档.md
similarity index 100%
rename from 文档.md
rename to NutritionMaster/文档.md
diff --git a/服务器文档.md b/NutritionMaster/服务器文档.md
similarity index 100%
rename from 服务器文档.md
rename to NutritionMaster/服务器文档.md
diff --git a/NutritionMasterSpider/.idea/NutritionMasterSpider.iml b/NutritionMasterSpider/.idea/NutritionMasterSpider.iml
new file mode 100644
index 0000000..e98082a
--- /dev/null
+++ b/NutritionMasterSpider/.idea/NutritionMasterSpider.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="projectConfiguration" value="py.test" />
+    <option name="PROJECT_TEST_RUNNER" value="py.test" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/NutritionMasterSpider/.idea/misc.xml b/NutritionMasterSpider/.idea/misc.xml
new file mode 100644
index 0000000..240f774
--- /dev/null
+++ b/NutritionMasterSpider/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (untitled)" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/NutritionMasterSpider/.idea/modules.xml b/NutritionMasterSpider/.idea/modules.xml
new file mode 100644
index 0000000..e07063c
--- /dev/null
+++ b/NutritionMasterSpider/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/NutritionMasterSpider.iml" filepath="$PROJECT_DIR$/.idea/NutritionMasterSpider.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/NutritionMasterSpider/.idea/workspace.xml b/NutritionMasterSpider/.idea/workspace.xml
new file mode 100644
index 0000000..70df0eb
--- /dev/null
+++ b/NutritionMasterSpider/.idea/workspace.xml
@@ -0,0 +1,648 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="dfd5cef2-7aa5-48fc-9b87-f9a3ae45a1b4" name="Default" comment="" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="CoverageDataManager">
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$baidu_api.coverage" NAME="baidu_api Coverage Results" MODIFIED="1536541774663" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/functions" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$baospider.coverage" NAME="baospider Coverage Results" MODIFIED="1537522486263" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$bao5.coverage" NAME="bao5 Coverage Results" MODIFIED="1537885982415" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$.coverage" NAME="食材 Coverage Results" MODIFIED="1536227768462" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$get_trick.coverage" NAME="get_trick Coverage Results" MODIFIED="1538311346349" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/xzs" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$get_name.coverage" NAME="get_name Coverage Results" MODIFIED="1535965498693" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$send_request.coverage" NAME="send_request Coverage Results" MODIFIED="1538646278785" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/functions" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$xinshipu.coverage" NAME="xinshipu Coverage Results" MODIFIED="1536409554160" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$bbspider.coverage" NAME="bbspider Coverage Results" MODIFIED="1537518943086" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$bao6.coverage" NAME="bao6 Coverage Results" MODIFIED="1537886013597" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$test1.coverage" NAME="test1 Coverage Results" MODIFIED="1535424604030" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$nutrition_add.coverage" NAME="nutrition_add Coverage Results" MODIFIED="1538090409810" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$bao3.coverage" NAME="bao3 Coverage Results" MODIFIED="1537885937292" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$get_info.coverage" NAME="get_info Coverage Results" MODIFIED="1538307610061" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/xzs" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$bao4.coverage" NAME="bao4 Coverage Results" MODIFIED="1537885950026" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$write_calorie.coverage" NAME="write_calorie Coverage Results" MODIFIED="1537448987990" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$info_add.coverage" NAME="info_add Coverage Results" MODIFIED="1538090158147" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$py_test_in_get_proxy_py.coverage" NAME="py.test in get_proxy.py Coverage Results" MODIFIED="1538647591592" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/functions" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$baobspider2.coverage" NAME="baobspider2 Coverage Results" MODIFIED="1537885874622" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$reget_image_url.coverage" NAME="reget_image_url Coverage Results" MODIFIED="1537317759261" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$baobspider.coverage" NAME="baobspider Coverage Results" MODIFIED="1537885833785" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$xinshipu_selenium.coverage" NAME="xinshipu_selenium Coverage Results" MODIFIED="1535974931291" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$test__1_.coverage" NAME="test (1) Coverage Results" MODIFIED="1536223487397" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$test.coverage" NAME="test Coverage Results" MODIFIED="1538832467108" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$bao_cheat.coverage" NAME="bao_cheat Coverage Results" MODIFIED="1538648220854" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/NutritionMasterSpider$ttmeishi.coverage" NAME="ttmeishi Coverage Results" MODIFIED="1535964234605" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+  </component>
+  <component name="FavoritesManager">
+    <favorites_list name="NutritionMasterSpider" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375" />
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Python Script" />
+      </list>
+    </option>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>延</find>
+      <find>fi_pa</find>
+      <find>新建</find>
+      <find>comment</find>
+      <find>毛笔字体生成效果</find>
+      <find>验证</find>
+    </findStrings>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/test1.py" />
+        <option value="$PROJECT_DIR$/ztshiliao.py" />
+        <option value="$PROJECT_DIR$/ttmeishi.py" />
+        <option value="$PROJECT_DIR$/get_selector.py" />
+        <option value="$PROJECT_DIR$/get_name.py" />
+        <option value="$PROJECT_DIR$/xinshipu_selenium.py" />
+        <option value="$PROJECT_DIR$/send_request.py" />
+        <option value="$PROJECT_DIR$/食材.py" />
+        <option value="$PROJECT_DIR$/functions/wtrte_csv.py" />
+        <option value="$PROJECT_DIR$/xinshipu.py" />
+        <option value="$PROJECT_DIR$/reget_image_url.py" />
+        <option value="$PROJECT_DIR$/demo/test.py" />
+        <option value="$PROJECT_DIR$/write_calorie.py" />
+        <option value="$PROJECT_DIR$/functions/baidu_api.py" />
+        <option value="$PROJECT_DIR$/bbspider.py" />
+        <option value="$PROJECT_DIR$/baospider.py" />
+        <option value="$PROJECT_DIR$/functions/bao3.py" />
+        <option value="$PROJECT_DIR$/bao3.py" />
+        <option value="$PROJECT_DIR$/bao4.py" />
+        <option value="$PROJECT_DIR$/bao5.py" />
+        <option value="$PROJECT_DIR$/bao6.py" />
+        <option value="$PROJECT_DIR$/baobspider2.py" />
+        <option value="$PROJECT_DIR$/info_add.py" />
+        <option value="$PROJECT_DIR$/nutrition_add.py" />
+        <option value="$PROJECT_DIR$/baobspider.py" />
+        <option value="$PROJECT_DIR$/xzs/get_info.py" />
+        <option value="$PROJECT_DIR$/xzs/get_trick.py" />
+        <option value="$PROJECT_DIR$/functions/send_request.py" />
+        <option value="$PROJECT_DIR$/functions/get_proxy.py" />
+        <option value="$PROJECT_DIR$/bao_cheat.py" />
+        <option value="$PROJECT_DIR$/test.py" />
+      </list>
+    </option>
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="1957" />
+    <option name="y" value="-26" />
+    <option name="width" value="1936" />
+    <option name="height" value="1038" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+      <manualOrder />
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="NutritionMasterSpider" type="b2602c69:ProjectViewProjectNode" />
+              <item name="NutritionMasterSpider" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="NutritionMasterSpider" type="b2602c69:ProjectViewProjectNode" />
+              <item name="NutritionMasterSpider" type="462c0819:PsiDirectoryNode" />
+              <item name="functions" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scratches" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="E:/datapy/code" />
+  </component>
+  <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="E:\JetBrains\PyCharm 2017.3.4\Codes\NutritionMasterSpider\demo" />
+      <recent name="E:\JetBrains\PyCharm 2017.3.4\Codes\NutritionMasterSpider\functions" />
+    </key>
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager" selected="Python.test">
+    <configuration name="bao_cheat" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="NutritionMasterSpider" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/bao_cheat.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+    </configuration>
+    <configuration name="get_trick" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/xzs" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="NutritionMasterSpider" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/xzs/get_trick.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+    </configuration>
+    <configuration name="send_request" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/functions" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="NutritionMasterSpider" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/functions/send_request.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+    </configuration>
+    <configuration name="test" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="NutritionMasterSpider" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+    </configuration>
+    <configuration name="py.test in get_proxy.py" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/functions" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="NutritionMasterSpider" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;$PROJECT_DIR$/functions/get_proxy.py&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+    </configuration>
+    <list size="5">
+      <item index="0" class="java.lang.String" itemvalue="Python.test" />
+      <item index="1" class="java.lang.String" itemvalue="Python.get_trick" />
+      <item index="2" class="java.lang.String" itemvalue="Python.bao_cheat" />
+      <item index="3" class="java.lang.String" itemvalue="Python.send_request" />
+      <item index="4" class="java.lang.String" itemvalue="Python tests.py.test in get_proxy.py" />
+    </list>
+    <recent_temporary>
+      <list size="5">
+        <item index="0" class="java.lang.String" itemvalue="Python.test" />
+        <item index="1" class="java.lang.String" itemvalue="Python.bao_cheat" />
+        <item index="2" class="java.lang.String" itemvalue="Python tests.py.test in get_proxy.py" />
+        <item index="3" class="java.lang.String" itemvalue="Python.send_request" />
+        <item index="4" class="java.lang.String" itemvalue="Python.get_trick" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="dfd5cef2-7aa5-48fc-9b87-f9a3ae45a1b4" name="Default" comment="" />
+      <created>1535340831983</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1535340831983</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="TestHistory">
+    <history-entry file="py_test_in_get_proxy_py - 2018.10.04 at 18h 06m 38s.xml">
+      <configuration name="py.test in get_proxy.py" configurationId="tests" />
+    </history-entry>
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="1911" y="-9" width="1938" height="1048" extended-state="6" />
+    <layout>
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45724058" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.49486887" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22532189" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="SciView" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3299356" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3990878" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295325" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+    </layout>
+    <layout-to-restore>
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36259976" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295325" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20225322" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="SciView" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3299356" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3990878" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+    </layout-to-restore>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <option name="time" value="5" />
+    </breakpoint-manager>
+    <watches-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/ztshiliao.py" />
+    <entry file="file://$PROJECT_DIR$/ttmeishi.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ztshiliao.py" />
+    <entry file="file://$PROJECT_DIR$/ttmeishi.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ttmeishi.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.PyCharm2017.3/system/python_stubs/-791851423/builtins.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="18525">
+          <caret line="475" column="4" lean-forward="false" selection-start-line="475" selection-start-column="4" selection-end-line="475" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test1.py" />
+    <entry file="file://$PROJECT_DIR$/functions/get_proxy.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="429">
+          <caret line="15" column="24" lean-forward="false" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ttmeishi.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test1.py" />
+    <entry file="file://$PROJECT_DIR$/functions/get_proxy.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="429">
+          <caret line="15" column="24" lean-forward="false" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ttmeishi.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="663">
+          <caret line="22" column="23" lean-forward="true" selection-start-line="22" selection-start-column="23" selection-end-line="22" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/functions/get_proxy.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1560">
+          <caret line="44" column="21" lean-forward="true" selection-start-line="44" selection-start-column="21" selection-end-line="44" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ttmeishi.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/functions/get_proxy.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="39">
+          <caret line="1" column="13" lean-forward="true" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test1.py" />
+    <entry file="file://$PROJECT_DIR$/ztshiliao.py" />
+    <entry file="file://E:/Anaconda3/Lib/site-packages/selenium/webdriver/remote/errorhandler.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="241" column="0" lean-forward="false" selection-start-line="241" selection-start-column="0" selection-end-line="241" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/demo/get_name.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="78">
+          <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/demo/xinshipu_selenium.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="975">
+          <caret line="25" column="18" lean-forward="true" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/functions/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/demo/食材.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="353">
+          <caret line="35" column="58" lean-forward="true" selection-start-line="35" selection-start-column="58" selection-end-line="35" selection-end-column="78" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/functions/wtrte_csv.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="78">
+          <caret line="2" column="19" lean-forward="false" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/xinshipu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="546">
+          <caret line="14" column="18" lean-forward="false" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://E:/Anaconda3/Lib/site-packages/requests/models.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="155">
+          <caret line="304" column="0" lean-forward="false" selection-start-line="304" selection-start-column="0" selection-end-line="304" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://E:/Anaconda3/Lib/site-packages/requests/api.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="155">
+          <caret line="71" column="0" lean-forward="false" selection-start-line="71" selection-start-column="0" selection-end-line="71" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/demo/test.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://E:/Anaconda3/Lib/site-packages/selenium/webdriver/remote/webdriver.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="140">
+          <caret line="392" column="0" lean-forward="false" selection-start-line="392" selection-start-column="0" selection-end-line="392" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bbspider.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-249">
+          <caret line="76" column="0" lean-forward="false" selection-start-line="76" selection-start-column="0" selection-end-line="79" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/functions/baidu_api.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="315">
+          <caret line="58" column="35" lean-forward="false" selection-start-line="58" selection-start-column="35" selection-end-line="58" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/reget_image_url.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="64" column="24" lean-forward="false" selection-start-line="64" selection-start-column="24" selection-end-line="64" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/ttmeishi.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="429">
+          <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/functions/bao3.py" />
+    <entry file="file://E:/Anaconda3/Lib/csv.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="178">
+          <caret line="150" column="0" lean-forward="false" selection-start-line="150" selection-start-column="0" selection-end-line="150" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/write_calorie.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="218">
+          <caret line="54" column="31" lean-forward="true" selection-start-line="54" selection-start-column="31" selection-end-line="54" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bao6.py" />
+    <entry file="file://$PROJECT_DIR$/bao5.py" />
+    <entry file="file://$PROJECT_DIR$/bao4.py" />
+    <entry file="file://$PROJECT_DIR$/bao3.py" />
+    <entry file="file://$PROJECT_DIR$/baobspider2.py" />
+    <entry file="file://$PROJECT_DIR$/functions/get_selector.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="7" column="31" lean-forward="true" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/nutrition_add.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="425">
+          <caret line="64" column="15" lean-forward="false" selection-start-line="64" selection-start-column="15" selection-end-line="64" selection-end-column="81" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/baospider.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2301">
+          <caret line="60" column="13" lean-forward="false" selection-start-line="60" selection-start-column="13" selection-end-line="60" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/info_add.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1989">
+          <caret line="60" column="20" lean-forward="true" selection-start-line="46" selection-start-column="0" selection-end-line="60" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/xzs/get_trick.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3003">
+          <caret line="78" column="20" lean-forward="false" selection-start-line="78" selection-start-column="20" selection-end-line="78" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/baobspider.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="663">
+          <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/functions/send_request.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/functions/get_proxy.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="819">
+          <caret line="25" column="33" lean-forward="false" selection-start-line="25" selection-start-column="33" selection-end-line="25" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.PyCharm2017.3/system/python_stubs/-791851423/builtins.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="39">
+          <caret line="743" column="0" lean-forward="false" selection-start-line="743" selection-start-column="0" selection-end-line="743" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bao_cheat.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="30" column="1" lean-forward="true" selection-start-line="30" selection-start-column="1" selection-end-line="30" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/NutritionMasterSpider/bao_cheat.py b/NutritionMasterSpider/bao_cheat.py
new file mode 100644
index 0000000..ae30d8e
--- /dev/null
+++ b/NutritionMasterSpider/bao_cheat.py
@@ -0,0 +1,44 @@
+import requests
+import json
+from lxml import etree
+# from functions import send_request, get_selector
+
+header = {
+    'authority': 'www.zhenhaotv.com',
+    'method': 'POST',
+    'path': '/',
+    'scheme': 'https',
+    'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8',
+    'accept-encoding': 'gzip, deflate, br',
+    'accept-language': 'zh-CN,zh;q=0.9',
+    'cache-control': 'max-age=0',
+    'content-length': '86',
+    'content-type': 'application/x-www-form-urlencoded',
+    'cookie': 'Hm_lvt_1ebdb876cf5aaff194ebd474e2ae2c52=1538639708; SERVERID=4d5d41d7b10da55b4b26f74f163ced97|1538640214|1538639706; Hm_lpvt_1ebdb876cf5aaff194ebd474e2ae2c52=1538640215',
+    'origin': 'https://www.zhenhaotv.com',
+    'referer': 'https://www.zhenhaotv.com/',
+    'upgrade-insecure-requests': '1',
+    'user-agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36',
+}
+
+data = {
+    'text': '小老弟',
+    'font': '9',
+    'size': '68',
+    'color': '#000000',
+    'bg': '#ffffff',
+    'list': 'open'
+}
+
+url = "https://www.zhenhaotv.com"
+
+status_code = 0
+# s = get_selector.get_selector(send_request.post_request())
+s = etree.HTML(requests.post(url=url, data=data, headers=header).text)
+final_url = s.xpath('//div[@class="panel panel-default"]//img/@src')[0]
+final_url = url + final_url.strip('.')
+
+r = requests.get(final_url)
+status_code = r.status_code
+print(status_code, final_url)
+# while status_code != 200:
diff --git a/NutritionMasterSpider/baobspider.py b/NutritionMasterSpider/baobspider.py
new file mode 100644
index 0000000..f580ab7
--- /dev/null
+++ b/NutritionMasterSpider/baobspider.py
@@ -0,0 +1,133 @@
+# -*- coding:utf-8 -*-
+from functions import send_request, get_selector
+import os
+
+author_urls = {
+    "欧阳询": "http://www.yac8.com/news/?list_refer-theme-%C5%B7%D1%F4%D1%AF_",
+    "王羲之": "http://www.yac8.com/news/?list_refer-theme-%CD%F5%F4%CB%D6%AE_",
+    "颜真卿": "http://www.yac8.com/news/?list_refer-theme-%D1%D5%D5%E6%C7%E4_",
+    "文徵明": "http://www.yac8.com/news/?list_refer-theme-%CE%C4%E1%E7%C3%F7_",
+    "赵孟頫": "http://www.yac8.com/news/?list_refer-theme-%D5%D4%C3%CF%EE%5C_",
+    "柳公权": "http://www.yac8.com/news/?list_refer-theme-%C1%F8%B9%AB%C8%A8_"
+}
+
+base_url = "http://www.yac8.com"
+
+test_dic = {
+    "欧阳询": "http://www.yac8.com/news/?list_refer-theme-%C5%B7%D1%F4%D1%AF_",
+}
+
+def get_urls(all_author):
+    """
+    获取书法家的所有文章
+    :param all_author:
+    :return:
+    """
+    all_author_dic = {}
+    for name in all_author:
+        try:
+            page = 1
+            url = all_author[name] + "{index}.html".format(index=page)
+            # print(url)
+            s = get_selector.get_selector(send_request.send_requests(url))
+            result = s.xpath('//div[@class="navBtn font1_2"]/text()')[0]
+            page_max = result[3:result.index('页')]
+            result_dic = {}
+            for er_page in range(int(page_max)):
+                try:
+                    url = all_author[name] + "{index}.html".format(index=er_page + 1)
+                    # print("doing", name, "page{page}".format(page=er_page + 1))
+                    s = get_selector.get_selector(send_request.send_requests(url))
+                    result_url = s.xpath('//li//div[@class="b"]//h4/a/@href')
+                    result_title = [None] * len(result_url)
+                    for i in range(len(result_url)):
+                        try:
+                            s = get_selector.get_selector(send_request.send_requests(base_url + result_url[i].strip('.')))
+                            # print("正在打开 {url_} 获取title".format(url_=base_url + result_url[i].strip('.')))
+                            result_title[i] = s.xpath('//div[@class="a"]/h1/text()')[0]
+                            if "�" in result_title[i]:
+                                result_title[i] = result_title.replace("�", "頫")
+                            if "\\" in result_title[i]:
+                                result_title[i] = result_title[i].replace("\\", "")
+                            result_dic[result_title[i]] = base_url + result_url[i].strip('.')
+                        except:
+                            pass
+                    print("done", name, "page{page}".format(page=er_page + 1))
+                except Exception as e:
+                    print("error:获取这一篇文章出错", url, e)
+            # print(result_dic)
+            all_author_dic[name] = result_dic
+        except Exception as e:
+            print("error:获取这一页出错了", e)
+    return all_author_dic
+
+def get_img_info(dic):
+    """
+    获取图片并下载
+    :return:
+    """
+    for name in dic:
+        path = create_dir(r"/root/bao", name)#先创建任务文件夹
+        print("***正在弄***", name)
+        for title in dic[name]:
+            try:
+                all_imgs = []
+                # print("正在下载", title, dic[name][title])
+                file_path = create_dir(path, title)  # 再创建文章文件夹
+                s = get_selector.get_selector(send_request.send_requests(dic[name][title]))
+                result_page = s.xpath('//td//a[@rel="nofollow"]/text()')
+                img_list = s.xpath('//div[@id="newsContent"]//img/@src')
+                if img_list is not []:
+                    for i in range(len(img_list)):
+                        if img_list[i][0] is '.':
+                            img_list[i] = base_url + img_list[i].lstrip('.')
+                all_imgs.extend(img_list)
+                if result_page is not []:
+                    max_page = int(result_page[-2].strip('.'))
+                else:
+                    max_page = 1
+                if max_page > 1:
+                    for er_page in range(max_page)[1:]:
+                        url = dic[name][title].rstrip('.html')
+                        url = url + "_{page}.html".format(page=er_page + 1)
+                        s = get_selector.get_selector(send_request.send_requests(url))
+                        # print("获取图片链接", url)
+                        img_list = s.xpath('//div[@id="newsContent"]//img/@src')
+                        if img_list is not []:
+                            for j in range(len(img_list)):
+                                if img_list[j][0] is '.':
+                                    img_list[j] = base_url + img_list[j].lstrip('.')
+                        all_imgs.extend(img_list)
+                count = 1
+                for img in all_imgs:
+                    filename = file_path + "\\{i}.jpg".format(i=count)
+                    # print("downloading", filename)
+                    down_load(img, filename)
+                    count = count + 1
+            except Exception as e:
+                print("下载图片错了", e)
+
+def create_dir(path, name):
+    try:
+        fi_path = path + '\\' + name
+        os.mkdir(fi_path)
+    except Exception as e:
+        print("创建文件夹错误", e)
+    return fi_path
+
+def  down_load(url, filename):
+    """
+
+    :param filename: 文件夹路径
+    :return:
+    """
+    try:
+        content = send_request.download_img(url)
+        with open(filename, 'wb') as file:
+            file.write(content)
+    except Exception as e:
+        print("写入错误", e)
+
+
+
+get_img_info(get_urls(test_dic))
\ No newline at end of file
diff --git a/NutritionMasterSpider/baospider.py b/NutritionMasterSpider/baospider.py
new file mode 100644
index 0000000..848c775
--- /dev/null
+++ b/NutritionMasterSpider/baospider.py
@@ -0,0 +1,61 @@
+from functions import send_request, get_selector
+import os
+
+base_url = "http://www.shufabeitie.com"
+person_name_list = ["东晋王羲之", "元代赵孟頫", "明代文徵明", "唐代颜真卿"]
+test_name_list = ["唐代孙过庭"]
+
+def get_urls(name_list):
+    all_tie = {}
+    for name in name_list:
+        try:
+            url = "/".join((base_url, "shufa", name))
+            print("正在处理", name, url)
+            s = get_selector.get_selector(send_request.send_requests(url))
+            result = s.xpath('//div[@class="col-md-4 col-sm-6"]//a/@href')
+            for i in result:
+                all_tie[i.split('/')[-2]] = base_url + i
+            print(all_tie)
+        except Exception as e:
+            print("字帖获取失败了", e)
+    return all_tie
+
+def get_info(dic):
+    for name in dic:
+        try:
+            s = get_selector.get_selector(send_request.send_requests(dic[name]))
+            img1 = base_url + s.xpath('//div[@id="a0"]/img/@src')[0]
+            img_urls = s.xpath('//div[@id="a0"]/following-sibling::*/@data-original')
+            for i in range(len(img_urls)):
+                img_urls[i] = base_url + img_urls[i]
+            img_urls.append(img1)
+            dic[name] = img_urls
+            print("get info done", name)
+        except Exception as e:
+            print("图片链接获取失败", e)
+    return dic
+
+
+def write_in(dic):
+    for name in dic:
+        try:
+            path = create_dir(name)
+            print("创建文件夹", name)
+            for url in dic[name]:
+                filename = path + '//' + url.split('/')[-1]
+                with open(filename, 'wb') as file:
+                    file.write(send_request.download_img(url))
+                    print("write", url)
+        except Exception as e:
+            print("写入失败", e)
+
+def create_dir(name):
+    try:
+        dir_path = r"E:\datapy\bb" + "\\" + name
+        os.mkdir(dir_path)
+    except Exception as e:
+        print("文件夹创建失败", e)
+    return dir_path
+
+dic = get_info(get_urls(person_name_list))
+write_in(dic)
\ No newline at end of file
diff --git a/NutritionMasterSpider/bbspider.py b/NutritionMasterSpider/bbspider.py
new file mode 100644
index 0000000..d9b660d
--- /dev/null
+++ b/NutritionMasterSpider/bbspider.py
@@ -0,0 +1,92 @@
+from selenium import webdriver
+from functions import send_request, get_selector
+import time
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+import os
+
+base_url = "http://www.shufabeitie.com"
+person_name_list = ["东晋王羲之", "元代赵孟頫", "明代文徵明", "唐代颜真卿"]
+test_name_list = ["东晋王羲之"]
+
+def get_urls(list):
+    """
+    获取该网站所有的贴
+    :param list: person_name_list
+    :return:
+    """
+    urls = []
+    for name in list:
+        try:
+            time.sleep(5)
+            url = base_url + "/shufa/" + name
+            print(name, "start")
+            s = get_selector.get_selector(send_request.send_requests(url))
+            result = s.xpath('//div[@class="caption ellipsis"]//a/@href')
+            for i in range(len(result)):
+                result[i] = base_url + result[i]
+            print(name, "done")
+            urls.extend(result)
+        except Exception as e:
+            print(e)
+    print(urls)
+    return urls
+
+def get_img_element_id(url):
+    try:
+        s = get_selector.get_selector(send_request.send_requests(url))
+        id_list = s.xpath('//div[@id="beitie-imgs-container"]//div/@id')
+        return id_list
+    except Exception as e:
+        print(e)
+
+def get_info(urls):
+    """
+    从所有的贴中取出图片
+    :param urls: 所有的地址
+    :return:
+    """
+    browser = webdriver.Chrome()
+    wait = WebDriverWait(browser, 10)
+    all_list_dic = {}
+
+    for url in urls[:1]:
+        time.sleep(2)
+        browser.get(url)
+        print("正在处理", url)
+        btn = wait.until(EC.element_to_be_clickable((By.ID, "beitie-pagination-next")))
+        #btn = browser.find_element_by_id("")
+        id_list = get_img_element_id(url)
+        img_list = []
+        for img_id in id_list:
+            try:
+                time.sleep(3)
+                # img_elment = browser.find_element_by_xpath('//div[@id="{id}"]/img'.format(id=img_id))#取属性
+                img_element = wait.until(
+                    EC.visibility_of_element_located((By.XPATH, '//div[@id="{id}"]/img'.format(id=img_id))))
+                img = img_element.get_attribute('src')
+                print(img)
+                img_list.append(img)
+                time.sleep(3)
+                btn.click()
+            except Exception as e:
+                print("下载图片出错", e)
+        write_in(img_list)
+
+def create_dir(name):
+    dir_path = r"E:\datapy\bb\东晋王羲之" + "\\" + name
+    os.mkdir(dir_path)
+    return dir_path
+
+
+def write_in(urls):
+    dir_name = urls[0].split('/')[4]
+    path = create_dir(dir_name)
+    for url in urls:
+        create_dir(dir_name)
+        file_name = path + "\\" + url.split('/')[-1] + '.jpg'
+        with open(file_name, 'wb') as file:
+            file.write(send_request.download_img(url))
+
+get_info(get_urls(test_name_list))
diff --git a/NutritionMasterSpider/demo/__init__.py b/NutritionMasterSpider/demo/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/NutritionMasterSpider/demo/get_name.py b/NutritionMasterSpider/demo/get_name.py
new file mode 100644
index 0000000..5667460
--- /dev/null
+++ b/NutritionMasterSpider/demo/get_name.py
@@ -0,0 +1,13 @@
+from functions import get_selector, send_request
+
+base_url = "https://www.xinshipu.com/%E9%A5%AE%E9%A3%9F%E5%81%A5%E5%BA%B7.html"
+
+def get_info():
+    s = get_selector.get_selector(send_request.send_requests(base_url))
+    name = s.xpath('//li//a[@rel="cpdq"]/text()')
+    return name
+
+with open( r"E:\datapy\类型名称.txt", 'w', encoding='utf-8') as file :
+    for i in get_info():
+        file.write(i)
+        file.write('\n')
diff --git a/NutritionMasterSpider/demo/test.py b/NutritionMasterSpider/demo/test.py
new file mode 100644
index 0000000..e69de29
diff --git a/NutritionMasterSpider/demo/xinshipu_selenium.py b/NutritionMasterSpider/demo/xinshipu_selenium.py
new file mode 100644
index 0000000..da63545
--- /dev/null
+++ b/NutritionMasterSpider/demo/xinshipu_selenium.py
@@ -0,0 +1,32 @@
+from selenium import webdriver
+from selenium.webdriver.common.keys import Keys
+import time
+
+base_url = "https://www.xinshipu.com/"
+
+browser = webdriver.Chrome()
+time.sleep(1)
+browser.get(base_url)
+names = []
+urls = []
+with open(r"E:\datapy\类型名称.txt", 'r', encoding='utf-8') as file:
+    for i in file.readlines():
+        s = i.strip('\n')
+        names.append(s)
+index = 1
+for i in names:
+    try:
+        search_box = browser.find_element_by_id('q')
+        time.sleep(2)
+        search_box.clear()
+        search_box.send_keys(i)
+        search_box.send_keys(Keys.ENTER)
+        urls.append(browser.current_url)
+        print(i, "done", index, browser.current_url)
+        index += 1
+    except Exception as e:
+        print("这一页没有内容   ", e)
+with open(r"E:\datapy\网页.txt", 'w', encoding='utf-8') as file:
+    for i in urls:
+        file.write(i)
+        file.write('\n')
diff --git a/NutritionMasterSpider/demo/食材.py b/NutritionMasterSpider/demo/食材.py
new file mode 100644
index 0000000..293f010
--- /dev/null
+++ b/NutritionMasterSpider/demo/食材.py
@@ -0,0 +1,102 @@
+# 8 9 10 14 15 25
+from functions import get_selector, send_request
+import time
+import csv
+
+aim_url = "http://www.chinacaipu.com/shicai/"
+
+def get_urls():
+    """
+
+    :return:
+    """
+    urls = []
+    s = get_selector.get_selector(send_request.send_requests(aim_url))
+    m = [8, 9, 10, 14, 15, 25]
+    for i in m:
+        url = s.xpath('//div[@class="fd_cont"]//dl[%d]//a/@href' % i)
+        urls = urls + url
+    return urls
+
+def get_info(url):
+    """
+
+    :param url:
+    :return: 返回的a是营养价值，b是食用效果
+    """
+    dic = {
+        "食材": "",
+        "简介": "",
+        "营养价值": "",
+        "食用效果": ""
+    }
+    try:
+        s = get_selector.get_selector(send_request.send_requests(url))
+        # 储存功效信息
+        fun = s.xpath('//div[@class="fd_yygx"]//strong[1]/following-sibling::*')
+        final_fun = []
+        intro = s.xpath('//div[@class="n_sp_main_info"]//p/text()')
+        dic["食材"] = s.xpath('//div[@class="fd_tit2"]//strong/text()')
+        t = []
+        jianjie = s.xpath('//div[@class="n_sp_main_info"]//p/text()')
+        for i in jianjie:
+            t.append(i.strip())
+        dic["简介"] = t
+        for i in range(len(fun)):
+            info = s.xpath('//div[@class="fd_yygx"]//strong[1]/following-sibling::*[%d]/text()' % (i + 1))
+            if info is not None:
+                final_fun = final_fun + info
+            for m in range(len(final_fun)):
+                final_fun[m] = final_fun[m].strip()
+        for i in range(len(intro)):
+            intro[i] = intro[i].strip()
+        final_fun.remove('')
+        for i in range(len(final_fun)):
+            if "的挑选" in final_fun[i]:
+                final_fun = final_fun[0:i]
+                break
+        for i in range(len(final_fun)):
+            if "的存储方法" in final_fun[i]:
+                final_fun = final_fun[0:i]
+                break
+        a = []
+        b = []
+        for i in range(len(final_fun)):
+            if "的食用效果" in final_fun[i]:
+                a = final_fun[1:i]
+                b = final_fun[i + 1:]
+        if len(a) is 0:
+            print(final_fun[0])
+            if "的营养价值" in final_fun[0]:
+                print("doit")
+                a = final_fun[1:]
+        print(a)
+        print(b)
+        dic["营养价值"] = a
+        dic["食用效果"] = b
+        return dic
+    except Exception as e:
+        print(e)
+
+def write_files(dics):
+    with open(r'E:\datapy\直接食用.csv', 'w', newline="") as file:
+        index = 1
+        fieldnames = ["食材", "简介", "营养价值", "食用效果"]
+        writer = csv.DictWriter(file, fieldnames=fieldnames)
+        writer.writeheader()
+        for dic in dics:
+            try:
+                writer.writerow(dic)
+                index = index + 1
+                print("write", index)
+            except Exception as e:
+                print(e)
+
+dic_list = []
+for i in get_urls():
+    time.sleep(2)
+    print("正在", i)
+    dic_list.append(get_info(i))
+    print("done")
+write_files(dic_list)
+
diff --git a/NutritionMasterSpider/functions/__init__.py b/NutritionMasterSpider/functions/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/NutritionMasterSpider/functions/__pycache__/__init__.cpython-36.pyc b/NutritionMasterSpider/functions/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..558f84ea5bbf3568bc1eae7298bd80f16a129f8f
GIT binary patch
literal 162
zcmXr!<>hM7n;6Xi1dl-k3@`#24nSPY0whuxf*CX!{Z=v*frJsnFMn677_Zb4r=rBn
zyyBREO6QEkqFe<d14DB?V?C1?=lqn^;uyculA_F#%=|px#Nv|FqTqtel+>b_w9>p}
jkYI64e0*kJW=VX!UP0w84x8Nkl+v73JCH@iK+FID$*3um

literal 0
HcmV?d00001

diff --git a/NutritionMasterSpider/functions/__pycache__/baidu_api.cpython-36.pyc b/NutritionMasterSpider/functions/__pycache__/baidu_api.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..06349772bc31eda80f0645fe0a1c993a560ed347
GIT binary patch
literal 1955
zcma)6OK;mo5ayDUM9X&Kq^avPZR)1E2q+A_A3;%6*3&hu$ddIiYrvqnlthXW>E+UT
zK<>r4_nJe{OHchvy!KG^+*?nbrJXd%sRVXrc6K@Y&CIu(+T4sjdGp&(uOb}x2lw75
zg8c&w_caL2VPtU=q#(p>-r^M=3s}S<9DXAx0*+t_uLZV<qj()}1a=5-;(PdhV2AM*
zet;hab_9QdAK^~}Tf*D;GrSYnYxpt#96t%{DE<O}`HEB4@l*U2=ncG!zXrXDpW$yn
z-@|;Hi#`7f&~Y*3Zxs#aV4@E7lBK$?F<3MdDUrw(;;BSR*}<2^Mb52i=1|F<;7Y!g
z>*cjdQ&Dy&*<OB5lC^%(Fb7_z6Hn3PaYGxWa|OF@%U(?Ic?0{xSYP;}3-Vpqys~rU
zcwT#~cg%f!=oYlAV!wQnxg1ZG-T5e9ZpLNXvz%luHQ6^$8Wt^`)JFDxa?&3af++cH
zJX3%uR|n-q%^g)v6Zle17B9P%q+=U%Ww+nb<!nAV^M+n$d^F6DOLF?)s<|xAEz<1A
z>nut>5l`h4%Fe0PU)pB6pPEcdS*zM@R&(mOedsB>=}i47o}2d$Y8^%I<)&qAp%m-g
z)8nNn7YY|HL`f&pg-jBnWHZylsv*y27jj0sygEz|#s`Z=8#1bOd)SsMjgB*F(pLFu
zBwrn76z{mBWP9D_AbA%ho5(0TEuu}`RJoo$pbhh7zBnItTC(PxD7)=hvbx{zWD}Kg
z-b-ZaJ!Rf{+0e0<p6T+$tiFwsOe;IfVPUKt4C=IP%0{-`qWxtv6Srqj-BL~`<7T$2
z%16y)DZQ+u)0t`$JB63EY?9R8W|W8O%12H)MJ{s}ZBreb=IV{~zSHj(AWEY%v($0E
zQjkZ>s@0NfmF0d$$&U`Zb=AopFEzxt1s~HP7$q3)QxKF}aVEm(1_heG)4~n95rC9p
zg9xyTuq#B^k1?L`pnPGd(-;c;zjFj`9QRMN^5X1Ao$eFWn7U`pMQNmx$!;>9$nB-}
z(q|<b>+V^@qr{+wJv~xgs*|>3V4a)|ys5^V?%9QEVDDUYj6G-JhvAU(qLGH^E<2S&
zWDVrIY?zOYAe(Q&Si$8UBl3`P6f(L-({1qZ;CT)n$PGLq=Gxo}L2g3B_#5hB{0SMx
zgdnmXxlrwMc0tw$#L%ZW!6q@@4^d;HyM9=+z)ORCZ-oS>`ca1Sb}0vQcLM~6Bot+X
z7ZJG!^AAw7G(PA7bb$XQdW}}dL^pu&m}_x;c%T3$-|%^I0U$)%(WkyhbQQx)8W@)D
zsC4A>1LtEzTMQA~aIV=?3XqF%pv$_*p$$YHf!2bGg27VQf)U{P6^w;NffFkZ>cvwY
zBg_M~hu6YNFohLwiZ}3d_5j;0MjB%5xfW@7#dK&DG9xS4a~-DADvX8492Or#EX2{Z
z|K`BC5O56oAaXQ1j*{1iyN)1kxkV)$UPW$rcE%}tqQU=jq|Z(HyLv<#%LhO;tWwok
zoT)C}Go7K&&o2Bh(Ou7?gt1(SXsTsH6aA1*h)rVazC`p(Pj{(H!mxp`oc+)Y=&1XV
zyD|lp3EHJZvEh!&I@LAmha6%|sV}&c_-mE9raO$SF-eISli|5XEW%puBjSs!=t{_7
z?>E^DoT`uXkNdM8Fy<Cu1$MdHAUMPWWj4?@F9qb;LfdEyk!P?HyRQhU;RJV&?0`d&
zX6kgv*r`a%(Jg6}@MLl8S-f2fk96iCQT9t@pc}z#9cBUFgG_I8W~aP|lHF($kX!n0
eVq?$Jzh_l-Ux3&^lE4F2N&MeZkOV0ziT?t5ujD}h

literal 0
HcmV?d00001

diff --git a/NutritionMasterSpider/functions/__pycache__/get_proxy.cpython-36.pyc b/NutritionMasterSpider/functions/__pycache__/get_proxy.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..623e1a8a172bcd150ae161258672854ab8a0eb68
GIT binary patch
literal 1933
zcmaJ?TW=dh6rR~#+v|1Gx@k~KTac+j6jzNeNqQj=Xh|!2Nz$kZN^w)Hjb{?Cz24o<
z&Jx>NBaji7UZhA!JXPhPAhk$bir}gI0Di;1Lel!B@SG>kteYqjQf<wdGv_vE=A3VK
zthZNtu<`q~S5$=lLc4wv@TXz8b3h0p*hB>}OD3*K1qpX$azO@}Y$~-#A@W=nEkub@
zh>-}18n~d67*Rh%g*b^54Q7qtd6Z6cAS#+o;~+vgqZF9r6?(&?E<aZ<QHLA0)f_By
z?zj`#?AqE|rt0Yi(GAncl<Zn|1$?rGRo1gj?R}TBku$5*;?2g4-84*7&mPa@Qo}QP
z$*{QXmfuWWusAhSAV^)FPhCyrbH#kVIG#?OaU7E_(&bAA&mJE;nHf8g8oqRXVP^VR
z$~3Ap^&Tx%?R09Y%<LM?9v{u*GNUKQ$1?f+iPXHlqBG;UTM3H;!7l+L31bR|dl97T
zxY56gTA0HfwlPNaEslNE#%Iy>XDx|K6`4pv&J`Z<B_a=iZU7Nw0JUTut;BqptKu&2
z$SuWJDsd94O6*^*RT8l3Y2#MJk5qbz3S2bg;=sj1P6JNmd;Dk{1C6z@f@D;c?0c{R
z`>JFq62gc*t1ok50d`?tr&^L9^`(~)Nem!ACODY?Cm}s|rB>X>mAyXfiP4Q;7txJ_
z9Kkst&o(B#;H6ZO;zXc5xQO5m_6XjG9#9b9SJl=rJBv|E!>E}A?OtDNLvJmj4@7@~
z{A2AZvZSlPL)Ro{y*{|s%^&Y?+<mZl^XtDK-+!|Hc_x$TL_pjTCD_8*js|mD3Swod
z6Uy8m#*G@aJ>K~f6wTpmmM`0+0TY8kuAL@2*GIU)O*(nx!rYPTSx)PGINdz@Ld&_!
zR~B|`y<-sih2~ElJ>Ix?YsX;=Pe6*w`GtkKLPXH{raUq-;`KnB?y)w0y1n`3`Yr)w
z%w`kmz98Z-=<6WDbZeCcia1>maZO5{KwZ{dTJ)G1$S!Ar%DR|x19=s21{g;{!sR;m
z++xXw%MmCSS<FmB95{6lsXIC^2eL`6AgVhKwMZaCJSKx>I#Ey@9rn~5X4e}<({Oo!
z4R%OG!7RXTpmsHevu)$pj2E8UR}F{;*@JI@=|jW@!EtNu+{DsF%HL(WVYy3ljj6KE
zYN^p&9^jZ6Uz&nE-KANNGef)zGrG$un|BPzerd(CN<!!^!SRY=;EdA<w4IeJ;OL6t
zAgsV&#e1-Z`*9Lz4-D}i#C=j9J|HEf!=P7iA7(>fzk_H67NRU6qU*pkKHSDK#}!Fn
zxrK?uWmw^Mh+e?8QUNskm`90BlsigG_T>t^iGbZ{@CKxHQ2;#P640-TIHL2dehiod
z2@;sbfP|g?kI#B9!T#O;?|kyr=B<Z25NJ;Ael3^bvGl^1(tXFElOA6gIW@F0d1{Ec
z9~GCK$@~zvCUc{?@i%hgW5v;Y(ODf@Ba<u!;nQ*u6IW?aH|!V|2O$%n3enfyvAa7o
z=*G=&z1KjuTfFhzqo==p|IZ({J73({{N|UgZP>}3A8tSW`O~gG9cR7Z7(}6uiCqh#
zrLt|5C=(E8`vvJ2L^LfE#||_OpNDRh(+WE*<VS!M)KD&(^i?4fP1Pl@3+^ZoQBU^(
z5QHVDu?F?;0}9oaROo{!4z1FOaN9sJ>oqfk2HOiRh5g$o%Fyj^lN;iJ4TGBP6C})1
kY!gP>l|z_~NF-3-s@cRd>D%I+a>X}7?A;xZhpZm@4-U~5jsO4v

literal 0
HcmV?d00001

diff --git a/NutritionMasterSpider/functions/__pycache__/get_selector.cpython-36.pyc b/NutritionMasterSpider/functions/__pycache__/get_selector.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ccbe4895387b700f21d8269cd0029f18aa909acb
GIT binary patch
literal 436
zcmYk2K}!Nr5XWcUu8^YQv2I@XB9%cAA(03XDZzFKTL|&Ja%*>$_nx4k5!fY)x&_?}
z@)!htioU>J!%*lGM2BWQgaf}nGygXX^Cq84C4Rqe4?h6lllTut*(RapNjPxyz{e^g
zaK?=*s4{NaV8tf%3KoVjp`{RYj7kcF$Ph(B6-c^i4X4<H0rs(nHkhE<SwgNM^cli=
zS{odDY(O~&o9MF(b^rkp)fTI?7ih}l^7`v$IC^{;-@T9SA4X5F<G1H5g=NZU;i|d4
zU)~MlrA}S6wA&2ASWCKrwv5nhXx|G_g(!v~=cxI|F0DH|LT|~M8z^V5TWr*%pIu&D
zTFvEiD^9V=g>ouwE!}8Txu&#`cFW~LI>+sx9+}EH5&B38Pt<i&=33n_Icr2`P)QO%
sh6yw=Ln;$gS1hAydL7@J?me}pOU+1}+QPXFzscL4C`6Z4(I1oS4~cbcy8r+H

literal 0
HcmV?d00001

diff --git a/NutritionMasterSpider/functions/__pycache__/send_request.cpython-36.pyc b/NutritionMasterSpider/functions/__pycache__/send_request.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..915f81713ad40f5b5f7542d514ec51132f19b4aa
GIT binary patch
literal 2427
zcmds3TW=dh6yDjJ*K0fU67IK^c&Vl0#JRLmK+rZSw>AOAMU9N5)#8~Z>#TQ|nOQZC
z?5L26H-z{P@W2zQ1mZ978|HzRs#WtBc;cL0$1-VD1VVjatT{7t=FDa1`_4IDtkv9i
z@Bi}I?`2K9uT2#l`j?=J4G>hLB+}a0>JjPdZJiW4qis-wnjvYMOz&CLIv{PE+O%|6
zYnP})%g{R1r4?w)v`TBxx|FoE`phBhtF70GDsM6Ar##sm?75!`#^1cW#bUWPSWEW8
zC<^A58}r_|wV)fuG7;Nvc^}4-MII=;k6YfR*PQp8O@FEGT~5=8-DIC%3+3GM;>E_|
z1@GLo4{oeoKkr514)fk;-JPWFt#0$A&*qjF8uN{Xi%W}*X7hsA3T_2F94|X0aI-E7
zEGE=bP*<UfyC4P|QtJ^)4hYet-ZP|mKt@DbJ$tCh64i%<8sC^BeW>>wYVPR#67<SL
z-FKm_v@}`GXRHH!M7yQk)Z+7|2J34(F5f5G$ROI@jI7eq&^WT8_Q=>bHnmva%-7VN
zY!R;FdQcvG``zK4FCYE%>%)6r<%*Rw;6dNZc(hWCIg=TWivc%a-JuJjZYl$8RB4+9
zlyRX-GVHS?ld6PhgiIX%24>kaAmEtdfCt~-d-U@U>)ErQoIbeFgIRq>nYfR#M8sIi
zkw?mvOpGyBZVt5{g+eNavoA8363PG)a2staLIyGuem9{^oeom?7@&jCVo-$fmU1RN
zQ?gyDtds*Y)TxbPtE;<RmdY@R>n68wKbQw<DZ&+DKWh9%(EZW6y3+ZG$tyevW6}9!
zu(}=azPB*n1lBZ`I;(KB=&Wawhq%*PASC0hG=x{`+{)rEDn&=InEK-nXru#Gn^uSl
zoFiTUq1ifd;dchALu|bY68rpRnCs&6V8N?SSoSpx1~*P%nLfp`f@jvq7#d@qU4dSC
zXaLWQG0$-3WS-pto|zM#nNvJ7_s#!|XB?fUZskDa=<*UMxC27jIZFkH!1K>J#*x4r
z-#8~2uVSx;Vg?0Lwm1*pl%Ga%2E|zvvnY_jM>l%~70;n~9tEP7^P~_j!BEW}G1b2v
z%5A^6`)e@s7mR0*WBe*u{I4TPfpFn!#}Iz1$f{B|fxHmQDRjrTdNQz8n%s_~B%prS
z-&!~h=wnX%Is%Fz6br_yiPP@GU~v5er!@+vg|wg#jiC<7!5W!EvscQK!wU2qNDAd#
z^SHCRkQ8>oS*_ez%a9Z%Hjosoee0<>t4RYH{3}2!Pj*#hriqX|chh6eX&3R^F47bC
z;C=tbNvpWmQAmCd>;+<f6oAn=r^4?WFjKGO@j{g+QN0K!d2~T^+wSDgi74U=Ms1F6
r&5;TmcbSS6m|b`tFr2sh3C$w*4*ri2_<at6&~G?~t2<|%S!ec7`EEvR

literal 0
HcmV?d00001

diff --git a/NutritionMasterSpider/functions/__pycache__/wtrte_csv.cpython-36.pyc b/NutritionMasterSpider/functions/__pycache__/wtrte_csv.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d52f54afbd30bd3fd091e52c9cd3143b2741bed0
GIT binary patch
literal 865
zcmZ`&&ubGw6n?Y2NjB*ZBUXA7y$AsbY6U?=#I_y;OSOl@7^xvMwOf--+?_RzY{VMv
z4=}V+Y*8y7Y6UMsX{n{H{t5m8a}vy^$;rDX-)ubepab9Iy|>?c-<#Q)zOJsw_npPt
zbp_xj99S5`WrW>>h5{uyNC8!-`V3Npk`ah$E&KvQS;>@3M;t@+BkUh&%AYy7$dy$!
zb$+R$P_3fU01eU*)oGYUXb0`Qr&lyiCKOk3HQH5EDgiezp;m#w<XsmA;7+m<ET6=j
z<_4>T01wb^9(2_z=>-|PD%E<Sq9)+MRSkIPe#BZKPze!u6h-bKH&j&!B;c0Z1?C@z
zlE{=uV3xuSxCu%0%u|1>#ewSRzp70oiFJ4ahld0y35XF9GFd5Sn5;!`-%b!sbAH8J
zsQIopJH5ZY+ji$yy_Xxl+gg3!c(>qmBDcQ1+x$4?eOYVH?f40AcB}q%rLnx#THb8e
zO}%MsymG=w_TGNmpPO;49Lh$<43?v2CeLgUC|L$)&IzP6mS*a^TaCpUHu3hJdfVH-
z_Fj0?uf6AM-iP((=Gy;Rjk!f{?@5~#(}h+jGE=Bo`(Y|FU}SkhYFMcbUu&FYC<eM8
zScQ@Z6fMK#LbbUi!h@4pR^&#(#5UnPGo8_#VRNAsGkiQ1!j5A`j){O_QZ{MH6BEI9
zBcVyQAnX%ZM=<|;c<@5{8sk^2jA7d8;d1|Y#>yW*d-}}zcwhWny1zh~ogQ*H&W3W=
zGd7MmQZ#V3^q6C2WztTUxW(Bh%EpUj5%!g2q@sW=Z!HjoM2SXvNH@_*1fvMXorpNX
jI*N>#V#y!i`~GAHjC>_RznCvjC&w<yTVTs~p(}p?GiMHz

literal 0
HcmV?d00001

diff --git a/NutritionMasterSpider/functions/baidu_api.py b/NutritionMasterSpider/functions/baidu_api.py
new file mode 100644
index 0000000..d2fd62e
--- /dev/null
+++ b/NutritionMasterSpider/functions/baidu_api.py
@@ -0,0 +1,82 @@
+from aip import AipImageClassify
+import requests
+
+wang_key = {
+    "id": "11790313",
+    "key": "dqAy7sFcjgZ7TdE8R7W8cEPZ",
+    "skey": "m6W8xr2GXAijfuUU03t2QNch479oHoLu"
+}
+
+zhao_key = {
+    "id": "11790318",
+    "key": "vpuuSkeUjBdKs9cvAXDT5qkn",
+    "skey": "xh0DP0Loulp273mBjTNltCTGhoB2mXh9"
+}
+
+my_key = {
+    "id": "11786059",
+    "key": "vvIDyGshEY1dqa2AqVE2poix",
+    "skey": "XReL682wuguUkMg8kCL4IvPzAxlrPX0H"
+}
+
+yang_key = {
+    "id": "11810381",
+    "key": "YlXzoj4X3mnC6lFVPF7akSKu",
+    "skey": "45HM07xWIGUZeW7nDcyZAHVYQzjL99bs"
+}
+
+he_key = {
+    "id": "14249521",
+    "key": "65nKFiLwwbL5cqvK4fkIyNSn",
+    "skey": "GVWdoLENUphPtRDvhLvK5ZuQUZ6WVPf2"
+}
+
+bao_key = {
+    "id": "14249615",
+    "key": "Rrcns3DH4ItNjO8AxgURLcpT",
+    "skey": "Sw2FBXU61ED8u15HWZxRONedu4weLmjF"
+}
+
+fei_key = {
+    "id": "14249624",
+    "key": "zg9kcIfHtSjLi6SRtXzP50ow",
+    "skey": "xC7erkP6VaLMP2C4zE445FPdp9OG62rG"
+}
+
+friend1_key = {
+    "id": "14249589",
+    "key": "LMpD3rq7bSjafY7HN4BpXV9w",
+    "skey": "NUwlak8E9LhzFlRLGEzB5Z8hKVHap6Qz"
+}
+
+def get_Ai(key):
+    return AipImageClassify(key.get("id"), key.get("key"), key.get("skey"))
+
+def get_client(times):
+    if times <= 499:
+        client = get_Ai(bao_key)
+    elif times <= 999:
+        client = get_Ai(friend1_key)
+    else:
+        return None
+    return client
+
+
+def get_file_content(filepath):
+    with open(filepath, 'rb') as fp:
+        return fp.read()
+
+def get_calorie(img_url, times):
+    try:
+        r = requests.get(img_url)
+        with open(r"E:\datapy\asd.jpg", 'wb') as file:
+            file.write(r.content)
+
+        image = get_file_content(r"E:\datapy\asd.jpg")
+        client = get_client(times)
+        a = client.dishDetect(image)
+        print(a["result"][0])
+        return str(a["result"][0].get("calorie"))
+    except Exception as e:
+        print("error", e)
+
diff --git a/NutritionMasterSpider/functions/get_proxy.py b/NutritionMasterSpider/functions/get_proxy.py
new file mode 100644
index 0000000..06e59de
--- /dev/null
+++ b/NutritionMasterSpider/functions/get_proxy.py
@@ -0,0 +1,51 @@
+import requests
+from lxml import etree
+import time
+from requests.exceptions import RequestException
+import random
+base_url = "https://www.kuaidaili.com/free/inha/"
+headers = {
+    'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36'
+}
+
+def get_proxys(page):
+    try:
+        proxy_list = []
+        print("正在抓代理...")
+        for i in range(page):
+            time.sleep(5)
+            url = base_url + str(i + 1) + "/"
+            r = requests.get(url, headers=headers, timeout=10)
+            if r.status_code == 200:
+                s = etree.HTML(r.text)
+                proxy_ip = s.xpath('//tbody//tr//td[@data-title="IP"]/text()')
+                proxy_port = s.xpath('//tbody//tr//td[@data-title="PORT"]/text()')
+                proxy_kind = s.xpath('//tbody//tr//td[@data-title="类型"]/text()')
+                if len(proxy_ip) == len(proxy_port) == len(proxy_kind):
+                    for i in range(len(proxy_ip)):
+                        proxy = {
+                            'HTTP': proxy_ip[i] + ":" + proxy_port[i],
+                            'HTTPS': proxy_ip[i] + ":" + proxy_port[i]
+                        }
+                        proxy_list.append(proxy)
+            else:
+                print(str(r.status_code) + "---" + r.url)
+        print("代理完成")
+        return proxy_list
+    except RequestException as e:
+        print("代理error:" , e)
+
+def test_proxy(proxy_list):
+    try:
+        print("正在选择代理...")
+        proxy = random.choice(proxy_list)
+        test_url = "https://www.baidu.com/s?ie=utf-8&f=8&rsv_bp=1&tn=02049043_21_pg&wd=" + str(random.random())
+        r = requests.get(test_url, proxies=proxy, headers=headers, timeout=10)
+        if r.status_code == 200:
+            print("代理选择成功")
+            return proxy
+        else:
+            print("代理选择失败，重新选择")
+            test_proxy(proxy_list)
+    except:
+        print("验证失败")
\ No newline at end of file
diff --git a/NutritionMasterSpider/functions/get_selector.py b/NutritionMasterSpider/functions/get_selector.py
new file mode 100644
index 0000000..4e03ee2
--- /dev/null
+++ b/NutritionMasterSpider/functions/get_selector.py
@@ -0,0 +1,9 @@
+from lxml import etree
+
+def get_selector(html):
+    try:
+        s = etree.HTML(html)
+        return s
+    except Exception as e:
+        print("选择器获取失败    ", e)
+        return None
diff --git a/NutritionMasterSpider/functions/send_request.py b/NutritionMasterSpider/functions/send_request.py
new file mode 100644
index 0000000..7c96ab6
--- /dev/null
+++ b/NutritionMasterSpider/functions/send_request.py
@@ -0,0 +1,87 @@
+import requests
+from functions import get_proxy
+import time
+
+headers = {
+    'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36'
+}
+
+proxy_list = get_proxy.get_proxys(1)
+
+def send_requests(url):
+    """
+    发送请求
+    :param url:
+    :return:
+    """
+    try:
+        time.sleep(1)
+        proxy = get_proxy.test_proxy(proxy_list)
+        r = requests.get(url=url, headers=headers, timeout=10, proxies=proxy)
+        if r.status_code == 200:
+            r.encoding = r.apparent_encoding
+            return r.text
+        else:
+            print(r.status_code, "   请求失败")
+            return None
+    except requests.RequestException as e:
+        print("发送请求失败   ", e)
+        return None
+def requests_with_params(url, params):
+    """
+    发送请求
+    :param url:
+    :return:
+    """
+    try:
+        time.sleep(1)
+        proxy = get_proxy.test_proxy(proxy_list)
+        r = requests.get(url=url, headers=headers, timeout=10, proxies=proxy, params=params)
+        if r.status_code == 200:
+            r.encoding = r.apparent_encoding
+            return r.text
+        else:
+            print(r.status_code, "   请求失败")
+            return None
+    except requests.RequestException as e:
+        print("发送请求失败   ", e)
+        return None
+
+def download_img(url):
+    """
+    发送请求
+    :param url:
+    :return:
+    """
+    try:
+        time.sleep(1)
+        proxy = get_proxy.test_proxy(proxy_list)
+        r = requests.get(url=url, headers=headers, timeout=10, proxies=proxy)
+        if r.status_code == 200:
+            r.encoding = r.apparent_encoding
+            return r.content
+        else:
+            print(r.status_code, "   请求失败")
+            return None
+    except requests.RequestException as e:
+        print("发送请求失败   ", e)
+        return None
+
+def post_request(url, header, data):
+    """
+    发送请求
+    :param url:
+    :return:
+    """
+    try:
+        time.sleep(1)
+        proxy = get_proxy.test_proxy(proxy_list)
+        r = requests.post(url=url, headers=header, timeout=10, proxies=proxy, data=data)
+        if r.status_code == 200:
+            return r.text
+        else:
+            print(r.status_code, "   请求失败")
+            return None
+    except requests.RequestException as e:
+        print("发送请求失败   ", e)
+        return None
\ No newline at end of file
diff --git a/NutritionMasterSpider/functions/wtrte_csv.py b/NutritionMasterSpider/functions/wtrte_csv.py
new file mode 100644
index 0000000..dbb8b48
--- /dev/null
+++ b/NutritionMasterSpider/functions/wtrte_csv.py
@@ -0,0 +1,19 @@
+import csv
+
+def write_csv(menu_list, path):
+    try:
+        with open(path, "w", newline="") as csvfile:
+            index = 1
+            fieldnames = ["菜名", "分类", "口味", "食材", "主要工艺", "制作时间", "做法", "图片url"]
+            writer = csv.DictWriter(csvfile, fieldnames=fieldnames)
+            writer.writeheader()
+            for menu in menu_list:
+                try:
+                    writer.writerow(menu)
+                    print("write" + str(index))
+                    index = index + 1
+                except Exception as e:
+                    print("文件操作异常，写入失败", e)
+    except Exception as e:
+        print("文件操作异常，打开失败", e)
+
diff --git a/NutritionMasterSpider/info_add.py b/NutritionMasterSpider/info_add.py
new file mode 100644
index 0000000..aba75df
--- /dev/null
+++ b/NutritionMasterSpider/info_add.py
@@ -0,0 +1,72 @@
+from functions import get_selector, send_request
+
+import time
+
+import csv
+
+base_url = "http://www.boohee.com"
+search_url = "http://www.boohee.com/food/search?keyword="
+
+test_list = ['番茄炒蛋', '土豆丝']
+
+def get_url(name):
+    time.sleep(1.5)
+    s = get_selector.get_selector(send_request.send_requests(search_url + name))
+    url = s.xpath('//li[@class="item clearfix"][1]//h4//a/@href')[0]
+    url = base_url + url
+    print(url)
+    return url
+
+def get_info(url):
+    dic = {}
+    s = get_selector.get_selector(send_request.send_requests(url))
+    name = s.xpath('//h2[@class="crumb"]/text()')[-1].strip().replace('/ ', '')
+    calorie = s.xpath('//span[@id="food-calory"]//span[@class="stress red1"]/text()')[0]
+    img_url = s.xpath('//div[@class="food-pic pull-left"]//a/@href')[0]
+    dic["new_name"] = name
+    dic["calorie"] = calorie
+    dic["img_url"] = img_url
+    return dic
+
+def read_csv(path):
+    """
+
+    :param path: csv文件的路径
+    :return:
+    """
+    old = []
+    with open(path, 'r') as file:
+        reader = csv.DictReader(file)
+        for row in reader:
+            try:
+                old.append(row)
+            except:
+                pass
+    return old#这里记得改了
+
+def write_csv(path, new_dics):
+    """
+
+    :param path: 写入文件的路径
+    :return:
+    """
+    with open(path, 'w', newline='') as file:
+        fieldnames = ['', 'name', 'new_name', 'calorie', 'img_url']
+        writer = csv.DictWriter(file, fieldnames)
+        writer.writeheader()
+        for new_dic in new_dics:
+            try:
+                writer.writerow(new_dic)
+            except:
+                pass
+
+if __name__ == '__main__':
+    rows = read_csv(r"F:\Tencent\TIM\Tencent Files\739843128\FileRecv\menu_names.csv")
+    for row in rows:
+        try:
+            dic = get_info(get_url(row.get('name')))
+            row.update(dic)
+        except Exception as e:
+            print(e)
+    write_csv(r"E:\datapy\new_info.csv", rows)
+
diff --git a/NutritionMasterSpider/nutrition_add.py b/NutritionMasterSpider/nutrition_add.py
new file mode 100644
index 0000000..938619b
--- /dev/null
+++ b/NutritionMasterSpider/nutrition_add.py
@@ -0,0 +1,75 @@
+from functions import send_request, get_selector
+import csv
+
+
+base_url = "http://www.boohee.com"
+search_url = "http://www.boohee.com/food/search?keyword="
+
+test_list = ["碘盐", ]
+
+def get_url(name):
+    s = get_selector.get_selector(send_request.send_requests(search_url + name))
+    url = s.xpath('//li[@class="item clearfix"][1]//h4//a/@href')[0]
+    url = base_url + url
+    print(url)
+    return url
+
+def get_info(url):
+    s = get_selector.get_selector(send_request.send_requests(url))
+    info = s.xpath('//div[@class="content"]//dd[2]/following::dd//span/text()')
+    info_dic = {}
+    for i in range(int(len(info) / 2)):
+        try:
+            info_dic[info[i * 2]] = info[(i + 1) * 2 - 1]
+        except:
+            pass
+    for ingredient in info_dic:
+        try:
+            float(info_dic[ingredient])
+        except:
+            info_dic[ingredient] = '-1'
+    return info_dic
+
+def read_csv(path):
+    """
+
+    :param path: csv文件的路径
+    :return:
+    """
+    old = []
+    with open(path, 'r') as file:
+        reader = csv.DictReader(file)
+        for i in reader:
+            try:
+                old.append(i)
+            except:
+                pass
+    return old#这里记得改了
+
+def write_csv(path, old_dic):
+    """
+
+    :param path: 写入文件的路径
+    :return:
+    """
+    with open(path, 'w', newline='') as file:
+        fieldnames = ['', 'material_name', 'name_correct', '镁(毫克)', '维生素A(微克)', '铁(毫克)', '硒(微克)', '钾(毫克)', '铜(毫克)', '磷(毫克)', '胡萝卜素(微克)', '碳水化合物(克)', '锰(毫克)', '钠(毫克)', '胆固醇(毫克)', '烟酸(毫克)', '热量(大卡)', '核黄素(毫克)', '锌(毫克)', '维生素C(毫克)', '硫胺素(毫克)', '脂肪(克)', '钙(毫克)', '维生素E(毫克)', '纤维素(克)', '蛋白质(克)']
+        writer = csv.DictWriter(file, fieldnames)
+        writer.writeheader()
+        for i in old_dic:
+            try:
+                writer.writerow(i)
+            except:
+                pass
+
+m = read_csv(r"F:\Tencent\TIM\Tencent Files\739843128\FileRecv\material_names.csv")
+for row in m:
+    try:
+        row.update(get_info(get_url(row.get('name_correct'))))
+        # for name in row:
+        #     if row.get(name) is None:
+        #         row[name] = "-1"
+        print(row)
+    except Exception as e:
+        print(e)
+write_csv(r"E:\datapy\test.csv", m)
diff --git a/NutritionMasterSpider/reget_image_url.py b/NutritionMasterSpider/reget_image_url.py
new file mode 100644
index 0000000..61fdfa2
--- /dev/null
+++ b/NutritionMasterSpider/reget_image_url.py
@@ -0,0 +1,87 @@
+from functions import get_selector, send_request
+import csv
+import requests
+import os
+import time
+
+headers = {
+    'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36'
+}
+
+def get_img_url(name):
+    base_url = "http://so.meishi.cc/index.php?q="
+    try:
+        time.sleep(2)
+        s = get_selector.get_selector(send_request.send_requests(base_url + name))
+        img = s.xpath('//div[@class="search2015_cpitem"][1]//a[@class="img"]//img/@src')
+        print(name, img)
+        return img[0]
+    except Exception as e:
+        print(e)
+
+def get_old_info(filename):
+    """
+
+    :param filename: 重新修改的文件名
+    :return:返回旧的字典列表
+    """
+    old_dicts = []
+    try:
+        with open(r'E:\datapy\天天美食\脏腑调理\%s' % filename, 'r') as file:
+            reader = csv.DictReader(file)
+            for i in reader:
+                old_dicts.append(i)
+        return old_dicts
+    except Exception as e:
+        print(e)
+
+def alter_info(name, dic):
+    dic["图片url"] = get_img_url(name)
+    return dic
+
+def rewrite_info(filename, old_dicts):
+    """
+
+    :param filename: 重写文件名
+    :param old_dicts: 重新写入的字典列表
+    :return:
+    """
+    index = 1
+    try:
+        with open(r'E:\datapy\test\脏腑调理\%s' % filename, 'w', newline='') as file:
+            fieldnames = ["菜名", "分类", "口味", "食材", "主要工艺", "制作时间", "做法", "图片url"]
+            writer = csv.DictWriter(file, fieldnames)
+            writer.writeheader()
+            for i in old_dicts:
+                try:
+                    writer.writerow(i)
+                    index = index + 1
+                    print("done", index)
+                except Exception as e:
+                    print("写入错误", e)
+    except Exception as e:
+        print("读取文件出错", e)
+
+def get_filenames(path):
+    """
+
+    :param path: 文件路径
+    :return: 所有文件名
+    """
+    filenames = []
+    for root, dirnames, s in os.walk(path):
+        filenames.extend(s)
+    return filenames
+
+if __name__ == "__main__":
+    filenames = get_filenames(path="E:\datapy\天天美食\脏腑调理")
+    for filename in filenames:
+        old_dicts = get_old_info(filename)
+        new_dicts = []
+        for old_dict in old_dicts:
+            time.sleep(2)
+            old_dict["图片url"] = get_img_url(old_dict.get("菜名"))
+            new_dicts.append(old_dict)
+            print("write new done")
+        rewrite_info(filename, new_dicts)
+
diff --git a/NutritionMasterSpider/test.py b/NutritionMasterSpider/test.py
new file mode 100644
index 0000000..e69de29
diff --git a/NutritionMasterSpider/ttmeishi.py b/NutritionMasterSpider/ttmeishi.py
new file mode 100644
index 0000000..a90cbce
--- /dev/null
+++ b/NutritionMasterSpider/ttmeishi.py
@@ -0,0 +1,162 @@
+from requests.exceptions import RequestException
+import requests
+import csv
+from lxml import etree
+import time
+from functions import get_proxy
+
+#tt网页
+base_url = "http://www.ttmeishi.com/CaiXi/ZiHanDaoHan/"
+#网页前面的前缀
+base_menu_url = "http://www.ttmeishi.com"
+
+headers = {
+    'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36'
+}
+#所有的菜谱
+total_menu=[]
+#现爬的代理池
+proxy_list = get_proxy.get_proxys(10)
+
+def get_html(url):
+    try:
+        proxy = get_proxy.test_proxy(proxy_list)
+        r = requests.get(url, headers=headers, proxies= proxy, timeout= 5)
+        if r.status_code == 200:
+            r.encoding = r.apparent_encoding
+            s = etree.HTML(r.text)
+            print("菜谱详情请求成功")
+            return s
+    except RequestException as e:
+        print("-----地址错误-----", e)
+
+
+def get_page(page):#从2开始
+    try:
+        if page != 1:
+            re = requests.get(base_url + "list%d.htm" %page, headers= headers, timeout= 5)
+            if re.status_code == 200:
+                print("一页ok")
+                return re.text
+            else:
+                print(re.status_code)
+        else:
+            re = requests.get(base_url, headers = headers, timeout= 5)
+            if re.status_code == 200:
+                print("一页ok")
+                return re.text
+            else:
+                print(re.status_code)
+    except RequestException as e:
+        print("asd", e)
+
+def get_urls(html):
+    menu=[]
+    try:
+        s = etree.HTML(html)
+        urls = s.xpath('//div[@id="content" and @class="content"]'
+                      '//li[@class="cx_liebiao_li"]'
+                      '//a/@href')
+        for url in urls:
+            url = base_menu_url + url
+            menu.append(url)
+        print(menu)
+        return menu
+    except RequestException as e:
+        print("-----获取菜谱失败-----", e)
+
+#获取菜谱得网址
+def get_info(urls):
+    total_info = []
+    index = 1
+    for url in urls:
+        if index % 10 == 0:
+            time.sleep(10)
+            print("大睡" + str(index))
+        else:
+            time.sleep(2)
+            print("小睡" + str(index))
+        try:
+            s = get_html(url)
+            dic = {
+                "菜名": "",
+                "分类": "",
+                "口味": "",
+                "食材": "",
+                "主要工艺": "",
+                "制作时间": "",
+                "做法": "",
+                "图片url": "",
+            }
+            dic["菜名"] = s.xpath('//div[@id= "content" and @class= "content"]'
+                                '//h1/text()')[0]
+            classification_info1 = s.xpath('//ul[@class= "fenlei_ul"]//li'
+                                           '//span[@class="fenlei_li_name"]'
+                                           '//a/text()')
+            classification_info2 = s.xpath('//ul[@class= "fenlei_ul"]//li'
+                                           '//span[@class="fenlei_li_sm"]/text()')
+            for i in range(len(classification_info1)):
+                classification_info2[i] = classification_info2[i] + ":" \
+                                          + classification_info1[i]
+            # 分类里有一堆，所以这里采用遍历分开
+            for classification in classification_info2:
+                if classification[0:2] == "分类":
+                    dic["分类"] = dic["分类"] + "," + classification[3:]
+                    dic["分类"].strip(",")
+                elif classification[0:4] == "菜品口味":
+                    dic["口味"] = classification[5:]
+                elif classification[2:4] == "时间":
+                    dic["制作时间"] = classification[5:]
+                elif classification[2:4] == "工艺":
+                    dic["主要工艺"] = classification[5:]
+                elif classification[0:2] == "工艺":
+                    dic["主要工艺"] = classification[3:]
+                elif classification[2:4] == "难度":
+                    pass
+                else:
+                    dic["食材"] = dic["食材"] + "," + classification
+            # step_info是菜谱的制作步骤的临时储存，下面好整理
+            step_info1 = s.xpath('//div[@class="c_bz_neirong_b0ah"]/text()')
+            step_info2 = s.xpath('//div[@class="c_buzhou cbox"]/text()')
+            for i in range(len(step_info1)):
+                step_info1[i] = str(i + 1) + "." + step_info1[i]
+            for i in range(len(step_info2)):
+                step_info2[i] = step_info2[i].strip()
+            dic["做法"] = step_info1 + step_info2
+            dic["图片url"] = s.xpath('//div[@class="cbox c_img"]//img/@src')
+            total_info.append(dic)
+            print("done" + str(index))
+            index = index + 1
+        except:
+            print(dic["菜名"]+"error")
+    return total_info
+
+#最终几百道菜的菜谱
+
+#写入文件
+def write_csv(menu_list):
+    try:
+        with open(r"E:\datapy\脏腑调理\自汗盗汗.csv", "w", newline="") as csvfile:
+            index = 1
+            fieldnames = ["菜名", "分类", "口味", "食材", "主要工艺", "制作时间", "做法", "图片url"]
+            writer = csv.DictWriter(csvfile, fieldnames=fieldnames)
+            writer.writeheader()
+            for menu in menu_list:
+                try:
+                    writer.writerow(menu)
+                    print("write" + str(index))
+                    index = index + 1
+                except Exception as e:
+                    print("文件操作异常，写入失败", e)
+    except:
+        print("文件操作异常，打开失败")
+
+if __name__ == '__main__':
+    urls = []
+    for i in range(4):
+        time.sleep(1)
+        print("主函数睡" + str(i))
+        html = get_page(i+1)
+        urls = get_urls(html) + urls
+    m = get_info(urls)
+    write_csv(m)
\ No newline at end of file
diff --git a/NutritionMasterSpider/write_calorie.py b/NutritionMasterSpider/write_calorie.py
new file mode 100644
index 0000000..c9376a0
--- /dev/null
+++ b/NutritionMasterSpider/write_calorie.py
@@ -0,0 +1,73 @@
+import os
+import csv
+from functions import baidu_api
+
+times = 1
+
+def get_filenames(path):
+    """
+
+    :param path: 文件路径
+    :return: 所有文件名
+    """
+    filenames = []
+    for root, dirnames, s in os.walk(path):
+        filenames.extend(s)
+    return filenames
+
+def get_old_info(filename):
+    """
+
+    :param filename: 重新修改的文件名
+    :return:返回旧的字典列表
+    """
+    old_dicts = []
+    try:
+        with open(r'E:\datapy\test\脏腑调理\%s' % filename, 'r') as file:
+            reader = csv.DictReader(file)
+            for i in reader:
+                old_dicts.append(i)
+        return old_dicts
+    except Exception as e:
+        print(e)
+
+def write_in_calorie(old_dicts):
+    global times
+    for i in old_dicts:
+        print(i.get('图片url'), times)
+        i["卡路里"] = baidu_api.get_calorie(i.get('图片url'), times)
+        times = times + 1
+    return old_dicts
+
+def rewrite_info(filename, old_dicts):
+    """
+
+    :param filename: 重写文件名
+    :param old_dicts: 重新写入的字典列表
+    :return:
+    """
+    index = 1
+    try:
+        with open(r'E:\datapy\final\脏腑调理\%s' % filename, 'w', newline="") as file:
+            fieldnames = ["菜名", "分类", "口味", "食材", "主要工艺", "制作时间", "做法", "图片url", "卡路里"]
+            writer = csv.DictWriter(file, fieldnames)
+            writer.writeheader()
+            for i in old_dicts:
+                try:
+                    writer.writerow(i)
+                    index = index + 1
+                    print("done", index)
+                except Exception as e:
+                    print("写入错误", e)
+    except Exception as e:
+        print("读取文件出错", e)
+
+if __name__ == "__main__":
+    filenames = get_filenames(r'E:\datapy\test\脏腑调理')
+    for filename in filenames:
+        dics = get_old_info(filename)
+        dics = write_in_calorie(dics)
+        rewrite_info(filename, dics)
+        print(filename, "done")
+
+
diff --git a/NutritionMasterSpider/xinshipu.py b/NutritionMasterSpider/xinshipu.py
new file mode 100644
index 0000000..8b4ba8c
--- /dev/null
+++ b/NutritionMasterSpider/xinshipu.py
@@ -0,0 +1,86 @@
+from functions import get_selector, send_request
+from requests import RequestException
+import time
+from functions import wtrte_csv
+
+ttt = ["zaocan", "wucan", "wancan"]
+base_url = "https://www.meishij.net/chufang/diy/"
+
+def get_urls(menu_url):
+    """
+    获取界面上的菜的url
+    :param menu_url: 某类食谱
+    :return: 该类食谱的所有菜的url
+    """
+    urls_list = []
+    for i in range(11):
+        time.sleep(1)
+        try:
+            url = menu_url + str(i + 1)
+            print(url)
+            s = get_selector.get_selector(send_request.send_requests(url))
+            urls = s.xpath('//div[@class="listtyle1"]//a/@href')
+            urls_list.extend(urls)
+            print("page"+str(i), "done")
+        except Exception as e:
+            print("打开失败", e)
+    return urls_list
+
+def get_info(url):
+    """
+    获取详细内容
+    :param url: 菜品的url
+    :return: 返回的字典
+    """
+    dic = {
+        "菜名": "",
+        "分类": "",
+        "口味": "",
+        "食材": "",
+        "主要工艺": "",
+        "制作时间": "",
+        "做法": "",
+        "图片url": "",
+    }
+    try:
+        time.sleep(1)
+        print("open", url)
+        s = get_selector.get_selector(send_request.send_requests(url))
+        dic["图片url"] = s.xpath('//div[@class="cp_headerimg_w"]//img/@src')[0]
+        dic["菜名"] = s.xpath('//h1[@class="title"]//a/text()')[0]
+        dic["分类"] = s.xpath('//dl[@class="yj_tags clearfix"]//a/text()')
+        dic["主要工艺"] = s.xpath('//li[@class="w127"]//a/text()')[0]
+        dic["口味"] = s.xpath('//li[@class="w127 bb0"]//a/text()')[0]
+        dic["制作时间"] = s.xpath('//li[@class="w270 bb0 br0"]//div[@class="processing_w"]//a/text()')[0]
+        zhuliao = s.xpath('//div[@class="c"]//h4/child::*/text()')
+        fuliao = s.xpath('//div[@class="yl fuliao clearfix"]//ul[@class="clearfix"]/descendant::*/text()')
+        cailiao = []
+        for i in range(len(zhuliao)):
+            if i % 2 == 0:
+                temp = zhuliao[i] + ":" + zhuliao[i + 1]
+                cailiao.append(temp)
+        for i in range(len(fuliao)):
+            if i % 2 == 0:
+                temp = fuliao[i] + ":" + fuliao[i + 1]
+                cailiao.append(temp)
+        dic["食材"] = cailiao
+        steps = s.xpath('//div[@class="editnew edit"]//div//p/text()')
+        for i in range(len(steps)):
+            steps[i] = str(i + 1) + steps[i]
+        dic["做法"] = steps
+        print(dic.get("菜名"), "done")
+    except Exception as e:
+        print("获取菜失败", e)
+    return dic
+
+if __name__ == '__main__':
+    path = r"E:\datapy\心食谱\\"
+    for i in ttt:
+        time.sleep(1)
+        menu_list = get_urls(base_url + i + "/?&page=")
+        dic_list = []
+        for menu in menu_list:
+            time.sleep(1)
+            dic_list.append(get_info(menu))
+        wtrte_csv.write_csv(dic_list, path + i + ".csv" )
+        print(i, "done")
\ No newline at end of file
diff --git a/NutritionMasterSpider/xzs/__init__.py b/NutritionMasterSpider/xzs/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/NutritionMasterSpider/xzs/get_trick.py b/NutritionMasterSpider/xzs/get_trick.py
new file mode 100644
index 0000000..5bfac0b
--- /dev/null
+++ b/NutritionMasterSpider/xzs/get_trick.py
@@ -0,0 +1,93 @@
+from functions import send_request, get_selector
+import csv
+
+base_url = "http://www.39yst.com"
+list_url = "http://www.39yst.com/changshi/list_24_"
+
+def get_url(page_url):
+    """
+    该方法返回当前界面的所有url
+    :param page_url: 某一页的网址
+    :return:
+    """
+    try:
+        s = get_selector.get_selector(send_request.send_requests(page_url))
+        urls = s.xpath('//div[@class="item_all"]//p[@class="item_tit"]//a/@href')
+        return urls
+    except Exception as e:
+        print(e)
+        return []
+
+def get_info(url):
+    """
+    获取段落文字信息
+    (这里有个单词记错了，comment应该是content，不过问题应该不大)
+    :param url: 详情界面url
+    :return:
+    """
+    try:
+        s = get_selector.get_selector(send_request.send_requests(url))
+        comment = s.xpath('//div[@id="articleContent"]/p/following-sibling::*/text()')
+        title = s.xpath('//h1/text()')[0]
+        for s in range(len(comment)):
+            comment[s] = comment[s].strip()
+            comment[s] = comment[s].lstrip('。')
+            comment[s] = comment[s].lstrip('(')
+            comment[s] = comment[s].lstrip('?')
+            comment[s] = comment[s].lstrip(')')
+            comment[s] = comment[s].lstrip('!')
+            comment[s] = comment[s].lstrip('：')
+            comment[s] = comment[s].lstrip('、')
+            comment[s] = comment[s].lstrip(',')
+            comment[s] = comment[s].lstrip('》')
+            comment[s] = comment[s].lstrip('《')
+            comment[s] = comment[s].lstrip(':')
+        for i in comment:
+            if i is '':
+                comment.remove(i)
+            if len(i) is 1:
+                comment.remove(i)
+        try:
+            index = comment.index("本篇文章版权归民福康健康所有，未经许可，谢绝转载。")
+            s = "\n".join(comment[:index])
+        except:
+            s = "\n".join(comment)
+        print("正在获取", comment[0][:5], "...")
+        dic = {}
+        dic['title'] = title
+        dic['content'] = s
+        return dic
+    except Exception as e:
+        print(e)
+        return ''
+
+def write_csv(path, dics):
+    """
+    把内容写入
+    :param path:储存位置
+    :param dics:信息字典列表
+    :return:
+    """
+    with open(path, 'w', newline='') as file:
+        fieldnames = ['title', "content"]
+        writer = csv.DictWriter(file, fieldnames)
+        writer.writeheader()
+        for dic in dics:
+            try:
+                writer.writerow(dic)
+            except:
+                pass
+
+if __name__ == "__main__":
+    info_list = []
+    for i in range(20):
+        try:
+            page_url = list_url + "{page}.shtml".format(page=i + 1)
+            info_urls = get_url(page_url)
+            for info_url in info_urls:
+                info_list.append(get_info(info_url))
+        except:
+            pass
+    write_csv(path=r"E:\datapy\trick.csv", dics=info_list)
+
+
diff --git a/NutritionMasterWeb b/NutritionMasterWeb
new file mode 160000
index 0000000..bc62fd4
--- /dev/null
+++ b/NutritionMasterWeb
@@ -0,0 +1 @@
+Subproject commit bc62fd40fcc62021c6a840b8f0fa9f2612869736