caiaf 4 éve
szülő
commit
9fd773adb6

+ 23 - 24
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://39.102.40.239:5432/datacenter
+    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
     #    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://39.102.40.239: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://39.102.40.239:8080/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,36 +106,36 @@ properties:
 
 
   datacenter:
-    url:                               http://39.102.40.239:8080/datacenter/
+    url:                               http://192.168.64.14:28888/datacenter/object/
     # 设备相关接口
-    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
+    equipCreate: ${properties.datacenter.url}equip/create
+    equipDelete: ${properties.datacenter.url}equip/delete
+    equipQuery: ${properties.datacenter.url}equip/query
+    equipUpdate: ${properties.datacenter.url}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
+    ispaceCreate: ${properties.datacenter.url}ispace/create
+    ispaceDelete: ${properties.datacenter.url}ispace/delete
+    ispaceQuery: ${properties.datacenter.url}ispace/query
+    ispaceUpdate: ${properties.datacenter.url}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
+    componentCreate: ${properties.datacenter.url}component/create
+    componentDelete: ${properties.datacenter.url}component/delete
+    componentQuery: ${properties.datacenter.url}component/query
+    componentUpdate: ${properties.datacenter.url}component/update
     # 楼层相关接口
-    floorQuery: ${properties.datacenter.url}object/floor/query
-    floorUpdate: ${properties.datacenter.url}object/floor/update
+    floorQuery: ${properties.datacenter.url}floor/query
+    floorUpdate: ${properties.datacenter.url}floor/update
     # 绑定楼层接口
-    floorBind: ${properties.datacenter.url}rel/update/equip-ispace
+    floorBind: ${properties.datacenter.url}update/equip-ispace
     # 资产接口
-    propertyQuery: ${properties.datacenter.url}object/property/query
-    propertyUpdate: ${properties.datacenter.url}object/property/update
+    propertyQuery: ${properties.datacenter.url}property/query
+    propertyUpdate: ${properties.datacenter.url}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://39.102.40.239:8080/message-center/
+    url: http://192.168.64.14:28888/message-center/
     # 发送消息接口
     createPath: ${properties.message.url}message/create

+ 4 - 4
revit-algorithm/src/main/resources-test/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://192.168.64.14:5432/datacenter
+    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
     #    url:                                jdbc:postgresql://192.168.20.250:5432/postgres
     #    url:                                jdbc:postgresql://47.94.89.44:5432/datacenter
     username:                           postgres
@@ -98,7 +98,7 @@ properties:
     mergeMultipartUpload:              ${properties.fileService.url}common/merge_multipart${properties.fileService.suffixWithSecret}&uploadId=
 
   scheduler:
-    url:                               http://60.205.177.43:8080/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
@@ -106,7 +106,7 @@ properties:
 
 
   datacenter:
-    url:                               http://192.168.64.14:8080/datacenter/object/
+    url:                               http://192.168.64.14:28888/datacenter/object/
     # 设备相关接口
     equipCreate: ${properties.datacenter.url}equip/create
     equipDelete: ${properties.datacenter.url}equip/delete
@@ -136,6 +136,6 @@ properties:
     doorCreate: ${properties.datacenter.url}door/create_ignore
 
   message:
-    url: http://192.168.64.14:8080/message-center/
+    url: http://192.168.64.14:28888/message-center/
     # 发送消息接口
     createPath: ${properties.message.url}message/create

+ 11 - 0
scheduler/build.gradle

@@ -159,6 +159,16 @@ task buildDevWar {
     finalizedBy(build)
 }
 
+task buildTestWar {
+    doFirst {
+        sourceSets.main.resources.srcDirs = ["src/main/resources", "src/main/resources-test"]
+        test.onlyIf {
+            project.hasProperty("needTest")
+        }
+    }
+    finalizedBy(build)
+}
+
 // 打产品包
 task buildProdJar {
     doFirst {
@@ -169,6 +179,7 @@ task buildProdJar {
     }
     finalizedBy(bootJar)
 }
+
 // 打开发环境包
 task buildDevJar {
     doFirst {

+ 87 - 0
scheduler/src/main/resources-test/application.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.64.14:5432/datacenterlabsl
+      #?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.64.14: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-test/application60.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://60.205.177.43:5432/datacenterlabsl
+      #?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://60.205.177.43: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