Skip to content

G
gic-qywx-self
Commit e77a95af by 徐高华
Options

Merge branch '转web' into 'developer' 

转web

See merge request !13
parents cef911ba 1ac71de5
Showing with 129 additions and 45 deletions
pom.xml
......@@ -47,6 +47,21 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-platform-config</artifactId>
<version>${gic-platform-config}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-commons</artifactId>
<version>${gic-commons}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-manage3-api</artifactId>
<version>${haoban-manage3-api}</version>
</dependency>
</dependencies>
<build>
......
src/main/java/com/gic/qywx/self/HttpClient.java
......@@ -15,6 +15,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.HttpVersion;
......@@ -66,7 +67,7 @@ public class HttpClient {
protected static org.apache.http.client.HttpClient getHttpClient(String ip) {
org.apache.http.client.HttpClient mHttpClient = map.get(ip) ;
logger.info("clientSize={}",map.size());
//logger.info("clientSize={}",map.size());
if(null != mHttpClient) {
return mHttpClient ;
}
......@@ -149,7 +150,11 @@ public class HttpClient {
e.printStackTrace();
} finally {
long end = new Date().getTime();
logger.info("call-res cost:" + (end - begin) + " url:" + url + " param:" + jsonStr + " res:" + resInfo);
if(StringUtils.isBlank(resInfo)) {
logger.info("请求url={},req={},resp={},time={}" ,url, map , "企微返回为空" , (end - begin));
}else {
logger.info("请求url={},req={},resp={},time={}" ,url, map , resInfo , (end - begin));
}
}
return weixinMap;
}
......@@ -183,7 +188,11 @@ public class HttpClient {
return new HashMap<String, Object>();
} finally {
long end = new Date().getTime();
logger.info("call-res cost:" + (end - begin) + " url:" + url + " param:" + map + " res:" + entityStr);
if(StringUtils.isBlank(entityStr)) {
logger.info("file请求url={},req={},resp={},time={}" ,url, map , "企微返回为空" , (end - begin));
}else {
logger.info("file请求url={},req={},resp={},time={}" ,url, map , entityStr , (end - begin));
}
}
return obj;
}
......
src/main/java/com/gic/qywx/self/QywxController.java
package com.gic.qywx.self;
import java.io.IOException;
import java.io.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.io.IOUtils;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.mime.content.ByteArrayBody;
import org.apache.http.entity.mime.content.ContentBody;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -23,48 +23,61 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
@RequestMapping("/qywx")
public class QywxController {
private static final Logger logger = LoggerFactory.getLogger(QywxController.class);
private Logger logger = LogManager.getLogger(QywxController.class);
@RequestMapping("self-post")
public Object selfPost(HttpServletRequest request,String url, String json, String ip) {
String traceid=request.getParameter("tranceid") ;
logger.info("自建post,url={},json={},{},{}", url, json,traceid,ip);
public Object selfPost(String url, String json, String ip) {
logger.info("自建post,url={},json={},ip={}", url, json,ip);
Map<String, Object> map = HttpClient.getWinxinResByJson(url, json, getIp(ip) , ip);
return map;
}
@RequestMapping("self-post-json")
public Object selfPostJson(HttpServletRequest request,String url, @RequestBody String json, String ip) {
String traceid=request.getParameter("tranceid") ;
logger.info("自建post json,url={},json={},{},{}", url, json,traceid,ip);
@RequestMapping("self-post-json-body")
public Object selfPostJson(String url, @RequestBody Map<String, Object> jsonBody, String ip) {
String json = null ;
if(null != jsonBody) {
json = JSONObject.toJSONString(jsonBody) ;
}
logger.info("自建post-json,url={},json={},,ip={}", url, json,ip);
Map<String, Object> map = HttpClient.getWinxinResByJson(url, json, getIp(ip) , ip);
return map;
}
@RequestMapping("self-post-json")
public Object selfPostJson(HttpServletRequest request, String url, String ip) throws IOException {
InputStream inputStream = request.getInputStream();
Map<String, Object> map = null ;
try {
String json = IOUtils.toString(inputStream,"UTF-8") ;
logger.info("自建post-json,url={},json={},ip={}", url, json,ip);
map = HttpClient.getWinxinResByJson(url, json, getIp(ip) , ip);
}finally {
IOUtils.closeQuietly(inputStream);
}
return map;
}
@RequestMapping("self-get")
public Object selfGet(HttpServletRequest request,String url, String ip) {
String traceid=request.getParameter("tranceid") ;
logger.info("自建get,url={},{},{}", url,traceid,ip);
logger.info("自建get,url={},ip={}", url,ip);
Map<String, Object> map = HttpClient.getHttpByGet(url, getIp(ip) , ip);
return map;
}
@RequestMapping("self-upload")
public Object selfUpload(HttpServletRequest request,String url, String fileUrl, String fileName, String ip) {
String traceid=request.getParameter("tranceid") ;
logger.info("自建upload,url={},fileUrl={},{},{}", url,fileUrl,traceid,ip);
public Object selfUpload(String url, String fileUrl, String fileName, String ip) {
logger.info("自建upload,url={},fileUrl={},ip={}", url,fileUrl,ip);
byte[] data = CommonUtil.getFileByte(fileUrl);
Map<String, ContentBody> paramsMap = new HashMap<String, ContentBody>();
paramsMap.put("media", new ByteArrayBody(data, ContentType.DEFAULT_BINARY, fileName));
Map<String, Object> map = HttpClient.getWinxinResByFile(url, paramsMap, getIp(ip) , ip);
logger.info("自建upload end={}",traceid);
return map;
}
@RequestMapping("self-upload-data")
public Object selfImage(HttpServletRequest request,String url, String fileName, String ip) throws IOException {
String traceid=request.getParameter("tranceid") ;
logger.info("自建upload-data,url={},{},{}", url,traceid,ip);
logger.info("自建upload-data,url={},ip={}", url,ip);
MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
List<MultipartFile> list = multiRequest.getMultiFileMap().get("media");
MultipartFile mf = list.get(0);
......@@ -72,7 +85,6 @@ public class QywxController {
Map<String, ContentBody> paramsMap = new HashMap<String, ContentBody>();
paramsMap.put("media", new ByteArrayBody(data, ContentType.DEFAULT_BINARY, fileName));
Map<String, Object> map = HttpClient.getWinxinResByFile(url, paramsMap, getIp(ip) , ip);
logger.info("自建upload-data end={}",traceid);
return map;
}
......
src/main/java/com/gic/qywx/self/QywxSelfApiServiceImpl.java 0 → 100644
package com.gic.qywx.self;
import com.alibaba.fastjson.JSONObject;
import com.gic.haoban.manage.api.service.QywxSelfApiService;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.mime.content.ByteArrayBody;
import org.apache.http.entity.mime.content.ContentBody;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.HashMap;
import java.util.Map;
@Service("qywxSelfApiService")
public class QywxSelfApiServiceImpl implements QywxSelfApiService {
private Logger logger = LogManager.getLogger(QywxSelfApiServiceImpl.class);
@Override
public Map<String,Object> selfPost(String url, String json, String ip) {
logger.info("自建post,url={},json={},{}", url, json,ip);
Map<String, Object> map = HttpClient.getWinxinResByJson(url, json, getIp(ip) , ip);
return map;
}
@Override
public Map<String,Object> selfGet(String url, String ip) {
logger.info("自建get,url={},ip={}", url,ip);
Map<String, Object> map = HttpClient.getHttpByGet(url, getIp(ip) , ip);
return map;
}
@Override
public Map<String,Object> selfUpload(String url, String fileUrl, String fileName, String ip) {
logger.info("自建upload,url={},fileUrl={},ip={}", url,fileUrl,ip);
byte[] data = CommonUtil.getFileByte(fileUrl);
Map<String, ContentBody> paramsMap = new HashMap<String, ContentBody>();
paramsMap.put("media", new ByteArrayBody(data, ContentType.DEFAULT_BINARY, fileName));
Map<String, Object> map = HttpClient.getWinxinResByFile(url, paramsMap, getIp(ip) , ip);
return map;
}
@Override
public Map<String,Object> selfImage(String url, String fileName, String ip , byte[] data) {
logger.info("自建upload-data,url={},ip={}", url,ip);
Map<String, ContentBody> paramsMap = new HashMap<String, ContentBody>();
paramsMap.put("media", new ByteArrayBody(data, ContentType.DEFAULT_BINARY, fileName));
Map<String, Object> map = HttpClient.getWinxinResByFile(url, paramsMap, getIp(ip) , ip);
return map;
}
// 必须是内网ip
private byte[] getIp(String ip) {
if(StringUtils.isEmpty(ip)) {
return null ;
}
String[] arr = ip.split("\\.");
byte[] b = new byte[] {Integer.valueOf(arr[0]).byteValue(), Integer.valueOf(arr[1]).byteValue(),Integer.valueOf(arr[2]).byteValue(),Integer.valueOf(arr[3]).byteValue()};
return b;
}
}
src/main/webapp/WEB-INF/applicationContext-conf.xml
......@@ -4,7 +4,8 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
<import resource="dubbo-haoban-self-web.xml"/>
<import resource="classpath*:applicationContext-init.xml"/>
<import resource="classpath*:dubbo-setting.xml"/>
<import resource="dubbo-haoban-self-web.xml"/>
</beans>
src/main/webapp/WEB-INF/dubbo-haoban-self-web.xml
......@@ -8,10 +8,11 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
<context:component-scan base-package="com.gic.qywx.*"/>
<dubbo:application name="gic-qywx-self"/>
<!-- 用dubbo协议在20880端口暴露服务 -->
<dubbo:protocol name="dubbo" port="20130" />
<context:component-scan base-package="com.gic.haoban.self"/>
<!-- 应用名称 -->
<dubbo:application name="haoban-selft-web"/>
<dubbo:protocol name="dubbo" port="20130"/>
<dubbo:service interface="com.gic.haoban.manage.api.service.QywxSelfApiService" ref="qywxSelfApiService" retries="0"/>
</beans>
\ No newline at end of file
src/main/webapp/WEB-INF/spring-servlet.xml
......@@ -11,7 +11,7 @@
http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<!-- 扫描注解包路径，多个包用逗号分隔，不填pacakge表示扫描当前ApplicationContext中所有的类 -->
<context:component-scan base-package="com.gic.haoban.*"/>
<context:component-scan base-package="com.gic.qywx.*" />
<!-- 启动对@AspectJ注解的支持 -->
<aop:aspectj-autoproxy/>
......@@ -98,16 +98,4 @@
</list>
</property>
</bean>
<!-- 跨域配置 -->
<mvc:cors>
<mvc:mapping path="/**"
allowed-headers="*"
allowed-origins="*"
allowed-methods="GET,POST,PUT,DELETE,OPTIONS"
allow-credentials="true"
max-age="3600"
/>
</mvc:cors>
</beans>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment