Merge branch 'master' of https://gitlab.eoffcn.com/lyy56980/study.git

Conflicts: studycenter_Api_auto_test/testng.xml

Merge branch 'master' of https://gitlab.eoffcn.com/lyy56980/study.git
Conflicts: studycenter_Api_auto_test/testng.xml
231a13fe · Li Yongyu · 517d2040 · de22e6a6 · 231a13fe · 231a13fe
Commit 231a13fe authored Mar 07, 2019 by Li Yongyu
183 changed files
--- a/.project
+++ b/.project
--- a/studycenter_Api_auto_test/.gitignore
+++ b/studycenter_Api_auto_test/.gitignore
--- a/studycenter_Api_auto_test/README.txt
+++ b/studycenter_Api_auto_test/README.txt
--- a/studycenter_Api_auto_test/TestData/CaseMake.xls
+++ b/studycenter_Api_auto_test/TestData/CaseMake.xls
--- a/studycenter_Api_auto_test/auto_test.iml
+++ b/studycenter_Api_auto_test/auto_test.iml
--- a/studycenter_Api_auto_test/src/Practice_test/CanshuTiQu.java
+++ b/studycenter_Api_auto_test/src/Practice_test/CanshuTiQu.java
--- a/studycenter_Api_auto_test/src/Practice_test/HttpRequest.java
+++ b/studycenter_Api_auto_test/src/Practice_test/HttpRequest.java
--- a/studycenter_Api_auto_test/src/Practice_test/HttpUtils.java
+++ b/studycenter_Api_auto_test/src/Practice_test/HttpUtils.java
--- a/studycenter_Api_auto_test/src/Practice_test/HttpsUtil_Post_Json.java
+++ b/studycenter_Api_auto_test/src/Practice_test/HttpsUtil_Post_Json.java
--- a/studycenter_Api_auto_test/src/Practice_test/LMFMD5.java
+++ b/studycenter_Api_auto_test/src/Practice_test/LMFMD5.java
--- a/studycenter_Api_auto_test/src/Practice_test/MySqlUtil.java
+++ b/studycenter_Api_auto_test/src/Practice_test/MySqlUtil.java
--- a/studycenter_Api_auto_test/src/Practice_test/OCRTest.java
+++ b/studycenter_Api_auto_test/src/Practice_test/OCRTest.java
--- a/studycenter_Api_auto_test/src/Practice_test/ReadExcels.java
+++ b/studycenter_Api_auto_test/src/Practice_test/ReadExcels.java
--- a/studycenter_Api_auto_test/src/Practice_test/RequestDataUtils.java
+++ b/studycenter_Api_auto_test/src/Practice_test/RequestDataUtils.java
--- a/studycenter_Api_auto_test/src/Practice_test/RequestDataUtils2.java
+++ b/studycenter_Api_auto_test/src/Practice_test/RequestDataUtils2.java
--- a/studycenter_Api_auto_test/src/Practice_test/RequestDataUtils3.java
+++ b/studycenter_Api_auto_test/src/Practice_test/RequestDataUtils3.java
--- a/studycenter_Api_auto_test/src/Practice_test/Rgxs.java
+++ b/studycenter_Api_auto_test/src/Practice_test/Rgxs.java
--- a/studycenter_Api_auto_test/src/Practice_test/Test_maxiao.java
+++ b/studycenter_Api_auto_test/src/Practice_test/Test_maxiao.java
--- a/studycenter_Api_auto_test/src/Practice_test/UserUtil.java
+++ b/studycenter_Api_auto_test/src/Practice_test/UserUtil.java
--- a/studycenter_Api_auto_test/src/Practice_test/aliOCR.java
+++ b/studycenter_Api_auto_test/src/Practice_test/aliOCR.java
--- a/studycenter_Api_auto_test/src/Practice_test/map_show.java
+++ b/studycenter_Api_auto_test/src/Practice_test/map_show.java
--- a/studycenter_Api_auto_test/src/Practice_test/maxiao.java
+++ b/studycenter_Api_auto_test/src/Practice_test/maxiao.java
--- a/studycenter_Api_auto_test/src/Practice_test/panduanshifushishuzi.java
+++ b/studycenter_Api_auto_test/src/Practice_test/panduanshifushishuzi.java
--- a/studycenter_Api_auto_test/src/Practice_test/properties_test.java
+++ b/studycenter_Api_auto_test/src/Practice_test/properties_test.java
--- a/studycenter_Api_auto_test/src/Practice_test/t1.java
+++ b/studycenter_Api_auto_test/src/Practice_test/t1.java
--- a/studycenter_Api_auto_test/src/Practice_test/test.java
+++ b/studycenter_Api_auto_test/src/Practice_test/test.java
--- a/studycenter_Api_auto_test/src/Practice_test/test1.java
+++ b/studycenter_Api_auto_test/src/Practice_test/test1.java
--- a/studycenter_Api_auto_test/src/Practice_test/testng1.java
+++ b/studycenter_Api_auto_test/src/Practice_test/testng1.java
--- a/studycenter_Api_auto_test/src/Practice_test/time_test.java
+++ b/studycenter_Api_auto_test/src/Practice_test/time_test.java
--- a/studycenter_Api_auto_test/src/Practice_test/w_excel.java
+++ b/studycenter_Api_auto_test/src/Practice_test/w_excel.java
--- a/studycenter_Api_auto_test/src/aoutTestCode/MakeCode.java
+++ b/studycenter_Api_auto_test/src/aoutTestCode/MakeCode.java
--- a/studycenter_Api_auto_test/src/aoutTestCode/ParseXml.java
+++ b/studycenter_Api_auto_test/src/aoutTestCode/ParseXml.java
--- a/studycenter_Api_auto_test/src/aoutTestCode/xmlToftl.java
+++ b/studycenter_Api_auto_test/src/aoutTestCode/xmlToftl.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestData/offcn_api_testData.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestData/offcn_api_testData.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/AES256Encryption.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/AES256Encryption.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/AESUtils.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/AESUtils.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/CopyOfRequestDataUtils.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/CopyOfRequestDataUtils.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/GetTaoBaoCookies.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/GetTaoBaoCookies.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/GetVerifyCode.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/GetVerifyCode.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/HttpRequest.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/HttpRequest.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/HttpUtils.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/HttpUtils.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/InstallCert.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/InstallCert.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/IoResponse.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/IoResponse.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/ListUtil.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/ListUtil.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/Log.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/Log.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/MD5keyUtil.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/MD5keyUtil.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/MapUtil.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/MapUtil.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/MoXie.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/MoXie.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/MockServerTestUtil.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/MockServerTestUtil.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/MyDateUtil.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/MyDateUtil.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/MySqlUtil.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/MySqlUtil.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/PhoneNoGeneratorUtil.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/PhoneNoGeneratorUtil.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/ReadExcels.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/ReadExcels.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/ReadHtml.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/ReadHtml.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/ReadProperties.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/ReadProperties.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/RedisUtils.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/RedisUtils.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/Reflect_api.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/Reflect_api.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/SheetUtils.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/SheetUtils.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/StringUtils.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/StringUtils.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/VerificationMethod.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/VerificationMethod.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/XMLread.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/XMLread.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/aliOCR.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/aliOCR.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/cmdUtil.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/cmdUtil.java
--- a/studycenter_Api_auto_test/src/com/offcn/TestUnti/randomUtil.java
+++ b/studycenter_Api_auto_test/src/com/offcn/TestUnti/randomUtil.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/study/studyapi/login.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/study/studyapi/login.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/tk/addOrEditPhone.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/tk/addOrEditPhone.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/tk/area.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/tk/area.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/tk/bindThirdLoginByUserId.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/tk/bindThirdLoginByUserId.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/tk/bindUserByPhone.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/tk/bindUserByPhone.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/tk/checkCode.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/tk/checkCode.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/tk/checkUserPhoneIfExist.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/tk/checkUserPhoneIfExist.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/tk/editUserName.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/tk/editUserName.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/tk/getCode.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/tk/getCode.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/tk/getUserArea.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/tk/getUserArea.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/tk/login.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/tk/login.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/tk/register.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/tk/register.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/tk/setDefaultArea.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/tk/setDefaultArea.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/tk/thirdLogin.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/tk/thirdLogin.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/announce.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/announce.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/announce_del.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/announce_del.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/announce_get.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/announce_get.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/answer.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/answer.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/ask_status.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/ask_status.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/banned_status.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/banned_status.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/banned_status_get.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/banned_status_get.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/banned_time.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/banned_time.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/banned_time_up.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/banned_time_up.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/del.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/del.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/edit.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/edit.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/getRooms.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/getRooms.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/getUser.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/getUser.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/get_config.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/get_config.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/get_teacher_info.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/get_teacher_info.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/login.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/login.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/modify.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/modify.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/operation_info.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/operation_info.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/operation_info_up.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/operation_info_up.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/process/admin.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/process/admin.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/process/logout.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/process/logout.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/process/member.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/process/member.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/process/room_files_del.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/process/room_files_del.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/process/webAdmin.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/process/webAdmin.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/process/weblogin.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/process/weblogin.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/pull.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/pull.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/push.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/push.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/questions.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/questions.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/questions_get.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/questions_get.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_files.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_files.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_files_del.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_files_del.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_files_get.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_files_get.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_files_update.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_files_update.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_info.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_info.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_info_up.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_info_up.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_mails.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_mails.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_mails_add.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_mails_add.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_mails_delete.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_mails_delete.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_record.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_record.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_rest_status.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_rest_status.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_status_down.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_status_down.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_stream.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_stream.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_uuid.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/room_uuid.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/suggest.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/suggest.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/suggest_get.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/suggest_get.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/suggest_get_id.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/suggest_get_id.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/suggest_type.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/suggest_type.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/update.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/update.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/updateUser.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/updateUser.java
--- a/studycenter_Api_auto_test/src/com/offcn/api/xyzb/users.java
+++ b/studycenter_Api_auto_test/src/com/offcn/api/xyzb/users.java
--- a/studycenter_Api_auto_test/src/com/offcn/interfaces/API.java
+++ b/studycenter_Api_auto_test/src/com/offcn/interfaces/API.java
--- a/studycenter_Api_auto_test/src/com/offcn/listener/ProcessTestng.java
+++ b/studycenter_Api_auto_test/src/com/offcn/listener/ProcessTestng.java
--- a/studycenter_Api_auto_test/src/com/offcn/listener/ResultTestng.java
+++ b/studycenter_Api_auto_test/src/com/offcn/listener/ResultTestng.java
--- a/studycenter_Api_auto_test/src/com/offcn/process/BasicsGM.java
+++ b/studycenter_Api_auto_test/src/com/offcn/process/BasicsGM.java
--- a/studycenter_Api_auto_test/src/com/offcn/process/STUDY.java
+++ b/studycenter_Api_auto_test/src/com/offcn/process/STUDY.java
--- a/studycenter_Api_auto_test/src/com/offcn/process/TK.java
+++ b/studycenter_Api_auto_test/src/com/offcn/process/TK.java
--- a/studycenter_Api_auto_test/src/com/offcn/process/XYZB.java
+++ b/studycenter_Api_auto_test/src/com/offcn/process/XYZB.java
--- a/studycenter_Api_auto_test/src/com/offcn/system/MyRequest.java
+++ b/studycenter_Api_auto_test/src/com/offcn/system/MyRequest.java
--- a/studycenter_Api_auto_test/src/com/offcn/system/NwnStudent.java
+++ b/studycenter_Api_auto_test/src/com/offcn/system/NwnStudent.java
--- a/studycenter_Api_auto_test/src/com/offcn/system/system.java
+++ b/studycenter_Api_auto_test/src/com/offcn/system/system.java
--- a/studycenter_Api_auto_test/src/log4f.properties
+++ b/studycenter_Api_auto_test/src/log4f.properties
--- a/studycenter_Api_auto_test/src/makeTestCase/HelloHongShu.java
+++ b/studycenter_Api_auto_test/src/makeTestCase/HelloHongShu.java
--- a/studycenter_Api_auto_test/src/makeTestCase/MakeTestCases.java
+++ b/studycenter_Api_auto_test/src/makeTestCase/MakeTestCases.java
--- a/studycenter_Api_auto_test/src/makeTestCase/MakeTestCases190131.java
+++ b/studycenter_Api_auto_test/src/makeTestCase/MakeTestCases190131.java
--- a/studycenter_Api_auto_test/src/makeTestCase/readExcels.java
+++ b/studycenter_Api_auto_test/src/makeTestCase/readExcels.java
--- a/studycenter_Api_auto_test/src/resources/class.properties
+++ b/studycenter_Api_auto_test/src/resources/class.properties
--- a/studycenter_Api_auto_test/src/resources/customers.xml
+++ b/studycenter_Api_auto_test/src/resources/customers.xml
--- a/studycenter_Api_auto_test/src/resources/information.properties
+++ b/studycenter_Api_auto_test/src/resources/information.properties
--- a/studycenter_Api_auto_test/src/resources/system.xml
+++ b/studycenter_Api_auto_test/src/resources/system.xml
--- a/studycenter_Api_auto_test/src/resources/system1.xml
+++ b/studycenter_Api_auto_test/src/resources/system1.xml
--- a/studycenter_Api_auto_test/src/resources/test.properties
+++ b/studycenter_Api_auto_test/src/resources/test.properties
--- a/studycenter_Api_auto_test/src/test/CanshuTiQu.java
+++ b/studycenter_Api_auto_test/src/test/CanshuTiQu.java
--- a/studycenter_Api_auto_test/src/test/HttpRequest.java
+++ b/studycenter_Api_auto_test/src/test/HttpRequest.java
--- a/studycenter_Api_auto_test/src/test/HttpUtils.java
+++ b/studycenter_Api_auto_test/src/test/HttpUtils.java
--- a/studycenter_Api_auto_test/src/test/HttpsUtil_Post_Json.java
+++ b/studycenter_Api_auto_test/src/test/HttpsUtil_Post_Json.java
--- a/studycenter_Api_auto_test/src/test/LMFMD5.java
+++ b/studycenter_Api_auto_test/src/test/LMFMD5.java
--- a/studycenter_Api_auto_test/src/test/MySqlUtil.java
+++ b/studycenter_Api_auto_test/src/test/MySqlUtil.java
--- a/studycenter_Api_auto_test/src/test/OCRTest.java
+++ b/studycenter_Api_auto_test/src/test/OCRTest.java
--- a/studycenter_Api_auto_test/src/test/ReadExcels.java
+++ b/studycenter_Api_auto_test/src/test/ReadExcels.java
--- a/studycenter_Api_auto_test/src/test/RequestDataUtils.java
+++ b/studycenter_Api_auto_test/src/test/RequestDataUtils.java
--- a/studycenter_Api_auto_test/src/test/RequestDataUtils2.java
+++ b/studycenter_Api_auto_test/src/test/RequestDataUtils2.java
--- a/studycenter_Api_auto_test/src/test/RequestDataUtils3.java
+++ b/studycenter_Api_auto_test/src/test/RequestDataUtils3.java
--- a/studycenter_Api_auto_test/src/test/Rgxs.java
+++ b/studycenter_Api_auto_test/src/test/Rgxs.java
--- a/studycenter_Api_auto_test/src/test/Test_maxiao.java
+++ b/studycenter_Api_auto_test/src/test/Test_maxiao.java
--- a/studycenter_Api_auto_test/src/test/UserUtil.java
+++ b/studycenter_Api_auto_test/src/test/UserUtil.java
--- a/studycenter_Api_auto_test/src/test/aliOCR.java
+++ b/studycenter_Api_auto_test/src/test/aliOCR.java
--- a/studycenter_Api_auto_test/src/test/map_show.java
+++ b/studycenter_Api_auto_test/src/test/map_show.java
--- a/studycenter_Api_auto_test/src/test/maxiao.java
+++ b/studycenter_Api_auto_test/src/test/maxiao.java
--- a/studycenter_Api_auto_test/src/test/panduanshifushishuzi.java
+++ b/studycenter_Api_auto_test/src/test/panduanshifushishuzi.java
--- a/studycenter_Api_auto_test/src/test/properties_test.java
+++ b/studycenter_Api_auto_test/src/test/properties_test.java
--- a/studycenter_Api_auto_test/src/test/t1.java
+++ b/studycenter_Api_auto_test/src/test/t1.java
--- a/studycenter_Api_auto_test/src/test/test.java
+++ b/studycenter_Api_auto_test/src/test/test.java
--- a/studycenter_Api_auto_test/src/test/test1.java
+++ b/studycenter_Api_auto_test/src/test/test1.java
--- a/studycenter_Api_auto_test/src/test/testng1.java
+++ b/studycenter_Api_auto_test/src/test/testng1.java
--- a/studycenter_Api_auto_test/src/test/time_test.java
+++ b/studycenter_Api_auto_test/src/test/time_test.java
--- a/studycenter_Api_auto_test/src/test/w_excel.java
+++ b/studycenter_Api_auto_test/src/test/w_excel.java
--- a/studycenter_Api_auto_test/templates/SendRequest.ftl
+++ b/studycenter_Api_auto_test/templates/SendRequest.ftl
--- a/studycenter_Api_auto_test/templates/code.ftl
+++ b/studycenter_Api_auto_test/templates/code.ftl
--- a/studycenter_Api_auto_test/templates/handleInput.ftl
+++ b/studycenter_Api_auto_test/templates/handleInput.ftl
--- a/studycenter_Api_auto_test/templates/handleOutput.ftl
+++ b/studycenter_Api_auto_test/templates/handleOutput.ftl
--- a/studycenter_Api_auto_test/templates/initialize.ftl
+++ b/studycenter_Api_auto_test/templates/initialize.ftl
--- a/studycenter_Api_auto_test/testng.xml
+++ b/studycenter_Api_auto_test/testng.xml
--- a/studycenter_Api_auto_test/xml_makecode/MakeCode.xml
+++ b/studycenter_Api_auto_test/xml_makecode/MakeCode.xml
--- a/studycenter_Api_auto_test/xml_makecode/rgxs-MakeCode.xml
+++ b/studycenter_Api_auto_test/xml_makecode/rgxs-MakeCode.xml