1.37 release

kalcaddle · Feb 22, 2023 · 843914b · 843914b
1 parent 490d3d2
commit 843914b
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 22 deletions.
diff --git a/app/controller/install/index.class.php b/app/controller/install/index.class.php
@@ -535,18 +535,16 @@ private function checkDbInit(){
         think_config($GLOBALS['config']['database']);
         // 判断数据库（表）是否存在
         $db = Model()->db();
-        if ($type == 'sqlite') {
-            $tables = $db->getTables();
-            if (empty($tables) || !in_array('user', $tables)) {
-                show_json(LNG('admin.install.dbError'), false);
-            }
+        if ($type != 'sqlite') {
+            $exist = $db->execute("show databases like '{$dbName}'");
+            if (!$exist) show_json(LNG('ERROR_DB_NOT_EXIST'), false);
+            $db->execute("use `{$dbName}`");
         }
-        $exist = $db->execute("show databases like '{$dbName}'");
-        if (!$exist) show_json(LNG('ERROR_DB_NOT_EXIST'), false);
-        $db->execute("use `{$dbName}`");
+        // sqlite可直接调用该方法，无论库文件是否存在
         $tables = $db->getTables();
         if (empty($tables) || !in_array('user', $tables)) {
-            show_json(LNG('admin.install.dbTableError'), false);
+            $msg = $type == 'sqlite' ? 'dbError' : 'dbTableError';
+            show_json(LNG('admin.install.'.$msg), false);
         }
         // 重新配置数据库信息
         $GLOBALS['config']['database'] = $data;

diff --git a/app/sdks/archiveLib/bin/data.bin b/app/sdks/archiveLib/bin/data.bin
diff --git a/config/version.php b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 define('KOD_VERSION','1.37');
-define('KOD_VERSION_BUILD','02');
+define('KOD_VERSION_BUILD','03');
diff --git a/static/app/dist/api.js b/static/app/dist/api.js
diff --git a/static/app/dist/lib.js b/static/app/dist/lib.js
diff --git a/static/app/dist/main.js b/static/app/dist/main.js
diff --git a/static/app/dist/sdk.js b/static/app/dist/sdk.js
diff --git a/static/app/dist/vendor.js b/static/app/dist/vendor.js
diff --git a/static/style/dist/main.css b/static/style/dist/main.css
diff --git a/static/style/dist/sdk.css b/static/style/dist/sdk.css
diff --git a/static/style/lib/main.css b/static/style/lib/main.css