From ebc658e1651c644e4b0bbead6fd8d74b451ba28d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 14 五月 2025 15:49:30 +0800
Subject: [PATCH] 修改配置

---
 UserOKTravel/guns-admin/pom.xml                            |   81 ++++++++++++++++++++--------------------
 UserOKTravel/guns-admin/src/main/resources/application.yml |   10 ++--
 2 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/UserOKTravel/guns-admin/pom.xml b/UserOKTravel/guns-admin/pom.xml
index da23b92..5d99f93 100644
--- a/UserOKTravel/guns-admin/pom.xml
+++ b/UserOKTravel/guns-admin/pom.xml
@@ -9,11 +9,12 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>guns-admin</artifactId>
+    <artifactId>user</artifactId>
     <name>guns-admin</name>
+    <version>1.0.0</version>
     <description>guns 的spring boot版本</description>
 
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -68,17 +69,17 @@
             <version>2.11.3</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
-            <scope>provided</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-tomcat</artifactId>-->
+<!--            <scope>provided</scope>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>javax.servlet</groupId>-->
+<!--            <artifactId>javax.servlet-api</artifactId>-->
+<!--            <version>3.1.0</version>-->
+<!--            <scope>provided</scope>-->
+<!--        </dependency>-->
 
 
         <!--shiro依赖-->
@@ -232,40 +233,40 @@
 
     <build>
         <!--打包jar包方式-->
-        <!--<plugins>-->
-            <!--<plugin>-->
-                <!--<groupId>org.springframework.boot</groupId>-->
-                <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
-                <!--<configuration>-->
-                    <!--<fork>true</fork>&lt;!&ndash; 如果没有该项配置,肯呢个devtools不会起作用,即应用不会restart &ndash;&gt;-->
-                <!--</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>
         </plugins>
 
+        <!--打包war包引入本地jar的打包方式-->
+<!--        <plugins>-->
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-war-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    &lt;!&ndash; 设置成false,否则检查web.xml是否存在。因为springboot是没有web.xml的 &ndash;&gt;-->
+<!--                    <failOnMissingWebXml>false</failOnMissingWebXml>-->
+<!--                    &lt;!&ndash;打包后的项目名&ndash;&gt;-->
+<!--                    &lt;!&ndash;<warName>example</warName>&ndash;&gt;-->
+<!--                    <webResources>-->
+<!--                        <resource>-->
+<!--                            &lt;!&ndash;把本地lib里面的jar复制到lib&ndash;&gt;-->
+<!--                            <directory>${project.basedir}/lib</directory>-->
+<!--                            <targetPath>WEB-INF/lib/</targetPath>-->
+<!--                            <includes>-->
+<!--                                <include>**/*.jar</include>-->
+<!--                            </includes>-->
+<!--                        </resource>-->
+<!--                    </webResources>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
+<!--        </plugins>-->
+
 
         <resources>
             <resource>
diff --git a/UserOKTravel/guns-admin/src/main/resources/application.yml b/UserOKTravel/guns-admin/src/main/resources/application.yml
index 7bbaa00..e82e492 100644
--- a/UserOKTravel/guns-admin/src/main/resources/application.yml
+++ b/UserOKTravel/guns-admin/src/main/resources/application.yml
@@ -2,7 +2,7 @@
   port: 8006
 
 guns:
-  swagger-open: true              #是否开启swagger (true/false)
+  swagger-open: false              #是否开启swagger (true/false)
   kaptcha-open: false             #是否开启登录时验证码 (true/false)
 #  file-upload-path: d:/tmp       #文件上传目录(不配置的话为java.io.tmpdir目录)
   spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
@@ -56,8 +56,8 @@
 
 spring:
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/oktravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-    username: oktravel
+    url: jdbc:mysql://127.0.0.1:3306/kytravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
     password: Si8bnm5KPGSZkF3F
     db-name: guns #用来搜集数据库的所有表
     filters: wall,mergeStat
@@ -110,12 +110,12 @@
 
 ---
 
-filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
+filePath: /root/server/app/orderPostionFile/ #存储订单轨迹文件路径
 #filePath: C:/orderPostionFile/  #存储订单轨迹文件路径
 
 #支付回调地址
 #正式环境
-callbackPath: https://www.kuaiyuncx.com:81/user
+callbackPath: https://kuaiyuncx.com/user
 #测试环境
 #callbackPath: http://121.37.97.220:81/user
 

--
Gitblit v1.7.1