Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/lang/en.js

@@ -1795,7 +1795,7 @@ export default {
     //--------------提示文本--------------
       //---二级窗口标题---
       titleAddJob: 'Add Job',
-      titleEditJob: 'Edit  Job',
+      titleEditJob: 'Edit Job',
 
       //---标签---
       nextValidTime:'Next Valid Time',
@@ -1853,6 +1853,107 @@ export default {
     lblWidthDialog: '100px',
   },
 
+  // ***************系统监控：服务监控***************
+  Monitor_Service:{
+    property: 'Property',
+    value: 'Value',
+    memory: 'Memory',
+
+    cpu_Infomation: 'CPU Information',
+    cpu_Cores: 'Cores',
+    cpu_UserUsage: 'User Usage',
+    cpu_SystemUsage: 'System Usage',
+    cpu_Idle: 'Idle',
+
+    memory_Infomation: 'Memory Information',
+    memory_total: 'Total Memory',
+    memory_Used: 'Used Memory',
+    memory_Free: 'Free Memory',
+    memory_Usage: 'Usage',
+
+    server_Information:  'Server Information',
+    server_Name: "Server Name",
+    server_Ip: "Server IP",
+    server_OS: "System OS",
+    server_OSArch: "System OS Arch",
+
+    jvm_Information:  'JVM Information',
+    jvm_Name: "Java Name",
+    jvm_Version: "Java Version",
+    jvm_StartTime: "StartTime",
+    jvm_RunningTime: "RunTime",
+    jvm_InstallPath: "Install Path",
+    jvm_ProjectPath: "Project Path",
+    jvm_Arguments: "Arguments",
+
+    disk_Information: 'Disk Information',
+    disk_Path: "Path",
+    disk_FileSystem: "File System",
+    disk_Type: "Type",
+    disk_TotalSize: "Total Size",
+    disk_AvailableSize: "Available Size",
+    disk_UsedSize: "Used Size",
+    disk_UsedPercent: "Used Percent",
+
+    textLoading: "Loading...",
+
+  },
+
+  // ***************系统监控：缓存监控***************
+  Monitor_Cache:{
+    basInfomation: 'Basic Information',
+    redisVersion: 'Redis Version',
+    redisMode: 'Redis Mode',
+    port: 'Port',
+    connectedClients: 'Connected Clients',
+
+    runningTime: 'Running Time',
+    memoryUsed: 'Memory Used',
+    cpuUsed: 'CPU Used',
+    memorySize: 'Memory Size',
+
+    AOFIsOpen: "AOF IsOpen",
+    RDBIsEnable: "RDB IsEnable",
+    keySize: "Key Size",
+    netInputAndOutput: "netInput/Output",
+
+    commandStats: 'Command Stats',
+    memoryUsedInfo: "Memory Infomation",
+
+    command:  "Command",
+    peakValue:  "Peak Value",
+    cacheMemoryUsed: "Cache Memory Used",
+    textLoading: "Loading...",
+
+  },
+
+  // ***************系统监控：缓存列表***************
+  Monitor_CacheList:{
+    cacheList: 'Cache List',
+    Id: 'Id',
+    cacheName: 'Cache Name',
+    remark: 'Remark',
+    operation: 'Operation',
+
+    keyList: 'Key List',
+    cacheKey: 'Cache Key',
+
+    CacheInfo: "Cache Info",
+    cacheValue: "Cache Value",
+
+    refreshCacheSuccessInfo: "Refresh Cache Success",
+    refreshKeySuccessInfo: "Refresh Key Success",
+    clearAllCacheSuccessInfo: "Clear All Cache Success",
+
+    textSuccess:'] Success',
+    textClearCacheName:'Clear Cache Name[',
+    textClearCacheKey:'Clear Cache Key[',
+
+    btnRefresh: 'Refresh',
+    btnClearAll: 'Clear',
+
+  },
+
 
   // ***************出库作业流水查询*************
   searchViewOutJobFlow: {