Merge branch 'develop'

app/build.gradle

@@ -41,7 +41,7 @@ android {
         tes {
             dimension "smart_canteen"
             buildConfigField "String", "MainWebSocketServerUrl", '"wss://diningservicetest.bgy.com.cn/websocket/%s/V%s"'
-            buildConfigField "String", "MainHttpServerHost", '"https://diningbacktest.bgy.com.cn"'
+            buildConfigField "String", "MainHttpServerHost", '"https://diningservicetest.bgy.com.cn"'
         }
         uat {
             dimension "smart_canteen"
@@ -51,7 +51,7 @@ android {
         pro {
             dimension "smart_canteen"
             buildConfigField "String", "MainWebSocketServerUrl", '"wss://diningservice.bgy.com.cn/websocket/%s/V%s"'
-            buildConfigField "String", "MainHttpServerHost", '"https://diningback.bgy.com.cn"'
+            buildConfigField "String", "MainHttpServerHost", '"https://diningservice.bgy.com.cn"'
         }
         pro_cloud {
             dimension "smart_canteen"

app/src/main/java/com/bgycc/smartcanteen/api/SCApi.java

@@ -12,6 +12,6 @@ public interface SCApi {
      * @param file 要上传的日志文件
      */
     @Multipart
-    @POST("upload")
+    @POST("open/upload")
     Call<String> upload(@Part MultipartBody.Part file);
 }