From caad86093475a38d79886eb8e77aa288bfb74d89 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 05 六月 2024 16:53:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java | 16 ++++----
ManagementNTTravel/guns-admin/pom.xml | 70 +++++++++++++++++-----------------
2 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/pom.xml b/ManagementNTTravel/guns-admin/pom.xml
index 40d5ecb..c22cf4e 100644
--- a/ManagementNTTravel/guns-admin/pom.xml
+++ b/ManagementNTTravel/guns-admin/pom.xml
@@ -13,7 +13,7 @@
<version>1.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<dependencies>
<!--<dependency>
@@ -216,47 +216,47 @@
<build>
- <!--<plugins>-->
- <!--<plugin>-->
- <!--<groupId>org.springframework.boot</groupId>-->
- <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<fork>true</fork><!– 如果没有该项配置，肯呢个devtools不会起作用，即应用不会restart –>-->
- <!--</configuration>-->
- <!--</plugin>-->
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-surefire-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<skip>true</skip>-->
- <!--</configuration>-->
- <!--</plugin>-->
- <!--</plugins>-->
-
- <!--打包war包引入本地jar的打包方式-->
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
- <!-- 设置成false，否则检查web.xml是否存在。因为springboot是没有web.xml的 -->
- <failOnMissingWebXml>false</failOnMissingWebXml>
- <!--打包后的项目名-->
- <!--<warName>example</warName>-->
- <!--<webResources>-->
- <!--<resource>-->
- <!--<!–把本地lib里面的jar复制到lib–>-->
- <!--<directory>${project.basedir}/lib</directory>-->
- <!--<targetPath>WEB-INF/lib/</targetPath>-->
- <!--<includes>-->
- <!--<include>**/*.jar</include>-->
- <!--</includes>-->
- <!--</resource>-->
- <!--</webResources>-->
+ <fork>true</fork><!-- 如果没有该项配置，肯呢个devtools不会起作用，即应用不会restart -->
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
+ <!--打包war包引入本地jar的打包方式-->
+<!-- <plugins>-->
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-war-plugin</artifactId>-->
+<!-- <configuration>-->
+<!-- <!– 设置成false，否则检查web.xml是否存在。因为springboot是没有web.xml的 –>-->
+<!-- <failOnMissingWebXml>false</failOnMissingWebXml>-->
+<!-- <!–打包后的项目名–>-->
+<!-- <!–<warName>example</warName>–>-->
+<!-- <!–<webResources>–>-->
+<!-- <!–<resource>–>-->
+<!-- <!–<!–把本地lib里面的jar复制到lib–>–>-->
+<!-- <!–<directory>${project.basedir}/lib</directory>–>-->
+<!-- <!–<targetPath>WEB-INF/lib/</targetPath>–>-->
+<!-- <!–<includes>–>-->
+<!-- <!–<include>**/*.jar</include>–>-->
+<!-- <!–</includes>–>-->
+<!-- <!–</resource>–>-->
+<!-- <!–</webResources>–>-->
+<!-- </configuration>-->
+<!-- </plugin>-->
+<!-- </plugins>-->
+
<resources>
<resource>
<directory>lib</directory>
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
index bcbe337..317a2a4 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
@@ -35,14 +35,14 @@
public static void main(String[] args) throws UnknownHostException {
ConfigurableApplicationContext applicationContext = SpringApplication.run(GunsApplication.class, args);
Environment env = applicationContext.getEnvironment();
- logger.info("GunsApplication is success!");
- logger.info("\n----------------------------------------------------------\n\t" +
- "应用 '{}' 运行成功! 访问连接:\n\t" +
- "Swagger文档: \t\thttp://{}:{}\n" +
- "----------------------------------------------------------",
- env.getProperty("spring.application.name", "后台管理"),
- InetAddress.getLocalHost().getHostAddress(),
- env.getProperty("server.port", "8010"));
+ System.out.println("GunsApplication is success!");
+// logger.info("\n----------------------------------------------------------\n\t" +
+// "应用 '{}' 运行成功! 访问连接:\n\t" +
+// "Swagger文档: \t\thttp://{}:{}\n" +
+// "----------------------------------------------------------",
+// env.getProperty("spring.application.name", "后台管理"),
+// InetAddress.getLocalHost().getHostAddress(),
+// env.getProperty("server.port", "8010"));
}
@Bean //通过ip地址调用
--
Gitblit v1.7.1