Merge branch 'xxy' of xuxinyi/ideaDemo into master

pom.xml

@@ -7,31 +7,38 @@
     <version>0.0.1-SNAPSHOT</version>
     <name>demo</name>
     <description>demo</description>
+    <packaging>war</packaging> <!-- 添加打包类型为 WAR -->
+
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <spring-boot.version>2.6.13</spring-boot.version>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.26</version> <!-- 可以指定一个版本 -->
+            <version>1.18.26</version> <!-- 确保使用可用版本 -->
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope> <!-- 添加 Tomcat 依赖 -->
+        </dependency>
     </dependencies>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -51,8 +58,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
@@ -62,7 +69,6 @@
                 <version>${spring-boot.version}</version>
                 <configuration>
                     <mainClass>com.example.demo.DemoApplication</mainClass>
-                    <skip>true</skip>
                 </configuration>
                 <executions>
                     <execution>

src/main/java/com/example/demo/DemoApplication.java

@@ -2,12 +2,12 @@ package com.example.demo;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
-public class DemoApplication {
+public class DemoApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
         SpringApplication.run(DemoApplication.class, args);
     }
-
-}
+}

src/main/java/com/example/demo/controllers/PoiController.java

@@ -10,14 +10,15 @@ public class PoiController {
 
     @GetMapping("/list")
     public String list(@RequestParam(defaultValue = "1") int pageNum,@RequestParam(defaultValue = "1") int pageSize){
-        String test = "pageNum:"+pageNum+"    "+"pageSize"+pageSize;
+        String test = "pageNum:"+pageNum+"    "+"pageSize:"+pageSize;
         log.info(test);
         return test;
     }
 
     @GetMapping("/detail")
-    public String detail(){
-        return "this is detail";
+    public String detail(int id){
+        log.info(String.valueOf(id));
+        return String.valueOf(id);
     }
 
     @PostMapping("/add")

数据库.md

@@ -0,0 +1,45 @@
+1.环境
+    ubuntu18.04  华为云远程服务器
+2.停止MySQL服务
+    sudo systemctl stop mysql
+3.卸载MySql
+    sudo apt-get remove --purge mysql-server mysql-client mysql-common mysql-server-core-* mysql-client-core-*
+4.删除相关文件和目录
+    sudo rm -rf /etc/mysql /var/lib/mysql /var/log/mysql
+5.清理未使用的包
+    sudo apt-get autoremove
+    sudo apt-get autoclean
+6.更新包列表
+    sudo apt-get update
+7.安装
+    sudo apt-get install mysql-server
+8.安全配置（可选，但推荐）
+    sudo mysql_secure_installation
+9.启动MySQL服务
+    sudo systemctl start mysql
+10.检查状态
+    sudo systemctl status mysql
+
+11.配置MySQL以允许远程连接（非root  11-16步)
+    sudo nano /etc/mysql/mysql.conf.d/mysqld.cnf
+    找到:bind-address = 127.0.0.1
+    更改:bind-address = 0.0.0.0
+    这将允许来自所有IP地址的连接。
+12.重启服务器
+    sudo systemctl restart mysql
+13.登录
+    mysql -u root -p  密码：1
+14.在MySQL中，您需要为允许远程访问的用户创建或修改用户。进入MySQL命令行
+    CREATE USER 'your_user'@'%' IDENTIFIED BY 'your_password';
+    GRANT ALL PRIVILEGES ON *.* TO 'your_user'@'%' WITH GRANT OPTION;
+    FLUSH PRIVILEGES;
+15.配置防火墙
+    sudo ufw allow 3306/tcp
+16.mysql -u your_user -p -h your_server_ip
+
+17.配置MySQL以允许远程连接（root  11-16步)
+    CREATE USER 'root'@'%' IDENTIFIED BY 'your_password';
+    GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
+    FLUSH PRIVILEGES;
+
+