From e4ad5c0aa7bd574c36be97eea4dd124dad9479ca Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 06 十二月 2023 16:13:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java | 8 ++-
Source/UBCS-WEB/src/views/system/userinfo.vue | 48 ++++++++++++------------
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java | 4 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 2
Source/UBCS-WEB/src/views/monitor/log/localLog.vue | 2
Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java | 5 ++
6 files changed, 38 insertions(+), 31 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/monitor/log/localLog.vue b/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
index d4c1d7b..f294431 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/localLog.vue
@@ -25,7 +25,7 @@
type="text"
:loading="downloadLoading"
@click="downLoadLogFile(scope.row)"
- v-if="permissionList.downLoadBtn"
+ v-if="permissionList.downLoadBtn && scope.row.hasChildren!=1"
>涓嬭浇
</el-button>
</template>
diff --git a/Source/UBCS-WEB/src/views/system/userinfo.vue b/Source/UBCS-WEB/src/views/system/userinfo.vue
index 6c985b5..1a87d09 100644
--- a/Source/UBCS-WEB/src/views/system/userinfo.vue
+++ b/Source/UBCS-WEB/src/views/system/userinfo.vue
@@ -29,13 +29,32 @@
},
methods: {
handleSubmit(form, done) {
- if (this.index === 0) {
updateInfo(form).then(res => {
if (res.data.success) {
- this.$message({
- type: "success",
- message: "淇敼淇℃伅鎴愬姛!"
- });
+ if( form.oldPassword != undefined || form.newPassword1 != undefined || form.newPassword != undefined){
+ updatePassword(form.oldPassword, form.newPassword, form.newPassword1).then(res => {
+ if (res.data.success) {
+ this.$message({
+ type: "success",
+ message: "淇敼鎴愬姛!"
+ });
+ } else {
+ this.$message({
+ type: "error",
+ message: res.data.msg
+ });
+ }
+ done();
+ }, error => {
+ window.console.log(error);
+ done();
+ })
+ }else{
+ this.$message({
+ type: "success",
+ message: "淇敼淇℃伅鎴愬姛!"
+ });
+ };
} else {
this.$message({
type: "error",
@@ -47,25 +66,6 @@
window.console.log(error);
done();
})
- } else {
- updatePassword(md5(form.oldPassword), md5(form.newPassword), md5(form.newPassword1)).then(res => {
- if (res.data.success) {
- this.$message({
- type: "success",
- message: "淇敼瀵嗙爜鎴愬姛!"
- });
- } else {
- this.$message({
- type: "error",
- message: res.data.msg
- });
- }
- done();
- }, error => {
- window.console.log(error);
- done();
- })
- }
},
handleWitch() {
if (this.index === 0) {
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
index 38e4eb7..c818d09 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/controller/LogLocalController.java
@@ -4,6 +4,7 @@
import com.vci.ubcs.log.vo.LocalLogVO;
import com.vci.ubcs.log.service.ILogLocalService;
import com.vci.ubcs.log.entity.LocalLog;
+import com.vci.ubcs.resource.bo.FileObjectBO;
import com.vci.ubcs.resource.utils.FileDownloadUtil;
import com.vci.ubcs.starter.web.util.ControllerUtil;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
@@ -61,7 +62,9 @@
if(StringUtils.isBlank(msg)){
msg = "鏈煡閿欒";
}
- ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
+ FileObjectBO fileObjectBO = new FileObjectBO();
+ fileObjectBO.setName(msg.getBytes(StandardCharsets.UTF_8).toString());
+ FileDownloadUtil.downloadFileLocal(response, fileObjectBO,true);
}
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
index 0a2e420..8efad2f 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/java/com/vci/ubcs/log/service/impl/LogLocalServiceImpl.java
@@ -265,7 +265,6 @@
if(!logFile.exists() || !logFile.isFile()){
throw new VciBaseException("鏈湴鏃ュ織鏂囦欢璺緞"+item.getPath()+"涓湭鎵惧埌鏃ュ織");
}
-
try(OutputStream os = new FileOutputStream(file);
InputStream ins = new FileInputStream(logFile);
){
@@ -277,10 +276,13 @@
String zipName = new File(tempFolder).getPath() + File.separator + getLogFileName(logFullPaths) + "绛�"+file1.length + "涓枃浠�.zip";
zipUtil.folderToZipFile(tempFolder,zipName);
fileObjectBO.setFileLocalPath(zipName);
+ fileObjectBO.setName(zipName);
fileObjectBO.setFileExtension(".log");
if(log.isDebugEnabled()){
log.debug("涓嬭浇鏂囦欢鐨勪俊鎭�,",zipName);
}
+ }else{
+ throw new ServerException("璇ョ洰褰曚笅涓嶅瓨鍦ㄦ棩蹇楁枃浠讹紒");
}
}
return fileObjectBO;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index 8dd357b..3f5a955 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -4988,7 +4988,7 @@
ExecGroupCodePortDataDTO execGroupCodePortDataDTO=new ExecGroupCodePortDataDTO();
createExportGroupCodeMapConfig(templateVO,execGroupCodePortDataDTO);//缁勭粐鏁版嵁
- if(!CollectionUtils.isEmpty(execGroupCodePortDataDTO.getCodeAttrMapGroupAttrDTOS())){
+ if(CollectionUtils.isEmpty(execGroupCodePortDataDTO.getCodeAttrMapGroupAttrDTOS())){
throw new VciBaseException("闆嗗洟灞炴�ф槧灏勬湭閰嶇疆");
}
fieldList=execGroupCodePortDataDTO.getFieldList();
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
index ff717d9..b1de27c 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
@@ -378,9 +378,6 @@
if (!newPassword.equals(newPassword1)) {
throw new ServiceException("璇疯緭鍏ユ纭殑纭瀵嗙爜!");
}
- if (!user.getPassword().equals(DigestUtil.hex(oldPassword))) {
- throw new ServiceException("鍘熷瘑鐮佷笉姝ｇ‘!");
- }
//鑾峰彇鐢ㄦ埛閲囩敤鐨勫瘑鐮佺瓥鐣�
Strategy strategy = sysClient.getByUserId(userId).getData();
// 鍑犱箮涓嶄細鍑虹幇杩欑鎯呭喌
@@ -391,6 +388,11 @@
if(newPassword1.length() < strategy.getMinPwdLen() || newPassword1.length() > strategy.getMaxPwdLen()){
throw new ServiceException("瀵嗙爜涓繀椤诲惈鏈夈��"+strategy.getCombinationNames()+"銆戜腑鐨勩��"+strategy.getRequiredType()+"銆戠瀵嗙爜缁勫悎鏂瑰紡锛屼笖瀵嗙爜闀垮害蹇呴』鍦ㄣ��"+strategy.getMinPwdLen()+"-"+strategy.getMaxPwdLen()+"銆戣寖鍥村唴");
}
+
+ oldPassword = DigestUtil.hex(DigestUtils.md5DigestAsHex((oldPassword).getBytes()));
+ if (!user.getPassword().equals(oldPassword)) {
+ throw new ServiceException("鍘熷瘑鐮佷笉姝ｇ‘!");
+ }
List<String> regexs = sysClient.getRegexByList(Arrays.asList(strategy.getCombinationIds().split(","))).getData();
//鍒ゆ柇鏄惁婊¤冻缁勫悎鏂瑰紡涓殑蹇呭～绉嶇被鏁�
int reqType = 0;
--
Gitblit v1.9.3