Commit d1efce7e by 徐高华

add

parent fe15e4ff
...@@ -47,6 +47,16 @@ ...@@ -47,6 +47,16 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </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>
</dependencies> </dependencies>
<build> <build>
......
...@@ -10,8 +10,8 @@ import javax.servlet.http.HttpServletRequest; ...@@ -10,8 +10,8 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.http.entity.ContentType; import org.apache.http.entity.ContentType;
import org.apache.http.entity.mime.content.ByteArrayBody; import org.apache.http.entity.mime.content.ByteArrayBody;
import org.apache.http.entity.mime.content.ContentBody; import org.apache.http.entity.mime.content.ContentBody;
import org.slf4j.Logger; import org.apache.logging.log4j.LogManager;
import org.slf4j.LoggerFactory; import org.apache.logging.log4j.Logger;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -23,48 +23,44 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; ...@@ -23,48 +23,44 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
@RequestMapping("/qywx") @RequestMapping("/qywx")
public class QywxController { public class QywxController {
private static final Logger logger = LoggerFactory.getLogger(QywxController.class); private Logger logger = LogManager.getLogger(QywxController.class);
@RequestMapping("self-post") @RequestMapping("self-post")
public Object selfPost(HttpServletRequest request,String url, String json, String ip) { public Object selfPost(HttpServletRequest request,String url, String json, String ip) {
String traceid=request.getParameter("tranceid") ; logger.info("自建post,url={},json={},{},{}", url, json,ip);
logger.info("自建post,url={},json={},{},{}", url, json,traceid,ip);
Map<String, Object> map = HttpClient.getWinxinResByJson(url, json, getIp(ip) , ip); Map<String, Object> map = HttpClient.getWinxinResByJson(url, json, getIp(ip) , ip);
return map; return map;
} }
@RequestMapping("self-post-json") @RequestMapping("self-post-json")
public Object selfPostJson(HttpServletRequest request,String url, @RequestBody String json, String ip) { 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,ip);
logger.info("自建post json,url={},json={},{},{}", url, json,traceid,ip);
Map<String, Object> map = HttpClient.getWinxinResByJson(url, json, getIp(ip) , ip); Map<String, Object> map = HttpClient.getWinxinResByJson(url, json, getIp(ip) , ip);
return map; return map;
} }
@RequestMapping("self-get") @RequestMapping("self-get")
public Object selfGet(HttpServletRequest request,String url, String ip) { public Object selfGet(HttpServletRequest request,String url, String ip) {
String traceid=request.getParameter("tranceid") ; logger.info("自建get,url={},{},{}", url,ip);
logger.info("自建get,url={},{},{}", url,traceid,ip);
Map<String, Object> map = HttpClient.getHttpByGet(url, getIp(ip) , ip); Map<String, Object> map = HttpClient.getHttpByGet(url, getIp(ip) , ip);
return map; return map;
} }
@RequestMapping("self-upload") @RequestMapping("self-upload")
public Object selfUpload(HttpServletRequest request,String url, String fileUrl, String fileName, String ip) { 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,ip);
logger.info("自建upload,url={},fileUrl={},{},{}", url,fileUrl,traceid,ip);
byte[] data = CommonUtil.getFileByte(fileUrl); byte[] data = CommonUtil.getFileByte(fileUrl);
Map<String, ContentBody> paramsMap = new HashMap<String, ContentBody>(); Map<String, ContentBody> paramsMap = new HashMap<String, ContentBody>();
paramsMap.put("media", new ByteArrayBody(data, ContentType.DEFAULT_BINARY, fileName)); paramsMap.put("media", new ByteArrayBody(data, ContentType.DEFAULT_BINARY, fileName));
Map<String, Object> map = HttpClient.getWinxinResByFile(url, paramsMap, getIp(ip) , ip); Map<String, Object> map = HttpClient.getWinxinResByFile(url, paramsMap, getIp(ip) , ip);
logger.info("自建upload end={}",traceid); logger.info("自建upload end={}");
return map; return map;
} }
@RequestMapping("self-upload-data") @RequestMapping("self-upload-data")
public Object selfImage(HttpServletRequest request,String url, String fileName, String ip) throws IOException { public Object selfImage(HttpServletRequest request,String url, String fileName, String ip) throws IOException {
String traceid=request.getParameter("tranceid") ; logger.info("自建upload-data,url={},{},{}", url,ip);
logger.info("自建upload-data,url={},{},{}", url,traceid,ip);
MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
List<MultipartFile> list = multiRequest.getMultiFileMap().get("media"); List<MultipartFile> list = multiRequest.getMultiFileMap().get("media");
MultipartFile mf = list.get(0); MultipartFile mf = list.get(0);
...@@ -72,7 +68,7 @@ public class QywxController { ...@@ -72,7 +68,7 @@ public class QywxController {
Map<String, ContentBody> paramsMap = new HashMap<String, ContentBody>(); Map<String, ContentBody> paramsMap = new HashMap<String, ContentBody>();
paramsMap.put("media", new ByteArrayBody(data, ContentType.DEFAULT_BINARY, fileName)); paramsMap.put("media", new ByteArrayBody(data, ContentType.DEFAULT_BINARY, fileName));
Map<String, Object> map = HttpClient.getWinxinResByFile(url, paramsMap, getIp(ip) , ip); Map<String, Object> map = HttpClient.getWinxinResByFile(url, paramsMap, getIp(ip) , ip);
logger.info("自建upload-data end={}",traceid); logger.info("自建upload-data end={}");
return map; return map;
} }
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd"> 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="classpath*:dubbo-setting.xml"/>
<import resource="dubbo-haoban-self-web.xml"/>
</beans> </beans>
...@@ -9,6 +9,6 @@ ...@@ -9,6 +9,6 @@
http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/context/spring-context.xsd
http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd"> http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
<dubbo:application name="haoban-selft-web"/> <dubbo:application name="gic-qywx-self"/>
</beans> </beans>
\ No newline at end of file
...@@ -11,7 +11,7 @@ ...@@ -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"> 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中所有的类 --> <!-- 扫描注解包路径,多个包用逗号分隔,不填pacakge表示扫描当前ApplicationContext中所有的类 -->
<context:component-scan base-package="com.gic.qywx.*"/> <context:component-scan base-package="com.gic.qywx.*" />
<!-- 启动对@AspectJ注解的支持 --> <!-- 启动对@AspectJ注解的支持 -->
<aop:aspectj-autoproxy/> <aop:aspectj-autoproxy/>
......
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