Procházet zdrojové kódy

修改默认导出文件字符集

luoshi před 2 roky
rodič
revize
a98b77be71

+ 2 - 3
src/main/java/com/qmth/ops/api/controller/export/NginxConfigExportController.java

@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.nio.charset.Charset;
 
 @RestController
 @RequestMapping(OpsApiConstants.EXPORT_URI_PREFIX + "/nginx")
@@ -82,9 +81,9 @@ public class NginxConfigExportController {
             fileName = fileName + "-" + moduleCode;
         }
         response.reset();
-        response.setContentType("application/octet-stream; charset=gbk");
+        response.setContentType("application/octet-stream;charset=utf-8");
         response.setHeader("Content-Disposition", "attachment; filename=" + fileName + ".conf");
-        ByteArray.fromString(config.getContent(), Charset.forName("gbk")).toOutputStream(response.getOutputStream());
+        ByteArray.fromString(config.getContent()).toOutputStream(response.getOutputStream());
     }
 
 }

+ 1 - 1
src/main/java/com/qmth/ops/api/controller/export/PropertyExportController.java

@@ -80,7 +80,7 @@ public class PropertyExportController {
         List<PropertyItem> list = propertyService
                 .mergePropertyList(app.getId(), version.getId(), module.getId(), env.getId());
         response.reset();
-        response.setContentType("application/octet-stream; charset=unicode");
+        response.setContentType("application/octet-stream");
         response.setHeader("Content-Disposition", "attachment; filename=application.properties");
         PropertyFileUtil.write(list, response.getOutputStream(),
                 appCode + "_" + moduleCode + "_" + version.getName() + "@" + envCode);