From 1be9111d14605b208ae2bad2052d5fbeedf0811e Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期四, 11 八月 2022 16:58:28 +0800
Subject: [PATCH] 解决应急预案资源文件夹不能打包的问题，resource重命名为resources
---
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanDepartmentInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml | 0
emergency/emergency-service/pom.xml | 7 +++++--
pom.xml | 12 ++++++++++++
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationUserInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteUserInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanLogInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesMaintainUserInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml | 4 +++-
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanFileInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInspectUserInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanUserInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyWorkApproveInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanAreaInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml | 0
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java | 31 +++++++++++--------------------
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanFileInfoMapper.xml | 0
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationFileInfoMapper.xml | 0
26 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/emergency/emergency-service/pom.xml b/emergency/emergency-service/pom.xml
index a91f4c3..a281c03 100644
--- a/emergency/emergency-service/pom.xml
+++ b/emergency/emergency-service/pom.xml
@@ -9,10 +9,13 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
-
-
<artifactId>emergency-service</artifactId>
+ <properties>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>com.gkhy.safePlatfrom</groupId>
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationFileInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationFileInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationFileInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationFileInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationUserInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationUserInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationUserInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationUserInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteUserInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteUserInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteUserInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteUserInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillPlanFileInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanFileInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillPlanFileInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanFileInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillPlanInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillPlanInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillPlanUserInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanUserInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillPlanUserInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanUserInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanAreaInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanAreaInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanAreaInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanAreaInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanDepartmentInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanDepartmentInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanDepartmentInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanDepartmentInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanFileInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanFileInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanFileInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanFileInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanLogInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanLogInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanLogInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanLogInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml
similarity index 98%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml
index ca32de3..b53ed5f 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml
@@ -23,7 +23,9 @@
LEFT JOIN emergency_supplies b ON a.supplies_id = b.id
WHERE
a.del_flag = 0
- <if test="query.suppliesId != null and query.suppliesId != ''">and a.supplies_id = #{query.suppliesId}</if>
+ <if test="query.suppliesId != null and query.suppliesId != ''">
+ and a.supplies_id = #{query.suppliesId}
+ </if>
</select>
<insert id="addEmergencySuppliesInspect" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInspectInfo"
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectUserInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInspectUserInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectUserInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInspectUserInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainUserInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesMaintainUserInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainUserInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesMaintainUserInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyWorkApproveInfoMapper.xml
similarity index 100%
rename from emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoMapper.xml
rename to emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyWorkApproveInfoMapper.xml
diff --git a/pom.xml b/pom.xml
index d2da4fc..44d62fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -257,6 +257,11 @@
<build>
<plugins>
+ <!-- 修改打包插件
+ 修改打包方式jar为pom后
+ 默认打包方式为spring-boot-maven-plugin
+ 等到后期打包的时候他会一直提示你，你引入的依赖不存在
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -266,6 +271,13 @@
<target>1.8</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests> <!--默认关掉单元测试 -->
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
index 1088b59..05ae1c5 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
@@ -19,12 +19,14 @@
import org.springframework.stereotype.Repository;
import javax.sql.DataSource;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
@Configuration
@MapperScan(basePackages = {"com.gkhy.safePlatform.emergency"},
- sqlSessionTemplateRef = "sqlTemplateEmergency",annotationClass =
+ sqlSessionTemplateRef = "sqlSessionTemplateEmergency",annotationClass =
Repository.class)
public class MyBatisConfigEmergency {
@@ -35,37 +37,26 @@
@Autowired
private MybatisPlusInterceptor mybatisPlusInterceptor;
- @Bean(name = "datasourceEmergency")
+ @Bean(name = "dataSourceEmergency")
@ConfigurationProperties(prefix = "spring.datasource.emergency")
- public DruidDataSource druidDataSourceA(){
+ public DruidDataSource dataSourceDoublePrevent(){
return DruidDataSourceBuilder.create().build();
}
- @Bean(name = "sqlFactoryEmergency")
- public SqlSessionFactory sqlSessionFactory(@Qualifier("datasourceEmergency") DruidDataSource dataSource)
- throws Exception
- {
+ @Bean(name = "sqlSessionFactoryEmergency")
+ public SqlSessionFactory sqlSessionFactoryEmergency(@Qualifier("dataSourceEmergency") DruidDataSource dataSource) throws Exception {
MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
- factoryBean.setDataSource(dataSource);
+ factoryBean.setDataSource(dsEmergency);
ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
-
- //-------------------
- Resource[] rs1 = resolver.getResources("classpath*:config/mapper/emergency/**/**Mapper.xml");
- ArrayList<Resource> resourceArrayList = new ArrayList<>(Arrays.asList(rs1));
- Resource[] resourceArray = new Resource[resourceArrayList.size()];
- resourceArrayList.toArray(resourceArray);
- factoryBean.setMapperLocations(resourceArray);
- //-------------------
+ factoryBean.setMapperLocations(resolver.getResources("classpath*:config/mapper/emergency/**Mapper.xml"));
//设置分页插件
Interceptor[] plugins = {mybatisPlusInterceptor};
factoryBean.setPlugins(plugins);
return factoryBean.getObject();
}
- @Bean(name = "sqlTemplateEmergency")
- public SqlSessionTemplate sqlSessionTemplate(@Qualifier("sqlFactoryEmergency") SqlSessionFactory sqlSessionFactory)
- {
+ @Bean
+ public SqlSessionTemplate sqlSessionTemplateEmergency(@Qualifier("sqlSessionFactoryEmergency") SqlSessionFactory sqlSessionFactory){
return new SqlSessionTemplate(sqlSessionFactory);
}
-
}
--
Gitblit v1.9.2