瀏覽代碼

**************************************万达adm*********************************************
更改同步

zhangweixin 3 年之前
父節點
當前提交
15f199728f
共有 25 個文件被更改,包括 138 次插入91 次删除
  1. 1 1
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/DataSynApp.kt
  2. 3 0
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/Opts.kt
  3. 2 0
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/obj/ObjectFromToControllers.kt
  4. 1 1
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/obj/ObjectToFromController.kt
  5. 13 13
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/dict/DictTypeApi.kt
  6. 5 5
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/obj/BuildingApi.kt
  7. 5 5
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/obj/EquipApi.kt
  8. 5 5
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/obj/FloorApi.kt
  9. 2 2
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/obj/ProjectApi.kt
  10. 2 2
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/obj/ShaftApi.kt
  11. 3 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/obj/SpaceApi.kt
  12. 1 1
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/obj/SystemApi.kt
  13. 3 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterBuilding.kt
  14. 3 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterComponent.kt
  15. 4 4
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterEquipment.kt
  16. 4 4
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterFloor.kt
  17. 3 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterShaft.kt
  18. 3 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterSpace.kt
  19. 3 3
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterSystem.kt
  20. 1 1
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/RwdFloor.kt
  21. 18 18
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/rel/AutomaticCalculationSync.kt
  22. 5 5
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/rel/EquipinSpaceSync.kt
  23. 42 0
      datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/task/ScheduledConfig.kt
  24. 5 5
      datasyn/src/main/resources/application-prod.yml
  25. 1 1
      message-center/src/main/resources/application-prod.yml

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/DataSynApp.kt

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn
+package com.persagy.server.datacenter.syn
 
 import com.persagy.base.utils.SHttpUtil
 import org.mybatis.spring.annotation.MapperScan

+ 3 - 0
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/Opts.kt

