Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -1172,8 +1172,16 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
         // 第一次处于待现场确认时，启动工作流
         if (ValidationUtil.isEmpty(processInstanceId)) {
             // 1、校验是否有启动后执行现场确认的权限
-            RoleBo roleBo = reginParams.getRole();
-            if (!onSiteConfirmRole.equals(roleBo.getRoleName())) {
+            // 获取当前登录用户的所有角色
+            Set<String> roleNameSet = Sets.newHashSet();
+            if (!ValidationUtil.isEmpty(reginParams.getUserModel().getOrgRoles())) {
+                reginParams.getUserModel().getOrgRoles().values().forEach(i -> {
+                    i.forEach(e -> {
+                        roleNameSet.add(e.getRoleName());
+                    });
+                });
+            }
+            if (!roleNameSet.contains(onSiteConfirmRole)) {
                 executeSubmitDto.setIsOk(false);
                 executeSubmitDto.setMsg("没有执行权限");
                 return executeSubmitDto;

amos-boot-system-supervision/src/main/resources/application.properties

@@ -29,6 +29,8 @@ mybatis.configuration.mapUnderscoreToCamelCase=true
 mybatis-plus.configuration.call-setters-on-nulls=true
 spring.liquibase.change-log=classpath:/db/changelog/changelog-master.xml
 spring.liquibase.enabled=true
+feign.client.config.default.read-timeout=60000
+feign.client.config.default.connect-timeout=30000
 
 mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl