Pre Merge pull request !43 from 阿斌/N/A

Signed-off-by: 阿斌 <38912748@qq.com>

.github/workflows/build.yml

@@ -30,17 +30,19 @@ jobs:
           # Eclipse基金会维护的开源Java发行版 因为github action参考java的用这个 所以用这个
           # 还有microsoft(微软维护的openjdk发行版) oracle(商用SDK)等
           distribution: 'temurin'
-          java-version: '8'
+          java-version: '21'
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
           node-version: '20.x' # Node.js版本 20系列的最新稳定版
 
-      - name: Compile backend
+      - name: clean maven cache
+        run: rm -rf ~/.m2/repository/io/github/git-commit-id
+
+      - name: Build Backend
         run: |
-          mvn package
-          mvn package -P war
+          mvn clean package
 
       - name: Compile frontend
         run: |

pom.xml

@@ -181,26 +181,26 @@
 		<!-- 手动下载驱动后安装 -->
 		<!-- mvn install:install-file -Dfile=/home/lin/soft/kingbase/jdbc-aarch/kingbase8-8.6.0.jar -DgroupId=com.kingbase -DartifactId=kingbase8 -Dversion=8.6.0 -Dpackaging=jar
  -->
-		<dependency>
-			<groupId>com.kingbase</groupId>
-			<artifactId>kingbase8</artifactId>
-			<version>8.6.0</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/libs/jdbc-aarch/kingbase8-8.6.0.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>com.kingbase</groupId>
-			<artifactId>kingbase8</artifactId>
-			<version>8.6.0</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/libs/jdbc-x86/kingbase8-8.6.0.jar</systemPath>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>com.kingbase</groupId>-->
+<!--			<artifactId>kingbase8</artifactId>-->
+<!--			<version>8.6.0</version>-->
+<!--			<scope>system</scope>-->
+<!--			<systemPath>${basedir}/libs/jdbc-aarch/kingbase8-8.6.0.jar</systemPath>-->
+<!--		</dependency>-->
+<!--		<dependency>-->
+<!--			<groupId>com.kingbase</groupId>-->
+<!--			<artifactId>kingbase8</artifactId>-->
+<!--			<version>8.6.0</version>-->
+<!--			<scope>system</scope>-->
+<!--			<systemPath>${basedir}/libs/jdbc-x86/kingbase8-8.6.0.jar</systemPath>-->
+<!--		</dependency>-->
 
-<!--        <dependency>-->
-<!--            <groupId>cn.com.kingbase</groupId>-->
-<!--            <artifactId>kingbase8</artifactId>-->
-<!--            <version>8.6.0</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>cn.com.kingbase</groupId>
+            <artifactId>kingbase8</artifactId>
+            <version>8.6.0</version>
+        </dependency>
 
         <!--Mybatis分页插件 -->
         <dependency>
@@ -450,7 +450,7 @@
             <plugin>
                 <groupId>io.github.git-commit-id</groupId>
                 <artifactId>git-commit-id-maven-plugin</artifactId>
-                <version>9.0.1</version>
+                <version>8.0.0</version>
                 <executions>
                     <execution>
                         <id>get-the-git-infos</id>

web/src/views/map/index.vue

@@ -89,7 +89,7 @@
           <div class="infobox-content" v-if="channel">
             <el-descriptions class="margin-top" :title="channel.gbName" :column="1" :colon="true" size="mini" :labelStyle="labelStyle" >
               <el-descriptions-item label="编号" >{{channel.gbDeviceId}}</el-descriptions-item>
-              <el-descriptions-item label="生产厂商">{{channel.gbManufacture}}</el-descriptions-item>
+              <el-descriptions-item label="生产厂商">{{channel.gbManufacturer}}</el-descriptions-item>
               <el-descriptions-item label="安装地址" >{{channel.gbAddress == null?'未知': channel.gbAddress}}</el-descriptions-item>
             </el-descriptions>
             <div style="padding-top: 10px; margin: 0 auto; width: fit-content;">