|
@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
-import java.nio.charset.Charset;
|
|
|
|
|
|
|
|
@RestController
|
|
@RestController
|
|
@RequestMapping(OpsApiConstants.EXPORT_URI_PREFIX + "/nginx")
|
|
@RequestMapping(OpsApiConstants.EXPORT_URI_PREFIX + "/nginx")
|
|
@@ -82,9 +81,9 @@ public class NginxConfigExportController {
|
|
fileName = fileName + "-" + moduleCode;
|
|
fileName = fileName + "-" + moduleCode;
|
|
}
|
|
}
|
|
response.reset();
|
|
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");
|
|
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());
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|