update:配置是否可编辑rsa秘钥

electron/service/os/tray.ts

@@ -1,9 +1,9 @@
-import { Tray, Menu } from 'electron';
+import {app as electronApp, Menu, Tray} from 'electron';
 import path from 'path';
-import { isDev, getBaseDir } from 'ee-core/ps';
+import {getBaseDir} from 'ee-core/ps';
 import {logger} from 'ee-core/log';
-import { app as electronApp } from 'electron';
+import {getConfig} from 'ee-core/config';
-import { getMainWindow, getCloseAndQuit, setCloseAndQuit } from 'ee-core/electron';
+import {getCloseAndQuit, getMainWindow, setCloseAndQuit} from 'ee-core/electron';
 
 /**
  * 托盘
@@ -19,7 +19,7 @@ class TrayService {
   constructor() {
     this.tray = null;
     this.config = {
-      title: 'electron-egg',
+      title: electronApp.name,
       icon: '/public/images/tray.png',
     }
   }
@@ -52,8 +52,9 @@ class TrayService {
       }
     ]
 
+    setCloseAndQuit(true);
     // Set a flag to minimize to tray instead of closing
-    setCloseAndQuit(false);
+    // setCloseAndQuit(false);
     mainWindow.on('close', (event: any) => {
       if (getCloseAndQuit()) {
         return;
@@ -64,6 +65,10 @@ class TrayService {
     
     // Initialize the tray
     this.tray = new Tray(iconPath);
+    const { windowsOption } = getConfig();
+    if (windowsOption.title) {
+      cfg.title = windowsOption.title;
+    }
     this.tray.setToolTip(cfg.title);
     const contextMenu = Menu.buildFromTemplate(trayMenuTemplate);
     this.tray.setContextMenu(contextMenu);

frontend/.env.development

@@ -2,3 +2,4 @@ VITE_TITLE="NPQS9100-自动检测平台工具箱"
 
 VITE_RSA_PUBLIC_KEY="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnFMmIVanMxsW5S/qP8Wcxf/J3/i4631BP3UtWkRzO7jAw9HIAgK4Y7X53hXj6zMbfme1vMjQc0mq7m/KrH4WlTYpFexLO6Gnk8oH40F04tp+ABZIq93zNOydPEaVoZeTPH/LlkwrrxVGAMNNIKuebcqapp25JiWtlSFMv4kH/nDAj+2m8+P4zYVM1Ed6gO01eKDEYE3SBA1Ket2BfHTgviR/F8WKwlXh11enywsJnrHTM5dJQdlUxCjHy214TpheYOz/cv9elQnDfFAbmZW8mH5/hgMSTkm3h4uR7ITin6Erg+yc/t1kGaTWrzloyBRMSiFN/Pwr5yQjj+1wQqqUkwIDAQAB"
 VITE_RSA_PRIVATE_KEY="MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcUyYhVqczGxblL+o/xZzF/8nf+LjrfUE/dS1aRHM7uMDD0cgCArhjtfneFePrMxt+Z7W8yNBzSarub8qsfhaVNikV7Es7oaeTygfjQXTi2n4AFkir3fM07J08RpWhl5M8f8uWTCuvFUYAw00gq55typqmnbkmJa2VIUy/iQf+cMCP7abz4/jNhUzUR3qA7TV4oMRgTdIEDUp63YF8dOC+JH8XxYrCVeHXV6fLCwmesdMzl0lB2VTEKMfLbXhOmF5g7P9y/16VCcN8UBuZlbyYfn+GAxJOSbeHi5HshOKfoSuD7Jz+3WQZpNavOWjIFExKIU38/CvnJCOP7XBCqpSTAgMBAAECggEAYeWokWRE3TpvwiOZnUpR/aVMdVi75a3ROL5XIpqPV61B+t/bU3cEpl0GF9C5pUeiRi0IoStZb3mI9D1KPW/REKyUWkhabQO1gFYbTnRlkNOn6MILzKX4cwJjDaZeeo4EBPU7N+qHyOOXrU6hdH5FfxhMdV983ajm5eeuupxER1C2kAcIklTeVpTX6EKOgZb5LBp5ssOVm2P42pOauvcRozRcvZmqnErXmukv0H4l3EVNt4rHpTn9riHUC63e8JfiYzVaF6zuNUxv6nHEft0/SRMw11XSTnNfDzcKqgjz6ksFBS/6eQQYKESk+ONC53HUuYHFAknkwsPupDCT2W8FIQKBgQDLHT/xCU3nxGr4vFKBDNaO2D5oK20ECbBO4oDvLWWmQG7f+6TsMy8PgVdMnoL4RfqGlwFAKEpS6KVFHnBVqnNEhcdy9uCI7x7Xx8UnyUtxj1EDTm76uta9Ki9OrlqB6tImDM9+Ya3vGktW37ht4WOx2OsJRhG1dbf6RLwFlH7DWwKBgQDFBxvi5I1BR6hg6Tj7xd2SqOT2Y+BED3xuSYENhWbmMhLJDResaB7mjztbxlYaY2mOE0holWm2uDmVFFhMh4jYXik4hYH8nmDzq9mDpZCZ9pyjYqnAP8THoAa8EbgrUWB8A6BPH4iL3KbMnBfBKY0pIr2xrvnjQjNBAgta7KDRKQKBgCe6oe4wxrdF2TKsC2tIqpMoQxS3Icy/ZGgZr+SYuaBKTCWtoDW/UT40K3JGMxIDBhzbXphBCUCsVt9tM8Xd4EwP6tJW7dZ7B0pnve2pVwNwaAVAiz6p2yUHIle+jN+Koe5lZRSwYIg7WW81tWpwwsJfzqFyvjYDP6hJV4mz4ROvAoGAaRcdnKvjXApomShMqJ4lTPChD3q+SA8qg3jZSOj6tZXHx00gb2kp8jg7pPvpOTIFPy6x1Ha9aCRjMk0ju84fA6lVuzwa1S907wOehUVuF3Eeo1cgy9Y3k3KbpPyeixxgpkUY4JslLdSHc2NemD0dee951qhJyRmqVOZOQDUuoeECgYEAqBw2cAFk3vM97WY06TSldGA8ajVHx3BYRjj+zl62NTQthy8fw3tqxb3c5e8toOmZWKjZvDhg2TRLhsDDQWEYg3LZG87REqVIjgEPcpjNLidjygGX8n3JF2o0O5I/EMvl0s/+LVQONfduOBvhwDqr8QNisbLsyneiAq7umewMolo="
+VITE_RSA_CAN_EDIT=true

frontend/.env.production

@@ -1,3 +1,4 @@
 VITE_TITLE="NPQS9100-自动检测平台工具箱"
 VITE_RSA_PUBLIC_KEY="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnFMmIVanMxsW5S/qP8Wcxf/J3/i4631BP3UtWkRzO7jAw9HIAgK4Y7X53hXj6zMbfme1vMjQc0mq7m/KrH4WlTYpFexLO6Gnk8oH40F04tp+ABZIq93zNOydPEaVoZeTPH/LlkwrrxVGAMNNIKuebcqapp25JiWtlSFMv4kH/nDAj+2m8+P4zYVM1Ed6gO01eKDEYE3SBA1Ket2BfHTgviR/F8WKwlXh11enywsJnrHTM5dJQdlUxCjHy214TpheYOz/cv9elQnDfFAbmZW8mH5/hgMSTkm3h4uR7ITin6Erg+yc/t1kGaTWrzloyBRMSiFN/Pwr5yQjj+1wQqqUkwIDAQAB"
 VITE_RSA_PRIVATE_KEY="MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcUyYhVqczGxblL+o/xZzF/8nf+LjrfUE/dS1aRHM7uMDD0cgCArhjtfneFePrMxt+Z7W8yNBzSarub8qsfhaVNikV7Es7oaeTygfjQXTi2n4AFkir3fM07J08RpWhl5M8f8uWTCuvFUYAw00gq55typqmnbkmJa2VIUy/iQf+cMCP7abz4/jNhUzUR3qA7TV4oMRgTdIEDUp63YF8dOC+JH8XxYrCVeHXV6fLCwmesdMzl0lB2VTEKMfLbXhOmF5g7P9y/16VCcN8UBuZlbyYfn+GAxJOSbeHi5HshOKfoSuD7Jz+3WQZpNavOWjIFExKIU38/CvnJCOP7XBCqpSTAgMBAAECggEAYeWokWRE3TpvwiOZnUpR/aVMdVi75a3ROL5XIpqPV61B+t/bU3cEpl0GF9C5pUeiRi0IoStZb3mI9D1KPW/REKyUWkhabQO1gFYbTnRlkNOn6MILzKX4cwJjDaZeeo4EBPU7N+qHyOOXrU6hdH5FfxhMdV983ajm5eeuupxER1C2kAcIklTeVpTX6EKOgZb5LBp5ssOVm2P42pOauvcRozRcvZmqnErXmukv0H4l3EVNt4rHpTn9riHUC63e8JfiYzVaF6zuNUxv6nHEft0/SRMw11XSTnNfDzcKqgjz6ksFBS/6eQQYKESk+ONC53HUuYHFAknkwsPupDCT2W8FIQKBgQDLHT/xCU3nxGr4vFKBDNaO2D5oK20ECbBO4oDvLWWmQG7f+6TsMy8PgVdMnoL4RfqGlwFAKEpS6KVFHnBVqnNEhcdy9uCI7x7Xx8UnyUtxj1EDTm76uta9Ki9OrlqB6tImDM9+Ya3vGktW37ht4WOx2OsJRhG1dbf6RLwFlH7DWwKBgQDFBxvi5I1BR6hg6Tj7xd2SqOT2Y+BED3xuSYENhWbmMhLJDResaB7mjztbxlYaY2mOE0holWm2uDmVFFhMh4jYXik4hYH8nmDzq9mDpZCZ9pyjYqnAP8THoAa8EbgrUWB8A6BPH4iL3KbMnBfBKY0pIr2xrvnjQjNBAgta7KDRKQKBgCe6oe4wxrdF2TKsC2tIqpMoQxS3Icy/ZGgZr+SYuaBKTCWtoDW/UT40K3JGMxIDBhzbXphBCUCsVt9tM8Xd4EwP6tJW7dZ7B0pnve2pVwNwaAVAiz6p2yUHIle+jN+Koe5lZRSwYIg7WW81tWpwwsJfzqFyvjYDP6hJV4mz4ROvAoGAaRcdnKvjXApomShMqJ4lTPChD3q+SA8qg3jZSOj6tZXHx00gb2kp8jg7pPvpOTIFPy6x1Ha9aCRjMk0ju84fA6lVuzwa1S907wOehUVuF3Eeo1cgy9Y3k3KbpPyeixxgpkUY4JslLdSHc2NemD0dee951qhJyRmqVOZOQDUuoeECgYEAqBw2cAFk3vM97WY06TSldGA8ajVHx3BYRjj+zl62NTQthy8fw3tqxb3c5e8toOmZWKjZvDhg2TRLhsDDQWEYg3LZG87REqVIjgEPcpjNLidjygGX8n3JF2o0O5I/EMvl0s/+LVQONfduOBvhwDqr8QNisbLsyneiAq7umewMolo="
+VITE_RSA_CAN_EDIT=true

frontend/src/layouts/AppSider.vue

@@ -21,7 +21,7 @@
         </a-menu-item>
       </a-menu>
     </a-layout-sider>
-    <a-layout :style="{ marginLeft: '200px' }">
+    <a-layout :style="contentStyles">
       <a-layout-content class="layout-content">
         <router-view />
       </a-layout-content>
@@ -29,7 +29,7 @@
   </a-layout>
 </template>
 <script setup lang="ts">
-import {onMounted, ref} from 'vue';
+import {onMounted, ref, watch} from 'vue';
 import {useRouter} from 'vue-router';
 import {FileProtectOutlined} from "@ant-design/icons-vue"; // 定义菜单项的类型
 
@@ -46,7 +46,7 @@ interface Menu {
 }
 
 const router = useRouter();
-
+const contentStyles = ref<any>({marginLeft: '200px'});
 const collapsed = ref<boolean>(false);
 const current = ref<string>('menu_1');
 const menu = ref<Menu>({
@@ -61,6 +61,13 @@ onMounted(() => {
   menuHandle(null);
 });
 
+watch(collapsed , (val:boolean) => {
+  if (val) {
+    contentStyles.value.marginLeft = '100px';
+  } else {
+    contentStyles.value.marginLeft='200px';
+  }
+})
 const menuHandle = (e: any): void => {
   console.log('sider menu e:', e);
   if (e) {

frontend/src/views/activate/index.vue

@@ -16,8 +16,10 @@
             <a-textarea
               v-model:value="rsaKeys.publicKey"
               :rows="5"
-              readonly
+              :readonly="readonly"
               placeholder="RSA公钥内容"
+              @blur="readonly = true"
+              @focus="readonly = false"
             />
             <a-button
               type="primary"
@@ -37,8 +39,10 @@
             <a-textarea
               v-model:value="rsaKeys.privateKey"
               :rows="5"
-              readonly
+              :readonly="readonly"
               placeholder="RSA私钥内容"
+              @blur="readonly = true"
+              @focus="readonly = false"
             />
             <a-button
               type="primary"
@@ -109,11 +113,13 @@ import {message} from 'ant-design-vue'
 import rsa from '@/utils/rsa'
 import {Activate} from "@/views/activate/index";
 
+const RSA_CAN_EDIT = import.meta.env.VITE_RSA_CAN_EDIT === 'true'
 const rsaKeys = ref({
   publicKey: rsa.publicKey,
   privateKey: rsa.privateKey
 })
-const hiddenKeys = ref(false)
+const hiddenKeys = ref(RSA_CAN_EDIT)
+const readonly = ref(true)
 const activationForm = ref({
   requestCode: '',
   activationCode: ''
@@ -124,6 +130,10 @@ const generating = ref(false)
 
 // 生成激活码
 const generateActivationCode = () => {
+  if (!rsaKeys.value.publicKey || !rsaKeys.value.privateKey) {
+    message.error('请先配置RSA密钥')
+    return
+  }
   if (!activationForm.value.requestCode.trim()) {
     message.error('请输入设备申请码')
     return