From 9fb370afff71f4d5659d8904e8751479280d5b48 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 09:26:50 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/pipIrr-common.iml | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/pipIrr-common.iml b/pipIrr-platform/pipIrr-common/pipIrr-common.iml
index 7fe4295..c4b7503 100644
--- a/pipIrr-platform/pipIrr-common/pipIrr-common.iml
+++ b/pipIrr-platform/pipIrr-common/pipIrr-common.iml
@@ -4,10 +4,6 @@
<facet type="web" name="Web">
<configuration>
<webroots />
- <sourceRoots>
- <root url="file://$MODULE_DIR$/src/main/java" />
- <root url="file://$MODULE_DIR$/src/main/resources" />
- </sourceRoots>
</configuration>
</facet>
<facet type="Spring" name="Spring">
@@ -19,17 +15,18 @@
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+ <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
- <orderEntry type="jdk" jdkName="20" jdkType="JavaSDK" />
+ <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:3.1.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:3.1.3" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:2.1.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:6.0.11" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:6.0.11" level="project" />
+ <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.33" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:3.1.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:10.1.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:10.1.12" level="project" />
@@ -42,6 +39,7 @@
<orderEntry type="library" name="Maven: org.springframework:spring-aop:6.0.11" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:6.0.11" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:6.0.11" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:3.1.3" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework.boot:spring-boot-devtools:3.1.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:3.1.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:3.1.3" level="project" />
@@ -49,14 +47,9 @@
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.20" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:3.1.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.20.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.20.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-jul:2.20.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.15.2" level="project" />
- <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.33" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.15.2" level="project" />
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0" level="project" />
<orderEntry type="library" name="Maven: org.webjars:swagger-ui:5.2.0" level="project" />
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-starter-webmvc-api:2.2.0" level="project" />
@@ -67,6 +60,9 @@
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models-jakarta:2.2.15" level="project" />
<orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:4.0.0" level="project" />
<orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:3.0.2" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.15.2" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.15.2" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.15.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2" level="project" />
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-security:1.7.0" level="project" />
<orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-common:1.7.0" level="project" />
@@ -87,23 +83,31 @@
<orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:4.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.3.2" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:3.1.3" level="project" />
+ <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:5.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:6.0.11" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:6.0.11" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.3.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.3.2" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.13" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.1.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:5.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-tx:6.0.11" level="project" />
- <orderEntry type="library" name="Maven: cglib:cglib:3.3.0" level="project" />
- <orderEntry type="library" name="Maven: org.ow2.asm:asm:7.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.40" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension-spring6:2.0.40" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.40" level="project" />
<orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.mina:mina-core:2.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
+ <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
+ <orderEntry type="library" name="Maven: com.github.oshi:oshi-core:6.6.2" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna:5.12.1" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:5.12.1" level="project" />
+ <orderEntry type="library" name="Maven: org.reflections:reflections:0.10.2" level="project" />
+ <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.21" level="project" />
- <orderEntry type="library" name="Maven: org.apache.mina:mina-core:2.2.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.17.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.20.0" level="project" />
</component>
</module>
\ No newline at end of file
--
Gitblit v1.8.0