Merge branch 'main' of github.com:eGovFramework/egovframe-msa-edu

2021-12-30 22:06:49 +09:00
parent 90f0777802 21e357c78e
commit 8050a9aa9e
16 changed files with 44 additions and 47 deletions
--- 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;

    /**
--- 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`),
--- 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`),
--- 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
--- 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
--- 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
+            failureThreshold: 3
--- 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
+            failureThreshold: 3
--- 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
+            failureThreshold: 3
--- 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
+            failureThreshold: 3
--- 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
--- 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
--- 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
--- 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
+    targetPort: 5601
+    nodePort: 30005
--- 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
--- 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
+      targetPort: 15672
+      nodePort: 30004
--- 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
+      targetPort: 9411
+      nodePort: 30008