caiaf 3 yıl önce
ebeveyn
işleme
adcc7c3ad0

+ 1 - 1
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/models/entities/Duct.kt

@@ -44,7 +44,7 @@ import javax.persistence.Table
 class Duct : BaseComponent(){
     /** 名称 */
     @ApiModelProperty(value = "名称")
-    @Column(name = "name")n
+    @Column(name = "name")
     @JSONField(name = "Name")
     @JsonProperty("Name")
     var name: String? = null

+ 4 - 4
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/models/entities/EquipComp.kt

@@ -61,8 +61,8 @@ open class EquipComp {
     var className: String? = null
 
 
-//    /** 慧云码*/
-//    @ApiModelProperty(value = "慧云码")
-//    @Column(name = "alias_code")
-//    var aliasCode: String? = null
+    /** 慧云码*/
+    @ApiModelProperty(value = "慧云码")
+    @Column(name = "alias_code")
+    var aliasCode: String? = null
 }

+ 5 - 5
revit-algorithm/src/main/resources-prod/application.yml

@@ -18,7 +18,7 @@ spring:
     name:                               revit-algorithm
     type:                               com.alibaba.druid.pool.DruidDataSource
     driver-class-name:                  org.postgresql.Driver
-    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
+    url:                                jdbc:postgresql://192.168.0.72:5432/datacenter
     #    url:                                jdbc:postgresql://192.168.20.250:5432/postgres
     #    url:                                jdbc:postgresql://47.94.89.44:5432/datacenter
     username:                           postgres
@@ -49,7 +49,7 @@ spring:
       max-request-size:                90MB        # 限制上传的多个文件的总大小
       max-file-size:                   90MB        # 限制单个文件的最大值
   activemq:
-    broker-url: failover:(tcp://172.17.100.16:61616)
+    broker-url: failover:(tcp://192.168.0.72:61616)
     in-memory: true
     pool:
       enabled: false
@@ -99,7 +99,7 @@ properties:
     mergeMultipartUpload:              ${properties.fileService.url}common/merge_multipart${properties.fileService.suffixWithSecret}&uploadId=
 
   scheduler:
-    url:                               http://172.17.100.16:8080/scheduler/
+    url:                               http://192.168.0.72:8080/scheduler/
     createTask:                        ${properties.scheduler.url}task/create
     queryTask:                         ${properties.scheduler.url}task/query
     queryTaskResult:                   ${properties.scheduler.url}result/query
@@ -107,7 +107,7 @@ properties:
 
 
   datacenter:
-    url:                               http://172.17.100.16:8080/datacenter/
+    url:                               http://192.168.0.72:8080/datacenter/
     # 设备相关接口
     equipCreate: ${properties.datacenter.url}object/equip/create
     equipDelete: ${properties.datacenter.url}object/equip/delete
@@ -137,6 +137,6 @@ properties:
     doorCreate: ${properties.datacenter.url}door/create_ignore
 
   message:
-    url: http://172.17.100.16:8080/message-center/
+    url: http://192.168.0.72:8080/message-center/
     # 发送消息接口
     createPath: ${properties.message.url}message/create

+ 142 - 0
revit-algorithm/src/main/resources-prod/application72.yml

@@ -0,0 +1,142 @@
+###############################################################################################################
+server:
+  port: 8080
+  tomcat:
+    basedir:                            /mnt/harddisk/saga/tomcatTemp
+
+spring:
+  application:
+    name:                               revit-algorithm
+  mvc:
+    favicon:
+      enabled:                          true
+
+  jmx:
+    default-domain:                     revit-algorithm
+
+  datasource:
+    name:                               revit-algorithm
+    type:                               com.alibaba.druid.pool.DruidDataSource
+    driver-class-name:                  org.postgresql.Driver
+    url:                                jdbc:postgresql://192.168.0.72:5432/datacenter
+    #    url:                                jdbc:postgresql://192.168.20.250:5432/postgres
+    #    url:                                jdbc:postgresql://47.94.89.44:5432/datacenter
+    username:                           postgres
+    password:                           cGVyc2FneV8yMDIwcXdlIUAj
+
+  jackson:
+    date-format:                        yyyy-MM-dd HH:mm:ss
+    time-zone:                          Asia/Shanghai
+    default-property-inclusion:         non_null
+    # 首字母大写
+    property-naming-strategy:           com.fasterxml.jackson.databind.PropertyNamingStrategy.PascalCaseStrategy
+    # 以下划线分隔全小写的单词
+    #property-naming-strategy:           com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy
+    mapper:
+      # 属性按字母顺序输出
+      sort_properties_alphabetically:   true
+
+  jms:
+    pub-sub-domain: true
+    template:
+      delivery-mode: non_persistent
+      receive-timeout: 1000
+      time-to-live: 36000
+      qos-enabled: true
+      default-destination: model.manage
+  servlet:
+    multipart:
+      max-request-size:                90MB        # 限制上传的多个文件的总大小
+      max-file-size:                   90MB        # 限制单个文件的最大值
+  activemq:
+    broker-url: failover:(tcp://192.168.0.72:61616)
+    in-memory: true
+    pool:
+      enabled: false
+    user: admin
+    password: admin
+    non-blocking-redelivery: true
+mybatis:
+  typeAliasesPackage:                  cn.sagacloud.server.algorithm.models
+
+#logging:
+#  pattern:
+#    console: "%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{10}) - %cyan(%msg%n)"
+#  level:
+#    - ".=info"
+#    - "cn.sagacloud=debug"
+#    - "org.springframework=info"
+#    - "com.sybotan=debug"
+#    - "org.apache.activemq=debug"
+
+
+properties:
+  #文件服务器配置
+  fileService:
+    # 基本属性
+    #url:                               http://api.sagacloud.cn/dp-auxiliary/image-service/ # http://47.93.33.207:28888/image-service/ #http://adm.sagacloud.cn/image-service/
+    url:                               http://47.93.33.207:8888/image-service/
+    systemId:                          revit
+    secret:                            63afbef6906c342b
+    dir:                               model
+    baseGraph:                         base
+    report:                            report
+    export:                            export
+    # 配置文件引用的属性
+    suffixWithSecret:                  ?systemId=${properties.fileService.systemId}&secret=${properties.fileService.secret}
+    suffix:                            ?systemId=${properties.fileService.systemId}
+    # 程序中会用到的
+    uploadPath:                        ${properties.fileService.url}common/file_upload${properties.fileService.suffixWithSecret}&overwrite=true&key=${properties.fileService.dir}/
+    baseGraphPath:                     ${properties.fileService.url}common/file_upload${properties.fileService.suffixWithSecret}&overwrite=true&key=${properties.fileService.baseGraph}/
+    reportPath:                        ${properties.fileService.url}common/file_upload${properties.fileService.suffixWithSecret}&overwrite=true&key=${properties.fileService.report}/
+    exportPath:                        ${properties.fileService.url}common/file_upload${properties.fileService.suffixWithSecret}&overwrite=true&key=${properties.fileService.export}/
+    downloadPath:                      ${properties.fileService.url}common/file_get${properties.fileService.suffix}&key=${properties.fileService.dir}/
+    reportDownloadPath:                ${properties.fileService.url}common/file_get${properties.fileService.suffix}&key=${properties.fileService.report}/
+    exportDownloadPath:                ${properties.fileService.url}common/file_get${properties.fileService.suffix}&key=${properties.fileService.export}/
+    renamePath:                        ${properties.fileService.url}common/file_key_change${properties.fileService.suffixWithSecret}
+    deletePath:                        ${properties.fileService.url}common/files_delete${properties.fileService.suffixWithSecret}
+    registerMultipartUpload:           ${properties.fileService.url}common/register_multipart_upload${properties.fileService.suffixWithSecret}&overwrite=true&key=${properties.fileService.dir}/
+    mergeMultipartUpload:              ${properties.fileService.url}common/merge_multipart${properties.fileService.suffixWithSecret}&uploadId=
+
+  scheduler:
+    url:                               http://192.168.0.72:8080/scheduler/
+    createTask:                        ${properties.scheduler.url}task/create
+    queryTask:                         ${properties.scheduler.url}task/query
+    queryTaskResult:                   ${properties.scheduler.url}result/query
+    createDownload:                    ${properties.scheduler.url}download/create
+
+
+  datacenter:
+    url:                               http://192.168.0.72:8080/datacenter/
+    # 设备相关接口
+    equipCreate: ${properties.datacenter.url}object/equip/create
+    equipDelete: ${properties.datacenter.url}object/equip/delete
+    equipQuery: ${properties.datacenter.url}object/equip/query
+    equipUpdate: ${properties.datacenter.url}object/equip/update
+    # 元空间相关接口
+    ispaceCreate: ${properties.datacenter.url}object/ispace/create
+    ispaceDelete: ${properties.datacenter.url}object/ispace/delete
+    ispaceQuery: ${properties.datacenter.url}object/ispace/query
+    ispaceUpdate: ${properties.datacenter.url}object/ispace/update
+    # 部件相关接口
+    componentCreate: ${properties.datacenter.url}object/component/create
+    componentDelete: ${properties.datacenter.url}object/component/delete
+    componentQuery: ${properties.datacenter.url}object/component/query
+    componentUpdate: ${properties.datacenter.url}object/component/update
+    # 楼层相关接口
+    floorQuery: ${properties.datacenter.url}object/floor/query
+    floorUpdate: ${properties.datacenter.url}object/floor/update
+    # 绑定楼层接口
+    floorBind: ${properties.datacenter.url}rel/update/equip-ispace
+    # 资产接口
+    propertyQuery: ${properties.datacenter.url}object/property/query
+    propertyUpdate: ${properties.datacenter.url}object/property/update
+    # 同步构件接口
+    windowCreate: ${properties.datacenter.url}window/create_ignore
+    vwallCreate: ${properties.datacenter.url}vwall/create_ignore
+    doorCreate: ${properties.datacenter.url}door/create_ignore
+
+  message:
+    url: http://192.168.0.72:8080/message-center/
+    # 发送消息接口
+    createPath: ${properties.message.url}message/create

+ 1 - 1
scheduler/build.gradle

@@ -136,7 +136,7 @@ dependencies {
 // 下面是配置文件选择
 /*******************************************************/
 
-sourceSets.main.resources.srcDirs = ['src/main/resources', 'src/main/resources-test']
+sourceSets.main.resources.srcDirs = ['src/main/resources', 'src/main/resources-prod']
 //ext.needTest = 'true'
 // 打产品包
 task buildProdWar {

+ 2 - 2
scheduler/src/main/resources-prod/application.yml

@@ -41,7 +41,7 @@ spring:
 #    driver-class-name:                  com.mysql.cj.jdbc.Driver
     driver-class-name:                  org.postgresql.Driver
 #    url:                                jdbc:mysql://172.16.0.235:3306/datacenter?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai  #&zeroDateTimeBehavior=convertToNull
-    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
+    url:                                jdbc:postgresql://192.168.0.72:5432/datacenter
       #?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai  #&zeroDateTimeBehavior=convertToNull
 #    username:                           root
 #    password:                           123456
@@ -68,7 +68,7 @@ spring:
 #    user:                               admin
 #    password:                           admin
   activemq:
-    broker-url: failover:(tcp://172.17.100.16:61616)
+    broker-url: failover:(tcp://192.168.0.72:61616)
     in-memory: true
     pool:
       enabled: false

+ 87 - 0
scheduler/src/main/resources-prod/application239.yml

@@ -0,0 +1,87 @@
+################################################################################################################
+## spring-cloud相关配置
+#eureka:
+#  client:                                   #客户端注册进eureka服务列表内
+#    service-url:
+#      defaultZone:                          http://eureka-service:8761/eureka
+##启用监控
+#management:
+#  endpoints:
+#    web:
+#      exposure:
+#        include:
+#          - "*"  # 开放所有端点health,info,metrics,通过actuator/+端点名就可以获取相应的信息。默认打开health和info
+#  endpoint:
+#    health:
+#      #未开启actuator/health时,我们获取到的信息是{"status":"UP"},status的值还有可能是 DOWN。开启后打印详细信息
+#      show-details:                       always
+###############################################################################################################
+
+server:
+  port: 8080
+#  ssl:
+#    key-store:                          classpath:keystore.key
+#    key-store-password:                 20090421
+#    key-store-type:                     PKCS12
+#    key-alias:                          cn.sagacloud
+
+spring:
+  application:
+    name:                               scheduler
+  mvc:
+    favicon:
+      enabled:                          true
+
+  jmx:
+    default-domain:                     scheduler
+
+  datasource:
+    name:                               scheduler
+    type:                               com.alibaba.druid.pool.DruidDataSource
+#    driver-class-name:                  com.mysql.cj.jdbc.Driver
+    driver-class-name:                  org.postgresql.Driver
+#    url:                                jdbc:mysql://172.16.0.235:3306/datacenter?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai  #&zeroDateTimeBehavior=convertToNull
+    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
+      #?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai  #&zeroDateTimeBehavior=convertToNull
+#    username:                           root
+#    password:                           123456
+    username:                           postgres
+    password:                           cGVyc2FneV8yMDIwcXdlIUAj
+
+  jackson:
+    date-format:                        yyyy-MM-dd HH:mm:ss
+    time-zone:                          Asia/Shanghai
+    default-property-inclusion:         non_null
+    # 首字母大写
+    property-naming-strategy:           com.fasterxml.jackson.databind.PropertyNamingStrategy.PascalCaseStrategy
+    # 以下划线分隔全小写的单词
+    #property-naming-strategy:           com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy
+    mapper:
+      # 属性按字母顺序输出
+      sort_properties_alphabetically:   true
+
+#  activemq:
+#    #broker-url:                         tcp://172.17.134.225:61616
+#    broker-url:                         tcp://activemq:61616
+#    in-memory:                          true
+#    pool.enabled:                       false
+#    user:                               admin
+#    password:                           admin
+  activemq:
+    broker-url: failover:(tcp://172.17.100.16:61616)
+    in-memory: true
+    pool:
+      enabled: false
+    user: admin
+    password: admin
+    non-blocking-redelivery: true
+
+  jms:
+    pub-sub-domain: true
+
+topic:                                 datacenter.broadcast
+
+mybatis:
+  typeAliasesPackage:                   cn.sagacloud.server.datacenter.entities
+#  configuration:
+#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl

+ 87 - 0
scheduler/src/main/resources-prod/application72.yml

@@ -0,0 +1,87 @@
+################################################################################################################
+## spring-cloud相关配置
+#eureka:
+#  client:                                   #客户端注册进eureka服务列表内
+#    service-url:
+#      defaultZone:                          http://eureka-service:8761/eureka
+##启用监控
+#management:
+#  endpoints:
+#    web:
+#      exposure:
+#        include:
+#          - "*"  # 开放所有端点health,info,metrics,通过actuator/+端点名就可以获取相应的信息。默认打开health和info
+#  endpoint:
+#    health:
+#      #未开启actuator/health时,我们获取到的信息是{"status":"UP"},status的值还有可能是 DOWN。开启后打印详细信息
+#      show-details:                       always
+###############################################################################################################
+
+server:
+  port: 8080
+#  ssl:
+#    key-store:                          classpath:keystore.key
+#    key-store-password:                 20090421
+#    key-store-type:                     PKCS12
+#    key-alias:                          cn.sagacloud
+
+spring:
+  application:
+    name:                               scheduler
+  mvc:
+    favicon:
+      enabled:                          true
+
+  jmx:
+    default-domain:                     scheduler
+
+  datasource:
+    name:                               scheduler
+    type:                               com.alibaba.druid.pool.DruidDataSource
+#    driver-class-name:                  com.mysql.cj.jdbc.Driver
+    driver-class-name:                  org.postgresql.Driver
+#    url:                                jdbc:mysql://172.16.0.235:3306/datacenter?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai  #&zeroDateTimeBehavior=convertToNull
+    url:                                jdbc:postgresql://192.168.0.72:5432/datacenter
+      #?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai  #&zeroDateTimeBehavior=convertToNull
+#    username:                           root
+#    password:                           123456
+    username:                           postgres
+    password:                           cGVyc2FneV8yMDIwcXdlIUAj
+
+  jackson:
+    date-format:                        yyyy-MM-dd HH:mm:ss
+    time-zone:                          Asia/Shanghai
+    default-property-inclusion:         non_null
+    # 首字母大写
+    property-naming-strategy:           com.fasterxml.jackson.databind.PropertyNamingStrategy.PascalCaseStrategy
+    # 以下划线分隔全小写的单词
+    #property-naming-strategy:           com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy
+    mapper:
+      # 属性按字母顺序输出
+      sort_properties_alphabetically:   true
+
+#  activemq:
+#    #broker-url:                         tcp://172.17.134.225:61616
+#    broker-url:                         tcp://activemq:61616
+#    in-memory:                          true
+#    pool.enabled:                       false
+#    user:                               admin
+#    password:                           admin
+  activemq:
+    broker-url: failover:(tcp://192.168.0.72:61616)
+    in-memory: true
+    pool:
+      enabled: false
+    user: admin
+    password: admin
+    non-blocking-redelivery: true
+
+  jms:
+    pub-sub-domain: true
+
+topic:                                 datacenter.broadcast
+
+mybatis:
+  typeAliasesPackage:                   cn.sagacloud.server.datacenter.entities
+#  configuration:
+#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl