From c098f1e3a3e052aa3d65584aae6dc003a70d75ad Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期二, 16 十二月 2025 00:09:14 +0800
Subject: [PATCH] feat: 停止轮询 uncount
---
app/permission.js | 5 ++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusSyncServiceImpl.java | 2
app/utils/wechat.js | 32 ++++++++++++++-
app/pagesTask/detail.vue | 11 +++++
ruoyi-admin/src/main/resources/application.yml | 2
app/App.vue | 24 +++++++++++
6 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/app/App.vue b/app/App.vue
index 1d029f2..f74c66c 100644
--- a/app/App.vue
+++ b/app/App.vue
@@ -68,7 +68,7 @@
this.updateUnreadMessageBadge()
// 閲嶆柊鍚姩杞锛堝鏋滀箣鍓嶅凡鍋滄锛�
if (!this.messagePollingTimer) {
- this.startMessagePolling()
+ // this.startMessagePolling()
}
}
},
@@ -99,6 +99,28 @@
try {
if (!getToken()) {
console.log('鐢ㄦ埛鏈櫥褰曪紝鍑嗗璺宠浆鍒扮櫥褰曢〉闈�')
+ // 淇濆瓨鐩爣椤甸潰鐢ㄤ簬鐧诲綍鍚庤烦杞�
+ if (options && options.path &&
+ options.path !== 'pages/login' &&
+ options.path !== 'pages/qylogin') {
+ // 鏋勯�犲畬鏁寸殑璺緞鍜屾煡璇㈠弬鏁�
+ let fullPath = '/' + options.path;
+ if (options.query) {
+ const queryString = Object.keys(options.query).map(key =>
+ `${key}=${encodeURIComponent(options.query[key])}`).join('&');
+ if (queryString) {
+ fullPath += '?' + queryString;
+ }
+ }
+
+ // 淇濆瓨鐩爣URL鍒版湰鍦板瓨鍌�
+ try {
+ uni.setStorageSync('targetUrl', fullPath);
+ } catch (e) {
+ console.error('淇濆瓨鐩爣URL澶辫触:', e);
+ }
+ }
+
// 浣跨敤宸ュ叿绫绘牴鎹幆澧冭嚜鍔ㄨ烦杞埌鍚堥�傜殑鐧诲綍椤甸潰
redirectToLoginByEnvironment(options, this.$tab);
} else {
diff --git a/app/pagesTask/detail.vue b/app/pagesTask/detail.vue
index 022152d..17289aa 100644
--- a/app/pagesTask/detail.vue
+++ b/app/pagesTask/detail.vue
@@ -702,7 +702,16 @@
// 杩斿洖涓婁竴椤�
goBack() {
- uni.navigateBack()
+ // 妫�鏌ユ槸鍚︽湁椤甸潰鍙互杩斿洖
+ uni.navigateBack({
+ delta: 1,
+ fail: () => {
+ // 濡傛灉鏃犳硶杩斿洖锛屽垯璺宠浆鍒颁换鍔″垪琛ㄩ〉闈�
+ uni.switchTab({
+ url: '/pages/task/index'
+ })
+ }
+ })
},
// 澶勭悊缂栬緫鎸夐挳
diff --git a/app/permission.js b/app/permission.js
index 5f79c2f..7adf6a1 100644
--- a/app/permission.js
+++ b/app/permission.js
@@ -22,7 +22,10 @@
// 淇濆瓨鐩爣椤甸潰URL锛岀敤浜庣櫥褰曞悗璺宠浆
function saveTargetUrl(url) {
try {
- uni.setStorageSync('targetUrl', url)
+ // 濡傛灉URL宸茬粡鏄�/pages/login鎴�/pages/qylogin锛屽垯涓嶄繚瀛�
+ if (url && !url.startsWith('/pages/login') && !url.startsWith('/pages/qylogin')) {
+ uni.setStorageSync('targetUrl', url)
+ }
} catch (e) {
console.error('淇濆瓨鐩爣URL澶辫触:', e)
}
diff --git a/app/utils/wechat.js b/app/utils/wechat.js
index 3c05e14..32802db 100644
--- a/app/utils/wechat.js
+++ b/app/utils/wechat.js
@@ -18,8 +18,18 @@
resolve(isWxWork);
} catch (e) {
console.error('鑾峰彇绯荤粺淇℃伅澶辫触:', e);
- // fallback妫�娴�
- resolve(false);
+ // fallback妫�娴嬶細灏濊瘯浣跨敤wx.qy瀵硅薄鍒ゆ柇
+ try {
+ if (typeof wx !== 'undefined' && wx.qy) {
+ console.log('閫氳繃wx.qy瀵硅薄妫�娴嬪埌浼佷笟寰俊鐜');
+ resolve(true);
+ } else {
+ resolve(false);
+ }
+ } catch (e2) {
+ console.error('fallback妫�娴嬩篃澶辫触:', e2);
+ resolve(false);
+ }
}
// #endif
@@ -87,9 +97,25 @@
export function redirectToQyLogin(options, tab) {
try {
let url = '/pages/qylogin';
- if (options && options.query) {
+ // 淇濆瓨鐩爣URL鐢ㄤ簬鐧诲綍鍚庤烦杞�
+ if (options && options.path && options.path !== 'pages/qylogin') {
+ // 鏋勯�犲畬鏁寸殑璺緞鍜屾煡璇㈠弬鏁�
+ let fullPath = '/' + options.path;
+ if (options.query) {
+ const queryString = Object.keys(options.query).map(key =>
+ `${key}=${encodeURIComponent(options.query[key])}`).join('&');
+ if (queryString) {
+ fullPath += '?' + queryString;
+ }
+ }
+
+ // 娣诲姞redirect鍙傛暟
+ const separator = fullPath.includes('?') ? '&' : '?';
+ url += `${separator}redirect=${encodeURIComponent(fullPath)}`;
+ } else if (options && options.query) {
url = buildUrlWithParams(url, options.query);
}
+
console.log('璺宠浆鍒颁紒涓氬井淇＄櫥褰曢〉闈�:', url);
tab.reLaunch(url);
} catch (e) {
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 105bc73..4219d2c 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -58,7 +58,7 @@
basename: i18n/messages
profiles:
# 鐜 dev|test|prod
- active: dev
+ active: prod
# 鏂囦欢涓婁紶
servlet:
multipart:
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusSyncServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusSyncServiceImpl.java
index 48e2a37..c04dbc0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusSyncServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TaskStatusSyncServiceImpl.java
@@ -114,7 +114,7 @@
try {
int totalSuccessCount = 0;
- int pageSize = 200; // 姣忛〉200鏉�
+ int pageSize = 10; // 姣忛〉200鏉�
int offset = 0;
while (true) {
--
Gitblit v1.9.1