1.15.1

CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to the "goploy" extension will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 
+## [1.15.1] - 2023-07-18
+
+### Added
+
+- add user api key
+- add publish progress
+
+### Changed
+
+- support media login log
+
+### Bug fixed
+- [fix dingtalk token cache #58](https://github.com/zhenorzz/goploy/commit/d823222a6e19bb9691caa419eee164404606cede)
+- fix commit info
+
+
 ## [1.15.0] - 2023-06-28
 
 ### Added

cmd/server/main.go

@@ -38,7 +38,7 @@ var (
 	s    string
 )
 
-const appVersion = "1.15.0"
+const appVersion = "1.15.1"
 
 func init() {
 	flag.StringVar(&config.AssetDir, "asset-dir", "", "default: ./")
@@ -53,7 +53,7 @@ func init() {
 }
 
 // @title Goploy
-// @version 1.15.0
+// @version 1.15.1
 // @description A web deployment system tool!
 // @contact.name zhenorzz
 // @contact.url https://github.com/zhenorzz/goploy

database/1.15.1.sql

@@ -1,2 +1,2 @@
 ALTER TABLE `user`
-    ADD COLUMN `api_key` varchar(255) NOT NULL DEFAULT '' AFTER `super_manager`;
+    ADD COLUMN `api_key` char(32) NOT NULL DEFAULT '' AFTER `super_manager`;

database/goploy.sql

@@ -254,7 +254,7 @@ CREATE TABLE IF NOT EXISTS `user`  (
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `last_login_time` datetime DEFAULT NULL,
   `super_manager` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT 'the mark of super admin',
-  `api_key` varchar(255) NOT NULL DEFAULT '',
+  `api_key` char(32) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci;
 
@@ -391,7 +391,7 @@ CREATE TABLE IF NOT EXISTS `terminal_log` (
 INSERT IGNORE INTO `user`(`id`, `account`, `password`, `name`, `contact`, `state`, `super_manager`) VALUES (1, 'admin', '$2a$10$89ZJ2xeJj35GOw11Qiucr.phaEZP4.kBX6aKTs7oWFp1xcGBBgijm', '超管', '', 1, 1);
 INSERT IGNORE INTO `namespace`(`id`, `name`) VALUES (1, 'goploy');
 INSERT IGNORE INTO `namespace_user`(`id`, `namespace_id`, `user_id`, `role_id`) VALUES (1, 1, 1, 0);
-INSERT IGNORE INTO `system_config` (`id`, `key`, `value`) VALUES (1, 'version', '1.15.0');
+INSERT IGNORE INTO `system_config` (`id`, `key`, `value`) VALUES (1, 'version', '1.15.1');
 INSERT IGNORE INTO `role`(`id`, `name`, `description`) VALUES (1, 'manager', '');
 INSERT IGNORE INTO `role`(`id`, `name`, `description`) VALUES (2, 'member', '');
 INSERT IGNORE INTO `permission`(`id`, `pid`, `name`, `sort`, `description`) VALUES (1, 0, 'Log', 0, '');

docker/Dockerfile

@@ -1,7 +1,7 @@
 # Import sql manually https://github.com/zhenorzz/goploy/blob/master/model/sql/goploy.sql
 FROM alpine
 LABEL maintainer="zhenorzz@gmail.com"
-ARG GOPLOY_VER=v1.15.0
+ARG GOPLOY_VER=v1.15.1
 ENV GOPLOY_VER=${GOPLOY_VER}
 
 ENV MYSQL_PORT=3306

internal/server/router.go

@@ -151,7 +151,7 @@ func (rt *Router) doRequest(w http.ResponseWriter, r *http.Request) (*Goploy, Re
 			}
 			gp.Namespace.ID = namespaceID
 			gp.Namespace.PermissionIDs = permissionIDs
-		} else {
+		} else if namespaceID > 0 {
 			namespace, err := model.NamespaceUser{
 				NamespaceID: namespaceID,
 				UserID:      gp.UserInfo.ID,
@@ -165,6 +165,8 @@ func (rt *Router) doRequest(w http.ResponseWriter, r *http.Request) (*Goploy, Re
 			}
 			gp.Namespace.ID = namespaceID
 			gp.Namespace.PermissionIDs = namespace.PermissionIDs
+		} else {
+			gp.Namespace.PermissionIDs = map[int64]struct{}{}
 		}
 
 		if err = route.hasPermission(gp.Namespace.PermissionIDs); err != nil {

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goploy",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "license": "GPL-3.0-or-later",
   "scripts": {
     "dev": "vite",

web/src/views/deploy/TheDetailDialog.vue

@@ -667,7 +667,7 @@ function getPublishTrace(publishToken: string) {
         }
         if ([0, 1, 2, 3, 7].includes(trace.type)) {
           localTraceList.value[trace.type] = trace
-        } else {
+        } else if ([4, 5, 6].includes(trace.type)) {
           if (!remoteTraceList.value[trace.serverName]) {
             remoteTraceList.value[trace.serverName] = []
           }