Browse Source

refactor(national-motion-module-system): 重构代码并优化数据库配置- 简化代码结构,替换 java.lang.String 为 String
- 更新数据库配置,使用 Asia/Shanghai时区
- 移除冗余代码和不必要的注释
- 统一异常处理,使用更具体的异常类型

SheepHy 3 weeks ago
parent
commit
db31e123cc

+ 3 - 3
national-motion-base-core/pom.xml

@@ -1,6 +1,6 @@
 <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">
+		 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">
 	<parent>
 		<groupId>org.jeecgframework.boot</groupId>
 		<artifactId>national-motion-backend</artifactId>
@@ -38,7 +38,7 @@
 			</snapshots>
 		</repository>
 	</repositories>
-	
+
 	<dependencies>
 		<!--jeecg-tools-->
 		<dependency>

+ 20 - 15
national-motion-module-system/national-motion-system-biz/pom.xml

@@ -11,20 +11,6 @@
 	<artifactId>national-motion-system-biz</artifactId>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.jeecgframework.boot</groupId>
-			<artifactId>national-motion-system-local-api</artifactId>
-		</dependency>
-		<!-- 积木报表 -->
-		<dependency>
-			<groupId>org.jeecgframework.jimureport</groupId>
-			<artifactId>jimureport-spring-boot-starter</artifactId>
-		</dependency>
-		<!-- 积木BI -->
-		<dependency>
-			<groupId>org.jeecgframework.jimureport</groupId>
-			<artifactId>jimubi-spring-boot-starter</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
@@ -33,12 +19,31 @@
 			<groupId>org.jeecgframework.boot</groupId>
 			<artifactId>hibernate-re</artifactId>
 		</dependency>
-
+		<!-- AI大模型管理 -->
+		<dependency>
+			<groupId>org.jeecgframework.boot</groupId>
+			<artifactId>national-motion-module-airag</artifactId>
+			<version>${jeecgboot.version}</version>
+		</dependency>
 		<!-- 企业微信/钉钉 api -->
 		<dependency>
 			<groupId>org.jeecgframework</groupId>
 			<artifactId>weixin4j</artifactId>
 		</dependency>
+		<!-- 积木报表 -->
+		<dependency>
+			<groupId>org.jeecgframework.jimureport</groupId>
+			<artifactId>jimureport-spring-boot-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jeecgframework.jimureport</groupId>
+			<artifactId>jimureport-nosql-starter</artifactId>
+		</dependency>
+		<!-- 积木BI -->
+		<dependency>
+			<groupId>org.jeecgframework.jimureport</groupId>
+			<artifactId>jimubi-spring-boot-starter</artifactId>
+		</dependency>
 	</dependencies>
 	
 </project>

+ 96 - 171
pom.xml

@@ -1,28 +1,27 @@
 <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>
-  <groupId>org.jeecgframework.boot</groupId>
-  <artifactId>national-motion-backend</artifactId>
-  <version>3.8.1</version>
-  <packaging>pom</packaging>
-  <name>JEECG BOOT ${project.version}</name>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.jeecgframework.boot</groupId>
+	<artifactId>national-motion-backend</artifactId>
+	<version>3.8.1</version>
+	<packaging>pom</packaging>
+	<name>JEECG BOOT ${project.version}</name>
 
 	<scm>
 		<connection>http://www.jeecg.com</connection>
 		<developerConnection>http://guojusoft.com</developerConnection>
 		<url>http://www.jeecg.com/vip</url>
 	</scm>
-	
-  	<parent>
-	    <groupId>org.springframework.boot</groupId>
-	    <artifactId>spring-boot-starter-parent</artifactId>
-	    <version>2.7.18</version>
-	    <relativePath/>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.7.18</version>
+		<relativePath/>
 	</parent>
 
 	<properties>
 		<jeecgboot.version>3.8.1</jeecgboot.version>
-		<!-- JDK版本支持17和1.8 -->
-		<java.version>17</java.version>
+		<java.version>11</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- 微服务 -->
@@ -30,11 +29,10 @@
 		<spring-cloud-alibaba.version>2021.0.6.2</spring-cloud-alibaba.version>
 		<alibaba.nacos.version>2.0.4</alibaba.nacos.version>
 		<seata.version>1.5.2</seata.version>
-		<!-- 积木报表-->
-		<jimureport-spring-boot-starter.version>1.9.1</jimureport-spring-boot-starter.version>
+
 		<xxl-job-core.version>2.4.1</xxl-job-core.version>
