From 5e91539195106afc3a03e7bd006786409ecd9b5d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 08 一月 2026 10:58:05 +0800
Subject: [PATCH] 修改简道云人员推送删除功能bug
---
server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java | 26 ++-----------
admin/src/views/business/internalCompany.vue | 17 +++++++-
admin/.env.production | 3 -
admin/public/index.html | 5 +-
admin/src/views/business/regionDevice.vue | 3 +
admin/src/views/business/internalMember.vue | 15 +++++++
6 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/admin/.env.production b/admin/.env.production
index 12cd1e2..bed91aa 100644
--- a/admin/.env.production
+++ b/admin/.env.production
@@ -2,8 +2,7 @@
NODE_ENV = 'production'
# VUE_APP_API_URL = 'http://192.168.0.212/system_gateway'
-# VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
-VUE_APP_API_URL = 'http://10.49.39.23/system_gateway'
+VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
VUE_APP_AMAP_KEY='045542fc5f436b75e6c911c5c84ff8cd'
diff --git a/admin/public/index.html b/admin/public/index.html
index 942ca7d..d580c28 100644
--- a/admin/public/index.html
+++ b/admin/public/index.html
@@ -5,12 +5,11 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
- <title>
- title: process.env.VUE_APP_TITLE,</title>
+ <title>鏅烘収鍥尯瀹夋秷涓�浣撳寲绯荤粺</title>
</head>
<body>
<noscript>
- <strong>We're sorry but 鑺滄箹鐑熻崏鏅烘収瀹夋秷瀹夊叏闃茶寖绯荤粺 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+ <strong>We're sorry but 鏅烘収鍥尯瀹夋秷涓�浣撳寲绯荤粺 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index a935d23..4f15279 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -92,7 +92,7 @@
total: 0
}
},
- provide() {
+ provide () {
return {
sysConfig: () => this.sysConfig
}
@@ -133,7 +133,20 @@
},
// 鍚屾淇℃伅
async synchronous () {
- this.$dialog.actionConfirm('璇ユ搷浣滃皢绯荤粺娓呯┖宸叉湁缁勭粐淇℃伅锛屾偍纭鍚屾鍏ㄩ儴淇℃伅鍚楋紵', '鎿嶄綔纭鎻愰啋')
+ var msg = '璇ユ搷浣滃皢绯荤粺娓呯┖宸叉湁缁勭粐淇℃伅'
+ this.sysConfig = this.sysConfig || {}
+ if (this.sysConfig.orgUserDataOrigin === 0) {
+ msg = '鏈郴缁熷綋鍓嶇粍缁囩敱绯荤粺鑷缓妯″紡锛岃鍔熻兘灏嗗垵濮嬪寲鍚屾娴峰悍瀹夐槻骞冲彴缁勭粐淇℃伅锛岃鎿嶄綔缁撴灉鍙兘浼氭竻绌烘垨鍒犻櫎绯荤粺宸叉湁缁勭粐鏁版嵁锛�'
+ }else if (this.sysConfig.orgUserDataOrigin === 1) {
+ msg = '鏈郴缁熷綋鍓嶇粍缁囨潵婧愪簬涓夋柟ERP骞冲彴锛岃璇ユ搷浣滅粨鏋滃彲鑳戒細娓呯┖鎴栧垹闄ょ郴缁熷凡鏈夌粍缁囨暟鎹紝'
+ }else if (this.sysConfig.orgUserDataOrigin === 2) {
+ msg = '鏈郴缁熷綋鍓嶇粍缁囨潵婧愪簬娴峰悍瀹夐槻骞冲彴骞冲彴锛岃璇ユ搷浣滅粨鏋滃彲鑳戒細娓呯┖鎴栧垹闄ょ郴缁熷凡鏈夌粍缁囨暟鎹紝'
+ }else if (this.sysConfig.orgUserDataOrigin === 3) {
+ msg = '鏈郴缁熷綋鍓嶇粍缁囨潵婧愪簬绠�閬撲簯骞冲彴锛岃璇ユ搷浣滅粨鏋滃彲鑳戒細娓呯┖鎴栧垹闄ょ郴缁熷凡鏈夌粍缁囨暟鎹紝'
+ }else if (this.sysConfig.orgUserDataOrigin === 4) {
+ msg = '鏈郴缁熷綋鍓嶇粍缁囨潵婧愪簬閽夐拤骞冲彴锛岃璇ユ搷浣滅粨鏋滃彲鑳戒細娓呯┖鎴栧垹闄ょ郴缁熷凡鏈夌粍缁囨暟鎹紝'
+ }
+ this.$dialog.actionConfirm(msg + ',鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�', '鎿嶄綔纭鎻愰啋')
.then(() => {
this.loading = true
companySync({})
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index bcf7d30..3c54c5d 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -361,7 +361,20 @@
},
// 鍚屾淇℃伅
async synchronous() {
- this.$dialog.actionConfirm('璇ユ搷浣滈檷瑙﹀彂鍏ㄥ憳淇℃伅鏇存柊鍜岄噸鏂颁笅鍙戯紒璇疯皑鎱庢搷浣�', '鎮ㄧ‘璁ゅ叏閲忓悓姝ュ唴閮ㄤ汉鍛樹俊鎭悧锛�')
+ var msg = '璇ユ搷浣滃皢绯荤粺娓呯┖宸叉湁缁勭粐淇℃伅'
+ this.sysConfig = this.sysConfig || {}
+ if (this.sysConfig.orgUserDataOrigin === 0) {
+ msg = '鏈郴缁熷綋鍓嶅唴閮ㄤ汉鍛樼敱绯荤粺鑷缓妯″紡锛岃鍔熻兘灏嗗垵濮嬪寲鍚屾娴峰悍瀹夐槻骞冲彴淇℃伅锛岃鎿嶄綔缁撴灉鍙兘浼氭竻绌烘垨鍒犻櫎绯荤粺宸叉湁鏁版嵁锛�'
+ }else if (this.sysConfig.orgUserDataOrigin === 1) {
+ msg = '鏈郴缁熷綋鍓嶅唴閮ㄤ汉鍛樻潵婧愪簬涓夋柟ERP骞冲彴锛岃璇ユ搷浣滅粨鏋滃彲鑳戒細娓呯┖鎴栧垹闄ょ郴缁熷凡鏈夋暟鎹紝'
+ }else if (this.sysConfig.orgUserDataOrigin === 2) {
+ msg = '鏈郴缁熷綋鍓嶅唴閮ㄤ汉鍛樻潵婧愪簬娴峰悍瀹夐槻骞冲彴骞冲彴锛岃璇ユ搷浣滅粨鏋滃彲鑳戒細娓呯┖鎴栧垹闄ょ郴缁熷凡鏈夋暟鎹紝'
+ }else if (this.sysConfig.orgUserDataOrigin === 3) {
+ msg = '鏈郴缁熷綋鍓嶅唴閮ㄤ汉鍛樻潵婧愪簬绠�閬撲簯骞冲彴锛岃璇ユ搷浣滅粨鏋滃彲鑳戒細娓呯┖鎴栧垹闄ょ郴缁熷凡鏈夋暟鎹紝'
+ }else if (this.sysConfig.orgUserDataOrigin === 4) {
+ msg = '鏈郴缁熷綋鍓嶅唴閮ㄤ汉鍛樻潵婧愪簬閽夐拤骞冲彴锛岃璇ユ搷浣滅粨鏋滃彲鑳戒細娓呯┖鎴栧垹闄ょ郴缁熷凡鏈夋暟鎹紝'
+ }
+ this.$dialog.actionConfirm(msg + ',璇ユ搷浣滈檷瑙﹀彂鍏ㄥ憳淇℃伅鏇存柊鍜岄噸鏂颁笅鍙戯紒璇疯皑鎱庢搷浣�', '鎮ㄧ‘璁ゅ叏閲忓悓姝ュ唴閮ㄤ汉鍛樹俊鎭悧锛�')
.then(() => {
this.loading = true
memberSync({})
diff --git a/admin/src/views/business/regionDevice.vue b/admin/src/views/business/regionDevice.vue
index 1aa5bfe..0d74ec8 100644
--- a/admin/src/views/business/regionDevice.vue
+++ b/admin/src/views/business/regionDevice.vue
@@ -10,6 +10,9 @@
</template>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
+ <p class="tip-warn" style="margin-bottom: 10px;"><i class="el-icon-info"></i>璇存槑锛�
+ 鍖哄煙璁惧淇℃伅琛ㄧず鍚屾娴峰悍瀹夐槻骞冲彴淇℃伅鏁版嵁锛屽綋瀹夐槻骞冲彴鐩稿叧鏁版嵁鍙戠敓鍙樺姩鏃讹紝璇枫�愬埛鏂扮紦瀛樸�戝悓姝ユ湰绯荤粺涓暟鎹俊鎭�
+ </p>
<ul class="toolbar" >
<li><el-button type="primary" icon="el-icon-refresh" :loading="isWorking.sort" @click="refreshRegionData()">鍒锋柊缂撳瓨</el-button></li>
</ul>
diff --git a/server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java b/server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
index ec844c8..40bca71 100644
--- a/server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
+++ b/server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
@@ -137,8 +137,8 @@
systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LOGIN_OUT_URL).getCode();
if(StringUtils.isNotBlank(loginUserInfo.getHkMenuToken())){
log.info("璋冭捣娴峰悍閫�鍑虹櫥褰�=======================>"+url+"?token="+loginUserInfo.getHkMenuToken());
-// this.hkLoginOut(url+"?token="+loginUserInfo.getHkMenuToken());
- HttpsUtil.get(url+"?token="+loginUserInfo.getHkMenuToken(),true);
+ this.hkLoginOut(url+"?token="+loginUserInfo.getHkMenuToken());
+// HttpsUtil.get(url+"?token="+loginUserInfo.getHkMenuToken(),true);
}
//鍒犻櫎鑰佺殑token
redisTemplate.delete(Constants.REDIS_TOKEN_KEY+token);
@@ -155,32 +155,14 @@
redisTemplate.delete(Constants.REDIS_TOKEN_KEY+token);
systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda().set(SystemUser::getOpenid,null)
.eq(SystemUser::getId,loginUserInfo.getId()));
-
} catch (Exception e) {
e.printStackTrace();
}
}
public void hkLoginOut(String url){
try {
- // 鍒涘缓HttpClient瀵硅薄
- HttpClient httpClient = HttpClientBuilder.create().build();
- // 鍒涘缓HttpGet瀵硅薄锛屾寚瀹氳璁块棶鐨刄RL鍦板潃
- HttpGet httpGet = new HttpGet(url);
- // 鍙戦�丟ET璇锋眰锛岃幏鍙栧搷搴�
- HttpResponse response = httpClient.execute(httpGet);
- // 鑾峰彇鍝嶅簲鐘舵�佺爜
- int statusCode = response.getStatusLine().getStatusCode();
- // 鍒ゆ柇璇锋眰鏄惁鎴愬姛
- if (statusCode == 200) {
- // 鑾峰彇鍝嶅簲鍐呭
- HttpEntity entity = response.getEntity();
- String responseContent = EntityUtils.toString(entity, "UTF-8");
- System.out.println(responseContent);
- log.info("璋冭捣娴峰悍閫�鍑虹櫥褰曡繑鍥炰俊鎭�=======================>"+responseContent);
- } else {
- System.out.println("璇锋眰澶辫触锛屽搷搴旂爜锛�" + statusCode);
- }
- } catch (IOException e) {
+ HttpsUtil.get(url,true);
+ } catch (Exception e) {
e.printStackTrace();
}
}
--
Gitblit v1.9.3