diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e758d7a7..67ecfd1c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ prod_build: - branches services: - name: docker:20.10.21-dind - command: ["--insecure-registry=10.99.253.167:8090","--registry-mirror=http://10.99.253.167:8090","--insecure-registry=10.99.253.167:8088","--registry-mirror=http://10.99.253.167:8088","--tls=false"] + command: ["--insecure-registry=10.99.253.167:8090","--registry-mirror=http://10.99.253.167:8090","--insecure-registry=10.99.253.167:8088","--registry-mirror=http://10.99.253.167:8088","--insecure-registry=harbor.dvgd.rzd","--tls=false"] variables: DOCKER_HOST: tcp://docker:2375 DOCKER_DRIVER: overlay2 @@ -62,7 +62,7 @@ prod_aihit_build: - branches services: - name: docker:20.10.21-dind - command: ["--insecure-registry=10.99.253.167:8090","--registry-mirror=http://10.99.253.167:8090","--insecure-registry=10.99.253.167:8088","--registry-mirror=http://10.99.253.167:8088","--tls=false"] + command: ["--insecure-registry=10.99.253.167:8090","--registry-mirror=http://10.99.253.167:8090","--insecure-registry=10.99.253.167:8088","--registry-mirror=http://10.99.253.167:8088","--insecure-registry=harbor.dvgd.rzd","--tls=false"] variables: DOCKER_HOST: tcp://docker:2375 DOCKER_DRIVER: overlay2 @@ -105,7 +105,7 @@ prod_espp-template_build: - branches services: - name: docker:20.10.21-dind - command: ["--insecure-registry=10.99.253.167:8090","--registry-mirror=http://10.99.253.167:8090","--insecure-registry=10.99.253.167:8088","--registry-mirror=http://10.99.253.167:8088","--tls=false"] + command: ["--insecure-registry=10.99.253.167:8090","--registry-mirror=http://10.99.253.167:8090","--insecure-registry=10.99.253.167:8088","--registry-mirror=http://10.99.253.167:8088","--insecure-registry=harbor.dvgd.rzd","--tls=false"] variables: DOCKER_HOST: tcp://docker:2375 DOCKER_DRIVER: overlay2 diff --git a/PARR.EsppTemplateSyncWorker/appsettings.json b/PARR.EsppTemplateSyncWorker/appsettings.json index d5530850..63291c72 100644 --- a/PARR.EsppTemplateSyncWorker/appsettings.json +++ b/PARR.EsppTemplateSyncWorker/appsettings.json @@ -37,8 +37,8 @@ "MqSettings": { "HostName": "10.99.253.216", "QueueName": "parr-espp-templates", - "UserName": "rmuser", - "Password": "rmpassword" + "UserName": "espp_templates_reader", + "Password": "P@ssReaderPtk202!" }, "StorageSettings": { diff --git a/PARR.MockData/Program.cs b/PARR.MockData/Program.cs index 16ba1116..5de3044d 100644 --- a/PARR.MockData/Program.cs +++ b/PARR.MockData/Program.cs @@ -3,8 +3,8 @@ using RabbitMQ.Client; using System.Text; var factory = new ConnectionFactory() { HostName = "10.99.253.216" }; -factory.UserName = "rmuser"; -factory.Password = "rmpassword"; +factory.UserName = "espp_templates_robot"; +factory.Password = "P@ssRwEsppTempl202"; string[] rows = EsppExport.data.Replace("\r", "").Split('\n'); using (var connection = factory.CreateConnection()) diff --git a/README.md b/README.md index c249ac4c..865c79ad 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # API PARR - Серверная часть проекта ПАРР. -[Документация по проекту](http://gvc-tex-docs-01.gvc.oao.rzd/docs/%D0%A2%D1%80%D0%B5%D0%B1%D0%BE%D0%B2%D0%B0%D0%BD%D0%B8%D1%8F%20%D0%BF%D0%BE%20%D1%81%D0%BE%D0%B7%D0%B4%D0%B0%D0%BD%D0%B8%D1%8E%20%D1%81%D1%86%D0%B5%D0%BD%D0%B0%D1%80%D0%B8%D0%B5%D0%B2%20%D0%B2%D1%8B%D0%BF%D0%BE%D0%BB%D0%BD%D0%B5%D0%BD%D0%B8%D1%8F%20%D1%80%D0%B5%D0%B3%D0%BB%D0%B0%D0%BC%D0%B5%D0%BD%D1%82%D0%BD%D1%8B%D1%85%20%D1%80%D0%B0%D0%B1%D0%BE%D1%82%20%D0%BD%D0%B0%20%D1%81%D0%B5%D1%80%D0%B2%D0%B5%D1%80%D0%B0%D1%85%20%D1%81%20%D0%B8%D1%81%D0%BF%D0%BE%D0%BB%D1%8C%D0%B7%D0%BE%D0%B2%D0%B0%D0%BD%D0%B8%D0%B5%D0%BC%20API%20%D0%9F%D0%90%D0%A0%D0%A0%20%D0%9F%D0%A2%D0%9A/index.html) +- [Внутренняя документация](http://gitlab.dvgd.oao.rzd/devptk/parr/parr_api/-/wikis/home) +- [Документация по проекту ГВЦ](http://gvc-tex-docs-01.gvc.oao.rzd/docs/%D0%A2%D1%80%D0%B5%D0%B1%D0%BE%D0%B2%D0%B0%D0%BD%D0%B8%D1%8F%20%D0%BF%D0%BE%20%D1%81%D0%BE%D0%B7%D0%B4%D0%B0%D0%BD%D0%B8%D1%8E%20%D1%81%D1%86%D0%B5%D0%BD%D0%B0%D1%80%D0%B8%D0%B5%D0%B2%20%D0%B2%D1%8B%D0%BF%D0%BE%D0%BB%D0%BD%D0%B5%D0%BD%D0%B8%D1%8F%20%D1%80%D0%B5%D0%B3%D0%BB%D0%B0%D0%BC%D0%B5%D0%BD%D1%82%D0%BD%D1%8B%D1%85%20%D1%80%D0%B0%D0%B1%D0%BE%D1%82%20%D0%BD%D0%B0%20%D1%81%D0%B5%D1%80%D0%B2%D0%B5%D1%80%D0%B0%D1%85%20%D1%81%20%D0%B8%D1%81%D0%BF%D0%BE%D0%BB%D1%8C%D0%B7%D0%BE%D0%B2%D0%B0%D0%BD%D0%B8%D0%B5%D0%BC%20API%20%D0%9F%D0%90%D0%A0%D0%A0%20%D0%9F%D0%A2%D0%9A/index.html) ## Структура