-        <fastjson.version>2.0.57</fastjson.version>
-        <aviator.version>5.2.6</aviator.version>
+		<fastjson.version>2.0.57</fastjson.version>
+		<aviator.version>5.2.6</aviator.version>
 		<pegdown.version>1.6.0</pegdown.version>
 		<commonmark.version>0.17.0</commonmark.version>
 		<knife4j-spring-boot-starter.version>4.4.0</knife4j-spring-boot-starter.version>
@@ -47,7 +45,7 @@
 		<!-- 国产数据库驱动 -->
 		<kingbase8.version>9.0.0</kingbase8.version>
 		<dm8.version>8.1.1.49</dm8.version>
-		
+
 		<!-- 积木报表-->
 		<jimureport-spring-boot-starter.version>2.0.0.1</jimureport-spring-boot-starter.version>
 		<minidao.version>1.10.10</minidao.version>
@@ -75,27 +73,25 @@
 		<log4j2.version>2.17.0</log4j2.version>
 		<logback.version>1.2.13</logback.version>
 	</properties>
-
 	<modules>
         <module>national-motion-base-core</module>
         <module>national-motion-module-system</module>
-        <module>national-motion-module</module>
     </modules>
 
 	<repositories>
 		<repository>
-            <id>aliyun</id>
-            <name>aliyun Repository</name>
-            <url>https://maven.aliyun.com/repository/public</url>
-            <snapshots>
+			<id>aliyun</id>
+			<name>aliyun Repository</name>
+			<url>https://maven.aliyun.com/repository/public</url>
+			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
-        </repository>
+		</repository>
 		<repository>
