From c115722130eb11af68ab639835a266ca9e2b4c9c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 22 五月 2025 16:26:06 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/components/common/UploadFile.vue | 44 +++++++----
server/system_service/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java | 4
server/system_timer/src/main/resources/application.yml | 10 ++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java | 2
server/README.md | 28 ------
server/system_service/src/main/java/com/doumee/api/BaseController.java | 1
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java | 2
admin/src/components/system/dict/OperaDictDataWindow.vue | 34 ++++++--
README.md | 28 ++++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java | 2
server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java | 12 ++
server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 4
server/meeting/meeting_admin/src/main/resources/application.yml | 13 +++
15 files changed, 122 insertions(+), 67 deletions(-)
diff --git a/README.md b/README.md
index d45964a..4cf546a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,28 @@
-## dmvisit
+鍩虹宸ョ▼锛欵va v2.0
+瀹樼綉锛歨ttp://eva.adjustrd.com/
+鎶�鏈敮鎸丵Q缇わ細877957236
-璁垮绯荤粺
+1銆佸畨瑁卬acos鏈嶅姟
+2銆佹寜鐓ysql5.x
+3銆乯dk1.8瀹夎
+4銆乺edis瀹夎
+5銆乫tp瀹夎
+
+
+nohup java -Xms512m -Xmx512m -Xmn512m -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=256m -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=10018 -jar /usr/local/jars/dmvisit/openapi.jar >/usr/local/jars/dmvisit/web.log 2>/usr/local/jars/dmvisit/err.log &
+
+
+
+閲嶈锛�
+1銆佸叧浜庡缃戣闂檺鍒� 锛屽鏋滄湇鍔″櫒閲嶅惎浜嗘垨鑰呯綉鍗￠噸鍚紝杩涜涓�涓嬫搷浣滐細
+vim /etc/resolv.conf
+nameserver 鏀规垚 nameserver 202.102.192.68
+
+
+#nohup涓嶄骇鐢熸棩蹇楁枃浠跺懡浠わ細
+nohup java -jar /usr/local/jars/admin_interface.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/admin_timer.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/meeting_admin.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/system_gateway.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/system_timer.jar > /dev/null 2>&1 &
diff --git a/admin/src/components/common/UploadFile.vue b/admin/src/components/common/UploadFile.vue
index 7dcad1f..bc6d804 100644
--- a/admin/src/components/common/UploadFile.vue
+++ b/admin/src/components/common/UploadFile.vue
@@ -4,14 +4,14 @@
class="upload-demo"
:accept="uploadData.fileTyp"
:action="uploadImgUrl"
- :limit="1"
+ :limit="this.fileLength"
:on-exceed="handleExceed"
:on-success="handleFileSuccess"
:on-error="uploadError"
:before-upload="beforeFileUpload"
:file-list="fileList">
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
- <div slot="tip" class="el-upload__tip">鍙兘涓婁紶{{ uploadData.fileType }}鏂囦欢锛屼笖涓嶈秴杩�5mb</div>
+ <div slot="tip" class="el-upload__tip" >鍙兘涓婁紶{{ this.fileLength }}涓枃浠讹紝鏁伴噺瓒呰繃璇峰垹闄ゅ凡浼犻檮浠堕噸鏂颁笂浼�</div>
</el-upload>
</div>
@@ -29,22 +29,30 @@
type: String,
default: 'width: 190px; height: 190px;'
},
+ fileLength:{
+ type: Number,
+ default: () => 1
+ },
uploadData: Object
},
data() {
return {
- fileList:null,
+ fileList: [],
uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload?folder='+this.uploadData.folder
}
},
methods: {
// 涓婁紶鍥剧墖
- handleExceed(){},
+ handleExceed(){
+ if(this.fileList && this.fileList.length >= this.fileLength){
+ this.$message.error('鍙厑璁镐笂浼犮��'+this.fileLength+'涓檮浠躲��')
+ }
+ },
handleFileSuccess(res, file) {
if (res.code == 200) {
let { data } = res
- // this.fileList = [{name: data.originname, url: data.url }]
+ this.fileList = [{name: data.originname, url: data.url }]
this.$message.success('涓婁紶鎴愬姛')
this.$emit('uploadSuccess', { fileurl: data.imgaddr, fileurlFull: data.url, name: data.originname })
} else {
@@ -56,8 +64,12 @@
this.$message.error('涓婁紶澶辫触')
this.$emit('uploadEnd')
},
- // // 鎷︽埅
+ //
beforeFileUpload(file) {
+ if(this.fileList && this.fileList.length >= this.fileLength){
+ this.$message.error('鍙厑璁镐笂浼犮��'+this.fileLength+'w鏂囦欢銆�')
+ return false;
+ }
this.$emit('uploadBegin')
return true
}
@@ -67,8 +79,9 @@
<style lang="scss" scoped>
$image-width: 100px;
+$image-height: 30px;
.avatar-uploader {
- width: $image-width;
+ width: 100px;
height: $image-width;
}
::v-deep .el-upload {
@@ -77,7 +90,7 @@
cursor: pointer;
position: relative;
width: $image-width;
- height: $image-width;
+ height: $image-height;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
@@ -88,12 +101,12 @@
font-size: 28px;
color: #8c939d;
width: $image-width;
- height: $image-width;
+ height: $image-height;
text-align: center;
}
.avatar {
width: $image-width;
- height: $image-width;
+ height: $image-height;
display: block;
}
.tips-style {
@@ -109,15 +122,14 @@
width: 90px !important;
height: 90px !important;
}
-::v-deep .el-upload-list__item {
- width: 80% !important;
- height: 50px !important;
-}
+
.icon {
-webkit-transform: translate(-50%,-50%);
-ms-transform: translate(-50%,-50%);
transform: translate(0%, -85%);
}
-
+::v-deep .el-upload-list__item {
+ width: 500px !important;
+ height: 30px !important;
+}
</style>
-
diff --git a/admin/src/components/system/dict/OperaDictDataWindow.vue b/admin/src/components/system/dict/OperaDictDataWindow.vue
index 3681a95..f51c43e 100644
--- a/admin/src/components/system/dict/OperaDictDataWindow.vue
+++ b/admin/src/components/system/dict/OperaDictDataWindow.vue
@@ -13,12 +13,21 @@
<el-input v-model="form.label" placeholder="璇疯緭鍏ユ暟鎹爣绛�" v-trim/>
</el-form-item>
<el-form-item label="鏄惁瀵屾枃鏈�" prop="istext" >
- <el-switch v-model="form.istext" :active-value="true" :inactive-value="false"/>
- <span class="status-text">{{form.istext | disabledText1}}</span>
+ <el-radio-group v-model="form.istext">
+ <el-radio :label="0" value="0">鏂囨湰</el-radio>
+ <el-radio :label="1" value="1">鍥剧墖|鏂囦欢</el-radio>
+ <el-radio :label="2" value="2">瀵屾枃鏈�</el-radio>
+ </el-radio-group>
+<!-- <el-switch v-model="form.istext" :active-value="true" :inactive-value="false"/>
+ <span class="status-text">{{form.istext | disabledText1}}</span>-->
</el-form-item>
<el-form-item label="鏁版嵁鍊�" prop="code" required>
- <el-input v-if="!form.istext" v-model="form.code" placeholder="璇疯緭鍏ユ暟鎹��" v-trim/>
- <RichEditor v-else :richData="form.code" :styleEditor="styleEditor" @getWangedditor="getWangedditor" :readonly="false"/>
+ <template v-if="form.istext == 1" >
+ <UploadFile :uploadData="{ folder: 'richeditor',fileType:'' }" :fileList="fileList" @uploadSuccess="fileUploaded" />
+ <el-input readonly v-model="form.code" placeholder="瀹屾暣鏁版嵁鍊�" v-trim/>
+ </template>
+ <RichEditor v-if="form.istext == 2" :richData="form.code" :styleEditor="styleEditor" @getWangedditor="getWangedditor" :readonly="false"/>
+ <el-input v-if="form.istext == 0" v-model="form.code" placeholder="璇疯緭鍏ユ暟鎹��" v-trim/>
</el-form-item>
<el-form-item label="鐘舵��" prop="disabled" required class="form-item-status">
<el-switch v-model="form.disabled" :active-value="false" :inactive-value="true"/>
@@ -32,10 +41,11 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import RichEditor from '@/components/common/RichEditor'
+import UploadFile from "@/components/common/UploadFile";
export default {
name: 'OperaDictDataWindow',
extends: BaseOpera,
- components: { GlobalWindow,RichEditor },
+ components: {UploadFile, GlobalWindow,RichEditor },
data () {
return {
// 琛ㄥ崟鏁版嵁
@@ -46,9 +56,10 @@
code: '',
label: '',
disabled: false,
- istext: false,
- remark:''
+ istext: 0,
+ remark: ''
},
+ fileList: [],
// 楠岃瘉瑙勫垯
rules: {
label: [
@@ -61,6 +72,9 @@
}
},
methods: {
+ fileUploaded(data){
+ this.form.code = data.fileurlFull
+ },
getWangedditor(val){
this.form.code =val
},
@@ -72,13 +86,15 @@
open (title, dictId, target) {
this.title = title
this.visible = true
+
+ this.form.istext = 0
// 鏂板缓
if (target == null) {
this.$nextTick(() => {
this.$refs.form.resetFields()
this.form.id = null
this.form.dictId = dictId
- this.form.istext=false
+ this.form.istext=0
})
return
}
@@ -87,7 +103,7 @@
for (const key in this.form) {
this.form[key] = target[key]
this.form.dictId = dictId
- this.form.istext=false
+ this.form.istext = 0
}
})
}
diff --git a/server/README.md b/server/README.md
index 4cf546a..9ce3c01 100644
--- a/server/README.md
+++ b/server/README.md
@@ -1,28 +1,2 @@
鍩虹宸ョ▼锛欵va v2.0
-瀹樼綉锛歨ttp://eva.adjustrd.com/
-鎶�鏈敮鎸丵Q缇わ細877957236
-
-1銆佸畨瑁卬acos鏈嶅姟
-2銆佹寜鐓ysql5.x
-3銆乯dk1.8瀹夎
-4銆乺edis瀹夎
-5銆乫tp瀹夎
-
-
-
-nohup java -Xms512m -Xmx512m -Xmn512m -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=256m -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=10018 -jar /usr/local/jars/dmvisit/openapi.jar >/usr/local/jars/dmvisit/web.log 2>/usr/local/jars/dmvisit/err.log &
-
-
-
-閲嶈锛�
-1銆佸叧浜庡缃戣闂檺鍒� 锛屽鏋滄湇鍔″櫒閲嶅惎浜嗘垨鑰呯綉鍗￠噸鍚紝杩涜涓�涓嬫搷浣滐細
-vim /etc/resolv.conf
-nameserver 鏀规垚 nameserver 202.102.192.68
-
-
-#nohup涓嶄骇鐢熸棩蹇楁枃浠跺懡浠わ細
-nohup java -jar /usr/local/jars/admin_interface.jar > /dev/null 2>&1 &
-nohup java -jar /usr/local/jars/admin_timer.jar > /dev/null 2>&1 &
-nohup java -jar /usr/local/jars/meeting_admin.jar > /dev/null 2>&1 &
-nohup java -jar /usr/local/jars/system_gateway.jar > /dev/null 2>&1 &
-nohup java -jar /usr/local/jars/system_timer.jar > /dev/null 2>&1 &
+
\ No newline at end of file
diff --git a/server/meeting/meeting_admin/src/main/resources/application.yml b/server/meeting/meeting_admin/src/main/resources/application.yml
index c3ba03a..7196155 100644
--- a/server/meeting/meeting_admin/src/main/resources/application.yml
+++ b/server/meeting/meeting_admin/src/main/resources/application.yml
@@ -68,4 +68,15 @@
max-swallow-size: -1
servlet:
session:
- timeout: PT3H #琛ㄧず12灏忔椂
\ No newline at end of file
+ timeout: PT3H #琛ㄧず12灏忔椂
+
+auth:
+ jwt:
+ enabled: true #鏄惁寮�鍚疛WT鐧诲綍璁よ瘉鍔熻兘
+ secret: fjkfaf;afa # JWT绉侀挜锛岀敤浜庢牎楠孞WT浠ょ墝鐨勫悎娉曟��
+ expiration: 1800000 #JWT浠ょ墝鐨勬湁鏁堟湡锛岀敤浜庢牎楠孞WT浠ょ墝鐨勫悎娉曟��
+ # expiration: 300000 #JWT浠ょ墝鐨勬湁鏁堟湡锛岀敤浜庢牎楠孞WT浠ょ墝鐨勫悎娉曟��
+ header: JWTHeaderName #HTTP璇锋眰鐨凥eader鍚嶇О锛岃Header浣滀负鍙傛暟浼犻�扟WT浠ょ墝
+ userParamName: username #鐢ㄦ埛鐧诲綍璁よ瘉鐢ㄦ埛鍚嶅弬鏁板悕绉�
+ pwdParamName: password #鐢ㄦ埛鐧诲綍璁よ瘉瀵嗙爜鍙傛暟鍚嶇О
+ useDefaultController: true # 鏄惁浣跨敤榛樿鐨凧wtAuthController
\ No newline at end of file
diff --git a/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
index b47e8d0..4751b64 100644
--- a/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
+++ b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
@@ -252,8 +252,6 @@
return ApiResponse.success(null);
}
-
-
@PostMapping("/logoutForH5")
@ApiOperation("閫�鍑虹櫥闄�")
public ApiResponse<String> logoutForH5(@RequestHeader(Constants.HEADER_USER_TOKEN) String oldToken){
@@ -265,7 +263,6 @@
return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
}
return ApiResponse.success(null);
-
}
diff --git a/server/system_service/src/main/java/com/doumee/api/BaseController.java b/server/system_service/src/main/java/com/doumee/api/BaseController.java
index b335103..ffe898e 100644
--- a/server/system_service/src/main/java/com/doumee/api/BaseController.java
+++ b/server/system_service/src/main/java/com/doumee/api/BaseController.java
@@ -1,6 +1,7 @@
package com.doumee.api;
import com.alibaba.fastjson.JSONObject;
+import com.doumee.config.jwt.JwtTokenUtil;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.service.business.third.model.LoginUserInfo;
diff --git a/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java b/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
index 16072d0..8048f43 100644
--- a/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
+++ b/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
@@ -9,6 +9,7 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.method.HandlerMethod;
@@ -26,11 +27,19 @@
import java.util.*;
import java.util.concurrent.TimeUnit;
+@Slf4j
public class LoginHandlerInterceptor implements HandlerInterceptor {
private RedisTemplate<String,Object> stringRedisTemplate;
private long expireTime;
+ public long getExpireTime() {
+ return expireTime;
+ }
+
+ public void setExpireTime(long expireTime) {
+ this.expireTime = expireTime;
+ }
// 鐢变簬璇ョ被鏈氦缁檚pring绠＄悊锛屽洜姝や笉鑳戒娇鐢ㄨ嚜鍔ㄨ閰嶇殑鏂瑰紡鑾峰彇RedisTemplate瀵硅薄
public LoginHandlerInterceptor(RedisTemplate<String,Object> stringRedisTemplate,long expireTime) {
@@ -134,7 +143,8 @@
if(user ==null ){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛鐧婚檰宸插け鏁堬紝璇烽噸鏂扮櫥闄嗭紒");
}
- stringRedisTemplate.expire(Constants.REDIS_TOKEN_KEY+token,this.expireTime, TimeUnit.MILLISECONDS);
+ log.error("=========寮�濮嬪埛鏂皌oken鏈夋晥鏈�:"+token+"======time:"+this.getExpireTime());
+ stringRedisTemplate.expire(Constants.REDIS_TOKEN_KEY+token,this.getExpireTime(), TimeUnit.MILLISECONDS);
//鏉冮檺鍒ゆ柇------------
return user;
}
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 bd8d38a..30882e7 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
@@ -229,6 +229,7 @@
try {
String userInfo = (String) redisTemplate.opsForValue().get(Constants.REDIS_TOKEN_KEY+token);
claims = JSONObject.toJavaObject(JSONObject.parseObject(userInfo),LoginUserInfo.class);
+ refreshToken(token);
} catch (Exception e) {
claims = null;
}
@@ -239,9 +240,10 @@
* 鍚戝悗寤朵几鏈夋晥鏈熶繚鎸佷細璇濈户缁�
* @param token
*/
-
public void refreshTokenTime(String token ) {
+ log.error("===============寮�濮嬪埛鏂扮櫥褰晅oken"+token);
redisTemplate.expire(Constants.REDIS_TOKEN_KEY+token,jwtProperties.getExpiration(), TimeUnit.MILLISECONDS);
+ log.error("===============缁撴潫鍒锋柊鐧诲綍token"+token);
// redisTemplate.opsForValue().set(Constants.REDIS_TOKEN_KEY+token,usrerInfo,jwtProperties.getExpiration(), TimeUnit.MILLISECONDS);
}
}
\ No newline at end of file
diff --git a/server/system_timer/src/main/resources/application.yml b/server/system_timer/src/main/resources/application.yml
index 97ea063..7a24317 100644
--- a/server/system_timer/src/main/resources/application.yml
+++ b/server/system_timer/src/main/resources/application.yml
@@ -68,3 +68,13 @@
servlet:
session:
timeout: PT3H #琛ㄧず12灏忔椂
+auth:
+ jwt:
+ enabled: true #鏄惁寮�鍚疛WT鐧诲綍璁よ瘉鍔熻兘
+ secret: fjkfaf;afa # JWT绉侀挜锛岀敤浜庢牎楠孞WT浠ょ墝鐨勫悎娉曟��
+ expiration: 1800000 #JWT浠ょ墝鐨勬湁鏁堟湡锛岀敤浜庢牎楠孞WT浠ょ墝鐨勫悎娉曟��
+ # expiration: 300000 #JWT浠ょ墝鐨勬湁鏁堟湡锛岀敤浜庢牎楠孞WT浠ょ墝鐨勫悎娉曟��
+ header: JWTHeaderName #HTTP璇锋眰鐨凥eader鍚嶇О锛岃Header浣滀负鍙傛暟浼犻�扟WT浠ょ墝
+ userParamName: username #鐢ㄦ埛鐧诲綍璁よ瘉鐢ㄦ埛鍚嶅弬鏁板悕绉�
+ pwdParamName: password #鐢ㄦ埛鐧诲綍璁よ瘉瀵嗙爜鍙傛暟鍚嶇О
+ useDefaultController: true # 鏄惁浣跨敤榛樿鐨凧wtAuthController
\ No newline at end of file
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java
index 26b96b7..f4128ad 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java
@@ -37,7 +37,7 @@
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/driverPlatform")
@Slf4j
-@LoginNoRequired
+//@LoginNoRequired
public class DriverPlatformController extends BaseController {
@Autowired
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
index a5f60f7..c7f6ecf 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
@@ -35,7 +35,7 @@
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/member")
@Slf4j
-@LoginNoRequired
+//@LoginNoRequired
public class InternalWebController extends BaseController {
@Autowired
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
index 9cf22d8..0671e49 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
@@ -34,7 +34,7 @@
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/pdaPlatform")
@Slf4j
-@LoginNoRequired
+//@LoginNoRequired
public class PdaPlatformController extends BaseController {
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
index 23d0ac9..6ec9c82 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
@@ -78,8 +78,6 @@
visits.setSourceType(Constants.ZERO);
return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.createFk(visits,false,Constants.ZERO));
}
-
-
@ApiOperation(value = "鏉ヨ浜嬬敱", notes = "鏉ヨ浜嬬敱")
@PostMapping("/visitReason")
public ApiResponse<List<VisitReason>> visitReason() {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 4490ed7..ba63d6f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1603,9 +1603,9 @@
if(Objects.isNull(visits)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!(Constants.equalsInteger(memberId,visits.getMemberId()))){
+/* if(!(Constants.equalsInteger(memberId,visits.getMemberId()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳鎿嶄綔鏉冮檺");
- }
+ }*/
if(!StringUtils.equals(openid,visits.getOpenid())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳鎿嶄綔鏉冮檺");
}
--
Gitblit v1.9.3