From e4dbf824311e19bf0246dfe811bb1b8d9e9469eb Mon Sep 17 00:00:00 2001 From: kimjaeyeol Date: Thu, 30 Dec 2021 17:22:44 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20ipAppr=2050=EC=9E=90?= =?UTF-8?q?=EB=A6=AC=20=EC=98=A4=EB=A5=98=20=EB=B0=9C=EC=83=9D=20=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=EC=84=B1=20=EC=9E=88=EC=96=B4=EC=84=9C=20100=EC=9E=90?= =?UTF-8?q?=EB=A6=AC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../egovframe/cloud/boardservice/domain/posts/PostsRead.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/board-service/src/main/java/org/egovframe/cloud/boardservice/domain/posts/PostsRead.java b/backend/board-service/src/main/java/org/egovframe/cloud/boardservice/domain/posts/PostsRead.java index d8c38f9..07bb2c2 100644 --- a/backend/board-service/src/main/java/org/egovframe/cloud/boardservice/domain/posts/PostsRead.java +++ b/backend/board-service/src/main/java/org/egovframe/cloud/boardservice/domain/posts/PostsRead.java @@ -49,7 +49,7 @@ public class PostsRead { /** * ip 주소 */ - @Column(nullable = false, columnDefinition = "varchar(50)") + @Column(nullable = false, columnDefinition = "varchar(100)") private String ipAddr; /** From c5220c386e437522ba15d7b0d25428a75b03bafe Mon Sep 17 00:00:00 2001 From: kimjaeyeol Date: Thu, 30 Dec 2021 17:26:29 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9B=20ipAppr=2050=EC=9E=90?= =?UTF-8?q?=EB=A6=AC=20=EC=98=A4=EB=A5=98=20=EB=B0=9C=EC=83=9D=20=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=EC=84=B1=20=EC=9E=88=EC=96=B4=EC=84=9C=20100=EC=9E=90?= =?UTF-8?q?=EB=A6=AC=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20=EC=86=8C=EA=B7=9C?= =?UTF-8?q?=EB=AA=A8=20admin=20=EA=B2=8C=EC=8B=9C=EB=AC=BC=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EB=A9=94=EB=89=B4=EC=99=80=20=EA=B6=8C=ED=95=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose/mysql/init/init.sql | 11 +++++++++-- docker-compose/mysql/msaportal.sql | 10 ++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/docker-compose/mysql/init/init.sql b/docker-compose/mysql/init/init.sql index 66b1899..123a37b 100644 --- a/docker-compose/mysql/init/init.sql +++ b/docker-compose/mysql/init/init.sql @@ -429,7 +429,7 @@ CREATE TABLE `login_log` ( `log_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '로그 id', `site_id` bigint(20) DEFAULT NULL COMMENT '사이트 id', `email_addr` varchar(100) DEFAULT NULL COMMENT '이메일 주소', - `ip_addr` varchar(50) DEFAULT NULL COMMENT 'ip 주소', + `ip_addr` varchar(100) DEFAULT NULL COMMENT 'ip 주소', `success_at` bit(1) NOT NULL COMMENT '성공 여부', `fail_content` varchar(500) DEFAULT NULL COMMENT '실패 내용', `created_date` datetime(6) DEFAULT NULL COMMENT '생성 일시', @@ -518,6 +518,13 @@ INSERT INTO `menu_role` VALUES (1,'2021-08-17 10:19:05.829000','2021-08-17 10:19 /*!40000 ALTER TABLE `menu_role` ENABLE KEYS */; UNLOCK TABLES; +INSERT INTO menu (menu_id, created_date, modified_date, created_by, last_modified_by, connect_id, menu_description, icon_name, blank_at, show_at, use_at, level_no, menu_eng_name, menu_kor_name, type_id, sort_seq, sub_name, url_path, parent_menu_id, site_id, menu_name) +VALUES (136, '2021-12-30 17:11:57', '2021-12-30 17:12:03', '65a00f65-8460-49af-98ec-042977e56f4b', '65a00f65-8460-49af-98ec-042977e56f4b', null, '', 'toc', 0, 0, 1, 3, 'Posts', '게시물 관리', 'inside', 1, '', '/posts', 100, 4, null); + +INSERT INTO menu_role (menu_role_id, created_date, modified_date, created_by, last_modified_by, show_at, role_id, menu_id) +VALUES (304, '2021-12-30 17:13:40.813000', '2021-12-30 17:13:40.813000', '65a00f65-8460-49af-98ec-042977e56f4b', '65a00f65-8460-49af-98ec-042977e56f4b', 1, 'ROLE_ADMIN', 136); + + -- -- Table structure for table `message` -- @@ -624,7 +631,7 @@ CREATE TABLE `posts_read` ( `read_no` int(9) NOT NULL COMMENT '조회 번호', `user_id` varchar(255) DEFAULT NULL COMMENT '사용자 id', `token_id` varchar(50) DEFAULT NULL COMMENT '토큰 id', - `ip_addr` varchar(50) NOT NULL COMMENT 'ip 주소', + `ip_addr` varchar(100) NOT NULL COMMENT 'ip 주소', `created_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '생성 일시', PRIMARY KEY (`board_no`,`posts_no`,`read_no`), KEY `posts_reader_FK02` (`user_id`), diff --git a/docker-compose/mysql/msaportal.sql b/docker-compose/mysql/msaportal.sql index f5e1afd..5bc3d5b 100644 --- a/docker-compose/mysql/msaportal.sql +++ b/docker-compose/mysql/msaportal.sql @@ -381,7 +381,7 @@ CREATE TABLE `login_log` ( `log_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '로그 id', `site_id` bigint(20) DEFAULT NULL COMMENT '사이트 id', `email_addr` varchar(100) DEFAULT NULL COMMENT '이메일 주소', - `ip_addr` varchar(50) DEFAULT NULL COMMENT 'ip 주소', + `ip_addr` varchar(100) DEFAULT NULL COMMENT 'ip 주소', `success_at` bit(1) NOT NULL COMMENT '성공 여부', `fail_content` varchar(500) DEFAULT NULL COMMENT '실패 내용', `created_date` datetime(6) DEFAULT NULL COMMENT '생성 일시', @@ -470,6 +470,12 @@ INSERT INTO `menu_role` VALUES (1,'2021-08-17 10:19:05.829000','2021-08-17 10:19 /*!40000 ALTER TABLE `menu_role` ENABLE KEYS */; UNLOCK TABLES; +INSERT INTO menu (menu_id, created_date, modified_date, created_by, last_modified_by, connect_id, menu_description, icon_name, blank_at, show_at, use_at, level_no, menu_eng_name, menu_kor_name, type_id, sort_seq, sub_name, url_path, parent_menu_id, site_id, menu_name) +VALUES (136, '2021-12-30 17:11:57', '2021-12-30 17:12:03', '65a00f65-8460-49af-98ec-042977e56f4b', '65a00f65-8460-49af-98ec-042977e56f4b', null, '', 'toc', 0, 0, 1, 3, 'Posts', '게시물 관리', 'inside', 1, '', '/posts', 100, 4, null); + +INSERT INTO menu_role (menu_role_id, created_date, modified_date, created_by, last_modified_by, show_at, role_id, menu_id) +VALUES (304, '2021-12-30 17:13:40.813000', '2021-12-30 17:13:40.813000', '65a00f65-8460-49af-98ec-042977e56f4b', '65a00f65-8460-49af-98ec-042977e56f4b', 1, 'ROLE_ADMIN', 136); + -- -- Table structure for table `message` -- @@ -576,7 +582,7 @@ CREATE TABLE `posts_read` ( `read_no` int(9) NOT NULL COMMENT '조회 번호', `user_id` varchar(255) DEFAULT NULL COMMENT '사용자 id', `token_id` varchar(50) DEFAULT NULL COMMENT '토큰 id', - `ip_addr` varchar(50) NOT NULL COMMENT 'ip 주소', + `ip_addr` varchar(100) NOT NULL COMMENT 'ip 주소', `created_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '생성 일시', PRIMARY KEY (`board_no`,`posts_no`,`read_no`), KEY `posts_reader_FK02` (`user_id`), From c8e6106271675de23577076452e0105a209b508d Mon Sep 17 00:00:00 2001 From: jooho Date: Thu, 30 Dec 2021 17:50:22 +0900 Subject: [PATCH 3/3] k8s --- k8s/applications/backend/apigateway/service.yaml | 2 ++ k8s/applications/backend/discovery/service.yaml | 2 ++ .../backend/reserve-check-service/deployment.yaml | 9 +-------- .../backend/reserve-item-service/deployment.yaml | 9 +-------- .../backend/reserve-request-service/deployment.yaml | 9 +-------- k8s/applications/backend/user-service/deployment.yaml | 9 +-------- k8s/applications/frontend/admin/service.yaml | 2 ++ k8s/applications/frontend/portal/service.yaml | 2 ++ k8s/environments/jenkins/service.yaml | 4 ++++ k8s/environments/logging/elk/kibana/service.yaml | 4 +++- k8s/environments/logging/elk/logstash/deplyment.yaml | 7 ------- k8s/environments/rabbitmq/service.yaml | 5 ++++- k8s/environments/zipkin/service.yaml | 4 +++- 13 files changed, 26 insertions(+), 42 deletions(-) diff --git a/k8s/applications/backend/apigateway/service.yaml b/k8s/applications/backend/apigateway/service.yaml index aa2229a..c8ae3b5 100644 --- a/k8s/applications/backend/apigateway/service.yaml +++ b/k8s/applications/backend/apigateway/service.yaml @@ -8,9 +8,11 @@ metadata: app: apigateway name: apigateway-service spec: + type: NodePort ports: - port: 8000 targetPort: 8000 + nodePort: 30001 selector: env: production tier: backend diff --git a/k8s/applications/backend/discovery/service.yaml b/k8s/applications/backend/discovery/service.yaml index cb0b810..417c1d2 100644 --- a/k8s/applications/backend/discovery/service.yaml +++ b/k8s/applications/backend/discovery/service.yaml @@ -8,9 +8,11 @@ metadata: app: discovery name: discovery-service spec: + type: NodePort ports: - port: 8761 targetPort: 8761 + nodePort: 30002 selector: env: production tier: backend diff --git a/k8s/applications/backend/reserve-check-service/deployment.yaml b/k8s/applications/backend/reserve-check-service/deployment.yaml index 9eb4a6d..ded9ef4 100644 --- a/k8s/applications/backend/reserve-check-service/deployment.yaml +++ b/k8s/applications/backend/reserve-check-service/deployment.yaml @@ -84,11 +84,4 @@ spec: initialDelaySeconds: 10 periodSeconds: 10 successThreshold: 1 - failureThreshold: 3 - volumeMounts: - - name: backend-volume - mountPath: /srv/nfs - volumes: - - name: backend-volume - persistentVolumeClaim: - claimName: backend-pvc \ No newline at end of file + failureThreshold: 3 \ No newline at end of file diff --git a/k8s/applications/backend/reserve-item-service/deployment.yaml b/k8s/applications/backend/reserve-item-service/deployment.yaml index f755a8b..a242176 100644 --- a/k8s/applications/backend/reserve-item-service/deployment.yaml +++ b/k8s/applications/backend/reserve-item-service/deployment.yaml @@ -84,11 +84,4 @@ spec: initialDelaySeconds: 10 periodSeconds: 10 successThreshold: 1 - failureThreshold: 3 - volumeMounts: - - name: backend-volume - mountPath: /srv/nfs - volumes: - - name: backend-volume - persistentVolumeClaim: - claimName: backend-pvc \ No newline at end of file + failureThreshold: 3 \ No newline at end of file diff --git a/k8s/applications/backend/reserve-request-service/deployment.yaml b/k8s/applications/backend/reserve-request-service/deployment.yaml index 2a42ff2..584cfcd 100644 --- a/k8s/applications/backend/reserve-request-service/deployment.yaml +++ b/k8s/applications/backend/reserve-request-service/deployment.yaml @@ -84,11 +84,4 @@ spec: initialDelaySeconds: 10 periodSeconds: 10 successThreshold: 1 - failureThreshold: 3 - volumeMounts: - - name: backend-volume - mountPath: /srv/nfs - volumes: - - name: backend-volume - persistentVolumeClaim: - claimName: backend-pvc \ No newline at end of file + failureThreshold: 3 \ No newline at end of file diff --git a/k8s/applications/backend/user-service/deployment.yaml b/k8s/applications/backend/user-service/deployment.yaml index a51a2da..7d06a9c 100644 --- a/k8s/applications/backend/user-service/deployment.yaml +++ b/k8s/applications/backend/user-service/deployment.yaml @@ -84,11 +84,4 @@ spec: initialDelaySeconds: 10 periodSeconds: 10 successThreshold: 1 - failureThreshold: 3 - volumeMounts: - - name: backend-volume - mountPath: /srv/nfs - volumes: - - name: backend-volume - persistentVolumeClaim: - claimName: backend-pvc \ No newline at end of file + failureThreshold: 3 \ No newline at end of file diff --git a/k8s/applications/frontend/admin/service.yaml b/k8s/applications/frontend/admin/service.yaml index da7a3df..1354c41 100644 --- a/k8s/applications/frontend/admin/service.yaml +++ b/k8s/applications/frontend/admin/service.yaml @@ -8,10 +8,12 @@ metadata: app: admin name: frontend-admin-service spec: + type: NodePort ports: - name: frontend-admin-http port: 3000 targetPort: 3000 + nodePort: 30011 selector: env: production tier: frontend diff --git a/k8s/applications/frontend/portal/service.yaml b/k8s/applications/frontend/portal/service.yaml index b1fd2f9..cde8ba1 100644 --- a/k8s/applications/frontend/portal/service.yaml +++ b/k8s/applications/frontend/portal/service.yaml @@ -8,10 +8,12 @@ metadata: app: portal name: frontend-portal-service spec: + type: NodePort ports: - name: frontend-portal-http port: 3000 targetPort: 3000 + nodePort: 30012 selector: env: production tier: frontend diff --git a/k8s/environments/jenkins/service.yaml b/k8s/environments/jenkins/service.yaml index be3f163..9374479 100644 --- a/k8s/environments/jenkins/service.yaml +++ b/k8s/environments/jenkins/service.yaml @@ -8,9 +8,11 @@ metadata: app: jenkins name: jenkins-service spec: + type: NodePort ports: - port: 8080 targetPort: 8080 + nodePort: 30006 selector: env: production tier: cicd @@ -27,9 +29,11 @@ metadata: app: jenkins name: jenkins-jnlp-service spec: + type: NodePort ports: - port: 50000 targetPort: 50000 + nodePort: 30007 selector: env: production tier: cicd diff --git a/k8s/environments/logging/elk/kibana/service.yaml b/k8s/environments/logging/elk/kibana/service.yaml index 429b205..20a608f 100644 --- a/k8s/environments/logging/elk/kibana/service.yaml +++ b/k8s/environments/logging/elk/kibana/service.yaml @@ -8,6 +8,7 @@ metadata: app: kibana name: kibana-service spec: + type: NodePort selector: env: production tier: backend @@ -16,4 +17,5 @@ spec: ports: - protocol: TCP port: 5601 - targetPort: 5601 \ No newline at end of file + targetPort: 5601 + nodePort: 30005 \ No newline at end of file diff --git a/k8s/environments/logging/elk/logstash/deplyment.yaml b/k8s/environments/logging/elk/logstash/deplyment.yaml index 56f3f03..481d42f 100644 --- a/k8s/environments/logging/elk/logstash/deplyment.yaml +++ b/k8s/environments/logging/elk/logstash/deplyment.yaml @@ -28,13 +28,6 @@ spec: image: docker.elastic.co/logstash/logstash:7.10.1 ports: - containerPort: 8088 - resources: - requests: - cpu: 300m - memory: 512Mi - limits: - cpu: 300m - memory: 512Mi volumeMounts: - name: logstash-config-volume mountPath: /usr/share/logstash/config diff --git a/k8s/environments/rabbitmq/service.yaml b/k8s/environments/rabbitmq/service.yaml index 85c926d..7784c4a 100644 --- a/k8s/environments/rabbitmq/service.yaml +++ b/k8s/environments/rabbitmq/service.yaml @@ -8,6 +8,7 @@ metadata: app: rabbitmq name: rabbitmq-service spec: + type: NodePort selector: env: production tier: backend @@ -18,7 +19,9 @@ spec: protocol: TCP port: 5672 targetPort: 5672 + nodePort: 30003 - name: http-15672 protocol: TCP port: 15672 - targetPort: 15672 \ No newline at end of file + targetPort: 15672 + nodePort: 30004 \ No newline at end of file diff --git a/k8s/environments/zipkin/service.yaml b/k8s/environments/zipkin/service.yaml index 4704bf9..dfdfeb4 100644 --- a/k8s/environments/zipkin/service.yaml +++ b/k8s/environments/zipkin/service.yaml @@ -8,6 +8,7 @@ metadata: app: zipkin name: zipkin-service spec: + type: NodePort selector: env: production tier: backend @@ -17,4 +18,5 @@ spec: - name: http-9411 protocol: TCP port: 9411 - targetPort: 9411 \ No newline at end of file + targetPort: 9411 + nodePort: 30008 \ No newline at end of file