浏览代码

1.restTemplate编码修改。
2.修改docker配置。

zhengqiang 5 年之前
父节点
当前提交
6f5791ab29

+ 11 - 0
src/main/java/com/jpsoft/smart/modules/sys/controller/ApiController.java

@@ -2,12 +2,16 @@ package com.jpsoft.smart.modules.sys.controller;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
+import java.nio.charset.Charset;
+import java.util.List;
 
 @RestController
 @RequestMapping("/sys/api")
@@ -17,6 +21,13 @@ public class ApiController {
     public ResponseEntity<String> selectAll(HttpServletRequest request){
         RestTemplate restTemplate = new RestTemplate();
 
+        for (HttpMessageConverter<?> httpMessageConverter : restTemplate.getMessageConverters()) {
+            if(httpMessageConverter instanceof StringHttpMessageConverter) {
+                ((StringHttpMessageConverter) httpMessageConverter).setDefaultCharset(Charset.forName("UTF-8"));
+                break;
+            }
+        }
+
         String path = request.getContextPath();
         String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
 

+ 31 - 0
src/main/resources/application-docker.yml

@@ -0,0 +1,31 @@
+server:
+  port: 8080
+  servlet:
+    context-path: /smart-community-server
+
+spring:
+  datasource:
+    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/smart-community?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    username: root
+    password: jpsoft2016
+  devtools:
+    restart:
+      enabled: true
+
+logger:
+  level: WARN
+  dir: /opt/logs
+
+netty:
+  port: 9966    #监听端口
+
+springfox:
+  documentation:
+    swagger:
+      v2:
+        host: 192.168.33.21:5566
+
+wx:
+  pay:
+    appId: wx7e70eb62a8459869
+    appSecret: 909d17e353268da57c4f18cc09798049