diff --git a/backend/embed/api_docs/components/CertificateAuthorityObject.json b/backend/embed/api_docs/components/CertificateAuthorityObject.json
index a25cad4..7cd157f 100644
--- a/backend/embed/api_docs/components/CertificateAuthorityObject.json
+++ b/backend/embed/api_docs/components/CertificateAuthorityObject.json
@@ -4,8 +4,8 @@
"additionalProperties": false,
"required": [
"id",
- "created_on",
- "modified_on",
+ "created_at",
+ "updated_at",
"name",
"acmesh_server",
"ca_bundle",
@@ -18,13 +18,15 @@
"type": "integer",
"minimum": 1
},
- "created_on": {
+ "created_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Created Unix time with milliseconds"
},
- "modified_on": {
+ "updated_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Updated Unix time with milliseconds"
},
"name": {
"type": "string",
diff --git a/backend/embed/api_docs/components/CertificateObject.json b/backend/embed/api_docs/components/CertificateObject.json
index 1eb580d..1e6399c 100644
--- a/backend/embed/api_docs/components/CertificateObject.json
+++ b/backend/embed/api_docs/components/CertificateObject.json
@@ -4,8 +4,8 @@
"additionalProperties": false,
"required": [
"id",
- "created_on",
- "modified_on",
+ "created_at",
+ "updated_at",
"expires_on",
"type",
"user_id",
@@ -21,13 +21,15 @@
"type": "integer",
"minimum": 1
},
- "created_on": {
+ "created_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Created Unix time with milliseconds"
},
- "modified_on": {
+ "updated_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Updated Unix time with milliseconds"
},
"expires_on": {
"type": "integer",
diff --git a/backend/embed/api_docs/components/DNSProviderObject.json b/backend/embed/api_docs/components/DNSProviderObject.json
index 9ea739f..2e1f305 100644
--- a/backend/embed/api_docs/components/DNSProviderObject.json
+++ b/backend/embed/api_docs/components/DNSProviderObject.json
@@ -4,8 +4,8 @@
"additionalProperties": false,
"required": [
"id",
- "created_on",
- "modified_on",
+ "created_at",
+ "updated_at",
"user_id",
"name",
"acmesh_name",
@@ -17,13 +17,15 @@
"type": "integer",
"minimum": 1
},
- "created_on": {
+ "created_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Created Unix time with milliseconds"
},
- "modified_on": {
+ "updated_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Updated Unix time with milliseconds"
},
"user_id": {
"type": "integer",
diff --git a/backend/embed/api_docs/components/HostObject.json b/backend/embed/api_docs/components/HostObject.json
index b57d156..7ff87e5 100644
--- a/backend/embed/api_docs/components/HostObject.json
+++ b/backend/embed/api_docs/components/HostObject.json
@@ -4,8 +4,8 @@
"additionalProperties": false,
"required": [
"id",
- "created_on",
- "modified_on",
+ "created_at",
+ "updated_at",
"expires_on",
"user_id",
"provider",
@@ -17,13 +17,15 @@
"type": "integer",
"minimum": 1
},
- "created_on": {
+ "created_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Created Unix time with milliseconds"
},
- "modified_on": {
+ "updated_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Updated Unix time with milliseconds"
},
"expires_on": {
"type": "integer",
diff --git a/backend/embed/api_docs/components/NginxTemplateObject.json b/backend/embed/api_docs/components/NginxTemplateObject.json
index 5668660..9b6b3f8 100644
--- a/backend/embed/api_docs/components/NginxTemplateObject.json
+++ b/backend/embed/api_docs/components/NginxTemplateObject.json
@@ -4,8 +4,8 @@
"additionalProperties": false,
"required": [
"id",
- "created_on",
- "modified_on",
+ "created_at",
+ "updated_at",
"user_id",
"name",
"type",
@@ -16,13 +16,15 @@
"type": "integer",
"minimum": 1
},
- "created_on": {
+ "created_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Created Unix time with milliseconds"
},
- "modified_on": {
+ "updated_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Updated Unix time with milliseconds"
},
"user_id": {
"type": "integer",
diff --git a/backend/embed/api_docs/components/SettingObject.json b/backend/embed/api_docs/components/SettingObject.json
index 60aab61..6f151df 100644
--- a/backend/embed/api_docs/components/SettingObject.json
+++ b/backend/embed/api_docs/components/SettingObject.json
@@ -2,19 +2,21 @@
"type": "object",
"description": "SettingObject",
"additionalProperties": false,
- "required": ["id", "name", "value"],
+ "required": ["id", "created_at", "updated_at", "name", "value"],
"properties": {
"id": {
"type": "integer",
"minimum": 1
},
- "created_on": {
+ "created_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Created Unix time with milliseconds"
},
- "modified_on": {
+ "updated_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Updated Unix time with milliseconds"
},
"name": {
"type": "string",
diff --git a/backend/embed/api_docs/components/StreamObject.json b/backend/embed/api_docs/components/StreamObject.json
index 7141e86..9c87871 100644
--- a/backend/embed/api_docs/components/StreamObject.json
+++ b/backend/embed/api_docs/components/StreamObject.json
@@ -4,8 +4,8 @@
"additionalProperties": false,
"required": [
"id",
- "created_on",
- "modified_on",
+ "created_at",
+ "updated_at",
"expires_on",
"user_id",
"provider",
@@ -17,13 +17,15 @@
"type": "integer",
"minimum": 1
},
- "created_on": {
+ "created_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Created Unix time with milliseconds"
},
- "modified_on": {
+ "updated_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Updated Unix time with milliseconds"
},
"expires_on": {
"type": "integer",
diff --git a/backend/embed/api_docs/components/UpstreamObject.json b/backend/embed/api_docs/components/UpstreamObject.json
index 6f1fa35..5a64e18 100644
--- a/backend/embed/api_docs/components/UpstreamObject.json
+++ b/backend/embed/api_docs/components/UpstreamObject.json
@@ -4,8 +4,8 @@
"additionalProperties": false,
"required": [
"id",
- "created_on",
- "modified_on",
+ "created_at",
+ "updated_at",
"user_id",
"name",
"nginx_template_id",
@@ -25,13 +25,15 @@
"type": "integer",
"minimum": 1
},
- "created_on": {
+ "created_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Created Unix time with milliseconds"
},
- "modified_on": {
+ "updated_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Updated Unix time with milliseconds"
},
"user_id": {
"type": "integer",
@@ -83,8 +85,8 @@
"additionalProperties": false,
"required": [
"id",
- "created_on",
- "modified_on",
+ "created_at",
+ "updated_at",
"upstream_id",
"server",
"weight",
@@ -98,13 +100,15 @@
"type": "integer",
"minimum": 1
},
- "created_on": {
+ "created_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Created Unix time with milliseconds"
},
- "modified_on": {
+ "updated_at": {
"type": "integer",
- "minimum": 1
+ "minimum": 1,
+ "description": "Updated Unix time with milliseconds"
},
"upstream_id": {
"type": "integer",
diff --git a/backend/embed/api_docs/components/UserAuthObject.json b/backend/embed/api_docs/components/UserAuthObject.json
index b3ab4b4..d24e839 100644
--- a/backend/embed/api_docs/components/UserAuthObject.json
+++ b/backend/embed/api_docs/components/UserAuthObject.json
@@ -2,12 +2,22 @@
"type": "object",
"description": "UserAuthObject",
"additionalProperties": false,
- "required": ["id", "user_id", "type", "created_on", "modified_on"],
+ "required": ["id", "user_id", "type", "created_at", "updated_at"],
"properties": {
"id": {
"type": "integer",
"minimum": 1
},
+ "created_at": {
+ "type": "integer",
+ "minimum": 1,
+ "description": "Created Unix time with milliseconds"
+ },
+ "updated_at": {
+ "type": "integer",
+ "minimum": 1,
+ "description": "Updated Unix time with milliseconds"
+ },
"user_id": {
"type": "integer",
"minimum": 1
@@ -15,14 +25,6 @@
"type": {
"type": "string",
"pattern": "^password$"
- },
- "created_on": {
- "type": "integer",
- "minimum": 1
- },
- "modified_on": {
- "type": "integer",
- "minimum": 1
}
}
}
diff --git a/backend/embed/api_docs/components/UserObject.json b/backend/embed/api_docs/components/UserObject.json
index 997f01a..692fe90 100644
--- a/backend/embed/api_docs/components/UserObject.json
+++ b/backend/embed/api_docs/components/UserObject.json
@@ -4,11 +4,11 @@
"additionalProperties": false,
"required": [
"id",
+ "created_at",
+ "updated_at",
"name",
"nickname",
"email",
- "created_on",
- "modified_on",
"is_disabled"
],
"properties": {
@@ -16,6 +16,16 @@
"type": "integer",
"minimum": 1
},
+ "created_at": {
+ "type": "integer",
+ "minimum": 1,
+ "description": "Created Unix time with milliseconds"
+ },
+ "updated_at": {
+ "type": "integer",
+ "minimum": 1,
+ "description": "Updated Unix time with milliseconds"
+ },
"name": {
"type": "string",
"minLength": 2,
@@ -31,14 +41,6 @@
"minLength": 5,
"maxLength": 150
},
- "created_on": {
- "type": "integer",
- "minimum": 1
- },
- "modified_on": {
- "type": "integer",
- "minimum": 1
- },
"gravatar_url": {
"type": "string"
},
diff --git a/backend/embed/api_docs/paths/certificates-authorities/caID/get.json b/backend/embed/api_docs/paths/certificates-authorities/caID/get.json
index 6bd4d00..bfc22e4 100644
--- a/backend/embed/api_docs/paths/certificates-authorities/caID/get.json
+++ b/backend/embed/api_docs/paths/certificates-authorities/caID/get.json
@@ -33,8 +33,8 @@
"value": {
"result": {
"id": 1,
- "created_on": 1627531400,
- "modified_on": 1627531400,
+ "created_at": 1627531400000,
+ "updated_at": 1627531400000,
"name": "ZeroSSL",
"acmesh_server": "zerossl",
"ca_bundle": "",
diff --git a/backend/embed/api_docs/paths/certificates-authorities/caID/put.json b/backend/embed/api_docs/paths/certificates-authorities/caID/put.json
index 63199bc..37ddd59 100644
--- a/backend/embed/api_docs/paths/certificates-authorities/caID/put.json
+++ b/backend/embed/api_docs/paths/certificates-authorities/caID/put.json
@@ -42,8 +42,8 @@
"value": {
"result": {
"id": 1,
- "created_on": 1627531400,
- "modified_on": 1627531400,
+ "created_at": 1627531400000,
+ "updated_at": 1627531400000,
"name": "ZeroSSL",
"acmesh_server": "zerossl",
"ca_bundle": "",
diff --git a/backend/embed/api_docs/paths/certificates-authorities/get.json b/backend/embed/api_docs/paths/certificates-authorities/get.json
index 54138b7..ed04f17 100644
--- a/backend/embed/api_docs/paths/certificates-authorities/get.json
+++ b/backend/embed/api_docs/paths/certificates-authorities/get.json
@@ -60,8 +60,8 @@
"items": [
{
"id": 1,
- "created_on": 1627531400,
- "modified_on": 1627531400,
+ "created_at": 1627531400000,
+ "updated_at": 1627531400000,
"name": "ZeroSSL",
"acmesh_server": "zerossl",
"ca_bundle": "",
@@ -71,8 +71,8 @@
},
{
"id": 2,
- "created_on": 1627531400,
- "modified_on": 1627531400,
+ "created_at": 1627531400000,
+ "updated_at": 1627531400000,
"name": "Let's Encrypt",
"acmesh_server": "https://acme-v02.api.letsencrypt.org/directory",
"ca_bundle": "",
diff --git a/backend/embed/api_docs/paths/certificates-authorities/post.json b/backend/embed/api_docs/paths/certificates-authorities/post.json
index 93d1379..19b1488 100644
--- a/backend/embed/api_docs/paths/certificates-authorities/post.json
+++ b/backend/embed/api_docs/paths/certificates-authorities/post.json
@@ -29,8 +29,8 @@
"value": {
"result": {
"id": 1,
- "created_on": 1627531400,
- "modified_on": 1627531400,
+ "created_at": 1627531400000,
+ "updated_at": 1627531400000,
"name": "ZeroSSL",
"acmesh_server": "zerossl",
"ca_bundle": "",
diff --git a/backend/embed/api_docs/paths/certificates/certificateID/get.json b/backend/embed/api_docs/paths/certificates/certificateID/get.json
index e26988f..f537d1f 100644
--- a/backend/embed/api_docs/paths/certificates/certificateID/get.json
+++ b/backend/embed/api_docs/paths/certificates/certificateID/get.json
@@ -1,9 +1,7 @@
{
"operationId": "getCertificate",
"summary": "Get a certificate object by ID",
- "tags": [
- "Certificates"
- ],
+ "tags": ["Certificates"],
"parameters": [
{
"in": "path",
@@ -23,9 +21,7 @@
"content": {
"application/json": {
"schema": {
- "required": [
- "result"
- ],
+ "required": ["result"],
"properties": {
"result": {
"$ref": "#/components/schemas/CertificateObject"
@@ -37,17 +33,15 @@
"value": {
"result": {
"id": 1,
- "created_on": 1604536109,
- "modified_on": 1604536109,
+ "created_at": 1604536109000,
+ "updated_at": 1604536109000,
"expires_on": null,
"type": "dns",
"user_id": 1,
"certificate_authority_id": 2,
"dns_provider_id": 1,
"name": "test1.jc21.com.au",
- "domain_names": [
- "test1.jc21.com.au"
- ],
+ "domain_names": ["test1.jc21.com.au"],
"is_ecc": 0,
"status": "ready"
}
@@ -58,4 +52,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/backend/embed/api_docs/paths/certificates/certificateID/put.json b/backend/embed/api_docs/paths/certificates/certificateID/put.json
index 3574d87..9a86d31 100644
--- a/backend/embed/api_docs/paths/certificates/certificateID/put.json
+++ b/backend/embed/api_docs/paths/certificates/certificateID/put.json
@@ -1,9 +1,7 @@
{
"operationId": "updateCertificate",
"summary": "Update an existing Certificate",
- "tags": [
- "Certificates"
- ],
+ "tags": ["Certificates"],
"parameters": [
{
"in": "path",
@@ -32,9 +30,7 @@
"content": {
"application/json": {
"schema": {
- "required": [
- "result"
- ],
+ "required": ["result"],
"properties": {
"result": {
"$ref": "#/components/schemas/CertificateObject"
@@ -46,17 +42,15 @@
"value": {
"result": {
"id": 1,
- "created_on": 1604536109,
- "modified_on": 1604536109,
+ "created_at": 1604536109000,
+ "updated_at": 1604536109000,
"expires_on": null,
"type": "dns",
"user_id": 1,
"certificate_authority_id": 2,
"dns_provider_id": 1,
"name": "test1.jc21.com.au",
- "domain_names": [
- "test1.jc21.com.au"
- ],
+ "domain_names": ["test1.jc21.com.au"],
"is_ecc": 0,
"status": "ready"
}
@@ -67,4 +61,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/backend/embed/api_docs/paths/certificates/get.json b/backend/embed/api_docs/paths/certificates/get.json
index d4cfcc7..4534c86 100644
--- a/backend/embed/api_docs/paths/certificates/get.json
+++ b/backend/embed/api_docs/paths/certificates/get.json
@@ -1,9 +1,7 @@
{
"operationId": "getCertificates",
"summary": "Get a list of certificates",
- "tags": [
- "Certificates"
- ],
+ "tags": ["Certificates"],
"parameters": [
{
"in": "query",
@@ -39,9 +37,7 @@
"content": {
"application/json": {
"schema": {
- "required": [
- "result"
- ],
+ "required": ["result"],
"properties": {
"result": {
"$ref": "#/components/schemas/CertificateList"
@@ -64,8 +60,8 @@
"items": [
{
"id": 1,
- "created_on": 1604536109,
- "modified_on": 1604536109,
+ "created_at": 1604536109000,
+ "updated_at": 1604536109000,
"expires_on": null,
"type": "dns",
"user_id": 1,
@@ -87,4 +83,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/backend/embed/api_docs/paths/certificates/post.json b/backend/embed/api_docs/paths/certificates/post.json
index 5a33227..1d8fa66 100644
--- a/backend/embed/api_docs/paths/certificates/post.json
+++ b/backend/embed/api_docs/paths/certificates/post.json
@@ -1,9 +1,7 @@
{
"operationId": "createCertificate",
"summary": "Create a new Certificate",
- "tags": [
- "Certificates"
- ],
+ "tags": ["Certificates"],
"requestBody": {
"description": "Certificate to create",
"required": true,
@@ -19,9 +17,7 @@
"content": {
"application/json": {
"schema": {
- "required": [
- "result"
- ],
+ "required": ["result"],
"properties": {
"result": {
"$ref": "#/components/schemas/CertificateObject"
@@ -33,17 +29,15 @@
"value": {
"result": {
"id": 1,
- "created_on": 1604536109,
- "modified_on": 1604536109,
+ "created_at": 1604536109000,
+ "updated_at": 1604536109000,
"expires_on": null,
"type": "dns",
"user_id": 1,
"certificate_authority_id": 2,
"dns_provider_id": 1,
"name": "test1.jc21.com.au",
- "domain_names": [
- "test1.jc21.com.au"
- ],
+ "domain_names": ["test1.jc21.com.au"],
"is_ecc": 0,
"status": "ready"
}
@@ -54,4 +48,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/backend/embed/api_docs/paths/dns-providers/get.json b/backend/embed/api_docs/paths/dns-providers/get.json
index cb7aac8..fff27f0 100644
--- a/backend/embed/api_docs/paths/dns-providers/get.json
+++ b/backend/embed/api_docs/paths/dns-providers/get.json
@@ -60,8 +60,8 @@
"items": [
{
"id": 1,
- "created_on": 1602593653,
- "modified_on": 1602593653,
+ "created_at": 1602593653000,
+ "updated_at": 1602593653000,
"user_id": 1,
"name": "Route53",
"acmesh_name": "dns_aws",
diff --git a/backend/embed/api_docs/paths/dns-providers/post.json b/backend/embed/api_docs/paths/dns-providers/post.json
index a37d9cd..f653f8c 100644
--- a/backend/embed/api_docs/paths/dns-providers/post.json
+++ b/backend/embed/api_docs/paths/dns-providers/post.json
@@ -29,8 +29,8 @@
"value": {
"result": {
"id": 1,
- "created_on": 1602593653,
- "modified_on": 1602593653,
+ "created_at": 1602593653000,
+ "updated_at": 1602593653000,
"user_id": 1,
"name": "Route53",
"acmesh_name": "dns_aws",
diff --git a/backend/embed/api_docs/paths/dns-providers/providerID/get.json b/backend/embed/api_docs/paths/dns-providers/providerID/get.json
index eff1a36..b4e16a2 100644
--- a/backend/embed/api_docs/paths/dns-providers/providerID/get.json
+++ b/backend/embed/api_docs/paths/dns-providers/providerID/get.json
@@ -33,8 +33,8 @@
"value": {
"result": {
"id": 1,
- "created_on": 1602593653,
- "modified_on": 1602593653,
+ "created_at": 1602593653000,
+ "updated_at": 1602593653000,
"user_id": 1,
"name": "Route53",
"acmesh_name": "dns_aws",
diff --git a/backend/embed/api_docs/paths/dns-providers/providerID/put.json b/backend/embed/api_docs/paths/dns-providers/providerID/put.json
index f90d9ef..c53003d 100644
--- a/backend/embed/api_docs/paths/dns-providers/providerID/put.json
+++ b/backend/embed/api_docs/paths/dns-providers/providerID/put.json
@@ -43,8 +43,8 @@
"result": {
"result": {
"id": 1,
- "created_on": 1602593653,
- "modified_on": 1602593653,
+ "created_at": 1602593653000,
+ "updated_at": 1602593653000,
"user_id": 1,
"name": "Route53",
"acmesh_name": "dns_aws",
diff --git a/backend/embed/api_docs/paths/hosts/get.json b/backend/embed/api_docs/paths/hosts/get.json
index a8683c7..626a9bc 100644
--- a/backend/embed/api_docs/paths/hosts/get.json
+++ b/backend/embed/api_docs/paths/hosts/get.json
@@ -60,8 +60,8 @@
"items": [
{
"id": 1,
- "created_on": 1646279455,
- "modified_on": 1646279455,
+ "created_at": 1646279455000,
+ "updated_at": 1646279455000,
"user_id": 2,
"type": "proxy",
"nginx_template_id": 1,
diff --git a/backend/embed/api_docs/paths/hosts/hostID/get.json b/backend/embed/api_docs/paths/hosts/hostID/get.json
index 090fdce..012bcd0 100644
--- a/backend/embed/api_docs/paths/hosts/hostID/get.json
+++ b/backend/embed/api_docs/paths/hosts/hostID/get.json
@@ -33,8 +33,8 @@
"value": {
"result": {
"id": 1,
- "created_on": 1646279455,
- "modified_on": 1646279455,
+ "created_at": 1646279455000,
+ "updated_at": 1646279455000,
"user_id": 2,
"type": "proxy",
"nginx_template_id": 1,
diff --git a/backend/embed/api_docs/paths/hosts/hostID/put.json b/backend/embed/api_docs/paths/hosts/hostID/put.json
index f1d38f9..a0bbfb3 100644
--- a/backend/embed/api_docs/paths/hosts/hostID/put.json
+++ b/backend/embed/api_docs/paths/hosts/hostID/put.json
@@ -42,8 +42,8 @@
"value": {
"result": {
"id": 1,
- "created_on": 1646279455,
- "modified_on": 1646279455,
+ "created_at": 1646279455000,
+ "updated_at": 1646279455000,
"user_id": 2,
"type": "proxy",
"nginx_template_id": 1,
diff --git a/backend/embed/api_docs/paths/hosts/post.json b/backend/embed/api_docs/paths/hosts/post.json
index da5dcd9..655c6bd 100644
--- a/backend/embed/api_docs/paths/hosts/post.json
+++ b/backend/embed/api_docs/paths/hosts/post.json
@@ -29,8 +29,8 @@
"value": {
"result": {
"id": 1,
- "created_on": 1645700556,
- "modified_on": 1645700556,
+ "created_at": 1645700556000,
+ "updated_at": 1645700556000,
"user_id": 2,
"type": "proxy",
"nginx_template_id": 1,
diff --git a/backend/embed/api_docs/paths/nginx-templates/get.json b/backend/embed/api_docs/paths/nginx-templates/get.json
index c242024..59adbdf 100644
--- a/backend/embed/api_docs/paths/nginx-templates/get.json
+++ b/backend/embed/api_docs/paths/nginx-templates/get.json
@@ -53,15 +53,15 @@
"limit": 10,
"sort": [
{
- "field": "created_on",
+ "field": "created_at",
"direction": "ASC"
}
],
"items": [
{
"id": 1,
- "created_on": 1646218093,
- "modified_on": 1646218093,
+ "created_at": 1646218093000,
+ "updated_at": 1646218093000,
"user_id": 1,
"name": "Default Proxy Template",
"type": "proxy",
diff --git a/backend/embed/api_docs/paths/nginx-templates/post.json b/backend/embed/api_docs/paths/nginx-templates/post.json
index 470ad39..c3d37a0 100644
--- a/backend/embed/api_docs/paths/nginx-templates/post.json
+++ b/backend/embed/api_docs/paths/nginx-templates/post.json
@@ -29,8 +29,8 @@
"value": {
"result": {
"id": 10,
- "created_on": 1646218093,
- "modified_on": 1646218093,
+ "created_at": 1646218093000,
+ "updated_at": 1646218093000,
"user_id": 1,
"name": "My proxy template",
"type": "proxy",
diff --git a/backend/embed/api_docs/paths/nginx-templates/templateID/get.json b/backend/embed/api_docs/paths/nginx-templates/templateID/get.json
index 01808aa..d783ad7 100644
--- a/backend/embed/api_docs/paths/nginx-templates/templateID/get.json
+++ b/backend/embed/api_docs/paths/nginx-templates/templateID/get.json
@@ -33,8 +33,8 @@
"value": {
"result": {
"id": 1,
- "created_on": 1646218093,
- "modified_on": 1646218093,
+ "created_at": 1646218093000,
+ "updated_at": 1646218093000,
"user_id": 1,
"name": "Default Proxy Template",
"type": "proxy",
diff --git a/backend/embed/api_docs/paths/nginx-templates/templateID/put.json b/backend/embed/api_docs/paths/nginx-templates/templateID/put.json
index 31d6647..a2ec376 100644
--- a/backend/embed/api_docs/paths/nginx-templates/templateID/put.json
+++ b/backend/embed/api_docs/paths/nginx-templates/templateID/put.json
@@ -42,8 +42,8 @@
"value": {
"result": {
"id": 1,
- "created_on": 1646218093,
- "modified_on": 1646218093,
+ "created_at": 1646218093000,
+ "updated_at": 1646218093000,
"user_id": 1,
"name": "My renamed proxy template",
"type": "proxy",
diff --git a/backend/embed/api_docs/paths/settings/get.json b/backend/embed/api_docs/paths/settings/get.json
index 3455b0f..fdfb802 100644
--- a/backend/embed/api_docs/paths/settings/get.json
+++ b/backend/embed/api_docs/paths/settings/get.json
@@ -1,9 +1,7 @@
{
"operationId": "getSettings",
"summary": "Get a list of settings",
- "tags": [
- "Settings"
- ],
+ "tags": ["Settings"],
"parameters": [
{
"in": "query",
@@ -39,9 +37,7 @@
"content": {
"application/json": {
"schema": {
- "required": [
- "result"
- ],
+ "required": ["result"],
"properties": {
"result": {
"$ref": "#/components/schemas/SettingList"
@@ -64,8 +60,8 @@
"items": [
{
"id": 1,
- "created_on": 1578010090,
- "modified_on": 1578010095,
+ "created_at": 1578010090000,
+ "updated_at": 1578010095000,
"name": "default-site",
"value": {
"html": "not found
",
@@ -81,4 +77,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/backend/embed/api_docs/paths/settings/name/get.json b/backend/embed/api_docs/paths/settings/name/get.json
index 775a473..e35e936 100644
--- a/backend/embed/api_docs/paths/settings/name/get.json
+++ b/backend/embed/api_docs/paths/settings/name/get.json
@@ -1,9 +1,7 @@
{
"operationId": "getSetting",
"summary": "Get a setting object by name",
- "tags": [
- "Settings"
- ],
+ "tags": ["Settings"],
"parameters": [
{
"in": "path",
@@ -23,9 +21,7 @@
"content": {
"application/json": {
"schema": {
- "required": [
- "result"
- ],
+ "required": ["result"],
"properties": {
"result": {
"$ref": "#/components/schemas/SettingObject"
@@ -37,8 +33,8 @@
"value": {
"result": {
"id": 2,
- "created_on": 1578010090,
- "modified_on": 1578010095,
+ "created_at": 1578010090000,
+ "updated_at": 1578010095000,
"name": "default-site",
"value": {
"html": "not found
",
@@ -52,4 +48,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/backend/embed/api_docs/paths/settings/name/put.json b/backend/embed/api_docs/paths/settings/name/put.json
index ee74110..a386856 100644
--- a/backend/embed/api_docs/paths/settings/name/put.json
+++ b/backend/embed/api_docs/paths/settings/name/put.json
@@ -1,9 +1,7 @@
{
"operationId": "updateSetting",
"summary": "Update an existing Setting",
- "tags": [
- "Settings"
- ],
+ "tags": ["Settings"],
"parameters": [
{
"in": "path",
@@ -32,9 +30,7 @@
"content": {
"application/json": {
"schema": {
- "required": [
- "result"
- ],
+ "required": ["result"],
"properties": {
"result": {
"$ref": "#/components/schemas/SettingObject"
@@ -46,8 +42,8 @@
"value": {
"result": {
"id": 2,
- "created_on": 1578010090,
- "modified_on": 1578010090,
+ "created_at": 1578010090000,
+ "updated_at": 1578010090000,
"name": "default-site",
"value": {
"html": "not found
",
@@ -61,4 +57,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/backend/embed/api_docs/paths/settings/post.json b/backend/embed/api_docs/paths/settings/post.json
index 63921da..09d414e 100644
--- a/backend/embed/api_docs/paths/settings/post.json
+++ b/backend/embed/api_docs/paths/settings/post.json
@@ -1,9 +1,7 @@
{
"operationId": "createSetting",
"summary": "Create a new Setting",
- "tags": [
- "Settings"
- ],
+ "tags": ["Settings"],
"requestBody": {
"description": "Setting to Create",
"required": true,
@@ -19,9 +17,7 @@
"content": {
"application/json": {
"schema": {
- "required": [
- "result"
- ],
+ "required": ["result"],
"properties": {
"result": {
"$ref": "#/components/schemas/SettingObject"
@@ -33,8 +29,8 @@
"value": {
"result": {
"id": 2,
- "created_on": 1578010090,
- "modified_on": 1578010090,
+ "created_at": 1578010090000,
+ "updated_at": 1578010090000,
"name": "default-site",
"value": {
"html": "not found
",
@@ -48,4 +44,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/backend/embed/api_docs/paths/upstreams/get.json b/backend/embed/api_docs/paths/upstreams/get.json
index e52d7a9..1067d26 100644
--- a/backend/embed/api_docs/paths/upstreams/get.json
+++ b/backend/embed/api_docs/paths/upstreams/get.json
@@ -60,8 +60,8 @@
"items": [
{
"id": 1,
- "created_on": 1672804124,
- "modified_on": 1672804124,
+ "created_at": 1672804124000,
+ "updated_at": 1672804124000,
"user_id": 2,
"name": "API servers",
"nginx_template_id": 5,
@@ -77,8 +77,8 @@
"servers": [
{
"id": 1,
- "created_on": 1672804124,
- "modified_on": 1672804124,
+ "created_at": 1672804124000,
+ "updated_at": 1672804124000,
"upstream_group_id": 1,
"server": "192.168.0.10:80",
"weight": 100,
@@ -89,8 +89,8 @@
},
{
"id": 2,
- "created_on": 1672804124,
- "modified_on": 1672804124,
+ "created_at": 1672804124000,
+ "updated_at": 1672804124000,
"upstream_group_id": 1,
"server": "192.168.0.11:80",
"weight": 50,
@@ -103,8 +103,8 @@
},
{
"id": 2,
- "created_on": 1672804197,
- "modified_on": 1672804197,
+ "created_at": 1672804197000,
+ "updated_at": 1672804197000,
"user_id": 2,
"name": "API servers 2",
"nginx_template_id": 5,
@@ -120,8 +120,8 @@
"servers": [
{
"id": 3,
- "created_on": 1672804197,
- "modified_on": 1672804197,
+ "created_at": 1672804197000,
+ "updated_at": 1672804197000,
"upstream_group_id": 2,
"server": "192.168.0.10:80",
"weight": 100,
@@ -132,8 +132,8 @@
},
{
"id": 4,
- "created_on": 1672804197,
- "modified_on": 1672804197,
+ "created_at": 1672804197000,
+ "updated_at": 1672804197000,
"upstream_group_id": 2,
"server": "192.168.0.11:80",
"weight": 50,
@@ -146,8 +146,8 @@
},
{
"id": 3,
- "created_on": 1672804200,
- "modified_on": 1672804200,
+ "created_at": 1672804200000,
+ "updated_at": 1672804200000,
"user_id": 2,
"name": "API servers 2",
"nginx_template_id": 5,
@@ -163,8 +163,8 @@
"servers": [
{
"id": 5,
- "created_on": 1672804200,
- "modified_on": 1672804200,
+ "created_at": 1672804200000,
+ "updated_at": 1672804200000,
"upstream_group_id": 3,
"server": "192.168.0.10:80",
"weight": 100,
@@ -175,8 +175,8 @@
},
{
"id": 6,
- "created_on": 1672804200,
- "modified_on": 1672804200,
+ "created_at": 1672804200000,
+ "updated_at": 1672804200000,
"upstream_group_id": 3,
"server": "192.168.0.11:80",
"weight": 50,
@@ -189,8 +189,8 @@
},
{
"id": 4,
- "created_on": 1672804201,
- "modified_on": 1672804201,
+ "created_at": 1672804201000,
+ "updated_at": 1672804201000,
"user_id": 2,
"name": "API servers 2",
"nginx_template_id": 5,
@@ -206,8 +206,8 @@
"servers": [
{
"id": 7,
- "created_on": 1672804201,
- "modified_on": 1672804201,
+ "created_at": 1672804201000,
+ "updated_at": 1672804201000,
"upstream_group_id": 4,
"server": "192.168.0.10:80",
"weight": 100,
@@ -218,8 +218,8 @@
},
{
"id": 8,
- "created_on": 1672804201,
- "modified_on": 1672804201,
+ "created_at": 1672804201000,
+ "updated_at": 1672804201000,
"upstream_group_id": 4,
"server": "192.168.0.11:80",
"weight": 50,
@@ -232,8 +232,8 @@
},
{
"id": 5,
- "created_on": 1672804201,
- "modified_on": 1672804201,
+ "created_at": 1672804201000,
+ "updated_at": 1672804201000,
"user_id": 2,
"name": "API servers 2",
"nginx_template_id": 5,
@@ -249,8 +249,8 @@
"servers": [
{
"id": 9,
- "created_on": 1672804201,
- "modified_on": 1672804201,
+ "created_at": 1672804201000,
+ "updated_at": 1672804201000,
"upstream_group_id": 5,
"server": "192.168.0.10:80",
"weight": 100,
@@ -261,8 +261,8 @@
},
{
"id": 10,
- "created_on": 1672804201,
- "modified_on": 1672804201,
+ "created_at": 1672804201000,
+ "updated_at": 1672804201000,
"upstream_group_id": 5,
"server": "192.168.0.11:80",
"weight": 50,
diff --git a/backend/embed/api_docs/paths/upstreams/post.json b/backend/embed/api_docs/paths/upstreams/post.json
index 8bab6d3..d4f588c 100644
--- a/backend/embed/api_docs/paths/upstreams/post.json
+++ b/backend/embed/api_docs/paths/upstreams/post.json
@@ -29,8 +29,8 @@
"value": {
"result": {
"id": 6,
- "created_on": 1672806857,
- "modified_on": 1672806857,
+ "created_at": 1672806857000,
+ "updated_at": 1672806857000,
"user_id": 2,
"name": "API servers 2",
"nginx_template_id": 5,
@@ -46,8 +46,8 @@
"servers": [
{
"id": 11,
- "created_on": 1672806857,
- "modified_on": 1672806857,
+ "created_at": 1672806857000,
+ "updated_at": 1672806857000,
"upstream_id": 6,
"server": "192.168.0.10:80",
"weight": 100,
@@ -58,8 +58,8 @@
},
{
"id": 12,
- "created_on": 1672806857,
- "modified_on": 1672806857,
+ "created_at": 1672806857000,
+ "updated_at": 1672806857000,
"upstream_id": 6,
"server": "192.168.0.11:80",
"weight": 50,
diff --git a/backend/embed/api_docs/paths/upstreams/upstreamID/get.json b/backend/embed/api_docs/paths/upstreams/upstreamID/get.json
index 8303b2c..4d283a6 100644
--- a/backend/embed/api_docs/paths/upstreams/upstreamID/get.json
+++ b/backend/embed/api_docs/paths/upstreams/upstreamID/get.json
@@ -33,8 +33,8 @@
"value": {
"result": {
"id": 1,
- "created_on": 1672786008,
- "modified_on": 1672786008,
+ "created_at": 1672786008000,
+ "updated_at": 1672786008000,
"user_id": 2,
"name": "API servers 3",
"ip_hash": true,
@@ -47,8 +47,8 @@
"servers": [
{
"id": 1,
- "created_on": 1672786009,
- "modified_on": 1672786009,
+ "created_at": 1672786009000,
+ "updated_at": 1672786009000,
"upstream_id": 1,
"server": "api1.localhost:1234",
"weight": 100,
@@ -59,8 +59,8 @@
},
{
"id": 2,
- "created_on": 1672786009,
- "modified_on": 1672786009,
+ "created_at": 1672786009000,
+ "updated_at": 1672786009000,
"upstream_id": 1,
"server": "api2.localhost:1234",
"weight": 50,
diff --git a/backend/embed/api_docs/paths/upstreams/upstreamID/put.json b/backend/embed/api_docs/paths/upstreams/upstreamID/put.json
index 7c324e1..78c9d34 100644
--- a/backend/embed/api_docs/paths/upstreams/upstreamID/put.json
+++ b/backend/embed/api_docs/paths/upstreams/upstreamID/put.json
@@ -42,8 +42,8 @@
"value": {
"result": {
"id": 1,
- "created_on": 1673234177,
- "modified_on": 1673244559,
+ "created_at": 1673234177000,
+ "updated_at": 1673244559000,
"user_id": 2,
"name": "API servers 2",
"nginx_template_id": 5,
@@ -59,8 +59,8 @@
"servers": [
{
"id": 1,
- "created_on": 1673234177,
- "modified_on": 1673244559,
+ "created_at": 1673234177000,
+ "updated_at": 1673244559000,
"upstream_id": 1,
"server": "192.168.0.10:80",
"weight": 100,
@@ -71,8 +71,8 @@
},
{
"id": 2,
- "created_on": 1673234177,
- "modified_on": 1673244559,
+ "created_at": 1673234177000,
+ "updated_at": 1673244559000,
"upstream_id": 1,
"server": "192.168.0.11:80",
"weight": 50,
diff --git a/backend/embed/api_docs/paths/users/get.json b/backend/embed/api_docs/paths/users/get.json
index 647b6d5..987a7f8 100644
--- a/backend/embed/api_docs/paths/users/get.json
+++ b/backend/embed/api_docs/paths/users/get.json
@@ -71,8 +71,8 @@
"name": "Jamie Curnow",
"nickname": "James",
"email": "jc@jc21.com",
- "created_on": 1578010090,
- "modified_on": 1578010095,
+ "created_at": 1578010090000,
+ "updated_at": 1578010095000,
"gravatar_url": "https://www.gravatar.com/avatar/6193176330f8d38747f038c170ddb193?d=mm&r=pg&s=128",
"is_disabled": false,
"capabilities": ["full-admin"]
@@ -82,8 +82,8 @@
"name": "John Doe",
"nickname": "John",
"email": "johdoe@example.com",
- "created_on": 1578010100,
- "modified_on": 1578010105,
+ "created_at": 1578010100000,
+ "updated_at": 1578010105000,
"gravatar_url": "https://www.gravatar.com/avatar/6193176330f8d38747f038c170ddb193?d=mm&r=pg&s=128",
"is_disabled": false,
"capabilities": [
@@ -96,8 +96,8 @@
"name": "Jane Doe",
"nickname": "Jane",
"email": "janedoe@example.com",
- "created_on": 1578010110,
- "modified_on": 1578010115,
+ "created_at": 1578010110000,
+ "updated_at": 1578010115000,
"gravatar_url": "https://www.gravatar.com/avatar/6193176330f8d38747f038c170ddb193?d=mm&r=pg&s=128",
"is_disabled": false,
"capabilities": [
diff --git a/backend/embed/api_docs/paths/users/post.json b/backend/embed/api_docs/paths/users/post.json
index 7305f18..dd165fa 100644
--- a/backend/embed/api_docs/paths/users/post.json
+++ b/backend/embed/api_docs/paths/users/post.json
@@ -32,8 +32,8 @@
"name": "Jamie Curnow",
"nickname": "James",
"email": "jc@jc21.com",
- "created_on": 1578010100,
- "modified_on": 1578010100,
+ "created_at": 1578010100000,
+ "updated_at": 1578010100000,
"gravatar_url": "https://www.gravatar.com/avatar/6193176330f8d38747f038c170ddb193?d=mm&r=pg&s=128",
"is_disabled": false,
"auth": {
diff --git a/backend/embed/api_docs/paths/users/userID/auth/post.json b/backend/embed/api_docs/paths/users/userID/auth/post.json
index a71432f..107943d 100644
--- a/backend/embed/api_docs/paths/users/userID/auth/post.json
+++ b/backend/embed/api_docs/paths/users/userID/auth/post.json
@@ -50,10 +50,10 @@
"value": {
"result": {
"id": 2,
+ "created_at": 1648422222000,
+ "updated_at": 1648423979000,
"user_id": 3,
- "type": "password",
- "created_on": 1648422222,
- "modified_on": 1648423979
+ "type": "password"
}
}
}
diff --git a/backend/embed/api_docs/paths/users/userID/get.json b/backend/embed/api_docs/paths/users/userID/get.json
index d5eebb0..bf10f84 100644
--- a/backend/embed/api_docs/paths/users/userID/get.json
+++ b/backend/embed/api_docs/paths/users/userID/get.json
@@ -44,8 +44,8 @@
"name": "Jamie Curnow",
"nickname": "James",
"email": "jc@jc21.com",
- "created_on": 1578010100,
- "modified_on": 1578010105,
+ "created_at": 1578010100000,
+ "updated_at": 1578010105000,
"gravatar_url": "https://www.gravatar.com/avatar/6193176330f8d38747f038c170ddb193?d=mm&r=pg&s=128",
"is_disabled": false,
"capabilities": ["full-admin"]
diff --git a/backend/embed/api_docs/paths/users/userID/put.json b/backend/embed/api_docs/paths/users/userID/put.json
index 33dccd5..752ba9e 100644
--- a/backend/embed/api_docs/paths/users/userID/put.json
+++ b/backend/embed/api_docs/paths/users/userID/put.json
@@ -53,8 +53,8 @@
"name": "Jamie Curnow",
"nickname": "James",
"email": "jc@jc21.com",
- "created_on": 1578010100,
- "modified_on": 1578010110,
+ "created_at": 1578010100000,
+ "updated_at": 1578010110000,
"gravatar_url": "https://www.gravatar.com/avatar/6193176330f8d38747f038c170ddb193?d=mm&r=pg&s=128",
"is_disabled": false,
"capabilities": ["full-admin"]
diff --git a/backend/internal/entity/auth/methods.go b/backend/internal/entity/auth/methods.go
index c711f30..e8c8835 100644
--- a/backend/internal/entity/auth/methods.go
+++ b/backend/internal/entity/auth/methods.go
@@ -21,67 +21,3 @@ func GetByUserIDType(userID uint, authType string) (Model, error) {
First(&auth)
return auth, result.Error
}
-
-/*
-// Create will create a Auth from this model
-func Create(auth *Model) (int, error) {
- if auth.ID != 0 {
- return 0, eris.New("Cannot create auth when model already has an ID")
- }
-
- auth.Touch(true)
-
- db := database.GetInstance()
- // nolint: gosec
- result, err := db.NamedExec(`INSERT INTO `+fmt.Sprintf("`%s`", tableName)+` (
- created_on,
- modified_on,
- user_id,
- type,
- secret,
- is_deleted
- ) VALUES (
- :created_on,
- :modified_on,
- :user_id,
- :type,
- :secret,
- :is_deleted
- )`, auth)
-
- if err != nil {
- return 0, err
- }
-
- last, lastErr := result.LastInsertId()
- if lastErr != nil {
- return 0, lastErr
- }
-
- return int(last), nil
-}
-*/
-
-/*
-// Update will Update a Auth from this model
-func Update(auth *Model) error {
- if auth.ID == 0 {
- return eris.New("Cannot update auth when model doesn't have an ID")
- }
-
- auth.Touch(false)
-
- db := database.GetInstance()
- // nolint: gosec
- _, err := db.NamedExec(`UPDATE `+fmt.Sprintf("`%s`", tableName)+` SET
- created_on = :created_on,
- modified_on = :modified_on,
- user_id = :user_id,
- type = :type,
- secret = :secret,
- is_deleted = :is_deleted
- WHERE id = :id`, auth)
-
- return err
-}
-*/
diff --git a/backend/internal/entity/nginxtemplate/methods.go b/backend/internal/entity/nginxtemplate/methods.go
index 58f48a2..c851bf5 100644
--- a/backend/internal/entity/nginxtemplate/methods.go
+++ b/backend/internal/entity/nginxtemplate/methods.go
@@ -17,7 +17,7 @@ func List(pageInfo model.PageInfo, filters []model.Filter) (entity.ListResponse,
var result entity.ListResponse
defaultSort := model.Sort{
- Field: "created_on",
+ Field: "created_at",
Direction: "ASC",
}