@waline/vercel 1.18.8 → 1.18.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.18.8",
+  "version": "1.18.9",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -22,16 +22,16 @@
     "dompurify": "2.3.8",
     "dy-node-ip2region": "1.0.1",
     "fast-csv": "4.3.6",
-    "jsdom": "19.0.0",
+    "jsdom": "20.0.0",
     "jsonwebtoken": "8.5.1",
     "katex": "0.16.0",
-    "leancloud-storage": "4.12.2",
+    "leancloud-storage": "4.12.3",
     "markdown-it": "13.0.1",
     "markdown-it-emoji": "2.0.2",
     "markdown-it-sub": "1.0.0",
     "markdown-it-sup": "1.0.0",
     "mathjax-full": "3.2.2",
-    "nodemailer": "6.7.5",
+    "nodemailer": "6.7.6",
     "nunjucks": "3.2.3",
     "phpass": "0.1.1",
     "prismjs": "1.28.0",
@@ -42,7 +42,7 @@
     "think-logger3": "1.3.1",
     "think-model": "1.5.4",
     "think-model-mysql": "1.1.7",
-    "think-model-postgresql": "1.1.6",
+    "think-model-postgresql": "1.1.7",
     "think-model-sqlite": "1.2.3",
     "think-mongo": "2.2.1",
     "think-router-rest": "1.0.5",

package/src/config/adapter.js

@@ -18,6 +18,7 @@ const {
   MYSQL_PASSWORD,
   MYSQL_PREFIX,
   MYSQL_CHARSET,
+  MYSQL_SSL,
   SQLITE_PATH,
   SQLITE_DB,
   SQLITE_PREFIX,
@@ -27,6 +28,7 @@ const {
   PG_PORT,
   PG_PREFIX,
   PG_USER,
+  PG_SSL,
   MONGO_AUTHSOURCE,
   MONGO_DB,
   MONGO_HOST,
@@ -93,6 +95,12 @@ exports.model = {
     port: PG_PORT || '3211',
     connectionLimit: 1,
     prefix: PG_PREFIX || 'wl_',
+    ssl:
+      PG_SSL == 'true'
+        ? {
+            rejectUnauthorized: false,
+          }
+        : null,
   },
 
   sqlite: {
@@ -113,6 +121,12 @@ exports.model = {
     password: MYSQL_PASSWORD,
     prefix: MYSQL_PREFIX || 'wl_',
     charset: MYSQL_CHARSET || 'utf8mb4',
+    ssl:
+      MYSQL_SSL === 'true'
+        ? {
+            rejectUnauthorized: false,
+          }
+        : null,
   },
 };
 

package/src/config/config.js

@@ -97,7 +97,7 @@ if (AVATAR_PROXY) {
   avatarProxy = !isFalse(AVATAR_PROXY) ? AVATAR_PROXY : '';
 }
 
-const oauthUrl = OAUTH_URL || 'https://user.75.team';
+const oauthUrl = OAUTH_URL || 'https://oauth.lithub.cc';
 
 module.exports = {
   workers: 1,

package/src/extend/think.js

@@ -55,7 +55,7 @@ module.exports = {
     });
   },
   async ip2region(ip, { depth = 1 }) {
-    if (!ip) return '';
+    if (!ip || ip.includes(':')) return '';
 
     try {
       const search = helper.promisify(regionSearch.btreeSearch, regionSearch);

package/src/service/storage/postgresql.js

@@ -5,8 +5,21 @@ module.exports = class extends MySQL {
     return super.model(tableName.toLowerCase());
   }
 
-  async select(...args) {
-    const data = await super.select(...args);
+  async select(where, options = {}) {
+    const lowerWhere = {};
+    for (const i in where) {
+      lowerWhere[i.toLowerCase()] = where[i];
+    }
+
+    if (options && options.desc) {
+      options.desc = options.desc.toLowerCase();
+    }
+
+    if (Array.isArray(options.field)) {
+      options.field = options.field.map((field) => field.toLowerCase());
+    }
+
+    const data = await super.select(where, options);
     return data.map(({ insertedat, createdat, updatedat, ...item }) => {
       const mapFields = {
         insertedAt: insertedat,