Kaynağa Gözat

Se actualizan vendors y se agregan parámetros para el deviceBundle.

Maxi Schvindt 7 yıl önce
ebeveyn
işleme
5ac6e1df9d

+ 4 - 0
app/config/bundles/ik/device-bundle/parameters.yml.dist

@@ -3,3 +3,7 @@ parameters:
     device_post_url: 'http://127.0.0.1/base/app_dev.php/api/devices.json'
     device_delete_post_url: 'http://127.0.0.1/base/app_dev.php/api/devices/'
     device_put_url: 'http://127.0.0.1/base/app_dev.php/api/devices/'
+    api_device_check_url: 'http://base:80/api/devices/check.json'
+    api_device_post_url: 'http://base:80/api/devices.json'
+    api_device_delete_post_url: 'http://base:80/api/devices/'
+    api_device_put_url: 'http://base:80/api/devices/'

+ 4 - 0
app/config/bundles/ik/device-bundle/parameters.yml.docker

@@ -4,3 +4,7 @@ parameters:
     device_post_url: 'http://%env(HOST_BASE)%/api/devices.json'
     device_delete_post_url: 'http://%env(HOST_BASE)%/api/devices/'
     device_put_url: 'http://%env(HOST_BASE)%/api/devices/'
+    api_device_check_url: 'http://base:80/api/devices/check.json'
+    api_device_post_url: 'http://base:80/api/devices.json'
+    api_device_delete_post_url: 'http://base:80/api/devices/'
+    api_device_put_url: 'http://base:80/api/devices/'

+ 8 - 4
app/config/bundles/ik/device-bundle/parameters.yml.drone

@@ -1,6 +1,10 @@
 parameters:
-   device_check_url: 'http://device.check.url/base/app_dev.php/api/devices/check.json'
-   device_post_url: 'http://device.post.url/base/app_dev.php/api/devices.json'
-   device_delete_post_url: 'http://device.delete.post.url/base/app_dev.php/api/devices/'
-   device_put_url: 'http://device.put.url/base/app_dev.php/api/devices/'
+    device_check_url: 'http://device.check.url/base/app_dev.php/api/devices/check.json'
+    device_post_url: 'http://device.post.url/base/app_dev.php/api/devices.json'
+    device_delete_post_url: 'http://device.delete.post.url/base/app_dev.php/api/devices/'
+    device_put_url: 'http://device.put.url/base/app_dev.php/api/devices/'
+    api_device_check_url: 'http://base:80/api/devices/check.json'
+    api_device_post_url: 'http://base:80/api/devices.json'
+    api_device_delete_post_url: 'http://base:80/api/devices/'
+    api_device_put_url: 'http://base:80/api/devices/'
  

+ 13 - 13
composer.lock

@@ -1442,7 +1442,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuthBundle.git",
-                "reference": "8f28559950fc4e12a96a97084057111fb97156e9"
+                "reference": "67612309a0afd5d2935dfb8a4bfb9da479a61361"
             },
             "type": "library",
             "autoload": {
@@ -1457,7 +1457,7 @@
                 "auth",
                 "bundle"
             ],
-            "time": "2018-02-19T12:38:29+00:00"
+            "time": "2018-05-15T18:25:14+00:00"
         },
         {
             "name": "ik/base-admin-bundle",
@@ -1465,7 +1465,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "30a35248a08d2677c0eb95769be905ce28731c2f"
+                "reference": "4dd3dddd193db37365a31ac475afcb3a76b31330"
             },
             "type": "library",
             "autoload": {
@@ -1480,7 +1480,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2018-05-17T18:14:39+00:00"
+            "time": "2018-05-29T17:20:10+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1488,7 +1488,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "3332f266c84c9b6c9ba8e3bb17fef6aa7d7fdccd"
+                "reference": "92e389263fa941ed35eeb54e7520bc1ccccc4ce7"
             },
             "type": "library",
             "autoload": {
@@ -1503,7 +1503,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2018-02-19T11:30:09+00:00"
+            "time": "2018-05-11T17:07:59+00:00"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1651,7 +1651,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/TemplateBundle.git",
-                "reference": "69e6761d6f3d3e9f85f5a43b72324f3d56dce4de"
+                "reference": "14e7b7c9d0deadf8c779874419cf2f183a02bbf8"
             },
             "require": {
                 "ik/base-admin-bundle": "*"
@@ -1669,7 +1669,7 @@
                 "bundle",
                 "template"
             ],
-            "time": "2018-04-04T17:49:43+00:00"
+            "time": "2018-04-24T15:29:11+00:00"
         },
         {
             "name": "ik/webservice-bundle",
@@ -1677,7 +1677,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "f4c224b26d011c99f789cb4bddf68e1d2cc32645"
+                "reference": "7425e39fc61b46db91ddcfb405adc1b9f38c0d59"
             },
             "require": {
                 "ext-curl": "*",
@@ -1690,7 +1690,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2018-02-27T11:03:58+00:00"
+            "time": "2018-05-22T17:32:16+00:00"
         },
         {
             "name": "ik/workflow-bundle",
@@ -1698,7 +1698,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "02e9a07ebe7c40417f4e78c451e26a893abc9164"
+                "reference": "4eff7cff8e2e23771f02e03646d4378c9d8a5e33"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1728,7 +1728,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2018-04-05T14:41:00+00:00"
+            "time": "2018-05-22T13:38:30+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -6335,7 +6335,7 @@
         "voryx/restgeneratorbundle": 20
     },
     "prefer-stable": false,
-    "prefer-lowest": false,
+    "prefer-lowest": true,
     "platform": {
         "php": ">=5.5.9"
     },