Commit 2bbd77c1 by 程彤

除了UE 安全没处理,其他的改了。

parent 8dd1b0e7
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
"@vue/cli-service": "^3.12.1", "@vue/cli-service": "^3.12.1",
"@vue/eslint-config-standard": "^4.0.0", "@vue/eslint-config-standard": "^4.0.0",
"babel-eslint": "^10.0.3", "babel-eslint": "^10.0.3",
"crypto-js": "^4.0.0",
"eslint": "^5.16.0", "eslint": "^5.16.0",
"eslint-plugin-vue": "^5.1.0", "eslint-plugin-vue": "^5.1.0",
"html-webpack-plugin": "^3.2.0", "html-webpack-plugin": "^3.2.0",
......
...@@ -2281,7 +2281,7 @@ ...@@ -2281,7 +2281,7 @@
// IE8 has postMessage, but it's sync & typeof its postMessage is 'object' // IE8 has postMessage, but it's sync & typeof its postMessage is 'object'
} else if (global.addEventListener && typeof postMessage == 'function' && !global.importScripts) { } else if (global.addEventListener && typeof postMessage == 'function' && !global.importScripts) {
defer = function (id) { defer = function (id) {
global.postMessage(id + '', '*'); // global.postMessage(id + '', '*');
}; };
global.addEventListener('message', listener, false); global.addEventListener('message', listener, false);
// IE8- // IE8-
......
import CryptoJS from 'crypto-js';
export default {
//随机生成指定数量的16进制key
generatekey(num) {
let library = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
let key = "";
for (var i = 0; i < num; i++) {
let randomPoz = Math.floor(Math.random() * library.length);
key += library.substring(randomPoz, randomPoz + 1);
}
return key;
},
//加密
encrypt(word, keyStr) {
keyStr = keyStr ? keyStr : 'abcdsxyzhkj12345'; //判断是否存在ksy,不存在就用定义好的key
var key = CryptoJS.enc.Utf8.parse(keyStr);
var srcs = CryptoJS.enc.Utf8.parse(word);
var encrypted = CryptoJS.AES.encrypt(srcs, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 });
return encrypted.toString();
},
//解密
decrypt(word, keyStr) {
keyStr = keyStr ? keyStr : 'abcdsxyzhkj12345';
var key = CryptoJS.enc.Utf8.parse(keyStr);
var decrypt = CryptoJS.AES.decrypt(word, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 });
return CryptoJS.enc.Utf8.stringify(decrypt).toString();
}
}
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
import {registercode} from '@/api/system' import {registercode} from '@/api/system'
import { postAction } from '@/api/manage' import { postAction } from '@/api/manage'
import {mapActions} from 'vuex' import {mapActions} from 'vuex'
import AES from "@/api/AES.js";
export default { export default {
name: "UserPassword", name: "UserPassword",
data () { data () {
...@@ -151,12 +152,16 @@ ...@@ -151,12 +152,16 @@
/*let keyss = setMaxDigits(130); /*let keyss = setMaxDigits(130);
keyss = new RSAKeyPair("10001","","a5d210338760bdbe2baabef73c410582e812dad8d9669d8c6ebfe026450e5cc10005290f17a0474c7351031edbff81bd8217a518bdf1a02855f53105ead0370e8a9e30b8560feab1d333a0b055b29419476b0eea1ea54315662ddfc46ec066f076e9490ec34c825afad9e44cf38e5ab600f3136acfe3a0ac0e672e2cb8e50371"); keyss = new RSAKeyPair("10001","","a5d210338760bdbe2baabef73c410582e812dad8d9669d8c6ebfe026450e5cc10005290f17a0474c7351031edbff81bd8217a518bdf1a02855f53105ead0370e8a9e30b8560feab1d333a0b055b29419476b0eea1ea54315662ddfc46ec066f076e9490ec34c825afad9e44cf38e5ab600f3136acfe3a0ac0e672e2cb8e50371");
let password = encryptedString(keyss,text);*/ let password = encryptedString(keyss,text);*/
let publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAcsbUyeRD2lQGPEnu5LbXOL2lycUJwK/8BsoZD3b932l4JehAvOKR/YNzs6EG4gnZ7gaXLCnWbE5kB1wuUooo6bv8fSAg0W5QmM1TH8zaIImdAaN6c8mw5dUS/2VJ/2GHI54R1NJziX9VHecpf2DrHnWngETsNytmXaVl3JiXywIDAQAB"; // let publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAcsbUyeRD2lQGPEnu5LbXOL2lycUJwK/8BsoZD3b932l4JehAvOKR/YNzs6EG4gnZ7gaXLCnWbE5kB1wuUooo6bv8fSAg0W5QmM1TH8zaIImdAaN6c8mw5dUS/2VJ/2GHI54R1NJziX9VHecpf2DrHnWngETsNytmXaVl3JiXywIDAQAB";
let encrypt = new window.JSEncrypt(); // let encrypt = new window.JSEncrypt();
encrypt.setPublicKey(publicKey); // encrypt.setPublicKey(publicKey);
var encryptPwd = encrypt.encryptLong(text); // var encryptPwd = encrypt.encryptLong(text);
return encryptPwd; // return encryptPwd;
//return text; //return text;
let publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAcsbUyeRD2lQGPEnu5LbXOL2lycUJwK/8BsoZD3b932l4JehAvOKR/YNzs6EG4gnZ7gaXLCnWbE5kB1wuUooo6bv8fSAg0W5QmM1TH8zaIImdAaN6c8mw5dUS/2VJ/2GHI54R1NJziX9VHecpf2DrHnWngETsNytmXaVl3JiXywIDAQAB";
var encrypts = AES.encrypt(text,publicKey);
return encrypts;
// var dess = AES.decrypt(encrypts);解密
}, },
show(uname){ show(uname){
let timestamp = (new Date()).valueOf(); let timestamp = (new Date()).valueOf();
......
...@@ -23,10 +23,13 @@ const service = axios.create({ ...@@ -23,10 +23,13 @@ const service = axios.create({
const err = (error) => { const err = (error) => {
if (error.response) { if (error.response) {
let data = error.response.data let data = {}
if(typeof error.response.data =="object") {
data = error.response.data
}
const token = Vue.ls.get(ACCESS_TOKEN) const token = Vue.ls.get(ACCESS_TOKEN)
console.log("------异常响应------",token) console.log("------异常响应------",token) ;console.log("------异常响应------")
console.log("------异常响应------",error.response.status) // console.log("------异常响应------",error.response.status)
switch (error.response.status) { switch (error.response.status) {
case 403: case 403:
notification.error({ message: '系统提示', description: '拒绝访问',duration: 4}) notification.error({ message: '系统提示', description: '拒绝访问',duration: 4})
...@@ -39,12 +42,12 @@ const err = (error) => { ...@@ -39,12 +42,12 @@ const err = (error) => {
// window.location.reload() // window.location.reload()
// }) // })
notification.error({ message: '系统提示', description:'很抱歉,登录已过期,请重新登录!',duration: 4}) notification.error({ message: '系统提示', description:'很抱歉,登录已过期,请重新登录!',duration: 4})
setTimeout(()=>{ // setTimeout(()=>{
store.dispatch('Logout').then(() => { store.dispatch('Logout').then(() => {
Vue.ls.remove(ACCESS_TOKEN) Vue.ls.remove(ACCESS_TOKEN)
window.location.reload() window.location.reload()
}) })
},300) // },300)
/*Modal.error({ /*Modal.error({
title: '登录已过期', title: '登录已过期',
content: '很抱歉,登录已过期,请重新登录', content: '很抱歉,登录已过期,请重新登录',
...@@ -112,7 +115,7 @@ service.interceptors.request.use(config => { ...@@ -112,7 +115,7 @@ service.interceptors.request.use(config => {
// response interceptor // response interceptor
service.interceptors.response.use((response) => { service.interceptors.response.use((response) => {
return response.data return response.data
}, err) }, err)
const installer = { const installer = {
vm: {}, vm: {},
......
...@@ -241,6 +241,7 @@ import JDate from '@/components/jeecg/JDate' ...@@ -241,6 +241,7 @@ import JDate from '@/components/jeecg/JDate'
import {notification} from 'ant-design-vue' import {notification} from 'ant-design-vue'
import { postAction } from '@/api/manage' import { postAction } from '@/api/manage'
import { unique } from '@/utils/util' import { unique } from '@/utils/util'
import AES from "@/api/AES.js";
import { import {
getList, getList,
tabList, tabList,
...@@ -405,12 +406,16 @@ export default { ...@@ -405,12 +406,16 @@ export default {
/*let keyss = setMaxDigits(130); /*let keyss = setMaxDigits(130);
keyss = new RSAKeyPair("10001","","a5d210338760bdbe2baabef73c410582e812dad8d9669d8c6ebfe026450e5cc10005290f17a0474c7351031edbff81bd8217a518bdf1a02855f53105ead0370e8a9e30b8560feab1d333a0b055b29419476b0eea1ea54315662ddfc46ec066f076e9490ec34c825afad9e44cf38e5ab600f3136acfe3a0ac0e672e2cb8e50371"); keyss = new RSAKeyPair("10001","","a5d210338760bdbe2baabef73c410582e812dad8d9669d8c6ebfe026450e5cc10005290f17a0474c7351031edbff81bd8217a518bdf1a02855f53105ead0370e8a9e30b8560feab1d333a0b055b29419476b0eea1ea54315662ddfc46ec066f076e9490ec34c825afad9e44cf38e5ab600f3136acfe3a0ac0e672e2cb8e50371");
let password = encryptedString(keyss,text);*/ let password = encryptedString(keyss,text);*/
let publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAcsbUyeRD2lQGPEnu5LbXOL2lycUJwK/8BsoZD3b932l4JehAvOKR/YNzs6EG4gnZ7gaXLCnWbE5kB1wuUooo6bv8fSAg0W5QmM1TH8zaIImdAaN6c8mw5dUS/2VJ/2GHI54R1NJziX9VHecpf2DrHnWngETsNytmXaVl3JiXywIDAQAB"; // let publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAcsbUyeRD2lQGPEnu5LbXOL2lycUJwK/8BsoZD3b932l4JehAvOKR/YNzs6EG4gnZ7gaXLCnWbE5kB1wuUooo6bv8fSAg0W5QmM1TH8zaIImdAaN6c8mw5dUS/2VJ/2GHI54R1NJziX9VHecpf2DrHnWngETsNytmXaVl3JiXywIDAQAB";
let encrypt = new window.JSEncrypt(); // let encrypt = new window.JSEncrypt();
encrypt.setPublicKey(publicKey); // encrypt.setPublicKey(publicKey);
var encryptPwd = encrypt.encryptLong(text); // var encryptPwd = encrypt.encryptLong(text);
return encryptPwd; // return encryptPwd;
//return text; //return text;
let publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAcsbUyeRD2lQGPEnu5LbXOL2lycUJwK/8BsoZD3b932l4JehAvOKR/YNzs6EG4gnZ7gaXLCnWbE5kB1wuUooo6bv8fSAg0W5QmM1TH8zaIImdAaN6c8mw5dUS/2VJ/2GHI54R1NJziX9VHecpf2DrHnWngETsNytmXaVl3JiXywIDAQAB";
var encrypts = AES.encrypt(text,publicKey);
return encrypts;
// var dess = AES.decrypt(encrypts);解密
}, },
//提交密码修改 //提交密码修改
editPassword() { editPassword() {
......
...@@ -105,19 +105,19 @@ ...@@ -105,19 +105,19 @@
</template> </template>
<script> <script>
import TwoStepCaptcha from '@/components/tools/TwoStepCaptcha' import TwoStepCaptcha from '@/components/tools/TwoStepCaptcha'
import {mapActions} from "vuex" import {mapActions} from "vuex"
import { getPhoneCode } from "@/api/login" import { getPhoneCode } from "@/api/login"
import {timeFix} from "@/utils/util" import {timeFix} from "@/utils/util"
import Vue from 'vue' import Vue from 'vue'
import {ACCESS_TOKEN} from "@/store/mutation-types" import {ACCESS_TOKEN} from "@/store/mutation-types"
import JGraphicCode from '@/components/jeecg/JGraphicCode' import JGraphicCode from '@/components/jeecg/JGraphicCode'
import LeakProofModel from '@/views/user/protocol/Leak-proof-model' import LeakProofModel from '@/views/user/protocol/Leak-proof-model'
import commitment from '@/views/user/protocol/commitment' import commitment from '@/views/user/protocol/commitment'
import {setMaxDigits , RSAKeyPair , encryptedString} from '@/utils/RSA' import {setMaxDigits , RSAKeyPair , encryptedString} from '@/utils/RSA'
import AES from "@/api/AES.js";
export default {
export default {
components: { components: {
TwoStepCaptcha, TwoStepCaptcha,
JGraphicCode, JGraphicCode,
...@@ -262,12 +262,17 @@ export default { ...@@ -262,12 +262,17 @@ export default {
/*let keyss = setMaxDigits(130); /*let keyss = setMaxDigits(130);
keyss = new RSAKeyPair("10001","","a5d210338760bdbe2baabef73c410582e812dad8d9669d8c6ebfe026450e5cc10005290f17a0474c7351031edbff81bd8217a518bdf1a02855f53105ead0370e8a9e30b8560feab1d333a0b055b29419476b0eea1ea54315662ddfc46ec066f076e9490ec34c825afad9e44cf38e5ab600f3136acfe3a0ac0e672e2cb8e50371"); keyss = new RSAKeyPair("10001","","a5d210338760bdbe2baabef73c410582e812dad8d9669d8c6ebfe026450e5cc10005290f17a0474c7351031edbff81bd8217a518bdf1a02855f53105ead0370e8a9e30b8560feab1d333a0b055b29419476b0eea1ea54315662ddfc46ec066f076e9490ec34c825afad9e44cf38e5ab600f3136acfe3a0ac0e672e2cb8e50371");
let password = encryptedString(keyss,text);*/ let password = encryptedString(keyss,text);*/
let publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAcsbUyeRD2lQGPEnu5LbXOL2lycUJwK/8BsoZD3b932l4JehAvOKR/YNzs6EG4gnZ7gaXLCnWbE5kB1wuUooo6bv8fSAg0W5QmM1TH8zaIImdAaN6c8mw5dUS/2VJ/2GHI54R1NJziX9VHecpf2DrHnWngETsNytmXaVl3JiXywIDAQAB"; // let publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAcsbUyeRD2lQGPEnu5LbXOL2lycUJwK/8BsoZD3b932l4JehAvOKR/YNzs6EG4gnZ7gaXLCnWbE5kB1wuUooo6bv8fSAg0W5QmM1TH8zaIImdAaN6c8mw5dUS/2VJ/2GHI54R1NJziX9VHecpf2DrHnWngETsNytmXaVl3JiXywIDAQAB";
let encrypt = new window.JSEncrypt(); // let encrypt = new window.JSEncrypt();
encrypt.setPublicKey(publicKey); // encrypt.setPublicKey(publicKey);
var encryptPwd = encrypt.encryptLong(text); // var encryptPwd = encrypt.encryptLong(text);
return encryptPwd; // return encryptPwd;
//return text; //return text;
let publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAcsbUyeRD2lQGPEnu5LbXOL2lycUJwK/8BsoZD3b932l4JehAvOKR/YNzs6EG4gnZ7gaXLCnWbE5kB1wuUooo6bv8fSAg0W5QmM1TH8zaIImdAaN6c8mw5dUS/2VJ/2GHI54R1NJziX9VHecpf2DrHnWngETsNytmXaVl3JiXywIDAQAB";
var encrypts = AES.encrypt(text,publicKey);
return encrypts;
// var dess = AES.decrypt(encrypts);解密
}, },
stepCaptchaSuccess() { stepCaptchaSuccess() {
this.loginSuccess() this.loginSuccess()
...@@ -358,7 +363,7 @@ export default { ...@@ -358,7 +363,7 @@ export default {
}) })
}, },
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
...@@ -102,7 +102,7 @@ import JGraphicCode from '@/components/jeecg/JGraphicCode' ...@@ -102,7 +102,7 @@ import JGraphicCode from '@/components/jeecg/JGraphicCode'
import { import {
register,registercode register,registercode
} from '@/api/system' } from '@/api/system'
import AES from "@/api/AES.js";
export default { export default {
components: { components: {
TwoStepCaptcha, TwoStepCaptcha,
...@@ -282,12 +282,17 @@ export default { ...@@ -282,12 +282,17 @@ export default {
/*let keyss = setMaxDigits(130); /*let keyss = setMaxDigits(130);
keyss = new RSAKeyPair("10001","","a5d210338760bdbe2baabef73c410582e812dad8d9669d8c6ebfe026450e5cc10005290f17a0474c7351031edbff81bd8217a518bdf1a02855f53105ead0370e8a9e30b8560feab1d333a0b055b29419476b0eea1ea54315662ddfc46ec066f076e9490ec34c825afad9e44cf38e5ab600f3136acfe3a0ac0e672e2cb8e50371"); keyss = new RSAKeyPair("10001","","a5d210338760bdbe2baabef73c410582e812dad8d9669d8c6ebfe026450e5cc10005290f17a0474c7351031edbff81bd8217a518bdf1a02855f53105ead0370e8a9e30b8560feab1d333a0b055b29419476b0eea1ea54315662ddfc46ec066f076e9490ec34c825afad9e44cf38e5ab600f3136acfe3a0ac0e672e2cb8e50371");
let password = encryptedString(keyss,text);*/ let password = encryptedString(keyss,text);*/
let publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAcsbUyeRD2lQGPEnu5LbXOL2lycUJwK/8BsoZD3b932l4JehAvOKR/YNzs6EG4gnZ7gaXLCnWbE5kB1wuUooo6bv8fSAg0W5QmM1TH8zaIImdAaN6c8mw5dUS/2VJ/2GHI54R1NJziX9VHecpf2DrHnWngETsNytmXaVl3JiXywIDAQAB"; // let publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAcsbUyeRD2lQGPEnu5LbXOL2lycUJwK/8BsoZD3b932l4JehAvOKR/YNzs6EG4gnZ7gaXLCnWbE5kB1wuUooo6bv8fSAg0W5QmM1TH8zaIImdAaN6c8mw5dUS/2VJ/2GHI54R1NJziX9VHecpf2DrHnWngETsNytmXaVl3JiXywIDAQAB";
let encrypt = new window.JSEncrypt(); // let encrypt = new window.JSEncrypt();
encrypt.setPublicKey(publicKey); // encrypt.setPublicKey(publicKey);
var encryptPwd = encrypt.encryptLong(text); // var encryptPwd = encrypt.encryptLong(text);
return encryptPwd; // return encryptPwd;
//return text; //return text;
let publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCAcsbUyeRD2lQGPEnu5LbXOL2lycUJwK/8BsoZD3b932l4JehAvOKR/YNzs6EG4gnZ7gaXLCnWbE5kB1wuUooo6bv8fSAg0W5QmM1TH8zaIImdAaN6c8mw5dUS/2VJ/2GHI54R1NJziX9VHecpf2DrHnWngETsNytmXaVl3JiXywIDAQAB";
var encrypts = AES.encrypt(text,publicKey);
return encrypts;
// var dess = AES.decrypt(encrypts);解密
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment