Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/activity_main.xml

.idea/gradle.xml

@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">

app/app.iml

@@ -4,7 +4,7 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":app" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.2" />
         <option name="LAST_KNOWN_AGP_VERSION" value="3.5.2" />
       </configuration>
     </facet>
@@ -20,7 +20,7 @@
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>

app/src/main/java/com/example/PersonalCenter/Search.java

@@ -26,8 +26,8 @@ public class Search {
         Set<String> reasonsSet = new HashSet<String>();
         for(String i: keywordList){
             Log.i("关键词提取",i+"ha");
-            String resq = SearchServiceGet.executeSearchGet(i,"/Search");
-
+//            String resq = SearchServiceGet.executeSearchGet(i,"/Search");
+                String resq="dd";
             if(!resq.equals("fail")) {
                 String[] me_rea = resq.split("-");
                 String[] medicines = me_rea[0].split("\\|");

app/src/main/java/com/example/PersonalCenter/SearchServiceGet.java

@@ -12,12 +12,14 @@ import java.net.ProtocolException;
 import java.net.URL;
 
 public class SearchServiceGet {
-    public static String executeSearchGet(String sickname,String address){
+    public static String executeSearchGet(String name){
         HttpURLConnection connection = null;
         InputStream in = null;
 
-        String Url = "http://106.54.210.208:8080/ChineseM"+address;
-        String path = Url + "?sickname="+sickname;
+        String address="/rest/cmkg/question";
+
+        String Url = "http://localhost:8080"+address;
+        String path = Url + "?name="+name;
         URL url = null;
         try {
             url = new URL(path);
@@ -37,6 +39,7 @@ public class SearchServiceGet {
                 }
                 //这时候response就是一个连续字符串了吧
                 Log.i("response+++++",response+"返回值");
+                System.out.println(response.toString());
                 return response.toString();
                 //
 
@@ -60,4 +63,8 @@ public class SearchServiceGet {
         }
         return "";
     }
+
+    public static void main(String args[]){
+        executeSearchGet("平和质");
+    }
 }