From 9bca9a57c8901367537bf1c1cbdea72601a5fe50 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 22 Apr 2024 09:25:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aliasPassword.txt | 8 ++++++++ pdatest.keystore | Bin 0 -> 2740 bytes src/App.vue | 28 ++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 aliasPassword.txt create mode 100644 pdatest.keystore diff --git a/aliasPassword.txt b/aliasPassword.txt new file mode 100644 index 0000000..22147f9 --- /dev/null +++ b/aliasPassword.txt @@ -0,0 +1,8 @@ +证书名称：pdatest.keystore +证书别名：pdatestalias +证书密码：092134 +SHA1: 53:30:B7:A6:0B:10:FA:0A:5A:3A:2F:4A:E5:21:96:EC:79:5B:41:C1 + SHA256: C4:85:45:66:D5:FC:6E:FB:C8:45:5D:FA:41:8D:94:6D:E5:C1:41:CE:D0:E3:4D:B3:F9:3B:68:6A:1B:E2:43:86 +Android 包名:com.eampda.uniapp +Android 应用签名:aa65e187685c2088b82d1a8c143bbabe//还没弄 +ios 包名:com.eam.bundleld//还没弄 \ No newline at end of file diff --git a/pdatest.keystore b/pdatest.keystore new file mode 100644 index 0000000000000000000000000000000000000000..e2133f2b0f3ce23b1619135bcaabc771a347d475 GIT binary patch literal 2740 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 { + // if (res.status == 0) { + // if (res.data.code == 0) { + // uni.downloadFile({ + // url: res.data.download, + // success: (downloadResult) => { + // if (downloadResult.statusCode === 200) { + // plus.runtime.install(downloadResult + // .tempFilePath, { + // force: true + // }, + // function() { + // plus.runtime.restart(); + // }, + // function(e) { + + + // }); + // } + // } + // }); + // } + // } + // }) + // }); if (getAccessToken()) { await store.GetPermissionInfo().then(res => { }).catch(() => { }) From 5fa322b371383b2177102405c26294cb6e0d212b Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 30 Apr 2024 09:12:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 4 +- src/manifest.json | 5 +- src/pages/inLocation/index.vue | 2 + src/pages/index.vue | 41 +++++++++--- src/pages/login.vue | 12 ++++ src/pages/outLocation/index.vue | 2 + src/plugins/auth.js | 108 +++++++++++++++++--------------- src/store/modules/countStore.ts | 6 +- 9 files changed, 113 insertions(+), 69 deletions(-) diff --git a/.env.development b/.env.development index 3158bf1..e17ded4 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ VITE_BASE_URL=http://192.168.0.106:12080/admin-api #VITE_BASE_URL=http://dev.ccwin-in.com:25203/api/admin-api -VITE_BASE_URL_IMAGE=http://localhost:12080/admin-api \ No newline at end of file +VITE_BASE_URL_IMAGE=http://192.168.0.106:12080/admin-api \ No newline at end of file diff --git a/.env.production b/.env.production index 7e42eab..2b60e3b 100644 --- a/.env.production +++ b/.env.production @@ -1,2 +1,2 @@ -VITE_BASE_URL=http://10.62.139.32:82/api/admin-api -VITE_BASE_URL_IMAGE=http://10.62.139.32:82/api/admin-api +VITE_BASE_URL=http://dev.ccwin-in.com:25210/admin-api +VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25210/admin-api diff --git a/src/manifest.json b/src/manifest.json index 4000fae..4d15faa 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,6 +1,6 @@ { "name" : "富维汽车镜", - "appid" : "__UNI__DA78BC9", + "appid" : "__UNI__0DC0349", "description" : "", "versionName" : "1.0.0", "versionCode" : "100", @@ -16,6 +16,9 @@ "autoclose" : true, "delay" : 0 }, + "compatible" : { + "ignoreVersion" : true + }, /* 模块配置 */ "modules" : {}, /* 应用发布信息 */ diff --git a/src/pages/inLocation/index.vue b/src/pages/inLocation/index.vue index 7b47048..363a689 100644 --- a/src/pages/inLocation/index.vue +++ b/src/pages/inLocation/index.vue @@ -47,6 +47,7 @@ getCurrentInstance } from 'vue' import * as inLocationApi from "@/api/inLocation.js" + import auth from '@/plugins/auth' const { proxy } = getCurrentInstance() const params = ref({ @@ -56,6 +57,7 @@ const status = ref('loadmore') //是否显示没有更多了 const list = ref([]) function openDetail(item){ + if(!auth.hasPermiOr(['eam:item-order-main:inOperation']))return; proxy.$tab.navigateTo(`/pages/inLocation/addForm?data=${encodeURIComponent(JSON.stringify(item))}`) } async function getList() { diff --git a/src/pages/index.vue b/src/pages/index.vue index a43f79f..82e4759 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -34,7 +34,28 @@ - + + {{item.name}} + + + + + + + + + + + + {{cur.name}} + + + + + + + + + 退出登录 @@ -102,14 +123,14 @@ // 获取自定义的store const store = useCountStore() const bgOpacity = ref(0) - const menus1 = ref([]) - const menus2 = ref([]) + const meaus = ref([]) + // const menus2 = ref([]) function open(url) { if (!getAccessToken()) { proxy.$tab.navigateTo('/pages/login') return } - proxy.$tab.navigateTo(url) + proxy.$tab.navigateTo("/" + url) } function handleLogout() { proxy.$modal.confirm('确定注销并退出系统吗？').then(() => { @@ -123,8 +144,10 @@ } onLoad(async () => { await proxy.$onLaunched; - menus1.value = store.menus1 - menus2.value = store.menus2 + // menus1.value = store.menus1 + // menus2.value = store.menus2 + meaus.value = store.meaus + console.log(meaus.value ) }) onPageScroll((e) => { if (e.scrollTop > 0) { diff --git a/src/pages/login.vue b/src/pages/login.vue index 18faabd..9a7929d 100644 --- a/src/pages/login.vue +++ b/src/pages/login.vue @@ -63,6 +63,18 @@ // 获取自定义的store const store = useCountStore() + if( import.meta.env.VITE_USER_NODE_ENV == 'development'){ + loginForm.value = { + tenantName: "闻荫源码", + username: "admin", + password: "123456", + captchaVerification: "", + rememberMe: false, + code: '1', + uuid: "APP", + cid:uni.getStorageSync('cid') + } + } async function handleLogin(params) { if (loginForm.value.username === "") { proxy.$modal.msgError("请输入您的账号") diff --git a/src/pages/outLocation/index.vue b/src/pages/outLocation/index.vue index 97e1adf..ceab2ae 100644 --- a/src/pages/outLocation/index.vue +++ b/src/pages/outLocation/index.vue @@ -64,6 +64,7 @@ getCurrentInstance } from 'vue' import * as outLocationApi from "@/api/outLocation.js" + import auth from '@/plugins/auth' const { proxy } = getCurrentInstance() const params = ref({ pageNo: 1, @@ -73,6 +74,7 @@ const list = ref([]) function openDetail(item){ + if(!auth.hasPermiOr(['eam:item-apply-record-main:outOperation']))return; proxy.$tab.navigateTo(`/pages/outLocation/addForm?data=${encodeURIComponent(JSON.stringify(item))}`) } async function getList() { diff --git a/src/plugins/auth.js b/src/plugins/auth.js index 3b91c14..fb5665d 100644 --- a/src/plugins/auth.js +++ b/src/plugins/auth.js @@ -1,60 +1,64 @@ -import store from '@/store' +// import store from '@/store' +import { + useCountStore +} from '@/store' +const store = useCountStore() function authPermission(permission) { - const all_permission = "*:*:*" - const permissions = store.getters && store.getters.permissions - if (permission && permission.length > 0) { - return permissions.some(v => { - return all_permission === v || v === permission - }) - } else { - return false - } + const all_permission = "*:*:*" + const permissions = store && store.permissions + if (permission && permission.length > 0) { + return permissions.some(v => { + return all_permission === v || v === permission + }) + } else { + return false + } } function authRole(role) { - const super_admin = "admin" - const roles = store.getters && store.getters.roles - if (role && role.length > 0) { - return roles.some(v => { - return super_admin === v || v === role - }) - } else { - return false - } + const super_admin = "admin" + const roles = store && store.roles + if (role && role.length > 0) { + return roles.some(v => { + return super_admin === v || v === role + }) + } else { + return false + } } export default { - // 验证用户是否具备某权限 - hasPermi(permission) { - return authPermission(permission) - }, - // 验证用户是否含有指定权限，只需包含其中一个 - hasPermiOr(permissions) { - return permissions.some(item => { - return authPermission(item) - }) - }, - // 验证用户是否含有指定权限，必须全部拥有 - hasPermiAnd(permissions) { - return permissions.every(item => { - return authPermission(item) - }) - }, - // 验证用户是否具备某角色 - hasRole(role) { - return authRole(role) - }, - // 验证用户是否含有指定角色，只需包含其中一个 - hasRoleOr(roles) { - return roles.some(item => { - return authRole(item) - }) - }, - // 验证用户是否含有指定角色，必须全部拥有 - hasRoleAnd(roles) { - return roles.every(item => { - return authRole(item) - }) - } -} + // 验证用户是否具备某权限 + hasPermi(permission) { + return authPermission(permission) + }, + // 验证用户是否含有指定权限，只需包含其中一个 + hasPermiOr(permissions) { + return permissions.some(item => { + return authPermission(item) + }) + }, + // 验证用户是否含有指定权限，必须全部拥有 + hasPermiAnd(permissions) { + return permissions.every(item => { + return authPermission(item) + }) + }, + // 验证用户是否具备某角色 + hasRole(role) { + return authRole(role) + }, + // 验证用户是否含有指定角色，只需包含其中一个 + hasRoleOr(roles) { + return roles.some(item => { + return authRole(item) + }) + }, + // 验证用户是否含有指定角色，必须全部拥有 + hasRoleAnd(roles) { + return roles.every(item => { + return authRole(item) + }) + } +} \ No newline at end of file diff --git a/src/store/modules/countStore.ts b/src/store/modules/countStore.ts index d152f09..0d22a8f 100644 --- a/src/store/modules/countStore.ts +++ b/src/store/modules/countStore.ts @@ -20,8 +20,7 @@ const useStore = defineStore('storeId', { role: '', post: '', dept: '', - menus1: [], - menus2: [], + meaus: [], }), getters: { // isEven: (state) => state.count % 2 === 0 @@ -63,8 +62,7 @@ const useStore = defineStore('storeId', { menus = item.children } }) - this.menus1 = menus.filter(item => item.path !== 'itemOut') - this.menus2 = menus.filter(item => item.path === 'itemOut') + this.meaus = menus } else { this.roles = [] this.role = '' From 0d609fac130a702b2f04721bb7ed933187d12a80 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 1 May 2024 19:16:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20js=E6=94=B9=E6=88=90ts=20=20?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/App.vue | 2 ++ src/api/{inLocation.js => inLocation.ts} | 0 src/api/{location.js => location.ts} | 0 src/api/{login.js => login.ts} | 0 src/api/{outLocation.js => outLocation.ts} | 0 src/api/{spareParts.js => spareParts.ts} | 0 src/api/{sparePartsReturn.js => sparePartsReturn.ts} | 0 src/api/{upload.js => upload.ts} | 0 src/api/{user.js => user.ts} | 0 src/main.ts | 2 ++ src/pages/inLocation/addForm.vue | 6 +++--- src/pages/inLocation/index.vue | 5 ++--- src/pages/outLocation/addForm.vue | 4 ++-- src/pages/outLocation/index.vue | 4 ++-- src/pages/scanCode/scanCode.vue | 2 +- src/pages/sparePartsReturn/addForm.vue | 8 ++++---- src/plugins/auth.js | 10 +++------- src/store/modules/countStore.ts | 5 +++++ 19 files changed, 27 insertions(+), 23 deletions(-) rename src/api/{inLocation.js => inLocation.ts} (100%) rename src/api/{location.js => location.ts} (100%) rename src/api/{login.js => login.ts} (100%) rename src/api/{outLocation.js => outLocation.ts} (100%) rename src/api/{spareParts.js => spareParts.ts} (100%) rename src/api/{sparePartsReturn.js => sparePartsReturn.ts} (100%) rename src/api/{upload.js => upload.ts} (100%) rename src/api/{user.js => user.ts} (100%) diff --git a/.env.development b/.env.development index e17ded4..dd2d32d 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -VITE_BASE_URL=http://192.168.0.106:12080/admin-api +VITE_BASE_URL=http://localhost:12080/admin-api #VITE_BASE_URL=http://dev.ccwin-in.com:25203/api/admin-api VITE_BASE_URL_IMAGE=http://192.168.0.106:12080/admin-api \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 31b5d75..6ec90eb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -81,6 +81,8 @@ // }); if (getAccessToken()) { await store.GetPermissionInfo().then(res => { + uni.setStorageSync('permissionInfo',res.permissions) + uni.setStorageSync('roles',res.roles) }).catch(() => { }) await store.GetInfo().then(res => { }).catch(() => { }) diff --git a/src/api/inLocation.js b/src/api/inLocation.ts similarity index 100% rename from src/api/inLocation.js rename to src/api/inLocation.ts diff --git a/src/api/location.js b/src/api/location.ts similarity index 100% rename from src/api/location.js rename to src/api/location.ts diff --git a/src/api/login.js b/src/api/login.ts similarity index 100% rename from src/api/login.js rename to src/api/login.ts diff --git a/src/api/outLocation.js b/src/api/outLocation.ts similarity index 100% rename from src/api/outLocation.js rename to src/api/outLocation.ts diff --git a/src/api/spareParts.js b/src/api/spareParts.ts similarity index 100% rename from src/api/spareParts.js rename to src/api/spareParts.ts diff --git a/src/api/sparePartsReturn.js b/src/api/sparePartsReturn.ts similarity index 100% rename from src/api/sparePartsReturn.js rename to src/api/sparePartsReturn.ts diff --git a/src/api/upload.js b/src/api/upload.ts similarity index 100% rename from src/api/upload.js rename to src/api/upload.ts diff --git a/src/api/user.js b/src/api/user.ts similarity index 100% rename from src/api/user.js rename to src/api/user.ts diff --git a/src/main.ts b/src/main.ts index c19c964..d5de468 100644 --- a/src/main.ts +++ b/src/main.ts @@ -9,6 +9,7 @@ import App from './App.vue' import tab from './plugins/tab' import modal from './plugins/modal' import time from './plugins/time' +import auth from './plugins/auth' // unocss @@ -30,6 +31,7 @@ export function createApp() { app.config.globalProperties.$modal = modal // 时间对象 app.config.globalProperties.$time = time + app.config.globalProperties.$auth = auth diff --git a/src/pages/inLocation/addForm.vue b/src/pages/inLocation/addForm.vue index 93c999a..946c6c5 100644 --- a/src/pages/inLocation/addForm.vue +++ b/src/pages/inLocation/addForm.vue @@ -133,9 +133,9 @@ ref, getCurrentInstance } from 'vue' - import * as inLocationApi from "@/api/inLocation.js" - import * as sparePartsApi from "@/api/spareParts.js" - import * as locationApi from "@/api/location.js" + import * as inLocationApi from "@/api/inLocation" + import * as sparePartsApi from "@/api/spareParts" + import * as locationApi from "@/api/location" const { proxy } = getCurrentInstance() const loading = ref(false) diff --git a/src/pages/inLocation/index.vue b/src/pages/inLocation/index.vue index 363a689..d6d50c7 100644 --- a/src/pages/inLocation/index.vue +++ b/src/pages/inLocation/index.vue @@ -46,8 +46,7 @@ ref, getCurrentInstance } from 'vue' - import * as inLocationApi from "@/api/inLocation.js" - import auth from '@/plugins/auth' + import * as inLocationApi from "@/api/inLocation" const { proxy } = getCurrentInstance() const params = ref({ @@ -57,7 +56,7 @@ const status = ref('loadmore') //是否显示没有更多了 const list = ref([]) function openDetail(item){ - if(!auth.hasPermiOr(['eam:item-order-main:inOperation']))return; + if(!proxy.$auth.hasPermiOr(['eam:item-order-main:inOperation']))return; proxy.$tab.navigateTo(`/pages/inLocation/addForm?data=${encodeURIComponent(JSON.stringify(item))}`) } async function getList() { diff --git a/src/pages/outLocation/addForm.vue b/src/pages/outLocation/addForm.vue index 87e128f..275c84d 100644 --- a/src/pages/outLocation/addForm.vue +++ b/src/pages/outLocation/addForm.vue @@ -151,8 +151,8 @@ ref, getCurrentInstance } from 'vue' - import * as outLocationApi from "@/api/outLocation.js" - import * as locationApi from "@/api/location.js" + import * as outLocationApi from "@/api/outLocation" + import * as locationApi from "@/api/location" const { proxy } = getCurrentInstance() const loading = ref(false) diff --git a/src/pages/outLocation/index.vue b/src/pages/outLocation/index.vue index ceab2ae..dc37c0c 100644 --- a/src/pages/outLocation/index.vue +++ b/src/pages/outLocation/index.vue @@ -63,7 +63,7 @@ ref, getCurrentInstance } from 'vue' - import * as outLocationApi from "@/api/outLocation.js" + import * as outLocationApi from "@/api/outLocation" import auth from '@/plugins/auth' const { proxy } = getCurrentInstance() const params = ref({ @@ -74,7 +74,7 @@ const list = ref([]) function openDetail(item){ - if(!auth.hasPermiOr(['eam:item-apply-record-main:outOperation']))return; + if(!proxy.$auth.hasPermiOr(['eam:item-apply-record-main:outOperation']))return; proxy.$tab.navigateTo(`/pages/outLocation/addForm?data=${encodeURIComponent(JSON.stringify(item))}`) } async function getList() { diff --git a/src/pages/scanCode/scanCode.vue b/src/pages/scanCode/scanCode.vue index ac5608b..161b672 100644 --- a/src/pages/scanCode/scanCode.vue +++ b/src/pages/scanCode/scanCode.vue @@ -70,7 +70,7 @@ ref, getCurrentInstance } from 'vue' - import * as locationApi from "@/api/location.js" + import * as locationApi from "@/api/location" const { proxy } = getCurrentInstance() const number = ref('LN0000000001') const list = ref([]) diff --git a/src/pages/sparePartsReturn/addForm.vue b/src/pages/sparePartsReturn/addForm.vue index d8cb531..efc4040 100644 --- a/src/pages/sparePartsReturn/addForm.vue +++ b/src/pages/sparePartsReturn/addForm.vue @@ -100,10 +100,10 @@ ref, getCurrentInstance } from 'vue' - import * as userApi from "@/api/user.js" - import * as sparePartsReturnApi from "@/api/sparePartsReturn.js" - import * as sparePartsApi from "@/api/spareParts.js" - import * as locationApi from "@/api/location.js" + import * as userApi from "@/api/user" + import * as sparePartsReturnApi from "@/api/sparePartsReturn" + import * as sparePartsApi from "@/api/spareParts" + import * as locationApi from "@/api/location" const { proxy } = getCurrentInstance() const loading = ref(false) diff --git a/src/plugins/auth.js b/src/plugins/auth.js index fb5665d..4f0663b 100644 --- a/src/plugins/auth.js +++ b/src/plugins/auth.js @@ -1,12 +1,8 @@ -// import store from '@/store' -import { - useCountStore -} from '@/store' -const store = useCountStore() + function authPermission(permission) { const all_permission = "*:*:*" - const permissions = store && store.permissions + const permissions =uni.getStorageSync('permissionInfo') if (permission && permission.length > 0) { return permissions.some(v => { return all_permission === v || v === permission @@ -18,7 +14,7 @@ function authPermission(permission) { function authRole(role) { const super_admin = "admin" - const roles = store && store.roles + const roles = uni.getStorageSync('roles') if (role && role.length > 0) { return roles.some(v => { return super_admin === v || v === role diff --git a/src/store/modules/countStore.ts b/src/store/modules/countStore.ts index 0d22a8f..c1b77b8 100644 --- a/src/store/modules/countStore.ts +++ b/src/store/modules/countStore.ts @@ -56,6 +56,9 @@ const useStore = defineStore('storeId', { this.roles = res.roles this.role = res.roles.filter(item => item == 'all_approve' || item == 'normal_approve')[0] this.permissions = res.permissions + + uni.setStorageSync('permissionInfo',res.permissions) + uni.setStorageSync('roles',res.roles) let menus = [] res.menus.forEach(item => { if (item.path == '/pda') { @@ -107,6 +110,8 @@ const useStore = defineStore('storeId', { this.post = '' this.dept = '' removeToken() + uni.removeStorageSync('permissionInfo') + uni.removeStorageSync('roles') resolve(res) }).catch(error => { reject(error) From c3c8929521a516323c5c8f10bac5410a8e25a717 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Wed, 8 May 2024 22:18:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.conf b/nginx.conf index 3cf2f79..736b346 100644 --- a/nginx.conf +++ b/nginx.conf @@ -27,10 +27,10 @@ http { gzip_vary on; gzip_disable "MSIE [1-6]\."; upstream eam { - server localhost:90 weight=10 max_fails=3 fail_timeout=10s; + server localhost:25210 weight=10 max_fails=3 fail_timeout=10s; } server { - listen 82; + listen 25203; server_name_in_redirect off; server_name dev.ccwin-in.com; location /api/ {