zhouy 11 сар өмнө
parent
commit
06eb5e17c3

+ 1 - 0
build.gradle

@@ -32,6 +32,7 @@ subprojects { Project subproject ->
         ojdbc = 'com.oracle:ojdbc6:11.2.0'
         fastjson = 'com.alibaba:fastjson:1.2.47'
         threadLocal = 'com.alibaba:transmittable-thread-local:2.2.0'
+        fasterxml = 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.6'
         
         // repoBaseUrl = "https://maven.ubtob.net/artifactory"
         repoBaseUrl = "http://10.1.81.211:1202/artifactory"

+ 1 - 1
uas-office-dingtalk-server/src/main/resources/config/application-dev.yaml

@@ -1,4 +1,4 @@
 spring:
   redis:
-    host: 10.1.81.2
+    host: 10.1.81.158
     port: 6379

+ 1 - 0
uas-office-qywx-server/build.gradle

@@ -8,5 +8,6 @@ dependencies {
     compile 'org.springframework.boot:spring-boot-starter-data-redis'
     compile 'com.h2database:h2'
     compile "$ojdbc"
+    compile "$fasterxml"
     testCompile 'org.springframework.boot:spring-boot-starter-test'
 }

+ 8 - 8
uas-office-qywx-server/src/main/java/com/usoftchina/uas/office/qywx/config/WebMvcConfig.java

@@ -3,6 +3,7 @@ package com.usoftchina.uas.office.qywx.config;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
@@ -10,6 +11,8 @@ import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 
+import java.nio.charset.Charset;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -39,15 +42,12 @@ public class WebMvcConfig implements WebMvcConfigurer {
         registry.addViewController("/corp").setViewName("corp.html");
     }
 
-    @Bean
-    public RequestMappingHandlerAdapter requestMappingHandlerAdapter() {
-        RequestMappingHandlerAdapter adapter = new RequestMappingHandlerAdapter();
-        List<HttpMessageConverter<?>> converters = adapter.getMessageConverters();
-        MappingJackson2XmlHttpMessageConverter xmlConverter = new MappingJackson2XmlHttpMessageConverter();
-        converters.add(xmlConverter);
-        adapter.setMessageConverters(converters);
-        return adapter;
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2XmlHttpMessageConverter xmlHttpMessageConverter = new MappingJackson2XmlHttpMessageConverter();
+        converters.add(xmlHttpMessageConverter);
     }
+
 }
 
 

+ 3 - 2
uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/manage/controller/QywxCallbackController.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -41,8 +42,8 @@ public class QywxCallbackController {
      * 消息接收
      * */
     @PostMapping(path = "/qywx/Callback")
-    public String  receiveMessage(@RequestBody QywxCallback qywxCallback ){
-        qywxCallbackService.callBack(qywxCallback);
+    public String  receiveMessage(@RequestBody String messageXml){
+        qywxCallbackService.callBack(messageXml);
         return  "success";
     }
 }

+ 2 - 2
uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/manage/service/QywxCallbackService.java

@@ -57,7 +57,7 @@ public class QywxCallbackService extends AbstractService {
         return callBackStr;
     }
 
-    public String callBack(QywxCallback qywxCallback){
+    public String callBack(String messageXml){
         //TODO 获取参数回调配置
         String decryptMsg = null;
         logger.info("企业微信CallBack POST ");
@@ -70,7 +70,7 @@ public class QywxCallbackService extends AbstractService {
         } catch (AesException e) {
             e.printStackTrace();
         }*/
-        logger.info(qywxCallback.toString());
+        logger.info(messageXml);
 
         return null;
     }