release -> develop merge (230731)

.gitignore

@@ -8,8 +8,9 @@
 *.njsproj
 *.sln
 *.sw?
+*.sh
 
 web
 main
 output
-vendor
+vendor

api/swagger/docs.go

@@ -2596,12 +2596,9 @@ const docTemplate = `{
                         "in": "query"
                     },
                     {
-                        "type": "array",
-                        "items": {
-                            "type": "string"
-                        },
-                        "description": "filters",
-                        "name": "filters",
+                        "type": "string",
+                        "description": "combinedFilter",
+                        "name": "combinedFilter",
                         "in": "query"
                     }
                 ],
@@ -3908,6 +3905,12 @@ const docTemplate = `{
         "domain.ChartData": {
             "type": "object",
             "properties": {
+                "podCounts": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/domain.PodCount"
+                    }
+                },
                 "series": {
                     "type": "array",
                     "items": {
@@ -4768,8 +4771,11 @@ const docTemplate = `{
                 "column": {
                     "type": "string"
                 },
-                "value": {
-                    "type": "string"
+                "values": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
                 }
             }
         },
@@ -5357,6 +5363,17 @@ const docTemplate = `{
                 }
             }
         },
+        "domain.PodCount": {
+            "type": "object",
+            "properties": {
+                "day": {
+                    "type": "integer"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            }
+        },
         "domain.Role": {
             "type": "object",
             "properties": {

api/swagger/swagger.json

@@ -2589,12 +2589,9 @@
                         "in": "query"
                     },
                     {
-                        "type": "array",
-                        "items": {
-                            "type": "string"
-                        },
-                        "description": "filters",
-                        "name": "filters",
+                        "type": "string",
+                        "description": "combinedFilter",
+                        "name": "combinedFilter",
                         "in": "query"
                     }
                 ],
@@ -3901,6 +3898,12 @@
         "domain.ChartData": {
             "type": "object",
             "properties": {
+                "podCounts": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/domain.PodCount"
+                    }
+                },
                 "series": {
                     "type": "array",
                     "items": {
@@ -4761,8 +4764,11 @@
                 "column": {
                     "type": "string"
                 },
-                "value": {
-                    "type": "string"
+                "values": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
                 }
             }
         },
@@ -5350,6 +5356,17 @@
                 }
             }
         },
