Merge remote-tracking branch 'origin/release/1.9.11' into develop

# Conflicts: # backend/src/main/java/ru/micord/ervu/account_applications/EnumColumnFormatter.java # backend/src/main/java/ru/micord/ervu/account_applications/service/AbstractUserDataService.java # backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesDaoService.java # resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на активацию.page # resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на деактивацию.page
2025-04-11 09:19:06 +03:00 · 2025-04-11 09:19:06 +03:00 · a4703b0d4a
commit a4703b0d4a
parent 4559afbc83 9abe6c18df
23 changed files with 167 additions and 291 deletions
--- a/config/config.yaml
+++ b/config/config.yaml
@ -1,74 +0,0 @@
-name: ervu-account-applications-backend
-
-replicaCount: 1
-
-resources:
-  requests:
-    memory: '256Mi'
-    cpu: '50m'
-  limits:
-    memory: '2Gi'
-    cpu: '1'
-
-env:
-  - name: ERVU_URL
-    value: 'https://{{ $.Values.ingress_base_host }}'
-  - name: ERVU_PWD_SIGN_SECRET_KEY
-    value: 'DtCAQdeKnrAMLfdJkFVdfQnyT/Z5OINK4jqX0LbavfM='
-
-ports:
-  - name: http
-    containerPort: 8080
-
-services:
-  - name: '{{ $.Values.name }}'
-    type: ClusterIP
-    ports:
-      - name: http
-        port: 80
-        targetPort: 8080
-
-postgres:
-  database: 'ervu_account_applications'
-
-livenessProbe:
-  failureThreshold: 3
-  httpGet:
-    path: /
-    port: 8080
-  initialDelaySeconds: 30
-  periodSeconds: 3
-  successThreshold: 1
-  timeoutSeconds: 5
-
-readinessProbe:
-  failureThreshold: 3
-  httpGet:
-    path: /account-applications/version
-    port: 8080
-  initialDelaySeconds: 30
-  periodSeconds: 3
-  successThreshold: 1
-  timeoutSeconds: 5
-
-ingress:
- name: '{{ $.Values.name }}'
-  annotations:
-    nginx.ingress.kubernetes.io/affinity: 'cookie'
-    nginx.ingress.kubernetes.io/session-cookie-name: 'stickysession'
-    nginx.ingress.kubernetes.io/session-cookie-max-age: '7200'
-    nginx.ingress.kubernetes.io/proxy-body-size: "75m"
-    nginx.ingress.kubernetes.io/rewrite-target: /account-applications/$2
-  labels:
-    app/name: ervu-account-applications
-  rules:
-  - host: '{{ $.Values.ingress_base_host }}'
-    http:
-      paths:
-      - path: /mfe/account-applications/account-applications(/|$)(.*)
-        pathType: Prefix
-        backend:
-          service:
-            name: '{{ $.Values.name }}'
-            port:
-              name: http
--- a/config/nginx.conf
+++ b/config/nginx.conf
@ -33,7 +33,7 @@ http {
    server {
        listen 80 default;

-	access_log /var/log/nginx/access.log nginx_main;
+		access_log /var/log/nginx/access.log nginx_main;
    	error_log /var/log/nginx/error.log error;

    	charset utf-8;
@ -55,8 +55,8 @@ http {
    	gzip_min_length 256;
    	gzip_types
    	  application/atom+xml
-   	  application/geo+json
-   	  application/javascript
+   		  application/geo+json
+   		  application/javascript
    	  application/x-javascript
    	  application/json
    	  application/ld+json
@ -75,41 +75,41 @@ http {
    	  text/xml;

    	location / {
-          root /frontend;
-          index index.html;
-          try_files $uri @index;
-
-	  #Application config
-	  location = /src/resources/app-config.json {
-	    add_header Cache-Control "no-cache";
-	    expires 0;
-	  }
-	  # Media: images, icons, video, audio, HTC
-	  location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|mp3|ogg|ogv|webm|htc|woff2|woff|ttf)$ {
-    	    expires 1M;
-    	    access_log off;
-    	    # max-age must be in seconds
-    	    add_header Cache-Control "max-age=2629746, public";
-	  }
-	  # CSS and Javascript
-	  location ~* \.(?:css|js)$ {
-    	    expires 1y;
-    	    access_log off;
-    	    add_header Cache-Control "max-age=31556952, public";
-	  }
+          	root /frontend;
+         	index index.html;
+          	try_files $uri @index;
+			
+			#Application config
+			location = /src/resources/app-config.json {
+    			add_header Cache-Control "no-cache";
+    			expires 0;
+			}
+			# Media: images, icons, video, audio, HTC
+			location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|mp3|ogg|ogv|webm|htc|woff2|woff|ttf)$ {
+    			expires 1M;
+    			access_log off;
+    			# max-age must be in seconds
+    			add_header Cache-Control "max-age=2629746, public";
+			}
+			# CSS and Javascript
+			location ~* \.(?:css|js)$ {
+    			expires 1y;
+    			access_log off;
+    			add_header Cache-Control "max-age=31556952, public";
+			}
    	}

-	location @index {
-	  root /frontend;
-    	  add_header Cache-Control "no-cache";
-    	  expires 0;
-    	  try_files /index.html =404;
-	}
+		location @index {
+			root /frontend;
+    		add_header Cache-Control "no-cache";
+    		expires 0;
+    		try_files /index.html =404;
+		}

-	location = /health {
-          access_log off;
-          add_header 'Content-Type' 'application/json';
-          return 200 '{"status":"UP"}';
-	}
+		location = /health {
+          	access_log off;
+          	add_header 'Content-Type' 'application/json';
+          	return 200 '{"status":"UP"}';
+	    }
    }
 }
--- a/config/settings.xml
+++ b/config/settings.xml
@ -1,13 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                          https://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <mirrors>
-    <mirror>
-      <id>central-mirror</id>
-      <name>rtlabs-public</name>
-      <url>https://nexus-dev.pgs.rtlabs.ru/repository/maven-public</url>
-      <mirrorOf>*</mirrorOf>
-    </mirror>
-  </mirrors>
-</settings>
--- a/config/uat/settings.xml
+++ b/config/uat/settings.xml
@ -1,13 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                          https://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <mirrors>
-    <mirror>
-      <id>central-mirror</id>
-      <name>rtlabs-public</name>
-      <url>http://nexus.gosuslugi.local/content/repositories/central</url>
-      <mirrorOf>*</mirrorOf>
-    </mirror>
-  </mirrors>
-</settings>