fix: 生成https 证书失败，#265

fix: 弹出层后文字标题没有隐藏
fix: windows 运行提示生成 rsa 证书路径错误

Author: donknap

app/application/http/controller/container-upgrade.go

@@ -29,9 +29,11 @@ import (
 
 func (self Container) Upgrade(http *gin.Context) {
 	type ParamsValidate struct {
-		Md5       string `json:"md5" binding:"required"`
-		ImageTag  string `json:"imageTag"`
-		EnableBak bool   `json:"enableBak"`
+		Md5              string `json:"md5" binding:"required"`
+		ImageTag         string `json:"imageTag"`
+		EnableBak        bool   `json:"enableBak"`
+		EnableResetEnv   bool   `json:"enableResetEnv"`   // 重置环境变量
+		EnableResetLabel bool   `json:"enableResetLabel"` // 重置 label 数据
 	}
 	params := ParamsValidate{}
 	if !self.Validate(http, &params) {

app/common/http/controller/registry.go

@@ -48,8 +48,11 @@ func (self Registry) Create(http *gin.Context) {
 	if params.Id <= 0 {
 		registryRow, _ = dao.Registry.Where(dao.Registry.ServerAddress.Eq(params.ServerAddress)).First()
 		if registryRow != nil {
-			self.JsonResponseWithError(http, function.ErrorMessage(define.ErrorMessageCommonIdAlreadyExists, "name", params.ServerAddress), 500)
-			return
+			// 类似腾讯云这样的仓库地址一样，如果用户名不一样也按两个仓库来对待
+			if params.Username != "" && params.Password != "" && params.Username == registryRow.Setting.Username {
+				self.JsonResponseWithError(http, function.ErrorMessage(define.ErrorMessageCommonIdAlreadyExists, "name", params.ServerAddress), 500)
+				return
+			}
 		}
 	} else {
 		registryRow, _ = dao.Registry.Where(dao.Registry.ID.Eq(params.Id)).First()

app/pro

@@ -77,8 +77,9 @@
   "components.appCron.cronDayOfWeekOption.5": "Every Friday",
   "components.appCron.cronDayOfWeekOption.6": "Every Saturday",
   "components.appCron.cronFormContainerName": "Execution Container",
-  "components.appCron.cronFormContainerNameEmpty": "Executes in the DPanel container by default, supporting Docker commands. Ensure the selected container contains all commands required by your script.",
-  "components.appCron.cronFormEnableRunBlock": "Wait for the current task execution to complete before initiating the next task.",
+  "components.appCron.cronFormContainerNameEmpty": "Executes in DPanel container or current environment by default",
+  "components.appCron.cronFormContainerNameTip": "DPanel container supports Docker commands. Ensure the target container includes all dependencies required by your script.",
+  "components.appCron.cronFormEnableRunBlock": "Wait for the current task to complete before starting the next one",
   "components.appCron.cronFormEnv": "Environment",
   "components.appCron.cronFormEventType": "Event Type",
   "components.appCron.cronFormEventTypeOption.container/create": "container/create",
@@ -156,14 +157,14 @@
   "components.appDetail.copyConfirmTip": "By default, copied container has identical configuration and may not start. Enable [Bind Random Ports] for normal operation.",
   "components.appDetail.copyCopyName": "Copied Container Name",
   "components.appDetail.copyEnableRandomPort": "Bind Random Ports",
-  "components.appDetail.deleteButton": "Delete",
   "components.appDetail.deleteConfirmDeleteImage": "Delete image?",
   "components.appDetail.deleteConfirmDeleteVolume": "Delete anonymous volumes?",
   "components.appDetail.deleteConfirmTip": "Volumes not mounted from directories declared in image, automatically created by Docker",
   "components.appDetail.drawerTitle": "Container Details - {name}",
   "components.appDetail.exportButton": "Export Container",
   "components.appDetail.exportConfirm": "Export container filesystem (excluding mounted directory data). Confirm?",
   "components.appDetail.exportEnableExportToPath": "Export to /dpanel/storage/export/container in panel container?",
+  "components.appDetail.rebuildConfirmTip": "The container will be deleted and rebuilt using its current configuration. All data except for mounted volumes will be reset to the original state. Confirm?",
   "components.appDetail.rollbackEmptyTip": "No rollback data available",
   "components.appDetail.rollbackTip": "Rollback only restores container configuration. Use container snapshot for full configuration and data recovery. Select rollback date:",
   "components.appDetail.runTimeValue": "Created: {create} / Updated: {upgrade}",
@@ -580,6 +581,7 @@
   "components.dockerEnvCreate.formAddressType": "Docker API address",
   "components.dockerEnvCreate.formAddressTypeTip": "Enable API access when connecting to remote Docker",
   "components.dockerEnvCreate.formComposePath": "Compose dedicated directory",
+  "components.dockerEnvCreate.formDockerType": "Container Type",
   "components.dockerEnvCreate.formEnableComposePath": "Enable independent Compose directory",
   "components.dockerEnvCreate.formEnableComposePathTip": "When enabled, switching remote Docker clients will only read compose tasks from this environment's dedicated directory",
   "components.dockerEnvCreate.formEnableSSH": "Enable host SSH connection",
@@ -630,16 +632,16 @@
   "components.explorer.listStatus": "Status",
   "components.explorer.listStatusColorOption.0": "blue",
   "components.explorer.listStatusColorOption.1": "green",
-  "components.explorer.listStatusColorOption.100": "cyan",
   "components.explorer.listStatusColorOption.2": "error",
+  "components.explorer.listStatusColorOption.100": "cyan",
   "components.explorer.listStatusOption.0": "MODIFIED",
   "components.explorer.listStatusOption.1": "ADD",
-  "components.explorer.listStatusOption.100": "VOLUME",
   "components.explorer.listStatusOption.2": "DELETED",
+  "components.explorer.listStatusOption.100": "VOLUME",
   "components.explorer.listStatusTipOption.0": "Modified during container runtime",
   "components.explorer.listStatusTipOption.1": "File added during container runtime",
-  "components.explorer.listStatusTipOption.100": "Mounted persistent directory",
   "components.explorer.listStatusTipOption.2": "File deleted during container runtime",
+  "components.explorer.listStatusTipOption.100": "Mounted persistent directory",
   "components.explorer.listUser": "User",
   "components.explorer.toolbarDeleteButton": "Delete",
   "components.explorer.toolbarDownloadButton": "Download to local",
@@ -675,7 +677,6 @@
   "components.image.quickTitle": "Image details",
   "components.image.registryCreateFormEnableAuth": "Configure repository permissions?",
   "components.image.registryCreateFormEnableHttp": "Use HTTP protocol?",
-  "components.image.registryCreateFormEnableHttpTip": "Enable if configuring local image registry. Configure insecure-registries in daemon.json for HTTP connection.",
   "components.image.registryCreateFormPassword": "Password",
   "components.image.registryCreateFormPasswordEmpty": "Configure repository password, use old password if empty",
   "components.image.registryCreateFormProxy": "Acceleration URL",
@@ -760,10 +761,10 @@
   "components.systemBasic.loginBasicTitle": "Basic",
   "components.systemBasic.loginFailedLockTime": "Lock time",
   "components.systemBasic.loginFailedLockTimeOption.-1": "Permanent (until panel container restart)",
-  "components.systemBasic.loginFailedLockTimeOption.18000": "5 hours",
   "components.systemBasic.loginFailedLockTimeOption.300": "5 minutes",
-  "components.systemBasic.loginFailedLockTimeOption.3600": "1 hour",
   "components.systemBasic.loginFailedLockTimeOption.900": "15 minutes",
+  "components.systemBasic.loginFailedLockTimeOption.3600": "1 hour",
+  "components.systemBasic.loginFailedLockTimeOption.18000": "5 hours",
   "components.systemBasic.loginFailedTitle": "Login failure lock",
   "components.systemBasic.loginFailedTotal": "Failure count",
   "components.systemBasic.loginNoPasswordTitle": "Password-free login",
@@ -805,11 +806,11 @@
   "components.systemBasic.themeConfigSideMenuOption.collapse": "Collapsed by default",
   "components.systemBasic.themeConfigSideMenuOption.default": "Expanded by default",
   "components.systemBasic.themeConfigTablePageSize": "Table page size",
+  "components.systemBasic.themeConfigTablePageSizeOption.5": "5 per page",
   "components.systemBasic.themeConfigTablePageSizeOption.10": "10 per page",
-  "components.systemBasic.themeConfigTablePageSizeOption.100": "100 per page",
   "components.systemBasic.themeConfigTablePageSizeOption.20": "20 per page",
-  "components.systemBasic.themeConfigTablePageSizeOption.5": "5 per page",
   "components.systemBasic.themeConfigTablePageSizeOption.50": "50 per page",
+  "components.systemBasic.themeConfigTablePageSizeOption.100": "100 per page",
   "components.systemBasic.themeConfigTablePageSizeOption.all": "Show all",
   "components.systemBasic.themeConfigTip": "Configure theme style, menu layout, font size, table default page size",
   "components.systemBasic.themeConfigTitle": "Theme style",
@@ -897,10 +898,10 @@
   "components.userInvite.formEmail": "Email",
   "components.userInvite.formRemark": "Remark",
   "components.userInvite.formSecurityPassword": "Strong password",
+  "components.userInvite.formUsername": "Username",
   "components.userInvite.formUserRole": "Role",
   "components.userInvite.formUserRoleTip": "Admins have all permissions except [System] by default. Operators have no permissions by default",
   "components.userInvite.formUserStatus": "Status",
-  "components.userInvite.formUsername": "Username",
   "components.userPermission.canSeeCompose": "Compose",
   "components.userPermission.canSeeComposeList": "View tasks",
   "components.userPermission.canSeeComposeListManage": "Manage tasks",
@@ -1184,7 +1185,7 @@
   "notification.imagePull": "Pulling {name} image",
   "notification.imagePullInvalidAuth": "Pull failed, no repository permission",
   "notification.imagePullRegistryBad": "Remote image registry inaccessible",
-  "notification.imagePullServerHttp": "Pull failed, configure HTTPS or add insecure-registries in daemon.json",
+  "notification.imagePullServerHttp": "Please enable the Registry HTTP option and add \"insecure-registries\": [\"{name}\"] to your daemon.json configuration.",
   "notification.imagePullTagNotFound": "Image {tag} not found or no permission",
   "notification.imagePullUseProxy": "Using {name} mirror to pull image",
   "notification.imageRemoteTagNoPermission": "Failed to get remote tags, repository missing or no access",
@@ -1214,8 +1215,8 @@
   "notification.listFilePath": "File Path",
   "notification.listHas": "Contains",
   "notification.listHasNot": "Does not contain",
-  "notification.listHostPath": "Mount",
   "notification.listHostnameTip": "Provides internal container access",
+  "notification.listHostPath": "Mount",
   "notification.listImageName": "Image",
   "notification.listInUse": "In Use",
   "notification.listIpAddress": "IP Address",
@@ -1264,8 +1265,8 @@
   "notification.listManageStop": "Stop",
   "notification.listManageSwitch": "Switch",
   "notification.listManageSync": "Sync",
-  "notification.listManageUnSelected": "Deselect",
   "notification.listManageUnpause": "Resume",
+  "notification.listManageUnSelected": "Deselect",
   "notification.listManageUpgrade": "Upgrade",
   "notification.listManageUpgradeBatch": "Batch Upgrade",
   "notification.listManageUse": "Use",
@@ -1303,9 +1304,9 @@
   "notification.listType": "Type",
   "notification.listUpdatedAt": "Updated At",
   "notification.listUsage": "Usage",
+  "notification.listUsername": "Username",
   "notification.listUseTime": "Time Used",
   "notification.listUseUser": "Custom",
-  "notification.listUsername": "Username",
   "notification.listVersion": "Version",
   "notification.login": "Please login first",
   "notification.proLicenseFileIsCorrect": "Pro license file error, upload correct file or contact developer",
@@ -1351,12 +1352,12 @@
   "notification.userFailedLock": "Too many failed attempts, retry after {time} or restart panel",
   "notification.userFailedLockForever": "Too many failed attempts, restart panel container",
   "notification.userFounderExists": "Admin already configured, modify in system settings",
+  "notification.usernameOrPasswordError": "Username or password incorrect",
   "notification.userNoPermission": "No operation permission",
   "notification.userPasswordConfirmFailed": "Passwords do not match",
   "notification.userResetTokenExpire": "Reset link expired",
   "notification.userTwoFaEmpty": "Please enter 2FA code",
   "notification.userTwoFaNotCorrect": "Verification code incorrect",
-  "notification.usernameOrPasswordError": "Username or password incorrect",
   "notification.volumeMountSomeVolume": "Mounting/unmounting volumes, please wait...",
   "notification.volumePrune": "Cleaned {count} volumes, freed {size} space",
   "notification.wsOustedDesc": "The backend service has stopped or restarted. Real-time updates are suspended. Please refresh the page to restore synchronization.",
@@ -1386,8 +1387,8 @@
   "swarm.nodeDetailDeleteButtonOption.leave": "Leave cluster",
   "swarm.nodeDetailJoinTip": "Current Docker not Swarm node, initialize as cluster or join existing",
   "swarm.nodeDetailManageManager": "Change to manager",
-  "swarm.nodeDetailManageWorker": "Change to worker",
   "swarm.nodeDetailManager": "Manager node",
+  "swarm.nodeDetailManageWorker": "Change to worker",
   "swarm.nodeDetailServiceList": "Service List",
   "swarm.nodeDetailSwarm": "Cluster Info",
   "swarm.nodeDetailSwarmManager": "Manager",
@@ -1443,8 +1444,6 @@
   "swarm.serviceManageScalingTip": "Scale service replicas, check redeploy to destroy and recreate",
   "system.env.createButton": "Add server",
   "system.env.switch": "Switch server",
-  "system.home.overview.basicDPanelTitleUpgradeInfo": "Upgrade log",
-  "system.home.overview.basicDPanelTitleVersion": "DPanel",
   "system.home.overview.basicDockerTitleFileDriver": "Volume driver",
   "system.home.overview.basicDockerTitleLogDriver": "Log driver",
   "system.home.overview.basicDockerTitlePluginsNetwork": "Network plugins",
@@ -1453,6 +1452,8 @@
   "system.home.overview.basicDockerTitleSystemTime": "System time",
   "system.home.overview.basicDockerTitleSystemVersion": "OS",
   "system.home.overview.basicDockerTitleVersion": "Docker version",
+  "system.home.overview.basicDPanelTitleUpgradeInfo": "Upgrade log",
+  "system.home.overview.basicDPanelTitleVersion": "DPanel",
   "system.home.overview.basicEnvSettingDefaultEnv": "Configure default Docker server",
   "system.home.overview.basicInfo": "",
   "system.home.overview.basicInfoTitle": "Basic information",
@@ -1503,12 +1504,12 @@
   "system.user.listStatusOption.2": "Normal",
   "system.user.listStatusOption.disable": "Disabled",
   "system.user.listStatusOption.enable": "Normal",
+  "system.user.listUsername": "Username",
   "system.user.listUserRole": "Role",
   "system.user.listUserRoleColorOption.manager": "blue",
   "system.user.listUserRoleColorOption.member": "gold",
   "system.user.listUserRoleOption.manager": "Administrator",
   "system.user.listUserRoleOption.member": "Operator",
-  "system.user.listUsername": "Username",
   "user.agree": "Login indicates agreement to",
   "user.documentTitle": "DPanel - Lightweight Docker Management Panel",
   "user.formAutoLogin": "Keep logged in",
@@ -1519,9 +1520,9 @@
   "user.formPasswordRule1": "Password must be at least 8 characters!",
   "user.formPasswordRule2": "Password must contain uppercase, lowercase letters and numbers!",
   "user.formTwofaEmpty": "Please enter 2FA code",
+  "user.formUsernameEmpty": "Please enter username",
   "user.formUserReset": "Forgot password?",
   "user.formUserResetTip": "Execute following command on host",
-  "user.formUsernameEmpty": "Please enter username",
   "user.jwtMessageIncorrectFormat": "Token format incorrect",
   "user.jwtMessageInvalid": "Token parse error:",
   "user.oauthRedirectContent": "Logging in...",