diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue
index b7bfc11eb..294f3874e 100644
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -1077,7 +1077,7 @@
let dpsArr = [];
let timeStamp = Math.floor(new Date().getTime() / 1000);
for (let i = 0; i < 20; i++) {
- tempArr.push([timeStamp - (20 - i) * 15, Math.floor(Math.random() * 10) + ""]);
+ tempArr.push([timeStamp - (20 - i) * 15, Math.floor(window.crypto.getRandomValues() * 10) + ""]);
queryItem.values.push(tempArr[i])
dpsArr.push([i + "", tempArr[i]]);
}
diff --git a/nezha-fronted/src/components/charts/richTextEditor.vue b/nezha-fronted/src/components/charts/richTextEditor.vue
index 36cfea4eb..4fabc7664 100644
--- a/nezha-fronted/src/components/charts/richTextEditor.vue
+++ b/nezha-fronted/src/components/charts/richTextEditor.vue
@@ -78,7 +78,7 @@
},
guid() {
function S4() {
- return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+ return (((1 + window.crypto.getRandomValues()) * 0x10000) | 0).toString(16).substring(1);
}
return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
},
diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue
index 065f2c81b..024a1a922 100644
--- a/nezha-fronted/src/components/common/header.vue
+++ b/nezha-fronted/src/components/common/header.vue
@@ -18,7 +18,7 @@
- {{item.name}}
+ {{item.name}}
@@ -122,7 +122,7 @@
- {{$t('overall.changePwd')}}
+ {{$t('overall.changeMima')}}
{{$t('overall.signOut')}}
diff --git a/nezha-fronted/src/components/common/js/common.js b/nezha-fronted/src/components/common/js/common.js
index 12f03105c..c4db6c676 100644
--- a/nezha-fronted/src/components/common/js/common.js
+++ b/nezha-fronted/src/components/common/js/common.js
@@ -10,7 +10,7 @@ export function resetZIndex(e){
}
export function getUUID(){
function S4() {
- return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+ return (((1 + window.crypto.getRandomValues()) * 0x10000) | 0).toString(16).substring(1);
}
return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
diff --git a/nezha-fronted/src/components/common/js/radomcolor/randomcolor.js b/nezha-fronted/src/components/common/js/radomcolor/randomcolor.js
index c353c5063..f6ef44cff 100644
--- a/nezha-fronted/src/components/common/js/radomcolor/randomcolor.js
+++ b/nezha-fronted/src/components/common/js/radomcolor/randomcolor.js
@@ -112,7 +112,7 @@ function randomcolor() {
return "hsl(" + n[0] + ", " + n[1] + "%, " + n[2] + "%)";
case "hsla":
var s = a(e),
- o = t.alpha || Math.random();
+ o = t.alpha || window.crypto.getRandomValues();
return "hsla(" + s[0] + ", " + s[1] + "%, " + s[2] + "%, " + o + ")";
case "rgbArray":
return i(e);
@@ -120,7 +120,7 @@ function randomcolor() {
return "rgb(" + i(e).join(", ") + ")";
case "rgba":
var r = i(e);
- o = t.alpha || Math.random();
+ o = t.alpha || window.crypto.getRandomValues();
return "rgba(" + r.join(", ") + ", " + o + ")";
default:
return function(e) {
@@ -242,7 +242,7 @@ function randomcolor() {
function o(t) {
if (null === e)
- return Math.floor(t[0] + Math.random() * (t[1] + 1 - t[0]));
+ return Math.floor(t[0] + window.crypto.getRandomValues() * (t[1] + 1 - t[0]));
var n = t[1] || 1,
s = t[0] || 0,
o = (e = (9301 * e + 49297) % 233280) / 233280;
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index af5dbfdea..c04fe001a 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -53,7 +53,7 @@ const cn = {
active: "活跃",
type: "类别",
detail: "详细信息",
- changePwd: "修改密码",
+ changeMima: "修改密码",
createCabinet: "创建机柜",
createModel: "创建型号",
createModule: "创建模块",
@@ -108,7 +108,7 @@ const cn = {
pageSize: "条/页",
login: {
username: "登录名",
- password: "密码",
+ mima: "密码",
login: "登录"
},
dashboard: {
@@ -469,7 +469,7 @@ const cn = {
remark: "描述",
cli: "CLI账号",
loginType: "登录类型",
- password: "密码",
+ mima: "密码",
ssh: "SSH-Key",
account: "用户名",
port: "端口",
@@ -520,16 +520,16 @@ const cn = {
remark: "描述",
cli: "CLI账号",
loginType: "登录类型",
- password: "密码",
+ mima: "密码",
ssh: "SSH key",
protocol: "协议",
sshProtocol: "SSH",
telnetProtocol: "Telnet",
userTip: "用户名提示",
- passwordTip: "密码提示",
- reloginPasswordTip: "RELOGIN提示",
- userPwdIntroduce: "请指定用户名和密码提示以便TELNET登录过程可自动运行",
- reLoginPwdIntroduce: "请指定密码提示以便RELOGIN登录过程可自动运行",
+ mimaTip: "密码提示",
+ reloginMimaTip: "RELOGIN提示",
+ userMimaIntroduce: "请指定用户名和密码提示以便TELNET登录过程可自动运行",
+ reLoginMimaIntroduce: "请指定密码提示以便RELOGIN登录过程可自动运行",
account: "用户名",
port: "端口",
upload: "上传",
@@ -570,16 +570,16 @@ const cn = {
createAccount: "新增用户",
editAccount: "编辑用户",
notCurrentlySupport: "暂不支持",
- password: "密码",
- oldPwd: "旧密码",
- inputOldPwd: "请输入旧密码",
- newPwd: "新密码",
- inputNewPwd: "请输入新密码",
- confirmPwd: "确认密码",
- inputConfirmPwd: "请再次输入密码",
- invalidPwd: "无效的密码,最少6个字符",
- confirmPwdErr: "两次密码输入不一致",
- reinputPwd: "请再次输入密码",
+ mima: "密码",
+ oldMima: "旧密码",
+ inputOldMima: "请输入旧密码",
+ newMima: "新密码",
+ inputNewMima: "请输入新密码",
+ confirmMima: "确认密码",
+ inputConfirmMima: "请再次输入密码",
+ invalidMima: "无效的密码,最少6个字符",
+ confirmMimaErr: "两次密码输入不一致",
+ reinputMima: "请再次输入密码",
notification: "通知"
},
roles:{
@@ -749,13 +749,13 @@ const cn = {
smtpHost: "SMTP主机",
smtpPort: "SMTP端口",
smtpAccount: "SMTP账号",
- smtpPwd: "SMTP密码",
+ smtpMima: "SMTP密码",
sendAccount: "发送账号",
testAccount: "测试账号",
useSSL: "SSL",
useTLS: "TLS",
testConnection: "测试连接",
- pwdTip: "提示:一些邮件提供商需要输入的是Token",
+ mimaTip: "提示:一些邮件提供商需要输入的是Token",
sendAccountTip: "提示:发送邮件账号,默认使用SMTP账号作为发送账号",
testAccountTip: "提示:仅用来作为测试邮件收件人",
sslTip: "如果SMTP端口是465,通常需要启用SSL",
@@ -769,7 +769,7 @@ const cn = {
ldap: "LDAP",
address: "LDAP地址",
dn: "Bind DN",
- pwd: "密码",
+ mima: "密码",
ou: "用户OU",
filter: "用户过滤器",
map: "LDAP属性映射",
@@ -801,11 +801,11 @@ const cn = {
reset: {
reset: "重置",
type: "类型",
- pwd: "密码",
+ mima: "密码",
metric: "指标",
alert: "告警",
sysConfig: "系统设置",
- pwdTip: "请输入密码",
+ mimaTip: "请输入密码",
promptTitle: "确认密码",
yes: "是",
no: "否"
@@ -907,7 +907,7 @@ const cn = {
authProtocol: "认证协议",
privProtocol: "隐私协议",
contextName: "内容名称",
- privPassword: "隐私密码"
+ privMima: "隐私密码"
},
endpoint: {
createEndpoint: "新增Endpoint",
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 71a75c323..f61300cb4 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -47,7 +47,7 @@ const en = {
back: 'Back', //返回
unavailable: 'Unavailable',
available: 'Available',
- changePwd:'Change password',//修改密码
+ changeMima:'Change password',//修改密码
createChart:'Create chart',
createProject:'Create project',
createEndpoint:'Create endpoint',
@@ -113,7 +113,7 @@ const en = {
},
login: {
username: 'Username',
- password: 'Password',
+ mima: 'Password',
login: 'Login'
},
dashboard:{
@@ -425,16 +425,16 @@ const en = {
remark:'Description',//'描述'
cli:'CLI account',//'CLI账号'
loginType:'Login type',//'登录类型'
- password:'Password',//'密码'
+ mima:'Password',//'密码'
ssh:'SSH key',//'SSH-Key'
protocol:"Protocol",
sshProtocol:"SSH",
telnetProtocol:"Telnet",
userTip:"User tip",//用户名提示
- passwordTip:"Password tip",//密码提示
- reloginPasswordTip:"Relogin tip",//密码提示
- userPwdIntroduce:'Please specify a user name and password so that the telenet login process can automatically log in',
- reLoginPwdIntroduce:'Please specify the password prompt so that the login process can run automatically',
+ mimaTip:"Password tip",//密码提示
+ reloginMimaTip:"Relogin tip",//密码提示
+ userMimaIntroduce:'Please specify a user name and password so that the telenet login process can automatically log in',
+ reLoginMimaIntroduce:'Please specify the password prompt so that the login process can run automatically',
account:'User name',//'用户名'
port:'Port',//'端口'
upload:'Upload',//'上传'
@@ -520,7 +520,7 @@ const en = {
remark:'Description',//'描述'
cli:'CLI account',//'CLI账号'
loginType:'Login type',//'登录类型'
- password:'Password',//'密码'
+ mima:'Password',//'密码'
ssh:'SSH-Key',//'SSH-Key'
account:'Username',//'用户名'
port:'Port',//'端口'
@@ -573,16 +573,16 @@ const en = {
createAccount: 'New account',//"新增用户"
editAccount: 'Edit account',//"编辑用户"
notCurrentlySupport: 'Not available',//'暂不支持'
- password: 'Password',//'密码'
- oldPwd:'Old password',
- inputOldPwd:'Please input old password',
- newPwd:'New password',
- inputNewPwd:'Please input new password',
- confirmPwd:'Confirm password',
- inputConfirmPwd:'Please input confirm password',
- invalidPwd:'invalide password,the length at least 6',
- confirmPwdErr:'The two passwords are inconsistent',
- reinputPwd:'Enter password again',
+ mima: 'Password',//'密码'
+ oldMima:'Old password',
+ inputOldMima:'Please input old password',
+ newMima:'New password',
+ inputNewMima:'Please input new password',
+ confirmMima:'Confirm password',
+ inputConfirmMima:'Please input confirm password',
+ invalidMima:'invalide password,the length at least 6',
+ confirmMimaErr:'The two passwords are inconsistent',
+ reinputMima:'Enter password again',
notification: 'Notification'
},
roles:{
@@ -753,13 +753,13 @@ const en = {
smtpHost:'SMTP host',
smtpPort:'SMTP port',
smtpAccount:'SMTP account',
- smtpPwd:'SMTP password',
+ smtpMima:'SMTP password',
sendAccount:'Send account',
testAccount:'Test account',
useSSL:'SSL',
useTLS:'TLS',
testConnection:'Test connection',
- pwdTip:'Tip:Some email providers need to enter token',
+ mimaTip:'Tip:Some email providers need to enter token',
sendAccountTip:'Tip:The SMTP account is used as the sending account by default',
testAccountTip:'Tip:Used only as test mail recipient',
sslTip:'If the SMTP port is 465, you usually need to enable SSL',
@@ -773,7 +773,7 @@ const en = {
ldap:'LDAP',
address:'LDAP address',
dn:'Bind DN',
- pwd:'Password',
+ mima:'Password',
ou:'User OU',
filter:'User filter',
map:'LDAP field mapping',
@@ -805,11 +805,11 @@ const en = {
reset:{
reset:'Reset',
type:'Type',
- pwd:'Password',
+ mima:'Password',
metric:'metric',
alert:'alert',
sysConfig:'System config',
- pwdTip:'Please input your password',
+ mimaTip:'Please input your password',
promptTitle:'Confirm',
yes:'Yes',
no:'No',
@@ -909,7 +909,7 @@ const en = {
authProtocol: 'Auth protocol',
privProtocol: 'Priv protocol',
contextName: 'Context name',
- privPassword: 'Priv password',
+ privMima: 'Priv password',
tip: {
defaultEndpointSet: 'Default endpoint settings',//"默认的Endpoint设置"
relation: 'Module associated Endpoint will configure the following ports/paths/parameters by default'//"组件关联的Endpoint将默认配置以下端口/路径/参数"
diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue
index 9028d6d09..1acc768a5 100644
--- a/nezha-fronted/src/components/common/login.vue
+++ b/nezha-fronted/src/components/common/login.vue
@@ -11,7 +11,7 @@
-
+
-
+
diff --git a/nezha-fronted/src/components/common/project/addLine.vue b/nezha-fronted/src/components/common/project/addLine.vue
index 00c3a5110..d795b48f8 100644
--- a/nezha-fronted/src/components/common/project/addLine.vue
+++ b/nezha-fronted/src/components/common/project/addLine.vue
@@ -420,7 +420,7 @@
};
} else{
model.smooth={
- roundness:0.5 ,// (Math.random()*8 +1)/10 获取0.1-0.9之间的随机数
+ roundness:0.5 ,// (window.crypto.getRandomValues()*8 +1)/10 获取0.1-0.9之间的随机数
type:this.form.type,
};
}
diff --git a/nezha-fronted/src/components/common/rightBox/accountBox.vue b/nezha-fronted/src/components/common/rightBox/accountBox.vue
index 330bd0c14..d7b1f86c8 100644
--- a/nezha-fronted/src/components/common/rightBox/accountBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/accountBox.vue
@@ -24,7 +24,7 @@
v-model="editUser.username" maxlength="64" show-word-limit size="small" :disabled="editUser.username==='admin' && editUser.userId==1">
-
+
diff --git a/nezha-fronted/src/components/common/rightBox/assetBox.vue b/nezha-fronted/src/components/common/rightBox/assetBox.vue
index f5f54a6ba..6a60178aa 100644
--- a/nezha-fronted/src/components/common/rightBox/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetBox.vue
@@ -505,7 +505,7 @@
if (response.code === 200) {
this.assetTypeData = response.data;
if(this.editAsset.model&&!this.editAsset.model.type.code){
- this.editAsset.model.type.code=response.data[0].value;
+ this.editAsset.model.type.code=response.data[0].code;
}
}
resolve(this.assetTypeData);
@@ -588,6 +588,9 @@
box.validateAccount();
});
}
+ // if(this.editAsset.model){
+ // delete this.editAsset.model;
+ // }
this.$refs.assetEditForm.validate((valid) => {
if (valid && this.accountValidResult) {
if (this.editAsset.id) {
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
index 092481a30..76592d815 100644
--- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
@@ -165,7 +165,7 @@
- {{$t('login.password')}}
+ {{$t('login.mima')}}
@@ -204,7 +204,7 @@
- {{$t('project.module.privPassword')}}
+ {{$t('project.module.privMima')}}
diff --git a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue
index e2ad70532..b0fcf89ac 100644
--- a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue
+++ b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue
@@ -67,7 +67,7 @@
- {{$t('login.password')}}
+ {{$t('login.mima')}}
@@ -100,7 +100,7 @@
- {{$t('project.module.privPassword')}}
+ {{$t('project.module.privMima')}}
diff --git a/nezha-fronted/src/components/page/asset/accountConfig.vue b/nezha-fronted/src/components/page/asset/accountConfig.vue
index 0a30979b4..24711f088 100644
--- a/nezha-fronted/src/components/page/asset/accountConfig.vue
+++ b/nezha-fronted/src/components/page/asset/accountConfig.vue
@@ -6,17 +6,17 @@
- {{$t('asset.password')}}
+ {{$t('asset.mima')}}
{{$t('asset.ssh')}}
-
+
-
+
@@ -30,7 +30,7 @@
-
+
@@ -71,7 +71,7 @@
-
+
@@ -86,7 +86,7 @@
-
+
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index a78cf49c3..c6675a8f2 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -687,7 +687,7 @@
detail.account = account.user;
let loginType = "";
if (account.authType == 1) {
- loginType = this.$t('asset.password');
+ loginType = this.$t('asset.mima');
} else if (account.authType == 2) {
loginType = this.$t('asset.ssh');
}
diff --git a/nezha-fronted/src/components/page/config/changePwd.vue b/nezha-fronted/src/components/page/config/changePwd.vue
index a99b36dc9..1cc65c0af 100644
--- a/nezha-fronted/src/components/page/config/changePwd.vue
+++ b/nezha-fronted/src/components/page/config/changePwd.vue
@@ -1,18 +1,18 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -46,7 +46,7 @@
if(value && value != '' ){
callback();
}else{
- callback(new Error(temp.$t('config.account.invalidPwd')))
+ callback(new Error(temp.$t('config.account.invalidMima')))
}
};
var validateConfirmPass=(rule,value,callback) => {
@@ -67,7 +67,7 @@
rules:{
pwd:[{required:true,message: this.$t('validate.required'), trigger: 'blur'}],
newPwd:[{required:true,message: this.$t('validate.required'), trigger: 'blur'},{validator:validatePass,trigger: 'blur'}],
- confirmPwd:[{required:true,message: this.$t('config.account.reinputPwd'), trigger: 'blur'},{validator:validateConfirmPass,trigger: 'blur'}]
+ confirmPwd:[{required:true,message: this.$t('config.account.reinputMima'), trigger: 'blur'},{validator:validateConfirmPass,trigger: 'blur'}]
},
visible:false,
}
diff --git a/nezha-fronted/src/components/page/config/mibBrowser.vue b/nezha-fronted/src/components/page/config/mibBrowser.vue
index d8ff5b488..aa59ee91c 100644
--- a/nezha-fronted/src/components/page/config/mibBrowser.vue
+++ b/nezha-fronted/src/components/page/config/mibBrowser.vue
@@ -81,7 +81,7 @@
- {{$t('login.password')}}
+ {{$t('login.mima')}}
@@ -114,7 +114,7 @@
- {{$t('project.module.privPassword')}}
+ {{$t('project.module.privMima')}}
diff --git a/nezha-fronted/src/components/page/config/system.vue b/nezha-fronted/src/components/page/config/system.vue
index 2126c8166..bfd9b01e7 100644
--- a/nezha-fronted/src/components/page/config/system.vue
+++ b/nezha-fronted/src/components/page/config/system.vue
@@ -63,7 +63,7 @@
autocomplete="off"
-
+
{{$t('config.system.email.pwdTip')}}
@@ -119,7 +119,7 @@
-
+
diff --git a/nezha-fronted/src/components/page/dashboard/explore/editor.vue b/nezha-fronted/src/components/page/dashboard/explore/editor.vue
index b45a0bf2a..4dc9a2c5e 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/editor.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/editor.vue
@@ -692,7 +692,7 @@
},
guid() {
function S4() {
- return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+ return (((1 + window.crypto.getRandomValues()) * 0x10000) | 0).toString(16).substring(1);
}
return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
},
diff --git a/nezha-fronted/src/components/page/dashboard/explore/explore.vue b/nezha-fronted/src/components/page/dashboard/explore/explore.vue
index 5f8f1a44f..38f2c4324 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/explore.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/explore.vue
@@ -102,7 +102,7 @@
-
+
Simple time series selection
diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
index 079c2e700..a9dfd3381 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
@@ -474,7 +474,7 @@
},
guid() {
function S4() {
- return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+ return (((1 + window.crypto.getRandomValues()) * 0x10000) | 0).toString(16).substring(1);
}
return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index 1f0f182c3..555894714 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -694,7 +694,7 @@
detail.account=account.user;
let loginType="";
if(account.authType==1){
- loginType=this.$t('asset.password');
+ loginType=this.$t('asset.mima');
}else if(account.authType==2){
loginType=this.$t('asset.ssh');
}