+        "domain.PodCount": {
+            "type": "object",
+            "properties": {
+                "day": {
+                    "type": "integer"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            }
+        },
         "domain.Role": {
             "type": "object",
             "properties": {

api/swagger/swagger.yaml

@@ -251,6 +251,10 @@ definitions:
     type: object
   domain.ChartData:
     properties:
+      podCounts:
+        items:
+          $ref: '#/definitions/domain.PodCount'
+        type: array
       series:
         items:
           $ref: '#/definitions/domain.Unit'
@@ -832,8 +836,10 @@ definitions:
     properties:
       column:
         type: string
-      value:
-        type: string
+      values:
+        items:
+          type: string
+        type: array
     type: object
   domain.FindIdRequest:
     properties:
@@ -1215,6 +1221,13 @@ definitions:
       totalRows:
         type: integer
     type: object
+  domain.PodCount:
+    properties:
+      day:
+        type: integer
+      value:
+        type: integer
+    type: object
   domain.Role:
     properties:
       createdAt:
@@ -3393,12 +3406,10 @@ paths:
         in: query
         name: sortOrder
         type: string
-      - description: filters
+      - description: combinedFilter
         in: query
-        items:
-          type: string
-        name: filters
-        type: array
+        name: combinedFilter
+        type: string
       produces:
       - application/json
       responses:

internal/aws/ses/contents/authcode.html

@@ -0,0 +1,107 @@
+<!DOCTYPE html><html lang="ko"><head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>이메일인증 안내</title>
+</head>
+<body style="margin:0;padding:0">
+<!-- 이메일 영역 -->
+<div style="max-width:720px;margin:0 auto">
+    <table cellspacing="0" cellpadding="0" width="720" border="0">
+        <tr>
+            <td colspan="3"><img src="https://s3-enterp-prd-an2-static.s3.ap-northeast-2.amazonaws.com/email/img_mail_header.png" alt="SKT Enterprise" valign="top" width="720" height="96"></td>
+        </tr>
+        <tr>
+            <td height="56" colspan="3"></td>
+        </tr>
+        <tr>
+            <td width="24"></td>
+            <td>
+                <table cellspacing="0" cellpadding="0" width="672" border="0">
+                    <tr>
+                        <td colspan="3">
+                            <strong style="letter-spacing:-0.02em;font-size:33px;font-family: Malgun Gothic, '맑은고딕';color:#00a892;">이메일 인증 안내</strong>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td height="23" colspan="3"></td>
+                    </tr>
+                    <tr>
+                        <td style="letter-spacing:-0.02em;font-size:17px;color:#666;line-height:1.59;font-family: Malgun Gothic, '맑은고딕';" colspan="3">안녕하세요. <br>항상 저희 TKS Cloud Service를 사랑해 주시고 성원해 주시는 고객님께 감사드립니다.</td>
+                    </tr>
+                    <tr>
+                        <td height="24" colspan="3"></td>
+                    </tr>
+                    <tr>
+                        <td style="letter-spacing:-0.02em;font-size:17px;color:#666;line-height:1.59;font-family: Malgun Gothic, '맑은고딕';" colspan="3">
+                            고객님께서 입력하신 이메일 주소 인증을 위해 아래 6자리 인증번호를
+                            <br>화면에 입력해 주세요.</td>
+                    </tr>
+                    <tr>
+                        <td height="60" colspan="3"></td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" style="font-family: Malgun Gothic, '맑은고딕';letter-spacing:-0.02em;font-size:21px;font-weight:bold;color:#000;line-height:1.29;">이메일 인증코드</td>
+                    </tr>
+                    <tr>
+                        <td height="15" colspan="3"></td>
+                    </tr>
+                    <tr>
+                        <td height="111" bgcolor="#f7f9fa" style="font-family: Malgun Gothic, '맑은고딕';letter-spacing:-0.02em;font-size:33px;font-weight:bold;color:#000; text-align:center" valign="middle">{{.AuthCode}}</td>
+                    </tr>
+                    <tr>
+                        <td height="40" colspan="3" style="border-bottom:1px solid #ddd"></td>
+                    </tr>
+                    <tr>
+                        <td height="24" colspan="3"></td>
+                    </tr>
+                    <tr>
+                        <td colspan="3" style="font-family: Malgun Gothic, '맑은고딕';letter-spacing:-0.02em;font-size:17px;color:#666;line-height:1.59;">더욱 편리한 서비스를 제공하기 위해 항상 최선을 다하겠습니다. <br>감사합니다.</td>
+                    </tr>
+                    <tr>
+                        <td height="60" colspan="3"></td>
+                    </tr>
+                </table>
+            </td>
+            <td width="24"></td>
+        </tr>
+        <tr style="background:#f8f8f8;">
+            <td colspan="3">
+                <table cellspacing="0" cellpadding="0" width="720" border="0">
+                    <tr>
+                        <td width="32" height="20"></td>
+                        <td width="656" height="20" colspan="2"></td>
+                        <td width="32" height="20"></td>
+                    </tr>
+                    <tr>
+                        <td width="32"></td>
+                        <td style="font-family: Malgun Gothic, '맑은고딕', sans-serif;letter-spacing:-0.02em;font-size:15px;color:#666;line-height:1.67;padding-top:20px;">본 메일은 발신 전용 메일로, 회신 되지 않습니다.</td>
+                        <td align="right"><img src="https://s3-enterp-prd-an2-static.s3.ap-northeast-2.amazonaws.com/email/email_footer_logo.png" alt="" width="96" height="38"></td>
+                        <td width="32"></td>
+                    </tr>
+                    <tr>
+                        <td width="32" height="20"></td>
+                        <td width="656" height="20" colspan="2" style="border-bottom:1px solid #eee"></td>
+                        <td width="32" height="20"></td>
+                    </tr>
+                    <tr>
+                        <td height="20" colspan="4"></td>
+                    </tr>
+                    <tr>
+                        <td width="32"></td>
+                        <td colspan="2" style="font-family: Malgun Gothic, '맑은고딕', sans-serif;letter-spacing:-0.02em;font-size:15px;color:#666;line-height:1.67">우편번호: 04539 서울특별시중구을지로65 (을지로2가) SK T-타워 SK텔레콤㈜ <span style="display:inline-block;width:1px;height:14px;background:#ccc;position:relative;top:1px;margin:0 4px"></span> 대표이사 : 유영상<br>COPYRIGHT SK TELECOM CO., LTD. ALL RIGHTS RESERVED.</td>
+                        <td width="32"></td>
+                    </tr>
+                    <tr>
+                        <td width="32" height="40"></td>
+                        <td width="656" height="40" colspan="2"></td>
+                        <td width="32" height="40"></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+</div>
+<!-- // 이메일 영역 -->
+</body>
+</html>