-            <id>jeecg</id>
-            <name>jeecg Repository</name>
-            <url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
-            <snapshots>
+			<id>jeecg</id>
+			<name>jeecg Repository</name>
+			<url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
+			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
@@ -150,28 +146,6 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<!-- spring-cloud-->
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<!-- spring-cloud-alibaba -->
-			<dependency>
-				<groupId>com.alibaba.cloud</groupId>
-				<artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>${spring-cloud-alibaba.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>io.seata</groupId>
-				<artifactId>seata-spring-boot-starter</artifactId>
-				<version>${seata.version}</version>
-			</dependency>
-
 			<!-- system 模块-->
 			<dependency>
 				<groupId>org.jeecgframework.boot</groupId>
@@ -198,12 +172,6 @@
 				<version>${jeecgboot.version}</version>
 			</dependency>
 
-            <!--微服务启动依赖-->
-            <dependency>
-                <groupId>org.jeecgframework.boot</groupId>
-                <artifactId>jeecg-boot-starter-cloud</artifactId>
-                <version>${jeecgboot.version}</version>
-            </dependency>
 			<!--xxl-job定时任务-->
 			<dependency>
 				<groupId>org.jeecgframework.boot</groupId>
@@ -249,6 +217,38 @@
 				<artifactId>hibernate-re</artifactId>
 				<version>3.8.0.2</version>
 			</dependency>
+
+			<!--mongon db-->
+			<dependency>
+				<groupId>org.jeecgframework.boot</groupId>
+				<artifactId>jeecg-boot-starter-mongon</artifactId>
+				<version>${jeecgboot.version}</version>
+			</dependency>
+
+			<!-- 七牛云SDK -->
+			<dependency>
+				<groupId>com.qiniu</groupId>
+				<artifactId>qiniu-java-sdk</artifactId>
+				<version>${qiniu-java-sdk.version}</version>
+				<exclusions>
+					<exclusion>
+						<artifactId>okhttp</artifactId>
+						<groupId>com.squareup.okhttp3</groupId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<!-- 百度SDK (OCR) -->
+			<dependency>
+				<groupId>com.baidu.aip</groupId>
+				<artifactId>java-sdk</artifactId>
+				<version>${baidu-java-sdk.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.slf4j</groupId>
+						<artifactId>slf4j-simple</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
 			<!-- dom4j -->
 			<dependency>
 				<groupId>dom4j</groupId>
@@ -427,48 +427,47 @@
 
 	<build>
 		<plugins>
-			<!-- 指定JDK编译版本 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-            <!-- 打包跳过测试 -->
-            <plugin>
-		        <groupId>org.apache.maven.plugins</groupId>
-		        <artifactId>maven-surefire-plugin</artifactId>
-		        <configuration>
-		          <skipTests>true</skipTests>
-		        </configuration>
-	        </plugin>
-	         <!-- 避免font文件的二进制文件格式压缩破坏 -->
-	         <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>${java.version}</source>
+					<target>${java.version}</target>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			<!-- 打包跳过测试 -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+			</plugin>
+			<!-- 避免font文件的二进制文件格式压缩破坏 -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
 				<version>3.1.0</version>
-                <configuration>
-                    <nonFilteredFileExtensions>
-                        <nonFilteredFileExtension>woff</nonFilteredFileExtension>
-                        <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
-                        <nonFilteredFileExtension>eot</nonFilteredFileExtension>
-                        <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
-                        <nonFilteredFileExtension>svg</nonFilteredFileExtension>
-                        <nonFilteredFileExtension>glb</nonFilteredFileExtension>
-                        <nonFilteredFileExtension>wasm</nonFilteredFileExtension>
-                        <nonFilteredFileExtension>ico</nonFilteredFileExtension>
-                    </nonFilteredFileExtensions>
-                </configuration>
-            </plugin>
+				<configuration>
+					<nonFilteredFileExtensions>
+						<nonFilteredFileExtension>woff</nonFilteredFileExtension>
+						<nonFilteredFileExtension>woff2</nonFilteredFileExtension>
+						<nonFilteredFileExtension>eot</nonFilteredFileExtension>
+						<nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+						<nonFilteredFileExtension>svg</nonFilteredFileExtension>
+						<nonFilteredFileExtension>glb</nonFilteredFileExtension>
+						<nonFilteredFileExtension>wasm</nonFilteredFileExtension>
+						<nonFilteredFileExtension>ico</nonFilteredFileExtension>
+					</nonFilteredFileExtensions>
+				</configuration>
+			</plugin>
 		</plugins>
 		<resources>
 			<resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
 			<resource>
 				<directory>src/main/java</directory>
 				<includes>
@@ -492,79 +491,5 @@
 			<url>http://maven.jeecg.com:8090/nexus/content/repositories/snapshots/</url>
 		</snapshotRepository>
 	</distributionManagement>
-	
-    <!-- 环境 -->
-    <profiles>
-        <!-- 开发 -->
-        <profile>
-            <id>dev</id>
-            <activation>
-                <!--默认激活配置-->
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <!--当前环境-->
-                <profile.name>dev</profile.name>
-                <!--Nacos服务地址-->
-                <config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
-				<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID,不能使用名称,默认为空-->
-				<config.namespace></config.namespace>
-				<!--Nacos配置分组名称-->
-				<config.group>DEFAULT_GROUP</config.group>
-				<!--Nacos用户名-->
-				<config.username></config.username>
-				<!--Nacos密码-->
-				<config.password></config.password>
-            </properties>
-        </profile>
-		<!-- 测试Nacos开启鉴权、设置分组和命名空间
-		<profile>
-			<id>dev</id>
-			<properties>
-				<profile.name>dev</profile.name>
-				<config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
-				<config.namespace>ac14ab82-51f8-4f0c-aa5b-25fb8384bfb6</config.namespace>
-				<config.group>JEECGDEV_GROUP</config.group>
-				<config.username>nacos</config.username>
-				<config.password>nacos</config.password>
-			</properties>
-		</profile> -->
-        <!-- 测试 -->
-        <profile>
-            <id>test</id>
-            <properties>
-                <!--当前环境-->
-                <profile.name>test</profile.name>
-                <!--Nacos服务地址-->
-                <config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
-				<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID,不能使用名称,默认为空-->
-				<config.namespace></config.namespace>
-				<!--Nacos配置分组名称-->
-				<config.group>DEFAULT_GROUP</config.group>
-				<!--Nacos用户名-->
-				<config.username></config.username>
-				<!--Nacos密码-->
-				<config.password></config.password>
-            </properties>
-        </profile>
-        <!-- 生产 -->
-        <profile>
-            <id>prod</id>
-            <properties>
-                <!--当前环境-->
-                <profile.name>prod</profile.name>
-                <!--Nacos服务地址-->
-                <config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
-				<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID,不能使用名称,默认为空-->
-				<config.namespace></config.namespace>
-				<!--Nacos配置分组名称-->
-				<config.group>DEFAULT_GROUP</config.group>
-				<!--Nacos用户名-->
-				<config.username></config.username>
-				<!--Nacos密码-->
-				<config.password></config.password>
-            </properties>
-        </profile>
-		<!-- SpringCloud运行环境 -->
-    </profiles>
+
 </project>