From de5d55508afd27fb2b47e6d4d6fd9984525c222c Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期二, 07 一月 2025 14:28:26 +0800
Subject: [PATCH] 升级架构
---
pom.xml | 445 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 364 insertions(+), 81 deletions(-)
diff --git a/pom.xml b/pom.xml
index ff96787..0b4c195 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,91 +1,374 @@
<?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>
+ 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>com.dingzhuo</groupId>
- <artifactId>energy-management</artifactId>
- <version>1.0.0</version>
- <modules>
- <module>data-service</module>
- <module>data-model</module>
- <module>parent</module>
- <module>data-monitoring</module>
- <module>energy_management_server</module>
- <module>basic</module>
- <module>basic-data</module>
- <module>compute-engine</module>
- </modules>
- <packaging>pom</packaging>
+ <groupId>com.zhitan</groupId>
+ <artifactId>BaseAdminAPI</artifactId>
+ <version>3.8.7</version>
- <name>energyManagement</name>
- <description>浼佷笟鑳芥簮绠＄悊绯荤粺</description>
+ <name>BaseAdminAPI</name>
+ <description>绠＄悊绯荤粺</description>
- <parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.2.5.RELEASE</version>
- <relativePath/>
- </parent>
+ <packaging>pom</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
- <mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>
- <pagehelper.spring.boot.starter.version>1.2.5</pagehelper.spring.boot.starter.version>
- <fastjson.version>1.2.47</fastjson.version>
- <druid.version>1.1.14</druid.version>
- <commons.io.version>2.5</commons.io.version>
- <commons.fileupload.version>1.3.3</commons.fileupload.version>
- <bitwalker.version>1.19</bitwalker.version>
- <jwt.version>0.9.0</jwt.version>
- <swagger.version>2.9.2</swagger.version>
- <poi.version>3.17</poi.version>
- <oshi.version>3.9.1</oshi.version>
- <velocity.version>1.7</velocity.version>
- </properties>
+ <properties>
+ <zhitan.version>3.8.7</zhitan.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <java.version>1.8</java.version>
+ <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+ <spring-framework.version>5.3.33</spring-framework.version>
+ <druid.version>1.2.20</druid.version>
+ <bitwalker.version>1.21</bitwalker.version>
+ <swagger.version>3.0.0</swagger.version>
+ <kaptcha.version>2.3.3</kaptcha.version>
+ <pagehelper.version>6.1.0</pagehelper.version>
+ <jsqlparser.version>4.9</jsqlparser.version>
+ <fastjson.version>2.0.43</fastjson.version>
+ <oshi.version>6.5.0</oshi.version>
+ <commons.io.version>2.13.0</commons.io.version>
+ <poi.version>4.1.2</poi.version>
+ <velocity.version>2.3</velocity.version>
+ <jwt.version>0.9.1</jwt.version>
+ <mybatis-plus.version>3.5.6</mybatis-plus.version>
+ </properties>
- <repositories>
- <repository>
- <id>public</id>
- <name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </dependency>
+ <!-- PostgreSQL椹卞姩鍖� -->
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.10.5</version>
+ </dependency>
- <pluginRepositories>
- <pluginRepository>
- <id>public</id>
- <name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>28.0-jre</version>
+ </dependency>
- <profiles>
- <profile>
- <id>dev</id>
- <properties>
- <!--褰撳墠鐜,鐢熶骇鐜涓虹┖-->
- <profile.name>dev</profile.name>
- </properties>
- </profile>
- <profile>
- <id>prod</id>
- <properties>
- <!--褰撳墠鐜,鐢熶骇鐜涓虹┖-->
- <profile.name>prod</profile.name>
- </properties>
- </profile>
- </profiles>
+ <dependency>
+ <groupId>com.jsoniter</groupId>
+ <artifactId>jsoniter</artifactId>
+ <version>0.9.23</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.influxdb</groupId>
+ <artifactId>influxdb-java</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>okhttp</artifactId>
+ <groupId>com.squareup.okhttp3</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>okio</artifactId>
+ <groupId>com.squareup.okio</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.influxdb</groupId>
+ <artifactId>influxdb-client-java</artifactId>
+ <version>3.4.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>kotlin-stdlib</artifactId>
+ <groupId>org.jetbrains.kotlin</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>1.6.2</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- 闃块噷JSON瑙ｆ瀽鍣� -->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>${fastjson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-core</artifactId>
+ <version>5.3.8</version>
+ </dependency>
+ </dependencies>
+
+ <!-- 渚濊禆澹版槑 -->
+ <dependencyManagement>
+ <dependencies>
+
+ <!-- SpringFramework鐨勪緷璧栭厤缃�-->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-framework-bom</artifactId>
+ <version>${spring-framework.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- SpringBoot鐨勪緷璧栭厤缃�-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>2.5.15</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- 闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>druid-spring-boot-starter</artifactId>
+ <version>${druid.version}</version>
+ </dependency>
+
+ <!-- 瑙ｆ瀽瀹㈡埛绔搷浣滅郴缁熴�佹祻瑙堝櫒绛� -->
+ <dependency>
+ <groupId>eu.bitwalker</groupId>
+ <artifactId>UserAgentUtils</artifactId>
+ <version>${bitwalker.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>${mybatis-plus.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.pagehelper</groupId>
+ <artifactId>pagehelper</artifactId>
+ <version>${pagehelper.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.jsqlparser</groupId>
+ <artifactId>jsqlparser</artifactId>
+ <version>${jsqlparser.version}</version>
+ </dependency>
+
+ <!-- 鑾峰彇绯荤粺淇℃伅 -->
+ <dependency>
+ <groupId>com.github.oshi</groupId>
+ <artifactId>oshi-core</artifactId>
+ <version>${oshi.version}</version>
+ </dependency>
+
+ <!-- Swagger3渚濊禆 -->
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-boot-starter</artifactId>
+ <version>${swagger.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-models</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- io甯哥敤宸ュ叿绫� -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ </dependency>
+
+ <!-- excel宸ュ叿 -->
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>${poi.version}</version>
+ </dependency>
+
+ <!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>${velocity.version}</version>
+ </dependency>
+
+ <!-- 闃块噷JSON瑙ｆ瀽鍣� -->
+ <dependency>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
+ <version>${fastjson.version}</version>
+ </dependency>
+
+ <!-- Token鐢熸垚涓庤В鏋�-->
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt</artifactId>
+ <version>${jwt.version}</version>
+ </dependency>
+
+ <!-- 楠岃瘉鐮� -->
+ <dependency>
+ <groupId>pro.fessional</groupId>
+ <artifactId>kaptcha</artifactId>
+ <version>${kaptcha.version}</version>
+ </dependency>
+
+ <!-- 瀹氭椂浠诲姟-->
+ <dependency>
+ <groupId>com.zhitan</groupId>
+ <artifactId>zhitan-quartz</artifactId>
+ <version>${zhitan.version}</version>
+ </dependency>
+
+ <!-- 浠ｇ爜鐢熸垚-->
+ <dependency>
+ <groupId>com.zhitan</groupId>
+ <artifactId>zhitan-generator</artifactId>
+ <version>${zhitan.version}</version>
+ </dependency>
+
+ <!-- 鏍稿績妯″潡-->
+ <dependency>
+ <groupId>com.zhitan</groupId>
+ <artifactId>zhitan-framework</artifactId>
+ <version>${zhitan.version}</version>
+ </dependency>
+
+ <!-- 绯荤粺妯″潡-->
+ <dependency>
+ <groupId>com.zhitan</groupId>
+ <artifactId>zhitan-system</artifactId>
+ <version>${zhitan.version}</version>
+ </dependency>
+
+ <!-- 閫氱敤宸ュ叿-->
+ <dependency>
+ <groupId>com.zhitan</groupId>
+ <artifactId>zhitan-common</artifactId>
+ <version>${zhitan.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <modules>
+ <module>zhitan-admin</module>
+ <module>zhitan-framework</module>
+ <module>zhitan-system</module>
+ <module>zhitan-quartz</module>
+ <module>zhitan-generator</module>
+ <module>zhitan-common</module>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <build.profile.id>dev</build.profile.id>
+ <profileActive>dev</profileActive>
+ </properties>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>prod</id>
+ <properties>
+ <build.profile.id>prod</build.profile.id>
+ <profileActive>prod</profileActive>
+ </properties>
+ </profile>
+ </profiles>
+
+ <build>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <!--寮�鍚繃婊わ紝鐢ㄦ寚瀹氱殑鍙傛暟鏇挎崲directory涓嬬殑鏂囦欢涓殑鍙傛暟-->
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <compilerArgs>
+ <!-- 杩囨湡鐨勬柟娉曠殑璀﹀憡-->
+ <arg>-Xlint:deprecation</arg>
+ </compilerArgs>
+ <compilerArguments>
+ <!-- 鏄惁杈撳嚭鎵�鏈夌殑缂栬瘧淇℃伅锛堝寘鎷被鐨勫姞杞界瓑锛�-->
+ <!--<verbose />-->
+ <!-- 瑙ｅ喅maven鍛戒护缂栬瘧鎶ラ敊锛屽洜涓簉t.jar 鍜宩ce.jar鍦╦re鐨刲ib涓嬮潰锛屼笉鍦╦dk鐨刲ib涓嬮潰锛�
+ 瀵艰嚧maven鎵句笉鍒帮紙java7浠ュ悗浼氬嚭鐜拌繖涓棶棰橈級锛屽皢杩�2涓猨ar鍖呮嫹璐濆埌jdk鐨刲ib涓嬮潰浼拌涔熷ソ浣�-->
+ <bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar</bootclasspath>
+ </compilerArguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>ali-public</id>
+ <name>ali-public</name>
+ <url>https://maven.aliyun.com/repository/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
+ <repository>
+ <id>central</id>
+ <url>https://maven.aliyun.com/repository/central</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>public</id>
+ <name>ali nexus</name>
+ <url>https://maven.aliyun.com/repository/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
</project>
--
Gitblit v1.9.3