Browse Source

Merge remote-tracking branch 'origin/v1.0.0' into v1.0.0

# Conflicts:
#	src/main/java/com/persagy/apm/alarmservice/group/management/service/impl/GroupManagementServiceImpl.java
易涛 3 years ago
parent
commit
08f1c52553

+ 1 - 0
pom.xml

@@ -120,6 +120,7 @@
         <artifactId>apm-mybatis</artifactId>
     </dependency>
 
+    <!-- actuator:查询项目状态;项目上线需要把这个包注释掉,不然会有安全风险 -->
     <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-actuator</artifactId>

+ 2 - 1
src/main/java/com/persagy/apm/alarmservice/configuration/PoemsWebConfigurer.java

@@ -29,6 +29,7 @@ public class PoemsWebConfigurer implements WebMvcConfigurer {
     }
 
     @Bean
+    @Order(1)
     public Filter poemsContextFilter() {
         return new PoemsContextFilter();
     }
@@ -36,7 +37,7 @@ public class PoemsWebConfigurer implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         // 设置拦截的路径、不拦截的路径、优先级等等
-        registry.addInterceptor(dynamicDataSourceHandler()).order(1).addPathPatterns("/**");
+        registry.addInterceptor(dynamicDataSourceHandler()).order(10).addPathPatterns("/**");
     }
 
     @Override

+ 1 - 0
src/main/java/com/persagy/apm/alarmservice/group/alarmrule/model/ConvertGroupAlarmRuleTool.java

@@ -37,6 +37,7 @@ public interface ConvertGroupAlarmRuleTool {
     * @author lixing
     * @version V1.0 2021-09-08 22:35:45
     */
+
     GroupAlarmRuleListItemVO convert2ResponseListItemDTO(GroupAlarmRule groupAlarmRule);
 
     /**

+ 3 - 2
src/main/java/com/persagy/apm/alarmservice/group/management/service/impl/GroupManagementServiceImpl.java

@@ -8,6 +8,7 @@ import com.persagy.apm.alarmservice.group.management.model.GroupManagement;
 import com.persagy.apm.alarmservice.group.management.model.vo.GroupTreeInfoVO;
 import com.persagy.apm.alarmservice.group.management.model.vo.GroupTreeVO;
 import com.persagy.apm.alarmservice.group.management.service.GroupManagementService;
+import com.persagy.apm.alarmservice.group.management.service.GroupManagementService;
 import com.persagy.apm.model.dto.GroupManagementDTO;
 import com.persagy.apm.model.vo.GroupManagementVo;
 import org.apache.commons.collections4.CollectionUtils;
@@ -98,12 +99,12 @@ public class GroupManagementServiceImpl implements GroupManagementService {
         }
         return JSONObject.parseObject(equipStr,GroupManagementVo.class);
     }
-    
+
     /**
      * 根据id查询设备-常用方法
      * @param id
      * @author 易涛
-     * @date 2021/9/10 10:05 
+     * @date 2021/9/10 10:05
      * @return java.lang.String
      */
     private String findEquipById(String id){

+ 6 - 2
src/main/resources/bootstrap.yml

@@ -15,7 +15,10 @@ spring:
           username: ${spring.datasource.username}
           password: ${spring.datasource.password}
           driver-class-name: ${spring.datasource.driver-class-name}
-    name: energy-alarm-service
+          continue-on-error: true
+          separator: ";"
+          schema: classpath*:db/init/table.sql
+#          data: classpath*:db/init/data.sql
   data:
     elasticsearch:
       repositories:
@@ -34,10 +37,11 @@ mybatis-plus:
 
 integrated:
   swagger:
-    title: energy-alarm-service 接口文档
+    title: energy_alarm_service 接口文档
     description: --
     version: v1.0.0
     termsOfServiceUrl: v1.0.0
     contact:
       name: lixing
+    # 只展示com.persagy包下的接口
     basePackage: "com.persagy"

+ 0 - 0
src/main/resources/db/init/data.sql


File diff suppressed because it is too large
+ 1 - 0
src/main/resources/db/init/table.sql