From ab6c20aa6fb88effc86945896d9cefd10383a1f8 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 3 Mar 2025 11:54:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=A0=E8=A7=A3=E5=AF=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.js | 5 +- manifest.json | 34 +++++++- store/modules/user.js | 2 + utils/aescbc.js | 16 ++-- utils/bonus.js | 196 ++++++++++++++++++++++-------------------- utils/request.js | 12 ++- 6 files changed, 158 insertions(+), 107 deletions(-) diff --git a/config.js b/config.js index 71315ad..d9215d8 100644 --- a/config.js +++ b/config.js @@ -1,10 +1,11 @@ // 应用全局配置 module.exports = { // baseUrl: 'https://vue.ruoyi.vip/prod-api', - baseUrl: 'http://218.21.27.6:1999/prod-api', // 正式环境 + baseUrl: 'http://218.21.27.6:1999/nxdt-api', // 正式环境 // baseUrl: 'http://192.168.0.14:21626/prod-api', // 测试环境 // baseUrl: 'http://192.168.0.58:19090', // 杰 // baseUrl: 'http://192.168.0.176:18080', // 强 + // baseUrl: 'http://192.168.0.38:18080', // 强 // fileUrl: 'http://192.168.0.14:21626/file/statics/', // 测试环境 // fileUrl2: 'http://192.168.0.14:21626/file/statics', // 测试环境 // 课件: 文件视频路径 @@ -36,7 +37,7 @@ module.exports = { url: '' } ] - }, + } // devServer: { // disableHostCheck: true, // proxy: { diff --git a/manifest.json b/manifest.json index 6f10c06..69c46fc 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "宁夏电投二期", - "appid" : "__UNI__9ED2404", + "appid" : "__UNI__92EF0C0", "description" : "", "versionName" : "1.1.0", "versionCode" : "100", @@ -65,6 +65,38 @@ } }, "maps" : {} + }, + "icons" : { + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + }, + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + }, + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + } + } } } }, diff --git a/store/modules/user.js b/store/modules/user.js index c5d5462..3798355 100644 --- a/store/modules/user.js +++ b/store/modules/user.js @@ -42,6 +42,8 @@ const user = { Login({ commit }, userInfo) { const username = userInfo.username.trim() const password = userInfo.password + + console.log('username', username, 'password', password) return new Promise((resolve, reject) => { login(username, password) .then(res => { diff --git a/utils/aescbc.js b/utils/aescbc.js index f093fb9..160297e 100644 --- a/utils/aescbc.js +++ b/utils/aescbc.js @@ -6,20 +6,20 @@ const cbc_iv = CryptoJS.enc.Utf8.parse('1234567812345678') * 默认参数需要加密 * @type {boolean} */ -const jia_mi=true; +const jia_mi = false /** * 默认后台会自动加密 * @type {boolean} */ -const jie_mi=true; +const jie_mi = false /** * 加密 * @param word * @returns {string} */ -export const encryptCBC = function(word) { - if(!jia_mi){ - return word; +export const encryptCBC = function (word) { + if (!jia_mi) { + return word } const srcs = CryptoJS.enc.Utf8.parse(word) const encrypted = CryptoJS.AES.encrypt(srcs, cbc_key, { @@ -34,9 +34,9 @@ export const encryptCBC = function(word) { * @param word * @returns {*} */ -export const decryptCBC = function(word) { - if(!jie_mi){ - return word; +export const decryptCBC = function (word) { + if (!jie_mi) { + return word } const encrypted = CryptoJS.AES.decrypt(word, cbc_key, { iv: cbc_iv, diff --git a/utils/bonus.js b/utils/bonus.js index a61f0ff..e4d0a29 100644 --- a/utils/bonus.js +++ b/utils/bonus.js @@ -1,19 +1,17 @@ - -export function lookFile(){ +export function lookFile() { // return 'http://192.168.0.14:21626/file/statics' //14服务器 - return 'http://218.21.27.6:1999/file/statics' //1.6演示服务器 + return 'http://218.21.27.6:1999/file/statics' //1.6演示服务器 } -export function lookFaceFile(){ - // return 'http://192.168.0.14:21626/file/statics/' //14服务器 +export function lookFaceFile() { + // return 'http://192.168.0.14:21626/file/statics/' //14服务器 // return 'http://192.168.2.76:18080/file/statics/' - return 'http://218.21.27.6:1999/file/statics/' //1.6演示服务器 + return 'http://218.21.27.6:1999/file/statics/' //1.6演示服务器 } -export function filePreview(){ - // return 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器 - return 'http://218.21.27.6:18013/onlinePreview?url=' //1.6演示服务器 +export function filePreview() { + // return 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器 + return 'http://218.21.27.6:18013/onlinePreview?url=' //1.6演示服务器 } - // lookFile: 'http://218.21.27.6:1999/nxnyback/statics', // filePreviewPath: 'http://218.21.27.6:8012/onlinePreview?url=', // lookFile: 'http://112.29.103.165:14413/file/statics', @@ -32,12 +30,15 @@ export function parseTime(time, pattern) { if (typeof time === 'object') { date = time } else { - if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { + if (typeof time === 'string' && /^[0-9]+$/.test(time)) { time = parseInt(time) } else if (typeof time === 'string') { - time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), ''); + time = time + .replace(new RegExp(/-/gm), '/') + .replace('T', ' ') + .replace(new RegExp(/\.[\d]{3}/gm), '') } - if ((typeof time === 'number') && (time.toString().length === 10)) { + if (typeof time === 'number' && time.toString().length === 10) { time = time * 1000 } date = new Date(time) @@ -54,7 +55,9 @@ export function parseTime(time, pattern) { const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { let value = formatObj[key] // Note: getDay() returns 0 on Sunday - if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] } + if (key === 'a') { + return ['日', '一', '二', '三', '四', '五', '六'][value] + } if (result.length > 0 && value < 10) { value = '0' + value } @@ -66,89 +69,92 @@ export function parseTime(time, pattern) { // 表单重置 export function resetForm(refName) { if (this.$refs[refName]) { - this.$refs[refName].resetFields(); + this.$refs[refName].resetFields() } } // 添加日期范围 export function addDateRange(params, dateRange, propName) { - let search = params; - search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {}; - dateRange = Array.isArray(dateRange) ? dateRange : []; - if (typeof (propName) === 'undefined') { - search.params['beginTime'] = dateRange[0]; - search.params['endTime'] = dateRange[1]; + let search = params + search.params = + typeof search.params === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {} + dateRange = Array.isArray(dateRange) ? dateRange : [] + if (typeof propName === 'undefined') { + search.params['beginTime'] = dateRange[0] + search.params['endTime'] = dateRange[1] } else { - search.params['begin' + propName] = dateRange[0]; - search.params['end' + propName] = dateRange[1]; + search.params['begin' + propName] = dateRange[0] + search.params['end' + propName] = dateRange[1] } - return search; + return search } // 回显数据字典 export function selectDictLabel(datas, value) { if (value === undefined) { - return ""; + return '' } - var actions = []; - Object.keys(datas).some((key) => { - if (datas[key].value == ('' + value)) { - actions.push(datas[key].label); - return true; + var actions = [] + Object.keys(datas).some(key => { + if (datas[key].value == '' + value) { + actions.push(datas[key].label) + return true } }) if (actions.length === 0) { - actions.push(value); + actions.push(value) } - return actions.join(''); + return actions.join('') } // 回显数据字典（字符串、数组） export function selectDictLabels(datas, value, separator) { - if (value === undefined || value.length ===0) { - return ""; + if (value === undefined || value.length === 0) { + return '' } if (Array.isArray(value)) { - value = value.join(","); + value = value.join(',') } - var actions = []; - var currentSeparator = undefined === separator ? "," : separator; - var temp = value.split(currentSeparator); - Object.keys(value.split(currentSeparator)).some((val) => { - var match = false; - Object.keys(datas).some((key) => { - if (datas[key].value == ('' + temp[val])) { - actions.push(datas[key].label + currentSeparator); - match = true; + var actions = [] + var currentSeparator = undefined === separator ? ',' : separator + var temp = value.split(currentSeparator) + Object.keys(value.split(currentSeparator)).some(val => { + var match = false + Object.keys(datas).some(key => { + if (datas[key].value == '' + temp[val]) { + actions.push(datas[key].label + currentSeparator) + match = true } }) if (!match) { - actions.push(temp[val] + currentSeparator); + actions.push(temp[val] + currentSeparator) } }) - return actions.join('').substring(0, actions.join('').length - 1); + return actions.join('').substring(0, actions.join('').length - 1) } // 字符串格式化(%s ) export function sprintf(str) { - var args = arguments, flag = true, i = 1; + var args = arguments, + flag = true, + i = 1 str = str.replace(/%s/g, function () { - var arg = args[i++]; + var arg = args[i++] if (typeof arg === 'undefined') { - flag = false; - return ''; + flag = false + return '' } - return arg; - }); - return flag ? str : ''; + return arg + }) + return flag ? str : '' } // 转换字符串，undefined,null等转化为"" export function parseStrEmpty(str) { - if (!str || str == "undefined" || str == "null") { - return ""; + if (!str || str == 'undefined' || str == 'null') { + return '' } - return str; + return str } // 数据合并 @@ -156,16 +162,16 @@ export function mergeRecursive(source, target) { for (var p in target) { try { if (target[p].constructor == Object) { - source[p] = mergeRecursive(source[p], target[p]); + source[p] = mergeRecursive(source[p], target[p]) } else { - source[p] = target[p]; + source[p] = target[p] } } catch (e) { - source[p] = target[p]; + source[p] = target[p] } } - return source; -}; + return source +} /** * 构造树型结构数据 @@ -179,65 +185,65 @@ export function handleTree(data, id, parentId, children) { id: id || 'id', parentId: parentId || 'parentId', childrenList: children || 'children' - }; + } - var childrenListMap = {}; - var nodeIds = {}; - var tree = []; + var childrenListMap = {} + var nodeIds = {} + var tree = [] for (let d of data) { - let parentId = d[config.parentId]; + let parentId = d[config.parentId] if (childrenListMap[parentId] == null) { - childrenListMap[parentId] = []; + childrenListMap[parentId] = [] } - nodeIds[d[config.id]] = d; - childrenListMap[parentId].push(d); + nodeIds[d[config.id]] = d + childrenListMap[parentId].push(d) } for (let d of data) { - let parentId = d[config.parentId]; + let parentId = d[config.parentId] if (nodeIds[parentId] == null) { - tree.push(d); + tree.push(d) } } for (let t of tree) { - adaptToChildrenList(t); + adaptToChildrenList(t) } function adaptToChildrenList(o) { if (childrenListMap[o[config.id]] !== null) { - o[config.childrenList] = childrenListMap[o[config.id]]; + o[config.childrenList] = childrenListMap[o[config.id]] } if (o[config.childrenList]) { for (let c of o[config.childrenList]) { - adaptToChildrenList(c); + adaptToChildrenList(c) } } } - return tree; + return tree } /** -* 参数处理 -* @param {*} params 参数 -*/ + * 参数处理 + * @param {*} params 参数 + */ export function tansParams(params) { let result = '' for (const propName of Object.keys(params)) { - const value = params[propName]; - var part = encodeURIComponent(propName) + "="; - if (value !== null && value !== "" && typeof (value) !== "undefined") { + const value = params[propName] + var part = encodeURIComponent(propName) + '=' + if (value !== null && value !== '' && typeof value !== 'undefined') { if (typeof value === 'object') { for (const key of Object.keys(value)) { - if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') { - let params = propName + '[' + key + ']'; - var subPart = encodeURIComponent(params) + "="; - result += subPart + encodeURIComponent(value[key]) + "&"; + if (value[key] !== null && value[key] !== '' && typeof value[key] !== 'undefined') { + let params = propName + '[' + key + ']' + var subPart = encodeURIComponent(params) + '=' + result += subPart + encodeURIComponent(value[key]) + '&' } } } else { - result += part + encodeURIComponent(value) + "&"; + result += part + encodeURIComponent(value) + '&' } } } @@ -266,12 +272,14 @@ export function indexContinuous(num, size) { */ export function hideSensitiveInfo(info) { // 假设只显示前三位和后四位，中间用星号代替 - if (info.length === 11) { // 手机号 - return info.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2'); - } else if (info.length === 18) { // 身份证号 - return info.replace(/(\d{4})\d{10}(\w{4})/, '$1**********$2'); + if (info.length === 11) { + // 手机号 + return info.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2') + } else if (info.length === 18) { + // 身份证号 + return info.replace(/(\d{4})\d{10}(\w{4})/, '$1**********$2') } else { - return info; // 其他情况，直接返回原始信息 + return info // 其他情况，直接返回原始信息 } } @@ -284,7 +292,7 @@ export function getFileData(fileList) { return Promise.all(fileList.filter(item => item?.hasOwnProperty('raw')).map(item => item.raw)) } -export function getParams(){ +export function getParams() { return { proId: this.$store.state.user.thisIds.proId, supUuid: this.$store.state.user.thisIds.supUuid, @@ -293,8 +301,8 @@ export function getParams(){ subUuid: this.$store.state.user.thisIds.subUuid, userType: this.$store.state.user.userType, uuid: this.$store.state.user.thisIds.uuid, - parentUuid : this.$store.state.user.thisIds.parentUuid - }; + parentUuid: this.$store.state.user.thisIds.parentUuid + } } /** diff --git a/utils/request.js b/utils/request.js index a0631ef..565675d 100644 --- a/utils/request.js +++ b/utils/request.js @@ -85,13 +85,21 @@ const request = config => { dataType: 'json' }) .then(response => { - // console.log('🚀 ~ request ~ response:', response) + console.log('🚀 ~ request ~ response:-------------', response) if (!response[1]) { toast('系统异常, 请联系管理员') reject('系统异常, 请联系管理员') return } - let res = JSON.parse(decryptCBC(response[1].data.data)) + let res = null + if (typeof response[1].data.decrypt != 'undefined' && response[1].data.decrypt) { + res = JSON.parse(decryptCBC(response[1].data.data)) + } else { + res = decryptCBC(response[1].data) + } + + console.log('处理之后的res', res) + // let res = JSON.parse(decryptCBC(response[1].data.data)) // console.log('🚀 ~ request ~ 返回数据-data:', res) if (res.code === 200) { resolve(res)