소스 검색

Merge branch 'develop' of http://code.nyzhwlw.com:3000/com_yunfei_saas/agmp_iots into develop

zhaiyifei 8 달 전
부모
커밋
6f9c9b6b27

+ 1 - 1
src/main/java/com/yunfeiyun/agmp/iots/warn/service/MsgService.java

@@ -165,7 +165,7 @@ public class MsgService {
         messageDto.setMsgbatchChannel(iotWarnpolicy.getWpChannel());  // 通知渠道,这里假设通过电子邮件发送,需要根据实际情况调整
         JSONObject extra = new JSONObject();
         extra.put("location", "/iotm/warning/record");
-        extra.put("permission", "iotm:warningPlanning:historyRecord");
+        extra.put("permission", "iotm:warning:record:list");
         extra.put("handleId", warnResult.getWlBid());
         messageDto.setMsgbatchExtra(extra.toJSONString());
         messageDto.setMsgbatchHandler(warnResult.getReceiverIds());  // 处理人暂时为空,根据业务逻辑补充

+ 0 - 267
src/main/resources/application-prod.yml

@@ -1,267 +0,0 @@
-# 项目相关配置
-application:
-  # 名称
-  name: IOTS
-  # 版本
-  version: 1.0.0
-  # 版权年份
-  copyrightYear: 2023
-  # 实例演示开关
-  demoEnabled: true
-  # 文件路径 示例( Windows配置D:/yunfei/farmwork/uploadPath,Linux配置 /home/yunfei/farmwork/uploadPath)
-  profile: /data/AGMP/iots
-  # 获取ip地址开关
-  addressEnabled: true
-  # 验证码类型 math 数组计算 char 字符验证
-  captchaType: math
-  # 顶级菜单的父Id
-  topMenuparentid: 0 #9a9d5a42-0803-5761-454c-177834ea4408
-  # 顶级部门的父Id
-  topDeptparentid: 8d4b26eb-1811-17a6-8dd1-127ea32c7cf8
-# 开发环境配置
-server:
-  # 服务器的HTTP端口
-  port: 8035
-  servlet:
-    # 应用的访问路径
-    context-path: /
-  tomcat:
-    # tomcat的URI编码
-    uri-encoding: UTF-8
-    # 连接数满后的排队数,默认为100
-    accept-count: 1000
-    threads:
-      # tomcat最大线程数,默认为200
-      max: 800
-      # Tomcat启动初始化的线程数,默认值10
-      min-spare: 100
-
-# 日志配置
-logging:
-  level:
-    com.yunfeiyun: debug
-    org.springframework: warn
-
-# 用户配置
-user:
-  password:
-    # 密码最大错误次数
-    maxRetryCount: 5
-    # 密码锁定时间(默认10分钟)
-    lockTime: 10
-
-# Spring配置
-spring:
-  autoconfigure:
-    exclude:
-      - org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration
-  # 资源信息
-  messages:
-    # 国际化资源文件路径
-    basename: i18n/messages
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.cj.jdbc.Driver
-    druid:
-      # 主库数据源
-      master:
-        url: jdbc:mysql://localhost:53306/com_yunfeiyun_agmp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
-        username: root
-        password: Yf@YqoGj#oG23
-      # 从库数据源
-      slave:
-        # 从数据源开关/默认关闭
-        enabled: false
-        url:
-        username:
-        password:
-      # 初始连接数
-      initialSize: 5
-      # 最小连接池数量
-      minIdle: 10
-      # 最大连接池数量
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置连接超时时间
-      connectTimeout: 30000
-      # 配置网络超时时间
-      socketTimeout: 60000
-      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间,单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      # 配置一个连接在池中最大生存的时间,单位是毫秒
-      maxEvictableIdleTimeMillis: 900000
-      # 配置检测连接是否有效
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      webStatFilter:
-        enabled: true
-      statViewServlet:
-        enabled: true
-        # 设置白名单,不填则允许所有访问
-        allow:
-        url-pattern: /druid/*
-        # 控制台管理用户名和密码
-        login-username: ruoyi
-        login-password: 123456
-      filter:
-        stat:
-          enabled: true
-          # 慢SQL记录
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
-  # 文件上传
-  servlet:
-    multipart:
-      # 单个文件大小
-      max-file-size:  10MB
-      # 设置总上传的文件大小
-      max-request-size:  20MB
-  # 服务模块
-  devtools:
-    restart:
-      # 热部署开关
-      enabled: true
-  rabbitmq:
-    host: localhost
-    port: 55763
-    username: yfkj_yanshi
-    password: Yf@TTki7F_katvL9
-    virtual-host: /agmpbs
-    connection-timeout: 15000
-    publisher-returns: true
-    enabled: true
-  # redis 配置
-  redis:
-    # 地址
-    host: localhost
-    # 端口,默认为6379
-    port: 56379
-    # 数据库索引
-    database: 0
-    # 密码
-    password: Yf@hsq9yVxp
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间(使用负值表示没有限制)
-        max-wait: -1ms
-
-# token配置
-token:
-  # 令牌自定义标识
-  header: Authorization
-  # 令牌密钥
-  secret: abcdefghijklmnopqrstuvwxyz
-  # 令牌有效期(默认30分钟)
-  expireTime: 30
-
-# MyBatis配置
-mybatis:
-  # 搜索指定包别名
-  typeAliasesPackage: com.yunfeiyun.**.domain
-  # 配置mapper的扫描,找到所有的mapper.xml映射文件
-  mapperLocations: classpath*:mapper/**/*Mapper.xml
-  # 加载全局的配置文件
-  configLocation: classpath:mybatis/mybatis-config.xml
-
-# PageHelper分页插件
-pagehelper:
-  helperDialect: mysql
-  supportMethodsArguments: true
-  params: count=countSql
-
-# Swagger配置
-swagger:
-  # 是否开启swagger
-  enabled: true
-  # 请求前缀
-  pathMapping: /dev-api
-
-# 防止XSS攻击
-xss:
-  # 过滤开关
-  enabled: true
-  # 排除链接(多个用逗号分隔)
-  excludes: /system/notice
-  # 匹配链接
-  urlPatterns: /system/*,/tool/*
-
-network:
-  ipaddrLogin: http://121.40.180.217
-  ipaddrSso: http://localhost
-  vueport: 7000
-  ssoport: 9002
-  icsport: 8023
-  wprport: 8027
-  fmsIp: localhost
-  fmsPort: 8021
-
-portal:
-  ssoEnabled: true
-  ssoLoginUrl: ${network.ipaddrLogin}:${network.vueport}/portal/login?redirect=
-  ssoTokenUrl: ${network.ipaddrSso}:${network.ssoport}/sso/auth/verifyToken
-  ssoSessionUrl: ${network.ipaddrSso}:${network.ssoport}/sso/auth/registerSession
-  ssoLogoutUrl: ${network.ipaddrSso}:${network.ssoport}/sso/auth/logout
-  appLogoutUrl: ${network.ipaddrSso}:${network.icsport}/sso/logoutToken
-  syncEnabled: true
-  orgEnabled: true
-
-policy:
-  # localSpace(本地空间), cloud 资源服务器
-  upload:
-    uploadType: localSpace
-    ossconfig:
-      ossType: 1
-      ossCloud:
-        aliYun:
-          accessType: 1
-          aliyunDomain: https://yunfei-agm.oss-cn-hangzhou.aliyuncs.com
-          aliyunPrefix: agmptest
-          aliyunEndPoint: oss-cn-hangzhou.aliyuncs.com
-          aliyunAccessKeyId: LTAI4G7tFh5Nk4KXZoSPk1D8
-          aliyunAccessKeySecret: RV4S2SfbLPoFNjlI4uIOoA0J1LQPQc
-          aliyunBucketName: yunfei-agm
-        qCloud:
-          qcloudDomain:
-          qcloudPrefix:
-          qcloudSecretId:
-          qcloudSecretKey:
-          qcloudBucketName: yunfei-agm
-  # table(表), cache(缓存)
-  water: table
-  queue:
-    productRouter:
-    consumeRouter:
-    ackEnabled: true
-iot:
-  customerId: 1
-  sassAble: false
-  ai:
-    rt:
-      callBackUrl: http://114.55.0.7:7000/iotsprod-api/ai/mc/camera/subscribe/image/callback
-
-weather:
-  api: http://open.nyzhwlw.com:10001/yf_weather
-  username: yunfeisaas
-  password: yf@yunfeisaas
-
-map:
-  gaode:
-    api: http://restapi.amap.com
-    key: 78ce288400f4fc6d9458989875c833c2

+ 11 - 0
src/main/resources/application-test.yml

@@ -134,11 +134,22 @@ spring:
       # 热部署开关
       enabled: true
   rabbitmq:
+    # 在物联网系统中 agmp 是 iotm 和 iots 之间通信使用
     agmp:
       host: localhost
       port: 5672
       username: user
       password: 123456
+      virtual-host: /agmp-saas-iot
+      connection-timeout: 15000
+      publisher-returns: true
+      enabled: true
+  # 物联网与门户之间使用
+    agmpIot:
+      host: localhost
+      port: 5672
+      username: user
+      password: 123456
       virtual-host: /agmp-saas
       connection-timeout: 15000
       publisher-returns: true