@@ -49,6 +49,9 @@ open class Opts {
 
     /** 物理世界地址 */
     lateinit var dataPlatform: String
+    lateinit var data_org: String
+    lateinit var data_rwd: String
+    lateinit var data_dic: String
 
     val SUCCESS_CODE = "success"
 

+ 2 - 0
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/obj/ObjectFromToControllers.kt

@@ -34,6 +34,8 @@ import com.persagy.server.datacenter.models.entities.assistant.PointPosition
 import com.persagy.server.datacenter.models.entities.objects.SpaceOutline
 import com.persagy.server.datacenter.models.entities.rel.RSpinBd
 import com.persagy.server.datacenter.models.entities.rel.RSpinFl
+import com.persagy.server.datacenter.syn.models.api.obj.FloorApi
+import com.persagy.server.datacenter.syn.models.api.obj.ShaftApi
 import com.persagy.server.datacenter.syn.models.tools.EquipUtil
 import com.persagy.server.datacenter.syn.models.tools.SpaceUtil
 import com.persagy.server.syn.models.api.obj.*

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/controllers/obj/ObjectToFromController.kt

@@ -39,7 +39,7 @@ import com.persagy.server.datacenter.wanda.obj.*
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.models.api.obj.BuildingApi
 import com.persagy.server.syn.models.api.obj.EquipApi
-import com.persagy.server.syn.models.api.obj.FloorApi
+import com.persagy.server.datacenter.syn.models.api.obj.FloorApi
 import com.persagy.server.syn.models.tools.ShaftUtil
 import com.persagy.server.syn.models.tools.SystemUtil
 import com.persagy.service.SBaseService

+ 13 - 13
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/dict/DictTypeApi.kt

@@ -71,7 +71,7 @@ object DictTypeApi {
             /** 直接 http 请求还是通过注册中心 */
             logger.debug("标记=${Configure.customProperties.eurekaorhttp}")
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/org/group/query"
+                val url = "${Configure.opts.data_org}/org/group/query"
                 val postObject = SHttpUtil.postObject<GroupResponse>(url, jsonObject)
                 DClassDefService.logger.debug("集团结果:${postObject.toJson()}")
                 if (postObject.result == "success"){
@@ -111,7 +111,7 @@ object DictTypeApi {
             jsonObject["criteria"] = jsonObject2
             /** 直接 http 请求还是通过注册中心 */
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/org/project/query?userId=123456&groupCode=$code"
+                val url = "${Configure.opts.data_org}/org/project/query?userId=123456&groupCode=$code"
 
                 DClassDefService.logger.debug("url:${url}")
                 DClassDefService.logger.debug("项目请求体:${jsonObject.toJson()}")
@@ -152,7 +152,7 @@ object DictTypeApi {
             jsonObject["criteria"] = jsonObject2
             /** 直接 http 请求还是通过注册中心 */
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/rwd/def/class/"
+                val url = "${Configure.opts.data_rwd}/rwd/def/class/"
                 val postObject = SHttpUtil.postObject<DictPlatformTypeResponse>(url, jsonObject)
                 if (postObject.result == Configure.opts.SUCCESS_CODE) {
                     if (!postObject.data.isNullOrEmpty()){
@@ -191,7 +191,7 @@ object DictTypeApi {
             jsonObject["criteria"] = jsonObject2
             /** 直接 http 请求还是通过注册中心 */
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/rwd/def/funcid"
+                val url = "${Configure.opts.data_rwd}/rwd/def/funcid"
                 val postObject = SHttpUtil.postObject<DictPlatformInfoResponse>(url, jsonObject)
                 if (postObject.result == Configure.opts.SUCCESS_CODE) {
                     if (!postObject.data.isNullOrEmpty()){
@@ -228,7 +228,7 @@ object DictTypeApi {
                 jsonObject2["type"] = type
                 jsonObject["criteria"] = jsonObject2
                 if (!Configure.customProperties.eurekaorhttp) {
-                    val url = "${Configure.opts.dataPlatform}/dic/dt/data/query?groupCode=WD&userId=123456"
+                    val url = "${Configure.opts.data_dic}/dic/dt/data/query?groupCode=WD&userId=123456"
                     val postObject = SHttpUtil.postObject<DictMajorResponse>(url, jsonObject)
                     if (postObject.result == Configure.opts.SUCCESS_CODE) {
                         if (!postObject.data.isNullOrEmpty()){
@@ -267,7 +267,7 @@ object DictTypeApi {
             jsonObject2["groupId"] = groupId
             jsonObject["criteria"] = jsonObject2
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/dict/scheme/query"
+                val url = "${Configure.opts.data_dic}/dict/scheme/query"
                 val postObject = SHttpUtil.postObject<DictGroupSchemeResponse>(url, jsonObject)
                 if (postObject.result == Configure.opts.SUCCESS_CODE) {
                     if (!postObject.data.isNullOrEmpty()){
@@ -303,7 +303,7 @@ object DictTypeApi {
             jsonObject2["groupId"] = schemeId.toString()
             jsonObject["criteria"] = jsonObject2
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/dict/scheme/class/query"
+                val url = "${Configure.opts.data_dic}/dict/scheme/class/query"
                 val postObject = SHttpUtil.postObject<DictSchemeCategoryResponse>(url, jsonObject)
                 if (postObject.result == Configure.opts.SUCCESS_CODE) {
                     if (!postObject.data.isNullOrEmpty()){
@@ -339,7 +339,7 @@ object DictTypeApi {
             jsonObject2["classCode"] = code
             jsonObject["criteria"] = jsonObject2
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/dict/scheme/funcid/query"
+                val url = "${Configure.opts.data_dic}/dict/scheme/funcid/query"
                 val postObject = SHttpUtil.postObject<DictSchemeCategoryResponseInfo>(url, jsonObject)
                 if (postObject.result == Configure.opts.SUCCESS_CODE) {
                     if (!postObject.data.isNullOrEmpty()){
@@ -376,7 +376,7 @@ object DictTypeApi {
             jsonObject2["projectId"] = jsonArray
             jsonObject["criteria"] = jsonObject2
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/dict/scheme/project/query"
+                val url = "${Configure.opts.data_dic}/dict/scheme/project/query"
                 val postObject = SHttpUtil.postObject<DictSchemeAndProjectResponse>(url, jsonObject)
                 if (postObject.result == Configure.opts.SUCCESS_CODE) {
                     if (!postObject.data.isNullOrEmpty()){
@@ -412,7 +412,7 @@ object DictTypeApi {
             val jsonObject2 = JSONObject()
             jsonObject["criteria"] = jsonObject2
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/rwd/def/class?groupCode=$groupId"
+                val url = "${Configure.opts.data_rwd}/rwd/def/class?groupCode=$groupId"
                 val dictGroupCategoryResponse = SHttpUtil.postObject<DictPlatformTypeResponse>(url,jsonObject)
                 if (dictGroupCategoryResponse.result == Configure.opts.SUCCESS_CODE) {
                     if (!dictGroupCategoryResponse.data.isNullOrEmpty()){
@@ -446,7 +446,7 @@ object DictTypeApi {
             jsonObject2["classCode"] = code
             jsonObject["criteria"] = jsonObject2
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/rwd/def/funcid?groupCode=$groupId"
+                val url = "${Configure.opts.data_rwd}/rwd/def/funcid?groupCode=$groupId"
                 val dictPlatformInfoResponse = SHttpUtil.postObject<DictPlatformInfoResponse>(url,jsonObject)
                 if (dictPlatformInfoResponse.result == Configure.opts.SUCCESS_CODE) {
                     if (!dictPlatformInfoResponse.data.isNullOrEmpty()){
@@ -483,7 +483,7 @@ object DictTypeApi {
             jsonObject["criteria"] = jsonObject2
 
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/rwd/def/class?groupCode=$groupCode&projectId=$projectId"
+                val url = "${Configure.opts.data_rwd}/rwd/def/class?groupCode=$groupCode&projectId=$projectId"
                 logger.debug("url = $url")
                 logger.debug("boby = ${jsonObject.toJson()}")
                 val dictGroupCategoryResponse = SHttpUtil.postObject<DictPlatformTypeResponse>(url,jsonObject)
@@ -520,7 +520,7 @@ object DictTypeApi {
         jsonObject2["classCode"] = code
         jsonObject["criteria"] = jsonObject2
         if (!Configure.customProperties.eurekaorhttp) {
-            val url = "${Configure.opts.dataPlatform}/rwd/def/funcid?groupCode=$groupId&projectId=$projectId"
+            val url = "${Configure.opts.data_rwd}/rwd/def/funcid?groupCode=$groupId&projectId=$projectId"
             val dictPlatformInfoResponse = SHttpUtil.postObject<DictPlatformInfoResponse>(url,jsonObject)
             if (dictPlatformInfoResponse.result == Configure.opts.SUCCESS_CODE) {
                 if (!dictPlatformInfoResponse.data.isNullOrEmpty()){

+ 5 - 5
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/obj/BuildingApi.kt

@@ -61,7 +61,7 @@ object BuildingApi {
             jsonObject["criteria"] = jsonObject2
             /** 直接 http 请求还是通过注册中心 */
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/rwd/instance/object/query?groupCode=$groupCode&projectId=${projectId}"
+                val url = "${Configure.opts.data_rwd}/rwd/instance/object/query?groupCode=$groupCode&projectId=${projectId}"
                 val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
                 if (postObject.result == "success"&&!postObject.data.isNullOrEmpty()) {
                     return postObject.data!!
@@ -91,7 +91,7 @@ object BuildingApi {
             val buildingTools = BuildingUtil.buildingTools(projectId, building)
             /** 直接 http 请求还是通过注册中心 */
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/rwd/instance/object/create?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+                val url = "${Configure.opts.data_rwd}/rwd/instance/object/create?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
                 val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, buildingTools)
                 if (postObject.result == "success") {
                     return true
@@ -121,7 +121,7 @@ object BuildingApi {
             val buildingTools = BuildingUtil.buildingTools(projectId, building)
             /** 直接 http 请求还是通过注册中心 */
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/rwd/instance/object/update?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+                val url = "${Configure.opts.data_rwd}/rwd/instance/object/update?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
                 val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, buildingTools)
                 if (postObject.result == "success") {
                     return true
@@ -152,7 +152,7 @@ object BuildingApi {
             listId.add(buildingId)
             /** 直接 http 请求还是通过注册中心 */
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/rwd/instance/object/delete?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+                val url = "${Configure.opts.data_rwd}/rwd/instance/object/delete?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
                 val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, listId)
                 if (postObject.result == "success") {
                     return true
@@ -185,7 +185,7 @@ object BuildingApi {
             jsonObject["criteria"] = jsonObject2
             /** 直接 http 请求还是通过注册中心 */
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/rwd/instance/object/query?groupCode=$groupCode&projectId=${projectId}"
+                val url = "${Configure.opts.data_rwd}/rwd/instance/object/query?groupCode=$groupCode&projectId=${projectId}"
                 val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
                 if (postObject.result == "success"&&!postObject.data.isNullOrEmpty()) {
                     return postObject.data!!

+ 5 - 5
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/obj/EquipApi.kt

@@ -248,7 +248,7 @@ object EquipApi {
         /** 直接 http 请求还是通过注册中心 */
         try {
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${opts.dataPlatform}/rwd/instance/object/update?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+                val url = "${opts.data_rwd}/rwd/instance/object/update?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
                 logger.debug("url= ${url}")
                 logger.debug("boby= ${listObj.toJson()}")
                 val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, listObj)
@@ -281,7 +281,7 @@ object EquipApi {
         listId.add(id)
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
-            val url = "${opts.dataPlatform}/rwd/instance/object/delete?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+            val url = "${opts.data_rwd}/rwd/instance/object/delete?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, listId)
             if (postObject.result == "success") {
                 return true
@@ -304,7 +304,7 @@ object EquipApi {
     fun createRel(groupCode: String, projectId: String, jsonArray:JSONArray): Boolean {
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
-            val url = "${opts.dataPlatform}/rwd/instance/relation/create?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+            val url = "${opts.data_rwd}/rwd/instance/relation/create?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonArray)
             if (postObject.result == "success") {
                 return true
@@ -323,7 +323,7 @@ object EquipApi {
     fun delRel(groupCode: String, projectId: String, jsonObject: JSONObject): Boolean {
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
-            val url = "${opts.dataPlatform}/rwd/instance/relation/delete?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+            val url = "${opts.data_rwd}/rwd/instance/relation/delete?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
             if (postObject.result == "success") {
                 return true
@@ -354,7 +354,7 @@ object EquipApi {
         jsonObject["criteria"] = jsonObject2
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
-            val url = "${opts.dataPlatform}/rwd/instance/relation/query?groupCode=$groupCode&projectId=${projectId}"
+            val url = "${opts.data_rwd}/rwd/instance/relation/query?groupCode=$groupCode&projectId=${projectId}"
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
             if (postObject.result == "success"&&!postObject.data.isNullOrEmpty()) {
                 return postObject.data!!

+ 5 - 5
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/obj/FloorApi.kt

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.models.api.obj
+package com.persagy.server.datacenter.syn.models.api.obj
 
 import com.alibaba.fastjson.JSONObject
 import com.persagy.base.utils.SHttpUtil
@@ -62,7 +62,7 @@ object FloorApi {
             jsonObject["criteria"] = jsonObject2
             /** 直接 http 请求还是通过注册中心 */
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/rwd/instance/relation/query?groupCode=$groupCode&projectId=${projectId}"
+                val url = "${Configure.opts.data_rwd}/rwd/instance/relation/query?groupCode=$groupCode&projectId=${projectId}"
                 val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
                 if (postObject.result == "success"&&!postObject.data.isNullOrEmpty()) {
                     return postObject.data!!
@@ -93,7 +93,7 @@ object FloorApi {
             val buildingTools = FloorUtil.floorTools(projectId, floor)
             /** 直接 http 请求还是通过注册中心 */
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/rwd/instance/object/create?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+                val url = "${Configure.opts.data_rwd}/rwd/instance/object/create?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
                 val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, buildingTools)
                 if (postObject.result == "success") {
                     return true
@@ -124,7 +124,7 @@ object FloorApi {
             val buildingTools = FloorUtil.floorTools(projectId, floor)
             /** 直接 http 请求还是通过注册中心 */
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/rwd/instance/object/update?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+                val url = "${Configure.opts.data_rwd}/rwd/instance/object/update?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
                 val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, buildingTools)
                 if (postObject.result == "success") {
                     return true
@@ -156,7 +156,7 @@ object FloorApi {
             listId.add(id)
             /** 直接 http 请求还是通过注册中心 */
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/rwd/instance/object/delete?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
+                val url = "${Configure.opts.data_rwd}/rwd/instance/object/delete?groupCode=$groupCode&projectId=${projectId}&appId=datacenter"
                 val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, listId)
                 if (postObject.result == "success") {
                     return true

+ 2 - 2
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/obj/ProjectApi.kt

@@ -54,7 +54,7 @@ object ProjectApi {
             jsonObject["criteria"] = jsonObject2
             /** 判断是否使用注册中心 */
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/rwd/instance/object/query?groupCode=${id}"
+                val url = "${Configure.opts.data_rwd}/rwd/instance/object/query?groupCode=${id}"
                 val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
                 if (postObject.result == "success"&&!postObject.data.isNullOrEmpty()) {
                     return postObject.data!!
@@ -88,7 +88,7 @@ object ProjectApi {
             jsonObject["criteria"] = jsonObject2
             /** 判断是否使用注册中心 */
             if (!Configure.customProperties.eurekaorhttp) {
-                val url = "${Configure.opts.dataPlatform}/rwd/instance/object/query?groupCode=$groupCode&projectId=${projectId}"
+                val url = "${Configure.opts.data_rwd}/rwd/instance/object/query?groupCode=$groupCode&projectId=${projectId}"
                 val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
                 if (postObject.result == "success"&&!postObject.data.isNullOrEmpty()) {
                     return postObject.data!!

+ 2 - 2
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/obj/ShaftApi.kt

@@ -24,7 +24,7 @@
  * *********************************************************************************************************************
  */
 
-package com.persagy.server.syn.models.api.obj
+package com.persagy.server.datacenter.syn.models.api.obj
 
 import com.alibaba.fastjson.JSONObject
 import com.persagy.base.utils.SHttpUtil
@@ -53,7 +53,7 @@ object ShaftApi {
         jsonObject["criteria"] = jsonObject2
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
-            val url = "${opts.dataPlatform}/rwd/instance/object/query?groupCode=$groupCode&projectId=${projectId}"
+            val url = "${opts.data_rwd}/rwd/instance/object/query?groupCode=$groupCode&projectId=${projectId}"
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
             if (postObject.result == "success"&&!postObject.data.isNullOrEmpty()) {
                 return postObject.data!!

+ 3 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/obj/SpaceApi.kt

@@ -60,7 +60,7 @@ object SpaceApi {
         jsonObject["criteria"] = jsonObject2
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
-            val url = "${opts.dataPlatform}/rwd/instance/object/query?groupCode=$groupCode&projectId=${projectId}"
+            val url = "${opts.data_rwd}/rwd/instance/object/query?groupCode=$groupCode&projectId=${projectId}"
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
             if (postObject.result == "success"&&!postObject.data.isNullOrEmpty()) {
                 return postObject.data!!
@@ -92,7 +92,7 @@ object SpaceApi {
         jsonObject["criteria"] = jsonObject2
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
-            val url = "${opts.dataPlatform}/rwd/instance/relation/query?groupCode=$groupCode&projectId=${projectId}"
+            val url = "${opts.data_rwd}/rwd/instance/relation/query?groupCode=$groupCode&projectId=${projectId}"
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
             if (postObject.result == "success"&&!postObject.data.isNullOrEmpty()) {
                 return postObject.data!!
@@ -124,7 +124,7 @@ object SpaceApi {
         jsonObject["criteria"] = jsonObject2
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
-            val url = "${opts.dataPlatform}/rwd/instance/relation/query?groupCode=$groupCode&projectId=${projectId}"
+            val url = "${opts.data_rwd}/rwd/instance/relation/query?groupCode=$groupCode&projectId=${projectId}"
 
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
             if (postObject.result == "success"&&!postObject.data.isNullOrEmpty()) {

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/models/api/obj/SystemApi.kt

@@ -64,7 +64,7 @@ object SystemApi {
         jsonObject["criteria"] = jsonObject2
         /** 直接 http 请求还是通过注册中心 */
         if (!Configure.customProperties.eurekaorhttp) {
-            val url = "${opts.dataPlatform}/rwd/instance/object/query?groupCode=$groupCode&projectId=${projectId}"
+            val url = "${opts.data_rwd}/rwd/instance/object/query?groupCode=$groupCode&projectId=${projectId}"
             val postObject = SHttpUtil.postObject<MiddleGroundDataRespose>(url, jsonObject)
             logger.debug("结果= ${postObject.toJson()}")
             if (postObject.result == "success"&&!postObject.data.isNullOrEmpty()) {

+ 3 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterBuilding.kt

@@ -86,7 +86,7 @@ class DataCenterBuilding {
                     message.sign = 0
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
             Configure.UPDATE -> {
                 /** 修改 */
@@ -118,7 +118,7 @@ class DataCenterBuilding {
                     message.sign = 0
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
             Configure.DELETE -> {
                 /** 删除 */
@@ -132,7 +132,7 @@ class DataCenterBuilding {
                     message.count +1
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
         }
     }

+ 3 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterComponent.kt

@@ -99,7 +99,7 @@ class DataCenterComponent {
                     message.sign = 0
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
             Configure.UPDATE -> {
                 /** 修改 */
@@ -125,7 +125,7 @@ class DataCenterComponent {
                     message.sign = 0
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
             Configure.DELETE -> {
                 /** 删除 */
@@ -139,7 +139,7 @@ class DataCenterComponent {
                     message.count +1
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
         }
     }

+ 4 - 4
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterEquipment.kt

@@ -120,7 +120,7 @@ class DataCenterEquipment {
                     message.count = message.count+1
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
             Configure.UPDATE -> {
                 /** 修改 */
@@ -151,7 +151,7 @@ class DataCenterEquipment {
                     message.count = message.count + 1
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
             Configure.DELETE -> {
                 if (dictProject!=null) {
@@ -171,7 +171,7 @@ class DataCenterEquipment {
                     message.count = message.count + 1
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
         }
     }
@@ -234,7 +234,7 @@ class DataCenterEquipment {
         }
 
         /** 更改标记 */
-        synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+        synchronousMessageObjService.update(message)
 
     }
 

+ 4 - 4
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterFloor.kt

@@ -35,7 +35,7 @@ import com.persagy.server.datacenter.wanda.obj.Floor
 import com.persagy.server.datacenter.models.jms.SynchronousMessage
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.models.api.obj.EquipApi
-import com.persagy.server.syn.models.api.obj.FloorApi
+import com.persagy.server.datacenter.syn.models.api.obj.FloorApi
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService
 import org.springframework.stereotype.Service
@@ -102,7 +102,7 @@ class DataCenterFloor {
                 }
 
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
             Configure.UPDATE -> {
                 /** 修改 */
@@ -127,7 +127,7 @@ class DataCenterFloor {
                     message.sign = 0
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
             Configure.DELETE -> {
                 /** 删除 */
@@ -141,7 +141,7 @@ class DataCenterFloor {
                     message.count +1
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
         }
     }

+ 3 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterShaft.kt

@@ -84,7 +84,7 @@ class DataCenterShaft {
                     message.sign = 0
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
             Configure.UPDATE -> {
                 /** 修改 */
@@ -109,7 +109,7 @@ class DataCenterShaft {
                     message.sign = 0
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
             Configure.DELETE -> {
                 /** 删除 */
@@ -123,7 +123,7 @@ class DataCenterShaft {
                     message.count +1
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
         }
     }

+ 3 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterSpace.kt

@@ -133,7 +133,7 @@ class DataCenterSpace {
                     message.sign = 0
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
             Configure.UPDATE -> {
                 /** 修改 */
@@ -158,7 +158,7 @@ class DataCenterSpace {
                     message.sign = 0
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
             Configure.DELETE -> {
                 /** 删除 */
@@ -172,7 +172,7 @@ class DataCenterSpace {
                     message.count +1
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
         }
     }

+ 3 - 3
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/DataCenterSystem.kt

@@ -84,7 +84,7 @@ class DataCenterSystem {
                     message.sign = 0
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
             Configure.UPDATE -> {
                 /** 修改 */
@@ -109,7 +109,7 @@ class DataCenterSystem {
                     message.sign = 0
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
             Configure.DELETE -> {
                 /** 删除 */
@@ -123,7 +123,7 @@ class DataCenterSystem {
                     message.count +1
                 }
                 /** 更改标记 */
-                synchronousMessageObjService.update(message, arrayListOf("sign","count"))
+                synchronousMessageObjService.update(message)
             }
         }
     }

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/RwdFloor.kt

@@ -34,7 +34,7 @@ import com.persagy.server.datacenter.wanda.obj.Floor
 import com.persagy.server.syn.Configure
 import com.persagy.server.syn.jms.bean.SyncRwdDatacenterMessage
 import com.persagy.server.syn.models.api.obj.BuildingApi
-import com.persagy.server.syn.models.api.obj.FloorApi
+import com.persagy.server.datacenter.syn.models.api.obj.FloorApi
 import com.persagy.server.syn.models.tools.FloorUtil
 import com.persagy.service.SBaseService
 import com.persagy.service.SObjectService

+ 18 - 18
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/rel/AutomaticCalculationSync.kt

@@ -111,7 +111,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
 
         }
     }
@@ -147,7 +147,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
         }
     }
 
@@ -181,7 +181,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
         }
     }
 
@@ -215,7 +215,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
         }
     }
 
@@ -249,7 +249,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
 
         }
     }
@@ -284,7 +284,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
         }
     }
 
@@ -318,7 +318,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
         }
     }
 
@@ -359,7 +359,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
         }
     }
 
@@ -393,7 +393,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
         }
     }
 
@@ -427,7 +427,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
         }
     }
 
@@ -462,7 +462,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
         }
     }
 
@@ -496,7 +496,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
         }
     }
 
@@ -530,7 +530,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
         }
     }
 
@@ -564,7 +564,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
         }
     }
 
@@ -598,7 +598,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
         }
     }
 
@@ -632,7 +632,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
         }
     }
     /**
@@ -665,7 +665,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
         }
     }
 
@@ -699,7 +699,7 @@ class AutomaticCalculationSync {
                 }
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(message, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(message)
         }
     }
 

+ 5 - 5
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/services/jms/rel/EquipinSpaceSync.kt

@@ -71,7 +71,7 @@ class EquipinSpaceSync {
                 synchronousMessageRel.count +1
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(synchronousMessageRel, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(synchronousMessageRel)
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -109,7 +109,7 @@ class EquipinSpaceSync {
                 synchronousMessageRel.count +1
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(synchronousMessageRel, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(synchronousMessageRel)
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -138,7 +138,7 @@ class EquipinSpaceSync {
                 synchronousMessageRel.count +1
             }
             /** 更改标记 */
-            synchronousMessageRelService.update(synchronousMessageRel, arrayListOf("sign","count"))
+            synchronousMessageRelService.update(synchronousMessageRel)
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -186,7 +186,7 @@ class EquipinSpaceSync {
             synchronousMessageRel.count +1
         }
         /** 更改标记 */
-        synchronousMessageRelService.update(synchronousMessageRel, arrayListOf("sign","count"))
+        synchronousMessageRelService.update(synchronousMessageRel)
     }
 
     /**
@@ -224,7 +224,7 @@ class EquipinSpaceSync {
                 }
 
                 /** 更改标记 */
-                synchronousMessageRelService.update(synchronousMessageRel, arrayListOf("sign","count"))
+                synchronousMessageRelService.update(synchronousMessageRel)
 
             } else {
                 synchronousMessageRel.sign = 2

+ 42 - 0
datasyn/src/main/kotlin/com/persagy/server/datacenter/syn/task/ScheduledConfig.kt

@@ -0,0 +1,42 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2021.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+package com.persagy.server.datacenter.syn.task
+
+import org.springframework.context.annotation.Configuration
+import org.springframework.scheduling.annotation.SchedulingConfigurer
+import org.springframework.scheduling.config.ScheduledTaskRegistrar
+import java.util.concurrent.Executors
+
+/**
+ * 定时任务并行执行
+ */
+@Configuration
+open class ScheduledConfig : SchedulingConfigurer {
+    override fun configureTasks(scheduledTaskRegistrar: ScheduledTaskRegistrar) {
+        scheduledTaskRegistrar.setScheduler(Executors.newScheduledThreadPool(5));
+    }
+}

+ 5 - 5
datasyn/src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ eureka:
   client:                                   #客户端注册进eureka服务列表内
     service-url:
 
-      defaultZone:                                http://frame:123456@192.168.100.33/:9931eureka/
+      defaultZone:                                http://frame:123456@192.168.100.33:9931/integrated-eureka/eureka/
       enable-self-preservation: false # 设为false,关闭自我保护
       eviction-interval-timer-in-ms: 5000 # 清理间隔(单位毫秒,默认是60*1000)启用主动失效,
   instance:
@@ -33,9 +33,9 @@ eureka:
 
 saga:
   dataPlatform:                        http://39.102.40.239:9970
-  data_org:                            http://172.16.46.33:8831
-  data_rwd:                            http://172.16.46.33:8832
-  data_dic:                            http://172.16.46.33:8830
+  data_org:                            http://172.172.173.22:8080
+  data_rwd:                            http://172.172.173.12:9932
+  data_dic:                            http://172.172.173.21:8080
 mqtopid:
   exchange:                           exchange-dmp
   routingKey:
@@ -43,7 +43,7 @@ mqtopid:
 
 custom: # 自定义类型
   #true 代表eureka  false  代表 http
-  eurekaorhttp:                       true
+  eurekaorhttp:                       false
 
 # 服务名
 servicename: #注册中心使用,服务名

+ 1 - 1
message-center/src/main/resources/application-prod.yml

@@ -32,7 +32,7 @@ spring:
     url:                                jdbc:postgresql://localhost:5432/datacenter
 #    url:                                jdbc:postgresql://60.205.177.43:5432/datacenterlabsl
     username:                           postgres
-    password:                           123456
+    password:                           cGVyc2FneV8yMDIwcXdlIUAj
 
   activemq:
     broker-url:                         tcp://localhost:61616