xiaoqi/crm-print
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'beta' into dev

Browse Source 
# Conflicts:
#	server/src/main/java/cn/keking/web/controller/ContractController.java
This commit is contained in:
huangsheng 2023-02-23 17:33:52 +08:00
commit 5218675a1a
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/pom.xml
View File

@ -232,6 +232,11 @@
<version>1.04</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<version>2.0.12</version>
</dependency>
<!-- https://mvnrepository.com/artifact/lennart/cpdetector -->
<!-- <dependency>-->

3
server/server.iml
View File

@ -215,7 +215,8 @@
<orderEntry type="library" name="Maven: org.apache.pdfbox:pdfbox-tools:2.0.15" level="project" />
<orderEntry type="library" name="Maven: org.apache.pdfbox:pdfbox-debugger:2.0.15" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.aspose:aspose-cad:19.9" level="project" />
<orderEntry type="library" name="Maven: lennart:cpdetector:1.0.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: cpdetector:cpdetector:1.04" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.12" level="project" />
<orderEntry type="library" name="Maven: io.mola.galimatias:galimatias:0.2.1" level="project" />
<orderEntry type="library" name="Maven: com.ibm.icu:icu4j:53.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />

11
server/src/main/java/cn/keking/web/controller/ContractController.java
View File

@ -12,9 +12,11 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.OutputStream;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
* @author Hikaru
@ -31,8 +33,6 @@ public class ContractController {
private ContractService contractService;
/**
* 合同生成
* listTemplate
@ -112,8 +112,7 @@ public class ContractController {
/**
* @return 下载合同pdf文件
*
* */
*/
@ApiParam("下载合同pdf文件")
@PostMapping("/download/{templateName}")
public ServiceResponse downloadcontract(