From 4d02466fed4f3ea012a80c3359cde9af0737141f Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 21 十一月 2022 20:01:12 +0800 Subject: [PATCH] add 增加 skywalking 集成 默认注释不开启 --- ruoyi-admin/pom.xml | 66 +++++++++++++++++++++------------ 1 files changed, 42 insertions(+), 24 deletions(-) diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index f3d9ca9..80eb05e 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>ruoyi-vue-plus</artifactId> <groupId>com.ruoyi</groupId> - <version>3.1.0</version> + <version>4.3.1</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> @@ -29,6 +29,21 @@ <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> </dependency> + <!-- Oracle --> + <dependency> + <groupId>com.oracle.database.jdbc</groupId> + <artifactId>ojdbc8</artifactId> + </dependency> + <!-- PostgreSql --> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + </dependency> + <!-- SqlServer --> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>mssql-jdbc</artifactId> + </dependency> <!-- 鏍稿績妯″潡--> <dependency> @@ -36,10 +51,14 @@ <artifactId>ruoyi-framework</artifactId> </dependency> - <!-- 瀹氭椂浠诲姟--> <dependency> <groupId>com.ruoyi</groupId> - <artifactId>ruoyi-quartz</artifactId> + <artifactId>ruoyi-system</artifactId> + </dependency> + + <dependency> + <groupId>com.ruoyi</groupId> + <artifactId>ruoyi-job</artifactId> </dependency> <dependency> @@ -58,6 +77,24 @@ <groupId>com.ruoyi</groupId> <artifactId>ruoyi-demo</artifactId> </dependency> + + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + </dependency> + + <!-- skywalking 鏁村悎 logback --> +<!-- <dependency>--> +<!-- <groupId>org.apache.skywalking</groupId>--> +<!-- <artifactId>apm-toolkit-logback-1.x</artifactId>--> +<!-- <version>${涓庝綘鐨刟gent鎺㈤拡鐗堟湰淇濇寔涓�鑷磢</version>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>org.apache.skywalking</groupId>--> +<!-- <artifactId>apm-toolkit-trace</artifactId>--> +<!-- <version>${涓庝綘鐨刟gent鎺㈤拡鐗堟湰淇濇寔涓�鑷磢</version>--> +<!-- </dependency>--> </dependencies> @@ -82,32 +119,13 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>3.1.0</version> + <version>3.2.2</version> <configuration> <failOnMissingWebXml>false</failOnMissingWebXml> <warName>${project.artifactId}</warName> </configuration> </plugin> - <plugin> - <groupId>com.spotify</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>${docker.plugin.version}</version> - <configuration> - <imageName>${docker.namespace}/ruoyi-server:${project.version}</imageName> - <dockerDirectory>${project.basedir}</dockerDirectory> - <dockerHost>${docker.registry.host}</dockerHost> - <registryUrl>${docker.registry.url}</registryUrl> - <serverId>${docker.registry.url}</serverId> - <resources> - <resource> - <targetPath>/</targetPath> - <directory>${project.build.directory}</directory> - <include>${project.build.finalName}.jar</include> - </resource> - </resources> - </configuration> - </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> -- Gitblit v1.9.3