From 098d3347a0df808908aab8c554cd7c4febc5e6d9 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 26 八月 2024 11:43:59 +0800 Subject: [PATCH] !577 发布 5.2.2 正式版 安全性提升 Merge pull request !577 from 疯狂的狮子Li/dev --- ruoyi-admin/pom.xml | 266 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 153 insertions(+), 113 deletions(-) diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 94316f5..9e97804 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -1,113 +1,153 @@ -<?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"> - <parent> - <artifactId>ruoyi</artifactId> - <groupId>com.ruoyi</groupId> - <version>3.4.0</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - <artifactId>ruoyi-admin</artifactId> - - <description> - web鏈嶅姟鍏ュ彛 - </description> - - <dependencies> - - <!-- spring-boot-devtools --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-devtools</artifactId> - <optional>true</optional> <!-- 琛ㄧず渚濊禆涓嶄細浼犻�� --> - </dependency> - - <!-- swagger2--> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger2</artifactId> - </dependency> - - <!--闃叉杩涘叆swagger椤甸潰鎶ョ被鍨嬭浆鎹㈤敊璇紝鎺掗櫎2.9.2涓殑寮曠敤锛屾墜鍔ㄥ鍔�1.5.21鐗堟湰--> - <dependency> - <groupId>io.swagger</groupId> - <artifactId>swagger-annotations</artifactId> - <version>1.5.21</version> - </dependency> - - <dependency> - <groupId>io.swagger</groupId> - <artifactId>swagger-models</artifactId> - <version>1.5.21</version> - </dependency> - - <dependency> - <groupId>com.github.xiaoymin</groupId> - <artifactId>swagger-bootstrap-ui</artifactId> - </dependency> - - <!-- Mysql椹卞姩鍖� --> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - </dependency> - - <!-- 鏍稿績妯″潡--> - <dependency> - <groupId>com.ruoyi</groupId> - <artifactId>ruoyi-framework</artifactId> - </dependency> - - <!-- 瀹氭椂浠诲姟--> - <dependency> - <groupId>com.ruoyi</groupId> - <artifactId>ruoyi-quartz</artifactId> - </dependency> - - <!-- 浠g爜鐢熸垚--> - <dependency> - <groupId>com.ruoyi</groupId> - <artifactId>ruoyi-generator</artifactId> - </dependency> - - <!-- demo妯″潡 --> - <dependency> - <groupId>com.ruoyi</groupId> - <artifactId>ruoyi-demo</artifactId> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <version>2.1.1.RELEASE</version> - <configuration> - <fork>true</fork> <!-- 濡傛灉娌℃湁璇ラ厤缃紝devtools涓嶄細鐢熸晥 --> - </configuration> - <executions> - <execution> - <goals> - <goal>repackage</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>3.1.0</version> - <configuration> - <failOnMissingWebXml>false</failOnMissingWebXml> - <warName>${project.artifactId}</warName> - </configuration> - </plugin> - </plugins> - <finalName>${project.artifactId}</finalName> - </build> - -</project> \ No newline at end of file +<?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"> + <parent> + <artifactId>ruoyi-vue-plus</artifactId> + <groupId>org.dromara</groupId> + <version>${revision}</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <packaging>jar</packaging> + <artifactId>ruoyi-admin</artifactId> + + <description> + web鏈嶅姟鍏ュ彛 + </description> + + <dependencies> + + <!-- Mysql椹卞姩鍖� --> + <dependency> + <groupId>com.mysql</groupId> + <artifactId>mysql-connector-j</artifactId> + </dependency> + +<!-- <!– mp鏀寔鐨勬暟鎹簱鍧囨敮鎸� 鍙渶瑕佸鍔犲搴旂殑jdbc渚濊禆鍗冲彲 –>--> +<!-- <!– Oracle –>--> +<!-- <dependency>--> +<!-- <groupId>com.oracle.database.jdbc</groupId>--> +<!-- <artifactId>ojdbc8</artifactId>--> +<!-- </dependency>--> +<!-- <!– 鍏煎oracle浣庣増鏈� –>--> +<!-- <dependency>--> +<!-- <groupId>com.oracle.database.nls</groupId>--> +<!-- <artifactId>orai18n</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> + <groupId>org.dromara</groupId> + <artifactId>ruoyi-common-doc</artifactId> + </dependency> + + <dependency> + <groupId>org.dromara</groupId> + <artifactId>ruoyi-common-social</artifactId> + </dependency> + + <dependency> + <groupId>org.dromara</groupId> + <artifactId>ruoyi-common-ratelimiter</artifactId> + </dependency> + + <dependency> + <groupId>org.dromara</groupId> + <artifactId>ruoyi-common-mail</artifactId> + </dependency> + + <dependency> + <groupId>org.dromara</groupId> + <artifactId>ruoyi-system</artifactId> + </dependency> + + <dependency> + <groupId>org.dromara</groupId> + <artifactId>ruoyi-job</artifactId> + </dependency> + + <!-- 浠g爜鐢熸垚--> + <dependency> + <groupId>org.dromara</groupId> + <artifactId>ruoyi-generator</artifactId> + </dependency> + + <!-- demo妯″潡 --> + <dependency> + <groupId>org.dromara</groupId> + <artifactId>ruoyi-demo</artifactId> + </dependency> + + <!-- 宸ヤ綔娴佹ā鍧� --> + <dependency> + <groupId>org.dromara</groupId> + <artifactId>ruoyi-workflow</artifactId> + </dependency> + + <dependency> + <groupId>de.codecentric</groupId> + <artifactId>spring-boot-admin-starter-client</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> + + <build> + <finalName>${project.artifactId}</finalName> + <plugins> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + <version>${spring-boot.version}</version> + <executions> + <execution> + <goals> + <goal>repackage</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>${maven-jar-plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>${maven-war-plugin.version}</version> + <configuration> + <failOnMissingWebXml>false</failOnMissingWebXml> + <warName>${project.artifactId}</warName> + </configuration> + </plugin> + </plugins> + </build> + +</project> -- Gitblit v1.9.3