From 8b3580acad2ebf93d9f54053f90956da33bc12fe Mon Sep 17 00:00:00 2001 From: "zhaoxingchang.sd" Date: Mon, 29 Apr 2024 16:31:15 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"fix=20=E6=96=B0=E5=A2=9E=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E7=A8=8E=E5=8A=A1=E5=B1=80=E7=99=BB=E5=BD=95=20?= =?UTF-8?q?=E5=85=A8=E5=B1=80api=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f899e150933c4362772255d23db9f81e10f52448. --- jianshui-ui/package.json | 1 - jianshui-ui/src/api/breaker/request.js | 2 +- jianshui-ui/src/api/digital/registered.js | 16 +- jianshui-ui/src/api/digital/taxBureauLogin.js | 49 --- jianshui-ui/src/api/invoice/billinfo.js | 12 +- jianshui-ui/src/api/login.js | 12 +- jianshui-ui/src/api/menu.js | 4 +- jianshui-ui/src/api/monitor/cache.js | 2 +- jianshui-ui/src/api/monitor/job.js | 16 +- jianshui-ui/src/api/monitor/jobLog.js | 6 +- jianshui-ui/src/api/monitor/logininfor.js | 6 +- jianshui-ui/src/api/monitor/online.js | 4 +- jianshui-ui/src/api/monitor/operlog.js | 6 +- jianshui-ui/src/api/monitor/server.js | 4 +- jianshui-ui/src/api/platform/exportmanage.js | 10 +- jianshui-ui/src/api/platform/exportsetting.js | 8 +- jianshui-ui/src/api/platform/product_info.js | 10 +- jianshui-ui/src/api/platform/vehiclecode.js | 10 +- jianshui-ui/src/api/sandbox/encrypt.js | 2 +- .../src/api/sdInvoicefile/sdinvoicefile.js | 4 +- jianshui-ui/src/api/system/companyservice.js | 10 +- .../src/api/system/companyservice_detail.js | 10 +- jianshui-ui/src/api/system/config.js | 14 +- jianshui-ui/src/api/system/dept.js | 18 +- jianshui-ui/src/api/system/dict/data.js | 12 +- jianshui-ui/src/api/system/dict/type.js | 16 +- jianshui-ui/src/api/system/manageservices.js | 10 +- jianshui-ui/src/api/system/menu.js | 16 +- jianshui-ui/src/api/system/notice.js | 12 +- jianshui-ui/src/api/system/post.js | 10 +- jianshui-ui/src/api/system/prop.js | 12 +- jianshui-ui/src/api/system/role.js | 26 +- jianshui-ui/src/api/system/user.js | 26 +- jianshui-ui/src/api/tool/gen.js | 18 +- jianshui-ui/src/assets/images/tishi.png | Bin 2811 -> 0 bytes jianshui-ui/src/store/modules/user.js | 7 +- jianshui-ui/src/utils/request.js | 5 +- .../src/views/digital/registered/index.vue | 27 +- .../views/digital/taxBureauLogin/index.vue | 401 ------------------ jianshui-ui/vue.config.js | 21 +- 40 files changed, 187 insertions(+), 668 deletions(-) delete mode 100644 jianshui-ui/src/api/digital/taxBureauLogin.js delete mode 100644 jianshui-ui/src/assets/images/tishi.png delete mode 100644 jianshui-ui/src/views/digital/taxBureauLogin/index.vue diff --git a/jianshui-ui/package.json b/jianshui-ui/package.json index 5059077..49b814d 100644 --- a/jianshui-ui/package.json +++ b/jianshui-ui/package.json @@ -49,7 +49,6 @@ "js-cookie": "3.0.1", "jsencrypt": "3.2.1", "nprogress": "0.2.0", - "qrcodejs2": "0.0.2", "quill": "1.3.7", "screenfull": "5.0.2", "sortablejs": "1.10.2", diff --git a/jianshui-ui/src/api/breaker/request.js b/jianshui-ui/src/api/breaker/request.js index edcc74a..7df9a68 100644 --- a/jianshui-ui/src/api/breaker/request.js +++ b/jianshui-ui/src/api/breaker/request.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function jianShuiLicense(data) { return request({ - url: '/dev-api/breaker/jianShuiLicense', + url: '/breaker/jianShuiLicense', method: 'post', data: data }) diff --git a/jianshui-ui/src/api/digital/registered.js b/jianshui-ui/src/api/digital/registered.js index def31b5..0462003 100644 --- a/jianshui-ui/src/api/digital/registered.js +++ b/jianshui-ui/src/api/digital/registered.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询金四-用户登记列表 export function listInvoiceallyhdj(query) { return request({ - url: '/dev-api/invoiceall/invoiceallyhdj/list', + url: '/invoiceall/invoiceallyhdj/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listInvoiceallyhdj(query) { // 查询金四-用户登记详细 export function getInvoiceallyhdj(id) { return request({ - url: '/dev-api/invoiceall/invoiceallyhdj/' + id, + url: '/invoiceall/invoiceallyhdj/' + id, method: 'get' }) } @@ -36,7 +36,7 @@ export function qrcodeMethod(qrcodeParams,identity) { // 新增金四-用户登记 export function addInvoiceallyhdj(data) { return request({ - url: '/dev-api/invoiceall/invoiceallyhdj', + url: '/invoiceall/invoiceallyhdj', method: 'post', data: data }) @@ -45,7 +45,7 @@ export function addInvoiceallyhdj(data) { // 修改金四-用户登记 export function updateInvoiceallyhdj(data) { return request({ - url: '/dev-api/invoiceall/invoiceallyhdj', + url: '/invoiceall/invoiceallyhdj', method: 'put', data: data }) @@ -54,14 +54,14 @@ export function updateInvoiceallyhdj(data) { // 删除金四-用户登记 export function delInvoiceallyhdj(id) { return request({ - url: '/dev-api/invoiceall/invoiceallyhdj/' + id, + url: '/invoiceall/invoiceallyhdj/' + id, method: 'delete' }) } export function encrypt(data) { return request({ - url: '/dev-api/sandbox/encrypt', + url: '/sandbox/encrypt', method: 'post', data: data }) @@ -69,14 +69,14 @@ export function encrypt(data) { export function obtainLoginStatus(data,identity) { return request({ - url: '/dev-api/invoice_all/obtainLoginStatus?identity=' + identity+"&order="+data, + url: '/invoice_all/obtainLoginStatus?identity=' + identity+"&order="+data, method: 'post' }) } export function getCompanyservice(companyid) { return request({ - url: '/dev-api/system/companyservice/' + companyid, + url: '/system/companyservice/' + companyid, method: 'get' }) } diff --git a/jianshui-ui/src/api/digital/taxBureauLogin.js b/jianshui-ui/src/api/digital/taxBureauLogin.js deleted file mode 100644 index 1d6246b..0000000 --- a/jianshui-ui/src/api/digital/taxBureauLogin.js +++ /dev/null @@ -1,49 +0,0 @@ -import request from '@/utils/request' -import store from '@/store' -// 获取用户列表 -export function queryRpaTaxAccountApi(data) { - return request({ - url:'/api/invoice/front/v1/queryRpaTaxAccount', - method: 'post', - data:{ - identity:store.state.user.authStatus.id, - secret:store.state.user.authStatus.key - } - }) -} -//数电登录接口 -export function rpaLoginApi(parameter) { - return request({ - url: '/api/invoice/front/v1/rpaLogin', - method: 'post', - data: { - ...parameter, - identity:store.state.user.authStatus.id, - secret:store.state.user.authStatus.key - } - }) -} -//数电获取二维码接口 -export function getRpaQrCodeApi(parameter) { - return request({ - url: '/api/invoice/front/v1/getRpaQrCode', - method: 'post', - data: { - ...parameter, - identity:store.state.user.authStatus.id, - secret:store.state.user.authStatus.key - } - }) -} -//数电实名认证状态查询接口 -export function postRpaAuthStatusApi(parameter) { - return request({ - url: '/api/invoice/front/v1/getRpaAuthStatus', - method: 'post', - data: { - ...parameter, - identity:store.state.user.authStatus.id, - secret:store.state.user.authStatus.key - } - }) -} diff --git a/jianshui-ui/src/api/invoice/billinfo.js b/jianshui-ui/src/api/invoice/billinfo.js index 3a83007..a095912 100644 --- a/jianshui-ui/src/api/invoice/billinfo.js +++ b/jianshui-ui/src/api/invoice/billinfo.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询开票信息列表 export function listBillinfo(query) { return request({ - url: '/dev-api/invoice/billinfo/list', + url: '/invoice/billinfo/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listBillinfo(query) { // 查询开票信息详细 export function getBillinfo(id) { return request({ - url: '/dev-api/invoice/billinfo/' + id, + url: '/invoice/billinfo/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getBillinfo(id) { // 新增开票信息 export function addBillinfo(data) { return request({ - url: '/dev-api/invoice/billinfo', + url: '/invoice/billinfo', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addBillinfo(data) { // 修改开票信息 export function updateBillinfo(data) { return request({ - url: '/dev-api/invoice/billinfo', + url: '/invoice/billinfo', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateBillinfo(data) { // 删除开票信息 export function delBillinfo(id) { return request({ - url: '/dev-api/invoice/billinfo/' + id, + url: '/invoice/billinfo/' + id, method: 'delete' }) } @@ -46,7 +46,7 @@ export function delBillinfo(id) { // 重新推送开票明细 export function pushBillinfo(id) { return request({ - url: '/dev-api/invoice/billinfo/push/' + id, + url: '/invoice/billinfo/push/' + id, method: 'get' }) } diff --git a/jianshui-ui/src/api/login.js b/jianshui-ui/src/api/login.js index 41c935f..649f59c 100644 --- a/jianshui-ui/src/api/login.js +++ b/jianshui-ui/src/api/login.js @@ -9,7 +9,7 @@ export function login(username, password, code, uuid) { uuid } return request({ - url: '/dev-api/login', + url: '/login', headers: { isToken: false }, @@ -21,7 +21,7 @@ export function login(username, password, code, uuid) { // 注册方法 export function register(data) { return request({ - url: '/dev-api/register', + url: '/register', headers: { isToken: false }, @@ -33,7 +33,7 @@ export function register(data) { // 获取用户详细信息 export function getInfo() { return request({ - url: '/dev-api/getInfo', + url: '/getInfo', method: 'get' }) } @@ -41,7 +41,7 @@ export function getInfo() { // 退出方法 export function logout() { return request({ - url: '/dev-api/logout', + url: '/logout', method: 'post' }) } @@ -49,11 +49,11 @@ export function logout() { // 获取验证码 export function getCodeImg() { return request({ - url: '/dev-api/captchaImage', + url: '/captchaImage', headers: { isToken: false }, method: 'get', timeout: 20000 }) -} +} \ No newline at end of file diff --git a/jianshui-ui/src/api/menu.js b/jianshui-ui/src/api/menu.js index a5ab5d1..faef101 100644 --- a/jianshui-ui/src/api/menu.js +++ b/jianshui-ui/src/api/menu.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 获取路由 export const getRouters = () => { return request({ - url: '/dev-api/getRouters', + url: '/getRouters', method: 'get' }) -} +} \ No newline at end of file diff --git a/jianshui-ui/src/api/monitor/cache.js b/jianshui-ui/src/api/monitor/cache.js index 5c205db..59d3505 100644 --- a/jianshui-ui/src/api/monitor/cache.js +++ b/jianshui-ui/src/api/monitor/cache.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询缓存详细 export function getCache() { return request({ - url: '/dev-api/monitor/cache', + url: '/monitor/cache', method: 'get' }) } diff --git a/jianshui-ui/src/api/monitor/job.js b/jianshui-ui/src/api/monitor/job.js index 1f55adf..3815569 100644 --- a/jianshui-ui/src/api/monitor/job.js +++ b/jianshui-ui/src/api/monitor/job.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询定时任务调度列表 export function listJob(query) { return request({ - url: '/dev-api/monitor/job/list', + url: '/monitor/job/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listJob(query) { // 查询定时任务调度详细 export function getJob(jobId) { return request({ - url: '/dev-api/monitor/job/' + jobId, + url: '/monitor/job/' + jobId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getJob(jobId) { // 新增定时任务调度 export function addJob(data) { return request({ - url: '/dev-api/monitor/job', + url: '/monitor/job', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addJob(data) { // 修改定时任务调度 export function updateJob(data) { return request({ - url: '/dev-api/monitor/job', + url: '/monitor/job', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateJob(data) { // 删除定时任务调度 export function delJob(jobId) { return request({ - url: '/dev-api/monitor/job/' + jobId, + url: '/monitor/job/' + jobId, method: 'delete' }) } @@ -50,7 +50,7 @@ export function changeJobStatus(jobId, status) { status } return request({ - url: '/dev-api/monitor/job/changeStatus', + url: '/monitor/job/changeStatus', method: 'put', data: data }) @@ -64,8 +64,8 @@ export function runJob(jobId, jobGroup) { jobGroup } return request({ - url: '/dev-api/monitor/job/run', + url: '/monitor/job/run', method: 'put', data: data }) -} +} \ No newline at end of file diff --git a/jianshui-ui/src/api/monitor/jobLog.js b/jianshui-ui/src/api/monitor/jobLog.js index dbb94d8..6e0be61 100644 --- a/jianshui-ui/src/api/monitor/jobLog.js +++ b/jianshui-ui/src/api/monitor/jobLog.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询调度日志列表 export function listJobLog(query) { return request({ - url: '/dev-api/monitor/jobLog/list', + url: '/monitor/jobLog/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listJobLog(query) { // 删除调度日志 export function delJobLog(jobLogId) { return request({ - url: '/dev-api/monitor/jobLog/' + jobLogId, + url: '/monitor/jobLog/' + jobLogId, method: 'delete' }) } @@ -20,7 +20,7 @@ export function delJobLog(jobLogId) { // 清空调度日志 export function cleanJobLog() { return request({ - url: '/dev-api/monitor/jobLog/clean', + url: '/monitor/jobLog/clean', method: 'delete' }) } diff --git a/jianshui-ui/src/api/monitor/logininfor.js b/jianshui-ui/src/api/monitor/logininfor.js index 82c8e47..26a46eb 100644 --- a/jianshui-ui/src/api/monitor/logininfor.js +++ b/jianshui-ui/src/api/monitor/logininfor.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询登录日志列表 export function list(query) { return request({ - url: '/dev-api/monitor/logininfor/list', + url: '/monitor/logininfor/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function list(query) { // 删除登录日志 export function delLogininfor(infoId) { return request({ - url: '/dev-api/monitor/logininfor/' + infoId, + url: '/monitor/logininfor/' + infoId, method: 'delete' }) } @@ -20,7 +20,7 @@ export function delLogininfor(infoId) { // 清空登录日志 export function cleanLogininfor() { return request({ - url: '/dev-api/monitor/logininfor/clean', + url: '/monitor/logininfor/clean', method: 'delete' }) } diff --git a/jianshui-ui/src/api/monitor/online.js b/jianshui-ui/src/api/monitor/online.js index 7675f8c..bd22137 100644 --- a/jianshui-ui/src/api/monitor/online.js +++ b/jianshui-ui/src/api/monitor/online.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询在线用户列表 export function list(query) { return request({ - url: '/dev-api/monitor/online/list', + url: '/monitor/online/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function list(query) { // 强退用户 export function forceLogout(tokenId) { return request({ - url: '/dev-api/monitor/online/' + tokenId, + url: '/monitor/online/' + tokenId, method: 'delete' }) } diff --git a/jianshui-ui/src/api/monitor/operlog.js b/jianshui-ui/src/api/monitor/operlog.js index 2b33ec9..a04bca8 100644 --- a/jianshui-ui/src/api/monitor/operlog.js +++ b/jianshui-ui/src/api/monitor/operlog.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询操作日志列表 export function list(query) { return request({ - url: '/dev-api/monitor/operlog/list', + url: '/monitor/operlog/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function list(query) { // 删除操作日志 export function delOperlog(operId) { return request({ - url: '/dev-api/monitor/operlog/' + operId, + url: '/monitor/operlog/' + operId, method: 'delete' }) } @@ -20,7 +20,7 @@ export function delOperlog(operId) { // 清空操作日志 export function cleanOperlog() { return request({ - url: '/dev-api/monitor/operlog/clean', + url: '/monitor/operlog/clean', method: 'delete' }) } diff --git a/jianshui-ui/src/api/monitor/server.js b/jianshui-ui/src/api/monitor/server.js index 2268504..e1f9ca2 100644 --- a/jianshui-ui/src/api/monitor/server.js +++ b/jianshui-ui/src/api/monitor/server.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 获取服务信息 export function getServer() { return request({ - url: '/dev-api/monitor/server', + url: '/monitor/server', method: 'get' }) -} +} \ No newline at end of file diff --git a/jianshui-ui/src/api/platform/exportmanage.js b/jianshui-ui/src/api/platform/exportmanage.js index 5fdd6ac..386da24 100644 --- a/jianshui-ui/src/api/platform/exportmanage.js +++ b/jianshui-ui/src/api/platform/exportmanage.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询导入设置列表 export function listExportmanage(query) { return request({ - url: '/dev-api/platform/exportmanage/list', + url: '/platform/exportmanage/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listExportmanage(query) { // 查询导入设置详细 export function getExportmanage(id) { return request({ - url: '/dev-api/platform/exportmanage/' + id, + url: '/platform/exportmanage/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getExportmanage(id) { // 新增导入设置 export function addExportmanage(data) { return request({ - url: '/dev-api/platform/exportmanage', + url: '/platform/exportmanage', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addExportmanage(data) { // 修改导入设置 export function updateExportmanage(data) { return request({ - url: '/dev-api/platform/exportmanage', + url: '/platform/exportmanage', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateExportmanage(data) { // 删除导入设置 export function delExportmanage(id) { return request({ - url: '/dev-api/platform/exportmanage/' + id, + url: '/platform/exportmanage/' + id, method: 'delete' }) } diff --git a/jianshui-ui/src/api/platform/exportsetting.js b/jianshui-ui/src/api/platform/exportsetting.js index f926c79..7444c02 100644 --- a/jianshui-ui/src/api/platform/exportsetting.js +++ b/jianshui-ui/src/api/platform/exportsetting.js @@ -3,7 +3,7 @@ import request from '@/utils/request' //查询单个记录 export function oneExportmanage() { return request({ - url: '/dev-api/platform/exportmanage/findByName', + url: '/platform/exportmanage/findByName', method: 'get' }) } @@ -12,7 +12,7 @@ export function oneExportmanage() { // 新增导入设置 export function addExportmanage(data) { return request({ - url: '/dev-api/platform/exportmanage', + url: '/platform/exportmanage', method: 'post', data: data }) @@ -21,7 +21,7 @@ export function addExportmanage(data) { // 修改导入设置 export function updateExportmanage(data) { return request({ - url: '/dev-api/platform/exportmanage', + url: '/platform/exportmanage', method: 'put', data: data }) @@ -30,7 +30,7 @@ export function updateExportmanage(data) { // 删除导入设置 export function delExportmanage(id) { return request({ - url: '/dev-api/platform/exportmanage/' + id, + url: '/platform/exportmanage/' + id, method: 'delete' }) } diff --git a/jianshui-ui/src/api/platform/product_info.js b/jianshui-ui/src/api/platform/product_info.js index 24ae4ef..02a5f63 100644 --- a/jianshui-ui/src/api/platform/product_info.js +++ b/jianshui-ui/src/api/platform/product_info.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询商品信息列表 export function listProduct_info(query) { return request({ - url: '/dev-api/platform/product_info/list', + url: '/platform/product_info/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listProduct_info(query) { // 查询商品信息详细 export function getProduct_info(id) { return request({ - url: '/dev-api/platform/product_info/' + id, + url: '/platform/product_info/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getProduct_info(id) { // 新增商品信息 export function addProduct_info(data) { return request({ - url: '/dev-api/platform/product_info', + url: '/platform/product_info', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addProduct_info(data) { // 修改商品信息 export function updateProduct_info(data) { return request({ - url: '/dev-api/platform/product_info', + url: '/platform/product_info', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateProduct_info(data) { // 删除商品信息 export function delProduct_info(id) { return request({ - url: '/dev-api/platform/product_info/' + id, + url: '/platform/product_info/' + id, method: 'delete' }) } diff --git a/jianshui-ui/src/api/platform/vehiclecode.js b/jianshui-ui/src/api/platform/vehiclecode.js index b81e6df..a3e8cfe 100644 --- a/jianshui-ui/src/api/platform/vehiclecode.js +++ b/jianshui-ui/src/api/platform/vehiclecode.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询车辆编码列表 export function listVehiclecode(query) { return request({ - url: '/dev-api/platform/vehiclecode/list', + url: '/platform/vehiclecode/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listVehiclecode(query) { // 查询车辆编码详细 export function getVehiclecode(id) { return request({ - url: '/dev-api/platform/vehiclecode/' + id, + url: '/platform/vehiclecode/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getVehiclecode(id) { // 新增车辆编码 export function addVehiclecode(data) { return request({ - url: '/dev-api/platform/vehiclecode', + url: '/platform/vehiclecode', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addVehiclecode(data) { // 修改车辆编码 export function updateVehiclecode(data) { return request({ - url: '/dev-api/platform/vehiclecode', + url: '/platform/vehiclecode', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateVehiclecode(data) { // 删除车辆编码 export function delVehiclecode(id) { return request({ - url: '/dev-api/platform/vehiclecode/' + id, + url: '/platform/vehiclecode/' + id, method: 'delete' }) } diff --git a/jianshui-ui/src/api/sandbox/encrypt.js b/jianshui-ui/src/api/sandbox/encrypt.js index d1c6532..899f2c1 100644 --- a/jianshui-ui/src/api/sandbox/encrypt.js +++ b/jianshui-ui/src/api/sandbox/encrypt.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function encrypt(data) { return request({ - url: '/dev-api/sandbox/encrypt', + url: '/sandbox/encrypt', method: 'post', data: data }) diff --git a/jianshui-ui/src/api/sdInvoicefile/sdinvoicefile.js b/jianshui-ui/src/api/sdInvoicefile/sdinvoicefile.js index 32b09dc..0550122 100644 --- a/jianshui-ui/src/api/sdInvoicefile/sdinvoicefile.js +++ b/jianshui-ui/src/api/sdInvoicefile/sdinvoicefile.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询导入设置列表 export function getFilePreview(data) { return request({ - url: '/dev-api/invoice/filePreview', + url: '/invoice/filePreview', method: 'post', data: data }) @@ -12,7 +12,7 @@ export function getFilePreview(data) { // 下载文件 export function downloadFile(data) { return request({ - url: '/dev-api/invoice/QuerySdInvoiceFileDownload', + url: '/invoice/QuerySdInvoiceFileDownload', method: 'post', data: data }) diff --git a/jianshui-ui/src/api/system/companyservice.js b/jianshui-ui/src/api/system/companyservice.js index 450ccfb..845defc 100644 --- a/jianshui-ui/src/api/system/companyservice.js +++ b/jianshui-ui/src/api/system/companyservice.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询销方信息列表 export function listCompanyservice(query) { return request({ - url: '/dev-api/system/companyservice/list', + url: '/system/companyservice/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listCompanyservice(query) { // 查询销方信息详细 export function getCompanyservice(companyid) { return request({ - url: '/dev-api/system/companyservice/' + companyid, + url: '/system/companyservice/' + companyid, method: 'get' }) } @@ -20,7 +20,7 @@ export function getCompanyservice(companyid) { // 新增销方信息 export function addCompanyservice(data) { return request({ - url: '/dev-api/system/companyservice', + url: '/system/companyservice', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addCompanyservice(data) { // 修改销方信息 export function updateCompanyservice(data) { return request({ - url: '/dev-api/system/companyservice', + url: '/system/companyservice', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateCompanyservice(data) { // 删除销方信息 export function delCompanyservice(companyid) { return request({ - url: '/dev-api/system/companyservice/' + companyid, + url: '/system/companyservice/' + companyid, method: 'delete' }) } diff --git a/jianshui-ui/src/api/system/companyservice_detail.js b/jianshui-ui/src/api/system/companyservice_detail.js index 4ea3180..3a6830a 100644 --- a/jianshui-ui/src/api/system/companyservice_detail.js +++ b/jianshui-ui/src/api/system/companyservice_detail.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询销方详情列表 export function listCompanyservice_detail(query) { return request({ - url: '/dev-api/system/companyservice_detail/list', + url: '/system/companyservice_detail/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listCompanyservice_detail(query) { // 查询销方详情详细 export function getCompanyservice_detail(id) { return request({ - url: '/dev-api/system/companyservice_detail/' + id, + url: '/system/companyservice_detail/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getCompanyservice_detail(id) { // 新增销方详情 export function addCompanyservice_detail(data) { return request({ - url: '/dev-api/system/companyservice_detail', + url: '/system/companyservice_detail', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addCompanyservice_detail(data) { // 修改销方详情 export function updateCompanyservice_detail(data) { return request({ - url: '/dev-api/system/companyservice_detail', + url: '/system/companyservice_detail', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateCompanyservice_detail(data) { // 删除销方详情 export function delCompanyservice_detail(id) { return request({ - url: '/dev-api/system/companyservice_detail/' + id, + url: '/system/companyservice_detail/' + id, method: 'delete' }) } diff --git a/jianshui-ui/src/api/system/config.js b/jianshui-ui/src/api/system/config.js index f9a6e15..a404d82 100644 --- a/jianshui-ui/src/api/system/config.js +++ b/jianshui-ui/src/api/system/config.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询参数列表 export function listConfig(query) { return request({ - url: '/dev-api/system/config/list', + url: '/system/config/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listConfig(query) { // 查询参数详细 export function getConfig(configId) { return request({ - url: '/dev-api/system/config/' + configId, + url: '/system/config/' + configId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getConfig(configId) { // 根据参数键名查询参数值 export function getConfigKey(configKey) { return request({ - url: '/dev-api/system/config/configKey/' + configKey, + url: '/system/config/configKey/' + configKey, method: 'get' }) } @@ -28,7 +28,7 @@ export function getConfigKey(configKey) { // 新增参数配置 export function addConfig(data) { return request({ - url: '/dev-api/system/config', + url: '/system/config', method: 'post', data: data }) @@ -37,7 +37,7 @@ export function addConfig(data) { // 修改参数配置 export function updateConfig(data) { return request({ - url: '/dev-api/system/config', + url: '/system/config', method: 'put', data: data }) @@ -46,7 +46,7 @@ export function updateConfig(data) { // 删除参数配置 export function delConfig(configId) { return request({ - url: '/dev-api/system/config/' + configId, + url: '/system/config/' + configId, method: 'delete' }) } @@ -54,7 +54,7 @@ export function delConfig(configId) { // 刷新参数缓存 export function refreshCache() { return request({ - url: '/dev-api/system/config/refreshCache', + url: '/system/config/refreshCache', method: 'delete' }) } diff --git a/jianshui-ui/src/api/system/dept.js b/jianshui-ui/src/api/system/dept.js index 608715b..2804676 100644 --- a/jianshui-ui/src/api/system/dept.js +++ b/jianshui-ui/src/api/system/dept.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询部门列表 export function listDept(query) { return request({ - url: '/dev-api/system/dept/list', + url: '/system/dept/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listDept(query) { // 查询部门列表(排除节点) export function listDeptExcludeChild(deptId) { return request({ - url: '/dev-api/system/dept/list/exclude/' + deptId, + url: '/system/dept/list/exclude/' + deptId, method: 'get' }) } @@ -20,7 +20,7 @@ export function listDeptExcludeChild(deptId) { // 查询部门详细 export function getDept(deptId) { return request({ - url: '/dev-api/system/dept/' + deptId, + url: '/system/dept/' + deptId, method: 'get' }) } @@ -28,7 +28,7 @@ export function getDept(deptId) { // 查询部门下拉树结构 export function treeselect() { return request({ - url: '/dev-api/system/dept/treeselect', + url: '/system/dept/treeselect', method: 'get' }) } @@ -36,7 +36,7 @@ export function treeselect() { // 根据角色ID查询部门树结构 export function roleDeptTreeselect(roleId) { return request({ - url: '/dev-api/system/dept/roleDeptTreeselect/' + roleId, + url: '/system/dept/roleDeptTreeselect/' + roleId, method: 'get' }) } @@ -44,7 +44,7 @@ export function roleDeptTreeselect(roleId) { // 新增部门 export function addDept(data) { return request({ - url: '/dev-api/system/dept', + url: '/system/dept', method: 'post', data: data }) @@ -53,7 +53,7 @@ export function addDept(data) { // 修改部门 export function updateDept(data) { return request({ - url: '/dev-api/system/dept', + url: '/system/dept', method: 'put', data: data }) @@ -62,7 +62,7 @@ export function updateDept(data) { // 删除部门 export function delDept(deptId) { return request({ - url: '/dev-api/system/dept/' + deptId, + url: '/system/dept/' + deptId, method: 'delete' }) -} +} \ No newline at end of file diff --git a/jianshui-ui/src/api/system/dict/data.js b/jianshui-ui/src/api/system/dict/data.js index 0c5ad60..6c9eb79 100644 --- a/jianshui-ui/src/api/system/dict/data.js +++ b/jianshui-ui/src/api/system/dict/data.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询字典数据列表 export function listData(query) { return request({ - url: '/dev-api/system/dict/data/list', + url: '/system/dict/data/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listData(query) { // 查询字典数据详细 export function getData(dictCode) { return request({ - url: '/dev-api/system/dict/data/' + dictCode, + url: '/system/dict/data/' + dictCode, method: 'get' }) } @@ -20,7 +20,7 @@ export function getData(dictCode) { // 根据字典类型查询字典数据信息 export function getDicts(dictType) { return request({ - url: '/dev-api/system/dict/data/type/' + dictType, + url: '/system/dict/data/type/' + dictType, method: 'get' }) } @@ -28,7 +28,7 @@ export function getDicts(dictType) { // 新增字典数据 export function addData(data) { return request({ - url: '/dev-api/system/dict/data', + url: '/system/dict/data', method: 'post', data: data }) @@ -37,7 +37,7 @@ export function addData(data) { // 修改字典数据 export function updateData(data) { return request({ - url: '/dev-api/system/dict/data', + url: '/system/dict/data', method: 'put', data: data }) @@ -46,7 +46,7 @@ export function updateData(data) { // 删除字典数据 export function delData(dictCode) { return request({ - url: '/dev-api/system/dict/data/' + dictCode, + url: '/system/dict/data/' + dictCode, method: 'delete' }) } diff --git a/jianshui-ui/src/api/system/dict/type.js b/jianshui-ui/src/api/system/dict/type.js index 4c7c204..a7a6e01 100644 --- a/jianshui-ui/src/api/system/dict/type.js +++ b/jianshui-ui/src/api/system/dict/type.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询字典类型列表 export function listType(query) { return request({ - url: '/dev-api/system/dict/type/list', + url: '/system/dict/type/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listType(query) { // 查询字典类型详细 export function getType(dictId) { return request({ - url: '/dev-api/system/dict/type/' + dictId, + url: '/system/dict/type/' + dictId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getType(dictId) { // 新增字典类型 export function addType(data) { return request({ - url: '/dev-api/system/dict/type', + url: '/system/dict/type', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addType(data) { // 修改字典类型 export function updateType(data) { return request({ - url: '/dev-api/system/dict/type', + url: '/system/dict/type', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateType(data) { // 删除字典类型 export function delType(dictId) { return request({ - url: '/dev-api/system/dict/type/' + dictId, + url: '/system/dict/type/' + dictId, method: 'delete' }) } @@ -46,7 +46,7 @@ export function delType(dictId) { // 刷新字典缓存 export function refreshCache() { return request({ - url: '/dev-api/system/dict/type/refreshCache', + url: '/system/dict/type/refreshCache', method: 'delete' }) } @@ -54,7 +54,7 @@ export function refreshCache() { // 获取字典选择框列表 export function optionselect() { return request({ - url: '/dev-api/system/dict/type/optionselect', + url: '/system/dict/type/optionselect', method: 'get' }) -} +} \ No newline at end of file diff --git a/jianshui-ui/src/api/system/manageservices.js b/jianshui-ui/src/api/system/manageservices.js index 7a9a8aa..fcf5cb4 100644 --- a/jianshui-ui/src/api/system/manageservices.js +++ b/jianshui-ui/src/api/system/manageservices.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询服务管理列表 export function listManageservices(query) { return request({ - url: '/dev-api/system/manageservices/list', + url: '/system/manageservices/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listManageservices(query) { // 查询服务管理详细 export function getManageservices(id) { return request({ - url: '/dev-api/system/manageservices/' + id, + url: '/system/manageservices/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getManageservices(id) { // 新增服务管理 export function addManageservices(data) { return request({ - url: '/dev-api/system/manageservices', + url: '/system/manageservices', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addManageservices(data) { // 修改服务管理 export function updateManageservices(data) { return request({ - url: '/dev-api/system/manageservices', + url: '/system/manageservices', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateManageservices(data) { // 删除服务管理 export function delManageservices(id) { return request({ - url: '/dev-api/system/manageservices/' + id, + url: '/system/manageservices/' + id, method: 'delete' }) } diff --git a/jianshui-ui/src/api/system/menu.js b/jianshui-ui/src/api/system/menu.js index 1902fb5..f6415c6 100644 --- a/jianshui-ui/src/api/system/menu.js +++ b/jianshui-ui/src/api/system/menu.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询菜单列表 export function listMenu(query) { return request({ - url: '/dev-api/system/menu/list', + url: '/system/menu/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listMenu(query) { // 查询菜单详细 export function getMenu(menuId) { return request({ - url: '/dev-api/system/menu/' + menuId, + url: '/system/menu/' + menuId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getMenu(menuId) { // 查询菜单下拉树结构 export function treeselect() { return request({ - url: '/dev-api/system/menu/treeselect', + url: '/system/menu/treeselect', method: 'get' }) } @@ -28,7 +28,7 @@ export function treeselect() { // 根据角色ID查询菜单下拉树结构 export function roleMenuTreeselect(roleId) { return request({ - url: '/dev-api/system/menu/roleMenuTreeselect/' + roleId, + url: '/system/menu/roleMenuTreeselect/' + roleId, method: 'get' }) } @@ -36,7 +36,7 @@ export function roleMenuTreeselect(roleId) { // 新增菜单 export function addMenu(data) { return request({ - url: '/dev-api/system/menu', + url: '/system/menu', method: 'post', data: data }) @@ -45,7 +45,7 @@ export function addMenu(data) { // 修改菜单 export function updateMenu(data) { return request({ - url: '/dev-api/system/menu', + url: '/system/menu', method: 'put', data: data }) @@ -54,7 +54,7 @@ export function updateMenu(data) { // 删除菜单 export function delMenu(menuId) { return request({ - url: '/dev-api/system/menu/' + menuId, + url: '/system/menu/' + menuId, method: 'delete' }) -} +} \ No newline at end of file diff --git a/jianshui-ui/src/api/system/notice.js b/jianshui-ui/src/api/system/notice.js index 4ae6276..c274ea5 100644 --- a/jianshui-ui/src/api/system/notice.js +++ b/jianshui-ui/src/api/system/notice.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询公告列表 export function listNotice(query) { return request({ - url: '/dev-api/system/notice/list', + url: '/system/notice/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listNotice(query) { // 查询公告详细 export function getNotice(noticeId) { return request({ - url: '/dev-api/system/notice/' + noticeId, + url: '/system/notice/' + noticeId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getNotice(noticeId) { // 新增公告 export function addNotice(data) { return request({ - url: '/dev-api/system/notice', + url: '/system/notice', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addNotice(data) { // 修改公告 export function updateNotice(data) { return request({ - url: '/dev-api/system/notice', + url: '/system/notice', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateNotice(data) { // 删除公告 export function delNotice(noticeId) { return request({ - url: '/dev-api/system/notice/' + noticeId, + url: '/system/notice/' + noticeId, method: 'delete' }) -} +} \ No newline at end of file diff --git a/jianshui-ui/src/api/system/post.js b/jianshui-ui/src/api/system/post.js index 71f13aa..1a8e9ca 100644 --- a/jianshui-ui/src/api/system/post.js +++ b/jianshui-ui/src/api/system/post.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询岗位列表 export function listPost(query) { return request({ - url: '/dev-api/system/post/list', + url: '/system/post/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listPost(query) { // 查询岗位详细 export function getPost(postId) { return request({ - url: '/dev-api/system/post/' + postId, + url: '/system/post/' + postId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getPost(postId) { // 新增岗位 export function addPost(data) { return request({ - url: '/dev-api/system/post', + url: '/system/post', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addPost(data) { // 修改岗位 export function updatePost(data) { return request({ - url: '/dev-api/system/post', + url: '/system/post', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updatePost(data) { // 删除岗位 export function delPost(postId) { return request({ - url: '/dev-api/system/post/' + postId, + url: '/system/post/' + postId, method: 'delete' }) } diff --git a/jianshui-ui/src/api/system/prop.js b/jianshui-ui/src/api/system/prop.js index 99be657..3cdce52 100644 --- a/jianshui-ui/src/api/system/prop.js +++ b/jianshui-ui/src/api/system/prop.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询企业扩展属性,包括大象key等列表 export function listProp(query) { return request({ - url: '/dev-api/system/prop/list', + url: '/system/prop/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listProp(query) { // 查询企业扩展属性,包括大象key等详细 export function getProp(companyid) { return request({ - url: '/dev-api/system/prop/' + companyid, + url: '/system/prop/' + companyid, method: 'get' }) } @@ -20,7 +20,7 @@ export function getProp(companyid) { // 新增企业扩展属性,包括大象key等 export function addProp(data) { return request({ - url: '/dev-api/system/prop', + url: '/system/prop', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addProp(data) { // 修改企业扩展属性,包括大象key等 export function updateProp(data) { return request({ - url: '/dev-api/system/prop', + url: '/system/prop', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateProp(data) { // 删除企业扩展属性,包括大象key等 export function delProp(companyid) { return request({ - url: '/dev-api/system/prop/' + companyid, + url: '/system/prop/' + companyid, method: 'delete' }) } @@ -46,7 +46,7 @@ export function delProp(companyid) { // 初始化销方prop export function initProp(companyid) { return request({ - url: '/dev-api/system/prop/init/' + companyid, + url: '/system/prop/init/' + companyid, method: 'get' }) } diff --git a/jianshui-ui/src/api/system/role.js b/jianshui-ui/src/api/system/role.js index e186c13..4b455e1 100644 --- a/jianshui-ui/src/api/system/role.js +++ b/jianshui-ui/src/api/system/role.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询角色列表 export function listRole(query) { return request({ - url: '/dev-api/system/role/list', + url: '/system/role/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listRole(query) { // 查询角色详细 export function getRole(roleId) { return request({ - url: '/dev-api/system/role/' + roleId, + url: '/system/role/' + roleId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getRole(roleId) { // 新增角色 export function addRole(data) { return request({ - url: '/dev-api/system/role', + url: '/system/role', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addRole(data) { // 修改角色 export function updateRole(data) { return request({ - url: '/dev-api/system/role', + url: '/system/role', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateRole(data) { // 角色数据权限 export function dataScope(data) { return request({ - url: '/dev-api/system/role/dataScope', + url: '/system/role/dataScope', method: 'put', data: data }) @@ -51,7 +51,7 @@ export function changeRoleStatus(roleId, status) { status } return request({ - url: '/dev-api/system/role/changeStatus', + url: '/system/role/changeStatus', method: 'put', data: data }) @@ -60,7 +60,7 @@ export function changeRoleStatus(roleId, status) { // 删除角色 export function delRole(roleId) { return request({ - url: '/dev-api/system/role/' + roleId, + url: '/system/role/' + roleId, method: 'delete' }) } @@ -68,7 +68,7 @@ export function delRole(roleId) { // 查询角色已授权用户列表 export function allocatedUserList(query) { return request({ - url: '/dev-api/system/role/authUser/allocatedList', + url: '/system/role/authUser/allocatedList', method: 'get', params: query }) @@ -77,7 +77,7 @@ export function allocatedUserList(query) { // 查询角色未授权用户列表 export function unallocatedUserList(query) { return request({ - url: '/dev-api/system/role/authUser/unallocatedList', + url: '/system/role/authUser/unallocatedList', method: 'get', params: query }) @@ -86,7 +86,7 @@ export function unallocatedUserList(query) { // 取消用户授权角色 export function authUserCancel(data) { return request({ - url: '/dev-api/system/role/authUser/cancel', + url: '/system/role/authUser/cancel', method: 'put', data: data }) @@ -95,7 +95,7 @@ export function authUserCancel(data) { // 批量取消用户授权角色 export function authUserCancelAll(data) { return request({ - url: '/dev-api/system/role/authUser/cancelAll', + url: '/system/role/authUser/cancelAll', method: 'put', params: data }) @@ -104,8 +104,8 @@ export function authUserCancelAll(data) { // 授权用户选择 export function authUserSelectAll(data) { return request({ - url: '/dev-api/system/role/authUser/selectAll', + url: '/system/role/authUser/selectAll', method: 'put', params: data }) -} +} \ No newline at end of file diff --git a/jianshui-ui/src/api/system/user.js b/jianshui-ui/src/api/system/user.js index 45a7355..9a1e271 100644 --- a/jianshui-ui/src/api/system/user.js +++ b/jianshui-ui/src/api/system/user.js @@ -4,7 +4,7 @@ import { praseStrEmpty } from "@/utils/jianshui"; // 查询用户列表 export function listUser(query) { return request({ - url: '/dev-api/system/user/list', + url: '/system/user/list', method: 'get', params: query }) @@ -13,7 +13,7 @@ export function listUser(query) { // 查询用户详细 export function getUser(userId) { return request({ - url: '/dev-api/system/user/' + praseStrEmpty(userId), + url: '/system/user/' + praseStrEmpty(userId), method: 'get' }) } @@ -21,7 +21,7 @@ export function getUser(userId) { // 新增用户 export function addUser(data) { return request({ - url: '/dev-api/system/user', + url: '/system/user', method: 'post', data: data }) @@ -30,7 +30,7 @@ export function addUser(data) { // 修改用户 export function updateUser(data) { return request({ - url: '/dev-api/system/user', + url: '/system/user', method: 'put', data: data }) @@ -39,7 +39,7 @@ export function updateUser(data) { // 删除用户 export function delUser(userId) { return request({ - url: '/dev-api/system/user/' + userId, + url: '/system/user/' + userId, method: 'delete' }) } @@ -51,7 +51,7 @@ export function resetUserPwd(userId, password) { password } return request({ - url: '/dev-api/system/user/resetPwd', + url: '/system/user/resetPwd', method: 'put', data: data }) @@ -64,7 +64,7 @@ export function changeUserStatus(userId, status) { status } return request({ - url: '/dev-api/system/user/changeStatus', + url: '/system/user/changeStatus', method: 'put', data: data }) @@ -73,7 +73,7 @@ export function changeUserStatus(userId, status) { // 查询用户个人信息 export function getUserProfile() { return request({ - url: '/dev-api/system/user/profile', + url: '/system/user/profile', method: 'get' }) } @@ -81,7 +81,7 @@ export function getUserProfile() { // 修改用户个人信息 export function updateUserProfile(data) { return request({ - url: '/dev-api/system/user/profile', + url: '/system/user/profile', method: 'put', data: data }) @@ -94,7 +94,7 @@ export function updateUserPwd(oldPassword, newPassword) { newPassword } return request({ - url: '/dev-api/system/user/profile/updatePwd', + url: '/system/user/profile/updatePwd', method: 'put', params: data }) @@ -103,7 +103,7 @@ export function updateUserPwd(oldPassword, newPassword) { // 用户头像上传 export function uploadAvatar(data) { return request({ - url: '/dev-api/system/user/profile/avatar', + url: '/system/user/profile/avatar', method: 'post', data: data }) @@ -112,7 +112,7 @@ export function uploadAvatar(data) { // 查询授权角色 export function getAuthRole(userId) { return request({ - url: '/dev-api/system/user/authRole/' + userId, + url: '/system/user/authRole/' + userId, method: 'get' }) } @@ -120,7 +120,7 @@ export function getAuthRole(userId) { // 保存授权角色 export function updateAuthRole(data) { return request({ - url: '/dev-api/system/user/authRole', + url: '/system/user/authRole', method: 'put', params: data }) diff --git a/jianshui-ui/src/api/tool/gen.js b/jianshui-ui/src/api/tool/gen.js index 775feff..4506927 100644 --- a/jianshui-ui/src/api/tool/gen.js +++ b/jianshui-ui/src/api/tool/gen.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询生成表数据 export function listTable(query) { return request({ - url: '/dev-api/tool/gen/list', + url: '/tool/gen/list', method: 'get', params: query }) @@ -11,7 +11,7 @@ export function listTable(query) { // 查询db数据库列表 export function listDbTable(query) { return request({ - url: '/dev-api/tool/gen/db/list', + url: '/tool/gen/db/list', method: 'get', params: query }) @@ -20,7 +20,7 @@ export function listDbTable(query) { // 查询表详细信息 export function getGenTable(tableId) { return request({ - url: '/dev-api/tool/gen/' + tableId, + url: '/tool/gen/' + tableId, method: 'get' }) } @@ -28,7 +28,7 @@ export function getGenTable(tableId) { // 修改代码生成信息 export function updateGenTable(data) { return request({ - url: '/dev-api/tool/gen', + url: '/tool/gen', method: 'put', data: data }) @@ -37,7 +37,7 @@ export function updateGenTable(data) { // 导入表 export function importTable(data) { return request({ - url: '/dev-api/tool/gen/importTable', + url: '/tool/gen/importTable', method: 'post', params: data }) @@ -46,7 +46,7 @@ export function importTable(data) { // 预览生成代码 export function previewTable(tableId) { return request({ - url: '/dev-api/tool/gen/preview/' + tableId, + url: '/tool/gen/preview/' + tableId, method: 'get' }) } @@ -54,7 +54,7 @@ export function previewTable(tableId) { // 删除表数据 export function delTable(tableId) { return request({ - url: '/dev-api/tool/gen/' + tableId, + url: '/tool/gen/' + tableId, method: 'delete' }) } @@ -62,7 +62,7 @@ export function delTable(tableId) { // 生成代码(自定义路径) export function genCode(tableName) { return request({ - url: '/dev-api/tool/gen/genCode/' + tableName, + url: '/tool/gen/genCode/' + tableName, method: 'get' }) } @@ -70,7 +70,7 @@ export function genCode(tableName) { // 同步数据库 export function synchDb(tableName) { return request({ - url: '/dev-api/tool/gen/synchDb/' + tableName, + url: '/tool/gen/synchDb/' + tableName, method: 'get' }) } diff --git a/jianshui-ui/src/assets/images/tishi.png b/jianshui-ui/src/assets/images/tishi.png deleted file mode 100644 index dba91b99e5138e38145d511fb5773f7df6496fd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2811 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 N002ovPDHLkV1gL_J;eY3 diff --git a/jianshui-ui/src/store/modules/user.js b/jianshui-ui/src/store/modules/user.js index bdb2d0e..0e45157 100644 --- a/jianshui-ui/src/store/modules/user.js +++ b/jianshui-ui/src/store/modules/user.js @@ -7,8 +7,7 @@ const user = { name: '', avatar: '', roles: [], - permissions: [], - authStatus:{}, + permissions: [] }, mutations: { @@ -26,11 +25,9 @@ const user = { }, SET_PERMISSIONS: (state, permissions) => { state.permissions = permissions - }, - SET_AUTH_STATUS: (state, authStatus) => { - state.authStatus = authStatus } }, + actions: { // 登录 Login({ commit }, userInfo) { diff --git a/jianshui-ui/src/utils/request.js b/jianshui-ui/src/utils/request.js index a1a792f..870e4d1 100644 --- a/jianshui-ui/src/utils/request.js +++ b/jianshui-ui/src/utils/request.js @@ -12,14 +12,13 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' // 创建axios实例 const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 - // baseURL: '/api', + baseURL: process.env.VUE_APP_BASE_API, // 超时 timeout: 1000 * 60 * 2 }) // request拦截器 service.interceptors.request.use(config => { - console.log(config) // 是否需要设置 token const isToken = (config.headers || {}).isToken === false if (getToken() && !isToken) { @@ -32,9 +31,7 @@ service.interceptors.request.use(config => { config.params = {}; config.url = url; } - console.log(config,'config') return config - }, error => { console.log(error) Promise.reject(error) diff --git a/jianshui-ui/src/views/digital/registered/index.vue b/jianshui-ui/src/views/digital/registered/index.vue index 42fbcc6..5570a65 100644 --- a/jianshui-ui/src/views/digital/registered/index.vue +++ b/jianshui-ui/src/views/digital/registered/index.vue @@ -1,8 +1,7 @@ - - diff --git a/jianshui-ui/vue.config.js b/jianshui-ui/vue.config.js index 83be1d2..c7daeb8 100644 --- a/jianshui-ui/vue.config.js +++ b/jianshui-ui/vue.config.js @@ -5,13 +5,11 @@ function resolve(dir) { return path.join(__dirname, dir) } -let portUrl = 'http://58.87.71.213:8082'//测试环境 - const name = process.env.VUE_APP_TITLE || '简税平台管理系统' // 网页标题 const port = process.env.port || process.env.npm_config_port || 8088 // 端口 -const url = process.env.NODE_ENV === 'development' ? portUrl : portUrl +const url = process.env.NODE_ENV === 'development' ? 'http://localhost:8081' : 'http://localhost:8080' // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions @@ -34,22 +32,15 @@ module.exports = { host: '0.0.0.0', port: port, open: true, - // logLevel: 'debug', proxy: { - '/api/invoice/front/v1': { - target: 'http://58.87.71.213:8082/api/invoice/front/v1', // 测试环境 + // detail: https://cli.vuejs.org/config/#devserver-proxy + [process.env.VUE_APP_BASE_API]: { + target: url, changeOrigin: true, pathRewrite: { - '^/api/invoice/front/v1': '' + ['^' + process.env.VUE_APP_BASE_API]: '' } - }, - '/dev-api': { - target: 'http://58.87.71.213:8082', // 测试环境 - changeOrigin: true, - pathRewrite: { - '^/dev-api':'' - } - }, + } }, disableHostCheck: true },