1、修复multipart/form-data生成问题

Author: HeartHappy

Annotation.md

@@ -47,10 +47,10 @@
 
 |   参数   | 类型     |                      描述                       | 必须 | 默认值 |
 | :------: | -------- | :---------------------------------------------: | :--: | :----: |
-| bodyType | BodyType | 类型：支持TEXT、JSON、FORM_DATA、FormUrlEncoded |  否  |  JSON  |
+| bodyType | BodyType | 类型：支持TEXT、JSON、FormData、FormUrlEncoded |  否  |  JSON  |
 
 ##### 7、@Query
-###### 描述：生成formData请求时使用。Body类型为FORM_DATA时，必须添加该注解修饰参数
+###### 描述：生成formData请求时使用。Body类型为FormData时，必须添加该注解修饰参数
 
 | 参数  | 类型   | 描述 | 必须 | 默认值 |
 | :---: | ------ | :--: | :--: | :----: |

annotations/src/main/java/com/hearthappy/annotations/Body.kt

@@ -5,7 +5,7 @@ package com.hearthappy.annotations
 annotation class Body(val bodyType: BodyType = BodyType.JSON)
 
 enum class BodyType {
-    NONE, TEXT, JSON, HTML, XML, FORM_DATA,FormUrlEncoded
+    NONE, TEXT, JSON, HTML, XML, FormData,FormUrlEncoded
 }
 
 

app/src/main/java/com/hearthappy/viewmodelautomation/MyApplication.kt

@@ -8,6 +8,7 @@ import com.hearthappy.annotations.ServiceConfig
 @ServiceConfig(baseURL = "https://api.apiopen.top/api")
 //定义一个文件上传下载的服务地址
 @ServiceConfig(baseURL = "http://192.168.51.62:9998", key = "fileOperate")
+@ServiceConfig(baseURL = "http://192.168.31.206:8888", key = "Apifox")
 class MyApplication: Application() {
 
     override fun onCreate() {

ktorexpand/src/main/java/com/hearthappy/ktorexpand/code/network/KtorTest.kt

@@ -98,9 +98,9 @@ internal suspend fun multiFileUpload(partData: List<PartData>, listener: (suspen
 
 
 fun main() = runBlocking {
-    val file = File("/Library/MyComputer/Software/Android/Git/ViewModelAutomation/test.jpeg")
+//    val file = File("/Library/MyComputer/Software/Android/Git/ViewModelAutomation/test.jpeg")
 
-    println("exist:${file.exists()},${file.name}")
+//    println("exist:${file.exists()},${file.name}")
 
     //fileDownload(outputStream)
 
@@ -127,7 +127,9 @@ fun main() = runBlocking {
          })
          println("http:${sendKtorUpload.bodyAsText()}")
      }*/
-    val part1 = MultipartBody.Part {
+
+    //上传
+    /*val part1 = MultipartBody.Part {
         part("file", file = file, contentDisposition = "filename=\"uploadFileName.png\"", contentType = ContentType.Image.PNG)
     }.formData {
         append("key2", "bbbbb")
@@ -141,5 +143,5 @@ fun main() = runBlocking {
         println("current:$a,total:$b")
     }
 
-    println("end...:")
-}
+    println("end...:")*/
+}

processor/src/main/java/com/hearthappy/processor/AnnotationHandler.kt

@@ -80,7 +80,7 @@ internal fun ViewModelProcessor.getRequestDataMap(roundEnv: RoundEnvironment, cr
 
             val requestData = RequestData(requestClass, httpType, requestUrl, findBaseConfig, headers, fixedHeaders, methodParameters, requestParameters, requestBodyData, order, streamingParameters, multiPartParameters)
             this[requestClass]=requestData
-            //sendNoteMsg("【RequestData】:$requestData")
+            sendNoteMsg("【RequestData】:$requestData")
         }
     }
 }
@@ -111,10 +111,10 @@ private fun ViewModelProcessor.getMethodParameters(requestElement: Element, body
         BodyType.JSON, BodyType.FormUrlEncoded -> parameters.addAll(getMethodParameterByBodyKind(bodyElements, requestElement))
         BodyType.HTML                          -> {
         }
-        BodyType.XML                           -> {
+        BodyType.XML      -> {
         }
-        BodyType.FORM_DATA                     -> parameters.addAll(getMethodParameterByBodyKind(bodyElements, requestElement))
-        else                                   -> {
+        BodyType.FormData -> parameters.addAll(getMethodParameterByBodyKind(bodyElements, requestElement))
+        else              -> {
         }
     }
     order?.let { parameters.add(ParameterData(it, "Int")) }
@@ -342,7 +342,7 @@ private fun getCurrentBodyQueryMap(currentBodyElement: Element, queryElements: M
  */
 private fun ViewModelProcessor.createRequestBodyData(bodyType: BodyType, currentBodyElement: Element, queryElements: MutableSet<out Element>): RequestBodyData {
     val currentBodyParameterName = getCurrentBodyParameterName(currentBodyElement)
-    return if (bodyType == BodyType.FormUrlEncoded || bodyType == BodyType.FORM_DATA) { //创建XWF数据类型所需的参数@Query列表
+    return if (bodyType == BodyType.FormUrlEncoded || bodyType == BodyType.FormData) { //创建XWF数据类型所需的参数@Query列表
         val currentBodyQueryMap = getCurrentBodyQueryMap(currentBodyElement, queryElements)
         if (currentBodyQueryMap.isEmpty()) sendErrorMsg("The request class is ${currentBodyElement.asType()}, the specified BodyType is FormUrlEncoded, but the Query annotation is not declared, resulting in an error")
         RequestBodyData(bodyType, xwfParameters = currentBodyParameterName?.run { Pair(this, currentBodyQueryMap) })

processor/src/main/java/com/hearthappy/processor/GenerateViewModelFile.kt

@@ -4,7 +4,6 @@ import com.hearthappy.annotations.AndroidViewModel
 import com.hearthappy.annotations.BindLiveData
 import com.hearthappy.annotations.BindStateFlow
 import com.hearthappy.processor.common.*
-import com.hearthappy.processor.model.RequestData
 import com.hearthappy.processor.model.ServiceConfigData
 import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.KModifier
@@ -13,7 +12,6 @@ import com.squareup.kotlinpoet.TypeSpec
 import java.io.File
 import javax.annotation.processing.RoundEnvironment
 import javax.lang.model.element.Element
-import kotlin.system.measureTimeMillis
 
 internal fun ViewModelProcessor.generateAndroidViewModelFile(roundEnv: RoundEnvironment, androidViewModelElements: MutableSet<out Element>, generatedSource: String, serviceConfigList: List<ServiceConfigData>): Boolean {
     if (androidViewModelElements.isEmpty()) {

processor/src/main/java/com/hearthappy/processor/ViewModelProcessor.kt

@@ -17,7 +17,7 @@ import kotlin.system.measureTimeMillis
  * @Author ChenRui
  * @Date   2021/12/27-16:46
  * @Email  1096885636@qq.com
- * ClassDescription :
+ * ClassDescription : 注解处理类
  * kotlin poet:
  * liveData.parameterizedBy(responseBean):liveData：声明类型，responseBean：泛型类型
  * FunSpec.addTypeVariable(TypeVariableName("T")) : 函数泛型 ：fun <T> add()