Fix typos

anyshake · Nov 29, 2023 · 0b82716 · 0b82716
1 parent 131743e
commit 0b82716
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 15 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v2.2.0p
+v2.2.1p
diff --git a/build/assets/config.json b/build/assets/config.json
@@ -40,7 +40,7 @@
     },
     "archiver_settings": {
         "enable": false,
-        "engine": "posgresql",
+        "engine": "postgresql",
         "host": "127.0.0.1",
         "port": 5432,
         "username": "postgres",

diff --git a/driver/dao/engine.go b/driver/dao/engine.go
@@ -2,7 +2,6 @@ package dao
 
 import (
 	"fmt"
-	"net/url"
 
 	"gorm.io/driver/mysql"
 	"gorm.io/driver/postgres"
@@ -20,8 +19,8 @@ func (p *PostgreSQL) isCompatible(engine string) bool {
 
 func (p *PostgreSQL) openDBConn(host string, port int, username, password, database string) (*gorm.DB, error) {
 	dsn := fmt.Sprintf(
-		"host=%s port=%d user=%s password=%s dbname=%s sslmode=disable connect_timeout=%d TimeZone=%s",
-		host, port, username, password, database, int(DB_TIMEOUT.Seconds()), DB_TIMEZONE,
+		"host=%s port=%d user=%s password=%s dbname=%s sslmode=disable connect_timeout=%d TimeZone=Etc/GMT",
+		host, port, username, password, database, int(DB_TIMEOUT.Seconds()),
 	)
 	db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{
 		Logger:                 logger.Default.LogMode(logger.Silent),
@@ -46,9 +45,9 @@ func (m *MariaDB) isCompatible(engine string) bool {
 
 func (m *MariaDB) openDBConn(host string, port int, username, password, database string) (*gorm.DB, error) {
 	dsn := fmt.Sprintf(
-		"%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&timeout=%ds&loc=%s",
+		"%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&timeout=%ds&loc=UTC",
 		username, password, host, port, database,
-		int(DB_TIMEOUT.Seconds()), url.QueryEscape(DB_TIMEZONE),
+		int(DB_TIMEOUT.Seconds()),
 	)
 	return gorm.Open(mysql.Open(dsn), &gorm.Config{
 		Logger:                 logger.Default.LogMode(logger.Silent),

diff --git a/driver/dao/types.go b/driver/dao/types.go
@@ -8,7 +8,6 @@ import (
 )
 
 const (
-	DB_TIMEZONE  = "Etc/GMT"
 	DB_TIMEOUT   = 5 * time.Second
 	DB_TABLENAME = "geophone_records"
 )

diff --git a/frontend/dist/asset-manifest.json b/frontend/dist/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/static/css/main.3d547ccc.css",
-    "main.js": "/static/js/main.73398af9.js",
+    "main.js": "/static/js/main.d5698ba2.js",
     "static/css/278.525e2941.chunk.css": "/static/css/278.525e2941.chunk.css",
     "static/js/278.f2bbf51e.chunk.js": "/static/js/278.f2bbf51e.chunk.js",
     "static/js/967.8f28312d.chunk.js": "/static/js/967.8f28312d.chunk.js",
@@ -47,6 +47,6 @@
   },
   "entrypoints": [
     "static/css/main.3d547ccc.css",
-    "static/js/main.73398af9.js"
+    "static/js/main.d5698ba2.js"
   ]
 }
diff --git a/frontend/dist/index.html b/frontend/dist/index.html
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/><link rel="icon" href="/favicon.ico"/><link rel="manifest" href="/manifest.json"/><script defer="defer" src="/static/js/main.73398af9.js"></script><link href="/static/css/main.3d547ccc.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
+<!doctype html><html><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no"/><link rel="icon" href="/favicon.ico"/><link rel="manifest" href="/manifest.json"/><script defer="defer" src="/static/js/main.d5698ba2.js"></script><link href="/static/css/main.3d547ccc.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
diff --git a/frontend/dist/static/js/main.73398af9.js → frontend/dist/static/js/main.d5698ba2.js b/frontend/dist/static/js/main.73398af9.js → frontend/dist/static/js/main.d5698ba2.js
diff --git a/...st/static/js/main.73398af9.js.LICENSE.txt → ...st/static/js/main.d5698ba2.js.LICENSE.txt b/...st/static/js/main.73398af9.js.LICENSE.txt → ...st/static/js/main.d5698ba2.js.LICENSE.txt
diff --git a/frontend/src/.env b/frontend/src/.env
@@ -1,2 +1,2 @@
-REACT_APP_VERSION=v2.2.0p
-REACT_APP_RELEASE=d7331515-20231129204232
+REACT_APP_VERSION=v2.2.1p
+REACT_APP_RELEASE=131743e1-20231129221715