From 3fd60f86761662d0d8b34a6c89212b86157475db Mon Sep 17 00:00:00 2001 From: 逐浪人 <zhulangren@gmail.com> Date: 星期三, 22 三月 2023 15:21:22 +0800 Subject: [PATCH] Update UserController.java --- pom.xml | 59 ++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 48 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 510f528..a675c6f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ <version>2.6.7</version> <name>web video platform</name> <description>鍥芥爣28181瑙嗛骞冲彴</description> + <packaging>${project.packaging}</packaging> <repositories> <repository> @@ -55,6 +56,42 @@ <asciidoctor.html.output.directory>${project.build.directory}/asciidoc/html</asciidoctor.html.output.directory> <asciidoctor.pdf.output.directory>${project.build.directory}/asciidoc/pdf</asciidoctor.pdf.output.directory> </properties> + + <profiles> + <profile> + <id>jar</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <project.packaging>jar</project.packaging> + </properties> + </profile> + <profile> + <id>war</id> + <properties> + <project.packaging>war</project.packaging> + </properties> + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-jetty</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.1.0</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> <dependencies> <dependency> @@ -179,8 +216,6 @@ <version>4.10.0</version> </dependency> - - <!-- okhttp-digest --> <dependency> <groupId>io.github.rburgst</groupId> @@ -189,10 +224,17 @@ </dependency> <!-- https://mvnrepository.com/artifact/net.sf.kxml/kxml2 --> +<!-- <dependency>--> +<!-- <groupId>net.sf.kxml</groupId>--> +<!-- <artifactId>kxml2</artifactId>--> +<!-- <version>2.3.0</version>--> +<!-- </dependency>--> + + <!-- jwt瀹炵幇 --> <dependency> - <groupId>net.sf.kxml</groupId> - <artifactId>kxml2</artifactId> - <version>2.3.0</version> + <groupId>org.bitbucket.b_c</groupId> + <artifactId>jose4j</artifactId> + <version>0.9.3</version> </dependency> <!--鍙嶅悜浠g悊--> @@ -242,13 +284,8 @@ <artifactId>spring-boot-starter-test</artifactId> <!-- <scope>test</scope>--> </dependency> - <dependency> - <groupId>org.flywaydb</groupId> - <artifactId>flyway-core</artifactId> - <version>7.15.0</version> - </dependency> - </dependencies> + </dependencies> <build> -- Gitblit v1.8.0