re-org projects

Author: qdriven

.gitignore

@@ -43,4 +43,4 @@ build/
 .env
 .evn.local
 .env
-susu-portal/
+fluent-apps/susu-portal/

components/fluent-quickdao/src/test/resources/config/db.setting

@@ -1,8 +1,8 @@
 ## db.setting文件
 
-url = jdbc:postgresql://127.0.0.1:7432/test_hub?currentSchema=demo
+url = jdbc:postgresql://127.0.0.1:7432/workspace?schema=qa
 user = postgres
-pass = changeit
+pass = postgres
 
 ## 可选配置
 # 是否在日志中显示执行的SQL

fluent-apps/pom.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.fluentqa</groupId>
+        <artifactId>qworkspace</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>fluent-apps</artifactId>
+    <packaging>pom</packaging>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

qaserver/.gitignore renamed to fluent-apps/qaserver/.gitignore

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.fluentqa</groupId>
-        <artifactId>qworkspace</artifactId>
+        <artifactId>fluent-apps</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
@@ -42,10 +42,10 @@
             <artifactId>erupt-web</artifactId>
             <version>${erupt.version}</version>
             <exclusions>
-            <exclusion>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-tomcat</artifactId>
-            </exclusion>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -111,13 +111,22 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <!--        <dependency>-->
-<!--            <groupId>io.hypersistence</groupId>-->
-<!--            <artifactId>hypersistence-utils-hibernate-62</artifactId>-->
-<!--            <version>3.6.0</version>-->
-<!--        </dependency>-->
+        <!--            <groupId>io.hypersistence</groupId>-->
+        <!--            <artifactId>hypersistence-utils-hibernate-62</artifactId>-->
+        <!--            <version>3.6.0</version>-->
+        <!--        </dependency>-->
     </dependencies>
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>17</source>
+                    <target>17</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>