jiangping
2024-12-27 951d65a44165825ad8d323108236a6647467c21a
最新版本541200007
已添加9个文件
已修改15个文件
565 ■■■■■ 文件已修改
admin/.env.development 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/vite.config.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/resources/bootstrap.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_service/src/main/resources/application-self.yml 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/pom.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/java/com/doumee/config/swagger/SwaggerConfig.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/resources/application-self.yml 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/resources/bootstrap-pro.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/resources/bootstrap-self.yml 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/resources/bootstrap.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_timer/src/main/java/com/doumee/config/swagger/SwaggerConfig.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_timer/src/main/resources/application-self.yml 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_timer/src/main/resources/bootstrap-self.yml 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_timer/src/main/resources/bootstrap.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/admin_timer/src/main/resources/bootstrap-self.yml 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireStatisticResponse.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/resources/application-pro.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/resources/application-self.yml 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/.env.development
@@ -1,8 +1,8 @@
# å¼€å‘环境配置
NODE_ENV = 'development'
VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'
# VUE_APP_API_URL  = 'http://192.168.0.103:10010'
# VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'
 VUE_APP_API_URL  = 'http://localhost:10010'
# VUE_APP_API_URL  = 'http://192.168.0.173/gateway_interface'
#  VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'
screen/vite.config.js
@@ -25,8 +25,8 @@
  server: {
    proxy: {
      "/gateway_interface": {
        target: "http://192.168.0.104:10010",
        // target: "http://10.50.250.253:8088/gateway_interface",
        // target: "http://192.168.0.104:10010",
        target: "http://10.50.250.253:8088/gateway_interface",
        // target: "http://192.168.0.173/gateway_interface",
        changeOrigin: true,
        rewrite: (path) => path.replace(/^\/gateway_interface/, ""),
server/meeting/meeting_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
@@ -29,6 +29,8 @@
    @Value("${swagger.host:}")
    private String host;
    @Value("${swagger.enabled:}")
    private Boolean enabled;
    @Value("${swagger.title:接口文档}")
    private String title;
@@ -64,6 +66,7 @@
        return new Docket(DocumentationType.SWAGGER_2)
                .apiInfo(this.getApiInfo()).groupName("default")
                .host(host)
                .enable(enabled)
                .select()
                .apis( basePackage("com.doumee.cloud;com.doumee.api.common"))
                // è®¾ç½®éœ€è¦è¢«æ‰«æçš„类,这里设置为添加了@Api注解的类
server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
spring:
  cloud:
    loadbalancer:
      enabled: true
      nacos:
        # ä½¿ç”¨Nacos负载策略,开发环境可以利用就近访问机制定向访问,启动参数如下:
        # -Dspring.cloud.nacos.discovery.cluster-name=自定义
        enabled: true
      cache:
        # æš‚时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      username: nacos
      password: nacos
      config:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        namespace: dmvisit_dev
#        namespace: dev_renkang
        username: nacos
        password: nacos
#        file-extension: yaml
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        namespace: dev_renkang
        namespace: dmvisit
        username: nacos
        password: nacos
      # å®‰å…¨é…ç½®
knife4j:
  enable: true
  basic:
    enable: true
    username: admin
    password: 111111
  main:
    allow-circular-references: true
# Swagger配置
server/meeting/meeting_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
  profiles:
    active: dev
    active: pro
  application:
    name: meetingAdmin
      # å®‰å…¨é…ç½®
server/meeting/meeting_service/src/main/resources/application-self.yml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,73 @@
spring:
  # æ•°æ®æºé…ç½®
  datasource:
    url: jdbc:mysql://localhost:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: root
    password: Titi@168.com
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  jackson:
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss
#rocketmq:
#  namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
#  groupId: GID-wakatest
#  topic: waka-test
#  username: 4derRb4Sw5EkqUMI
#  password: v50N97wf4av8Q8I4
#
#knife4j:
#  enable: true
#  basic:
#    enable: true
#    username: admin
#    password: 111111
debug_model: true
captcha_check: false
# Swagger配置
swagger:
  host:
  title: ${project.name}接口文档
  description: ${project.name}接口文档
  enabled: true
  # ç¦ç”¨swagger时的重定向地址
  redirect-uri: /
########################微信支付相关配置########################
wx:
  pay:
    appId: wxfab6da18632e28de
    appSecret: 4ee3b22afa90287834319fc3c1635271
    mchId: 1229817002
    mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
    notifyUrl: https://dmtest.ahapp.net/smartmeeting_interface/web/api/wxPayNotify
    keyPath: /usr/local/apiclient_cert.p12
tencent:
  map:
    remoteHost: https://apis.map.qq.com
    appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
########################定时开启配置########################
timing: true
des_pwd: 123456SDFKDJF
## MQTT##
mqtt:
  host: tcp://192.168.10.198:1883
  userName: root
  passWord: 123456
  qos: 1
  clientId: ClientId_local #ClientId_local必须唯一 æ¯”如你已经定了叫ABC  é‚£ä½ å°±ä¸€ç›´å«ABC  å…¶ä»–地方就不要使用ABC了
  timeout: 10
  keepalive: 20
  topic1: A/pick/warn/#  #符号是代表整个warn下面的全部子主题 æ²¡æœ‰ç†è§£çš„话 å¯ä»¥ç™¾åº¦ä»”细理解一下
  topic2: A/cmd/resp
  topic3: ABCF
  topic4: ABCH
server/system_gateway/pom.xml
@@ -79,6 +79,12 @@
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>
    <build>
        <finalName>system_gateway</finalName>
        <resources>
            <resource>
                <directory>src/main/resources</directory>
            </resource>
        </resources>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
server/system_gateway/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
@@ -28,6 +28,8 @@
    @Value("${swagger.host:}")
    private String host;
    @Value("${swagger.enabled:}")
    private Boolean enabled;
    @Value("${swagger.title:接口文档}")
    private String title;
@@ -51,6 +53,7 @@
        return new Docket(DocumentationType.SWAGGER_2)
                .apiInfo(this.getApiInfo()).groupName("default")
                .host(host)
                .enable(enabled)
                .select()
                .apis( basePackage("com.doumee.api.gateway;"))
                // è®¾ç½®éœ€è¦è¢«æ‰«æçš„类,这里设置为添加了@Api注解的类
server/system_gateway/src/main/resources/application-self.yml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
spring:
  # æ•°æ®æºé…ç½®
  datasource:
    url: jdbc:mysql://localhost:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: root
    password: Titi@168.com
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  jackson:
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss
debug_model: true
captcha_check: false
# Swagger配置
swagger:
  host:
  title: ${project.name}接口文档
  description: ${project.name}接口文档
  enabled: true
  # ç¦ç”¨swagger时的重定向地址
  redirect-uri: /
knife4j:
  enable: true
  basic:
    enable: true
    username: admin
    password: 123456
  main:
    allow-circular-references: true
timing: true
des_pwd: 123456SDFKDJF
server/system_gateway/src/main/resources/bootstrap-pro.yml
@@ -56,13 +56,13 @@
  # èšåˆswagger文档
  gateway:
    # ç¬¬ä¸€ä¸ªé…ç½®ï¼Œå¼€å¯gateway聚合组件
    enabled: true
    enabled: false
    # ç¬¬äºŒè¡Œé…ç½®ï¼Œè®¾ç½®èšåˆæ¨¡å¼é‡‡ç”¨discover服务发现的模式
    strategy: discover
    # æœåŠ¡å‘çŽ°æ¨¡å¼çš„é…ç½®
    discover:
      # ç¬¬ä¸‰è¡Œé…ç½®ï¼Œå¼€å¯discover模式
      enabled: true
      enabled: false
      # èšåˆæ‰€æœ‰å­æœåŠ¡(swagger2规范),子服务是3规范则替换为openapi3
      version: swagger2
      # éœ€è¦æŽ’除的微服务(eg:网关服务)
server/system_gateway/src/main/resources/bootstrap-self.yml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,95 @@
spring:
  cloud:
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      username: nacos
      password: nacos
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        namespace: dmvisit
        namespace: dmvisit_dev
        username: nacos
        password: nacos
    gateway:
      discovery:
        locator:
          #开启从注册中心动态创建路由的功能,利用微服务名进行路由
          enabled: true
          #开启小写验证,默认feign根据服务名查找都是用的全大写
          lower-case-service-id: true
      routes:
        - id: meetingAdmin
          name: ä¼šè®®å®¤å¾®æœåŠ¡
          uri: lb://meetingAdmin
          # æ–­è¨€,路径相匹配的进行路由
          predicates:
            - Path=/meetingAdmin/**
          filters:
            - SwaggerHeaderFilter
            - StripPrefix=1
        - id: visitsAdmin
          uri: lb://visitsAdmin
          name: è®¿å®¢ç³»ç»Ÿå¾®æœåŠ¡
          # æ–­è¨€,路径相匹配的进行路由
          predicates:
            - Path=/visitsAdmin/**
          filters:
            - SwaggerHeaderFilter
            - StripPrefix=1
        - id: systemTimer
          uri: lb://systemTimer
          name: å®šæ—¶ä»»åŠ¡å¾®æœåŠ¡
          # æ–­è¨€,路径相匹配的进行路由
          predicates:
            - Path=/systemTimer/**
          filters:
            - SwaggerHeaderFilter
            - StripPrefix=1
management:
  endpoints:
    web:
      exposure:
        include: "*"
knife4j:
  # èšåˆswagger文档
  gateway:
    # ç¬¬ä¸€ä¸ªé…ç½®ï¼Œå¼€å¯gateway聚合组件
    enabled: true
    # ç¬¬äºŒè¡Œé…ç½®ï¼Œè®¾ç½®èšåˆæ¨¡å¼é‡‡ç”¨discover服务发现的模式
    strategy: discover
    # æœåŠ¡å‘çŽ°æ¨¡å¼çš„é…ç½®
    discover:
      # ç¬¬ä¸‰è¡Œé…ç½®ï¼Œå¼€å¯discover模式
      enabled: true
      # èšåˆæ‰€æœ‰å­æœåŠ¡(swagger2规范),子服务是3规范则替换为openapi3
      version: swagger2
      # éœ€è¦æŽ’除的微服务(eg:网关服务)
      excluded-services:
        - gateway-service
# Api文档信息
# springdoc-openapi é¡¹ç›®é…ç½®
springdoc:
  swagger-ui:
    path: /doc.html
    tags-sorter: alpha
    operations-sorter: alpha
  api-docs:
    path: /v2/api-docs
  group-configs:
    - group: 'default'
      paths-to-match: '/**'
  info:
    title: ${spring.application.name} - API
    version: 3.0.0
    description: æŽ¥å£æ–‡æ¡£
    contact:
      name: 1
      url: 1
      email: 1
    license:
      name: Apache 2.0
      url: https://www.apache.org/licenses/LICENSE-2.0.html
server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
  profiles:
    active: dev
    active: self
  application:
    name: system_gateway
  # å®‰å…¨é…ç½®
server/system_timer/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
@@ -28,6 +28,8 @@
    @Value("${swagger.host:}")
    private String host;
    @Value("${swagger.enabled:}")
    private Boolean enabled;
    @Value("${swagger.title:接口文档}")
    private String title;
@@ -51,6 +53,7 @@
        return new Docket(DocumentationType.SWAGGER_2)
                .apiInfo(this.getApiInfo()).groupName("default")
                .host(host)
                .enable(enabled)
                .select()
                .apis( basePackage("com.doumee.api.timer;"))
                // è®¾ç½®éœ€è¦è¢«æ‰«æçš„类,这里设置为添加了@Api注解的类
server/system_timer/src/main/resources/application-self.yml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,83 @@
spring:
  # æ•°æ®æºé…ç½®
  datasource:
    url: jdbc:mysql://localhost:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: root
    password: Titi@168.com
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  redis:
    #    database: 0
    host: 127.0.0.1
    port: 6379
    password:
    timeout: 5000      # è¿žæŽ¥æ± ä¸­çš„æœ€å°ç©ºé—²è¿žæŽ¥
  jackson:
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss
#rocketmq:
#  namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
#  groupId: GID-wakatest
#  topic: waka-test
#  username: 4derRb4Sw5EkqUMI
#  password: v50N97wf4av8Q8I4
knife4j:
  enable: true
  basic:
    enable: true
#    username: admin
#    password: 111111
debug_model: true
########################同步数据模式  ########################
data-sync:
  org-user-data-origin: 1 #组织数据 0自建 2以海康为主 1华晟ERP系统
  visitor-data-origin: 1 #访客数据 0自建 2以海康为主 1华晟ERP系统
  need-deal-img: true #是否需要处理图片数据
# Swagger配置
swagger:
  host: 127.0.0.1
  title: ${project.name}接口文档
  description: ${project.name}接口文档
  enabled: true
  context-path:
  # ç¦ç”¨swagger时的重定向地址
  redirect-uri: /
########################微信支付相关配置########################
wx:
  pay:
    appId: wxfab6da18632e28de
    appSecret: 4ee3b22afa90287834319fc3c1635271
    mchId: 1229817002
    mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
    notifyUrl: https://dmtest.ahapp.net/smartmeeting_interface/web/api/wxPayNotify
    keyPath: /usr/local/apiclient_cert.p12
tencent:
  map:
    remoteHost: https://apis.map.qq.com
    appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
des_pwd: 123456SDFKDJF
## MQTT##
mqtt:
  host: tcp://192.168.10.198:1883
  userName: root
  passWord: 123456
  qos: 1
  clientId: ClientId_local #ClientId_local必须唯一 æ¯”如你已经定了叫ABC  é‚£ä½ å°±ä¸€ç›´å«ABC  å…¶ä»–地方就不要使用ABC了
  timeout: 10
  keepalive: 20
  topic1: A/pick/warn/#  #符号是代表整个warn下面的全部子主题 æ²¡æœ‰ç†è§£çš„话 å¯ä»¥ç™¾åº¦ä»”细理解一下
  topic2: A/cmd/resp
  topic3: ABCF
  topic4: ABCH
server/system_timer/src/main/resources/bootstrap-self.yml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
spring:
  cloud:
    loadbalancer:
      enabled: true
      nacos:
        # ä½¿ç”¨Nacos负载策略,开发环境可以利用就近访问机制定向访问,启动参数如下:
        # -Dspring.cloud.nacos.discovery.cluster-name=自定义
        enabled: true
      cache:
        # æš‚时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      username: nacos
      password: nacos
      #      config:
      #        server-addr: http://175.27.187.84:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos
      #        file-extension: yaml
      #        group: dev
      #        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        namespace: dmvisit_dev
        username: nacos
        password: nacos
server/system_timer/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
  profiles:
    active: pro
    active: self
  application:
    name: systemTimer
    # å®‰å…¨é…ç½®
server/visits/admin_timer/src/main/resources/bootstrap-self.yml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
spring:
  cloud:
    loadbalancer:
      enabled: true
      nacos:
        # ä½¿ç”¨Nacos负载策略,开发环境可以利用就近访问机制定向访问,启动参数如下:
        # -Dspring.cloud.nacos.discovery.cluster-name=自定义
        enabled: true
      cache:
        # æš‚时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
#        file-extension: yaml
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        namespace: dmvisit
        username: nacos
        password: nacos
knife4j:
  enable: true
  basic:
    enable: true
    username: admin
    password: 111111
server/visits/dmvisit_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
@@ -31,6 +31,8 @@
    @Value("${swagger.title:接口文档}")
    private String title;
    @Value("${swagger.enabled:}")
    private Boolean enabled;
    @Value("${swagger.description:}")
    private String description;
@@ -51,6 +53,7 @@
        return new Docket(DocumentationType.SWAGGER_2)
                .apiInfo(this.getApiInfo()).groupName("default")
                .host(host)
                .enable(enabled)
                .select()
                .apis( basePackage("com.doumee.cloud"))
//                .apis( basePackage("com.doumee.api.common"))
server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,73 @@
spring:
  cloud:
    loadbalancer:
      enabled: true
      nacos:
        # ä½¿ç”¨Nacos负载策略,开发环境可以利用就近访问机制定向访问,启动参数如下:
        # -Dspring.cloud.nacos.discovery.cluster-name=自定义
        enabled: true
      cache:
        # æš‚时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
#        file-extension: yaml
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        namespace: dmvisit
        namespace: dmvisit_dev
        username: nacos
        password: nacos
knife4j:
  enable: true
  basic:
    enable: true
    username: admin
    password: 111111
# swagger配置
#knife4j:
#  # å¼€å¯å¢žå¼ºé…ç½®
#  enable: true
#  # å¼€å¯ç”Ÿäº§çŽ¯å¢ƒå±è”½
#  # production: true
#  setting:
#    language: zh_cn
#  # è´¦æˆ·å¯†ç 
#  basic:
#    enable: true
#    username: abc
#    password: abc
#
## Api文档信息
## springdoc-openapi é¡¹ç›®é…ç½®
#springdoc:
#  swagger-ui:
#    path: /doc.html
#    tags-sorter: alpha
#    operations-sorter: alpha
#  api-docs:
#    path: /v3/api-docs
#  group-configs:
#    - group: 'default'
#      paths-to-match: '/**'
#  info:
#    title: ${spring.application.name} - API
#    version: 3.0.0
#    description: æŽ¥å£æ–‡æ¡£
#    contact:
#      name: 1
#      url: 1
#      email: 1
#    license:
#      name: Apache 2.0
#      url: https://www.apache.org/licenses/LICENSE-2.0.html
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -819,7 +819,9 @@
     * @return
     */
    public static String ruleEventSearch(String body) {
        return startDoPostStringArtemis(HKConstants.InterfacePath.ruleEventSearch,body);
        Map<String,String> header = new HashMap<>();
        header.put("User-Id","admin");
        return startDoPostStringArtemis(HKConstants.InterfacePath.ruleEventSearch,null,header,body);
    }
    /**
     * å®‰é˜²çœ‹æ¿-园区安防设备-各类型设备状态数据列表
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireStatisticResponse.java
@@ -8,5 +8,6 @@
public class FireStatisticResponse {
private Integer  maintenanceNum    ;//    Number    false    å·²ç»´ä¿çš„æ¶ˆé˜²è®¾å¤‡æ•°
   private Integer  maintenanceNumMonth    ;//    Number    false    æœ¬æœˆæ–°å¢žå·²ç»´ä¿çš„æ¶ˆé˜²è®¾å¤‡æ•°
   private Integer  deviceTotalNum    ;//    Number    false    æ¶ˆé˜²è®¾å¤‡æ€»æ•°
}
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -1198,7 +1198,7 @@
        BaseResponse<FireStatisticResponse> response1 = HKService.fireStatisticMonth(param);
        if(response1 != null && StringUtils.equals(response1.getCode(), HKConstants.RESPONSE_SUCCEE)
                && response1.getData()!=null ) {
            data.setMonthAddNum(Constants.formatIntegerNum(response1.getData().getMaintenanceNum()));
            data.setMonthAddNum(Constants.formatIntegerNum(response1.getData().getMaintenanceNumMonth()));
            data.setMonthTotalNum(Constants.formatIntegerNum(response1.getData().getDeviceTotalNum()));
        }
            return data;
server/visits/dmvisit_service/src/main/resources/application-pro.yml
@@ -17,7 +17,7 @@
    date-format: yyyy-MM-dd HH:mm:ss
debug_model: true
debug_model: false
########################同步数据模式  ########################
data-sync:
server/visits/dmvisit_service/src/main/resources/application-self.yml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
spring:
  # æ•°æ®æºé…ç½®
  datasource:
    url: jdbc:mysql://localhost:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: root
    password: Titi@168.com
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  redis:
    #    database: 0
    host: 127.0.0.1
    port: 6379
    password:
    timeout: 5000      # è¿žæŽ¥æ± ä¸­çš„æœ€å°ç©ºé—²è¿žæŽ¥
  jackson:
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss
debug_model: true
########################同步数据模式  ########################
data-sync:
  org-user-data-origin: 0 #组织数据 0自建 2以海康为主 1华晟ERP系统
  visitor-data-origin: 0 #访客数据 0自建 2以海康为主 1华晟ERP系统
  need-deal-img: true #是否需要处理图片数据
# Swagger配置
swagger:
  host: 127.0.0.1
  title: ${project.name}接口文档
  description: ${project.name}接口文档
  enabled: true
  context-path:
  # ç¦ç”¨swagger时的重定向地址
  redirect-uri: /
########################微信支付相关配置########################
wx:
  pay:
    appId: wxfab6da18632e28de
    appSecret: 4ee3b22afa90287834319fc3c1635271
    mchId: 1229817002
    mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
    notifyUrl: https://dmtest.ahapp.net/smartmeeting_interface/web/api/wxPayNotify
    keyPath: /usr/local/apiclient_cert.p12
tencent:
  map:
    remoteHost: https://apis.map.qq.com
    appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
des_pwd: 123456SDFKDJF