From 3e2159e45e12b2b8af058b68eafeaf082cf3fe85 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 15 九月 2022 09:30:31 +0800
Subject: [PATCH] 2022.9.15 1. 根据微信小程序前端需求，添加各对应后台逻辑
---
pom.xml | 40 +++++++++++++++++-----------------------
1 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index cfa143f..1f4a5c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,8 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.3.RELEASE</version>
- <relativePath/> <!-- lookup parent from repository -->
+ <relativePath/>
+ <!-- lookup parent from repository -->
</parent>
<properties>
@@ -312,17 +313,23 @@
<!-- pdf:start -->
<!-- https://mvnrepository.com/artifact/com.itextpdf/itext7-core -->
- <dependency>
- <groupId>com.itextpdf</groupId>
- <artifactId>itext7-core</artifactId>
- <version>${itext.version}</version>
- <type>pom</type>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.itextpdf</groupId>-->
+<!-- <artifactId>itext7-core</artifactId>-->
+<!-- <version>${itext.version}</version>-->
+<!-- <type>pom</type>-->
+<!-- </dependency>-->
<!-- https://mvnrepository.com/artifact/com.itextpdf/html2pdf -->
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>html2pdf</artifactId>
<version>4.0.2</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/org.apache.pdfbox/pdfbox -->
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ <version>2.0.26</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.itextpdf/font-asian -->
<dependency>
@@ -450,21 +457,8 @@
<resources>
<resource>
- <filtering>true</filtering>
<directory>src/main/resources</directory>
- <excludes>
- <exclude>application-dev.yml</exclude>
- <exclude>application-pro.yml</exclude>
- <exclude>application.yml</exclude>
- </excludes>
- </resource>
- <resource>
<filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>application-${profileActive}.yml</include>
- <include>application.yml</include>
- </includes>
</resource>
</resources>
</build>
@@ -473,7 +467,7 @@
<profile>
<id>dev</id>
<properties>
- <profileActive>dev</profileActive>
+ <profile.active>dev</profile.active>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
@@ -482,7 +476,7 @@
<profile>
<id>pro</id>
<properties>
- <profileActive>pro</profileActive>
+ <profile.active>pro</profile.active>
</properties>
<activation>
<activeByDefault>false</activeByDefault>
@@ -494,7 +488,7 @@
<repository>
<id>alimaven</id>
<name>aliyun maven</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <url>https://maven.aliyun.com/repository/public</url>
</repository>
<repository>
<id>spring-snapshots</id>
--
Gitblit v1.9.3