doum
3 天以前 4aab0eb183dc0a241a4a99436683f35d2982e379
新增智能电表、空调管理
已修改16个文件
79 ■■■■ 文件已修改
admin/.env.development 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/resources/application-dev.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/resources/bootstrap-dev.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/resources/bootstrap-pro.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/resources/bootstrap-test.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_service/src/main/java/com/doumee/core/utils/FtpUtil.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_timer/src/main/resources/bootstrap-dev.yml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_timer/src/main/resources/bootstrap-pro.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_timer/src/main/resources/bootstrap-test.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/admin_timer/src/main/resources/bootstrap-dev.yml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/admin_timer/src/main/resources/bootstrap-pro.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/admin_timer/src/main/resources/bootstrap-test.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/resources/application-dev.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/.env.development
@@ -3,9 +3,7 @@
# 项目上下文路径
VUE_APP_CONTEXT_PATH = './'
# VUE_APP_API_URL  = 'http://localhost:10010'
VUE_APP_API_URL  = 'http://192.168.0.137:10010'
VUE_APP_API_URL  = 'http://localhost:10010'
# VUE_APP_API_URL  = 'https://dmtest.ahapp.net/fn_admin'
server/system_gateway/src/main/resources/application-dev.yml
@@ -1,9 +1,9 @@
spring:
  # 数据源配置
  datasource:
    url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/funingyunwei?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: doumee
    password: rtjgfEr@&0c0m
    url: jdbc:mysql://192.168.0.211:3306/funingyunwei?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: root
    password: Doumee@168
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
server/system_gateway/src/main/resources/bootstrap-dev.yml
@@ -1,13 +1,13 @@
spring:
  cloud:
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
        namespace: dev_renkang
        namespace: funingyunwei_dev
        username: nacos
        password: nacos
    gateway:
server/system_gateway/src/main/resources/bootstrap-pro.yml
@@ -7,7 +7,7 @@
      discovery:
        server-addr: http://localhost:8848 #配置Nacos地址
        namespace: dmvisit
#        namespace: dev_renkang
#        namespace: funingyunwei_dev
        username: nacos
        password: funing@2024
    gateway:
server/system_gateway/src/main/resources/bootstrap-test.yml
@@ -1,13 +1,13 @@
spring:
  cloud:
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: funing_test
#        namespace: dev_renkang
#        namespace: funingyunwei_dev
        username: nacos
        password: nacos
    gateway:
server/system_service/src/main/java/com/doumee/core/utils/FtpUtil.java
@@ -19,6 +19,7 @@
import org.apache.http.util.EntityUtils;
import org.apache.xpath.operations.Bool;
import sun.misc.BASE64Encoder;
import sun.misc.BASE64Encoder;
/** */
/**
server/system_timer/src/main/resources/bootstrap-dev.yml
@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
      #      config:
      #        server-addr: http://175.27.187.84:8848 #配置Nacos地址
      #        server-addr: http://192.168.0.3:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos
@@ -22,7 +22,7 @@
      #        group: dev
      #        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        namespace: dev_renkang
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: funingyunwei_dev
        username: nacos
        password: nacos
server/system_timer/src/main/resources/bootstrap-pro.yml
@@ -14,7 +14,7 @@
      username: nacos
      password: funing@2024
      #      config:
      #        server-addr: http://175.27.187.84:8848 #配置Nacos地址
      #        server-addr: http://192.168.0.3:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos
server/system_timer/src/main/resources/bootstrap-test.yml
@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
      #      config:
      #        server-addr: http://175.27.187.84:8848 #配置Nacos地址
      #        server-addr: http://192.168.0.3:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos
@@ -22,7 +22,7 @@
      #        group: dev
      #        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: funing_test
        username: nacos
        password: nacos
server/visits/admin_timer/src/main/resources/bootstrap-dev.yml
@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
@@ -22,7 +22,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        namespace: dev_renkang
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: funingyunwei_dev
        username: nacos
        password: nacos
server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
@@ -14,7 +14,7 @@
      username: nacos
      password: funing@2024
      #      config:
      #        server-addr: http://175.27.187.84:8848 #配置Nacos地址
      #        server-addr: http://192.168.0.3:8848 #配置Nacos地址
      #        namespace: dmvisit
      #        username: nacos
      #        password: nacos
server/visits/admin_timer/src/main/resources/bootstrap-test.yml
@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
@@ -22,7 +22,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: funing_test
        username: nacos
        password: nacos
server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
@@ -22,9 +22,9 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
        namespace: dev_renkang
        namespace: funingyunwei_dev
        username: nacos
        password: nacos
# swagger配置
server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml
@@ -14,7 +14,7 @@
      username: nacos
      password: funing@2024
#      config:
#        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml
@@ -10,11 +10,11 @@
        # 暂时关闭缓存
        enabled: false
    nacos:
      server-addr: http://175.27.187.84:8848 #配置Nacos地址
      server-addr: http://192.168.0.3:8848 #配置Nacos地址
      username: nacos
      password: nacos
#      config:
#        server-addr: http://175.27.187.84:8848 #配置Nacos地址
#        server-addr: http://192.168.0.3:8848 #配置Nacos地址
#        namespace: dmvisit
#        username: nacos
#        password: nacos
@@ -22,7 +22,7 @@
#        group: dev
#        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://175.27.187.84:8848 #配置Nacos地址
        server-addr: http://192.168.0.3:8848 #配置Nacos地址
        namespace: funing_test
        username: nacos
        password: nacos
server/visits/dmvisit_service/src/main/resources/application-dev.yml
@@ -1,9 +1,9 @@
spring:
  # 数据源配置
  datasource:
    url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/funingyunwei?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: doumee
    password: rtjgfEr@&0c0m
    url: jdbc:mysql://192.168.0.211:3306/funingyunwei?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
    username: root
    password: Doumee@168
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  redis: