Browse Source

项目配置

caiaf 3 years ago
parent
commit
98cfd2add0

+ 5 - 0
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/models/modelFile/FloorModelView.kt

@@ -121,4 +121,9 @@ open class FloorModelView : Serializable {
     @ApiModelProperty(value = "模型的revit版本")
     @Column(name = "revit_version")
     var revitVersion: String? = null
+
+    /** 信息点 */
+    @ApiModelProperty(value = "信息点")
+    @Column(name = "infos")
+    var infos: Any? = null
 }

+ 11 - 12
revit-algorithm/src/main/resources-test/application.yml

@@ -1,6 +1,6 @@
 ###############################################################################################################
 server:
-  port: 8080
+  port: 8082
   tomcat:
     basedir:                            /mnt/harddisk/saga/tomcatTemp
 
@@ -18,7 +18,7 @@ spring:
     name:                               revit-algorithm
     type:                               com.alibaba.druid.pool.DruidDataSource
     driver-class-name:                  org.postgresql.Driver
-    url:                                jdbc:postgresql://192.168.64.15:5432/datacenterwanda
+    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterwd
     #    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://192.168.64.15:61616)
+    broker-url: failover:(tcp://192.168.64.14:61616)
     in-memory: true
     pool:
       enabled: false
@@ -74,8 +74,7 @@ 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/
+    url:                               http://api.sagacloud.cn/dp-auxiliary/image-service/ # http://47.93.33.207:28888/image-service/ #http://adm.sagacloud.cn/image-service/
     systemId:                          revit
     secret:                            63afbef6906c342b
     dir:                               model
@@ -99,7 +98,7 @@ properties:
     mergeMultipartUpload:              ${properties.fileService.url}common/merge_multipart${properties.fileService.suffixWithSecret}&uploadId=
 
   scheduler:
-    url:                               http://192.168.64.17:28890/scheduler/
+    url:                               http://192.168.64.14:28888/scheduler/
     createTask:                        ${properties.scheduler.url}task/create
     queryTask:                         ${properties.scheduler.url}task/query
     queryTaskResult:                   ${properties.scheduler.url}result/query
@@ -107,7 +106,7 @@ properties:
 
 
   datacenter:
-    url:                               http://192.168.64.17:28890/datacenter/
+    url:                               http://192.168.64.14:28888/datacenter/
     # 设备相关接口
     equipCreate: ${properties.datacenter.url}object/equip/create
     equipDelete: ${properties.datacenter.url}object/equip/delete
@@ -124,20 +123,20 @@ properties:
     componentQuery: ${properties.datacenter.url}object/component/query
     componentUpdate: ${properties.datacenter.url}object/component/update
     # 楼层相关接口
+    floorCreate: ${properties.datacenter.url}object/floor/create
     floorQuery: ${properties.datacenter.url}object/floor/query
     floorUpdate: ${properties.datacenter.url}object/floor/update
-    floorCreate: ${properties.datacenter.url}object/floor/create
     # 绑定楼层接口
     floorBind: ${properties.datacenter.url}rel/update/equip-ispace
-#    # 资产接口
-#    propertyQuery: ${properties.datacenter.url}object/property/query
-#    propertyUpdate: ${properties.datacenter.url}object/property/update
+    # 资产接口
+    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.64.17:28890/message-center/
+    url: http://192.168.64.14:28888/message-center/
     # 发送消息接口
     createPath: ${properties.message.url}message/create

+ 1 - 1
scheduler/src/main/resources-test/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://192.168.64.15:5432/datacenterwanda
+    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterwd
       #?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai  #&zeroDateTimeBehavior=convertToNull
 #    username:                           root
 #    password:                           123456