From 778950230b722f5b9f3be91bea45d53af6be6bee Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期一, 30 三月 2020 12:35:28 +0800
Subject: [PATCH] no message
---
src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java | 2 +-
src/main/java/com/highdatas/mdm/controller/ActivitiController.java | 9 +++++----
src/main/java/com/highdatas/mdm/controller/MasterAuthorDetailController.java | 4 +++-
src/main/resources/application-pro.yml | 16 +++++++---------
4 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/ActivitiController.java b/src/main/java/com/highdatas/mdm/controller/ActivitiController.java
index ca6815c..511b300 100644
--- a/src/main/java/com/highdatas/mdm/controller/ActivitiController.java
+++ b/src/main/java/com/highdatas/mdm/controller/ActivitiController.java
@@ -18,13 +18,15 @@
import org.activiti.engine.task.Task;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import java.io.*;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.*;
import java.util.stream.Collectors;
@@ -71,8 +73,7 @@
@Autowired
IMaintainFieldService maintainFieldService;
- @Value("${img.url}")
- String basePath;
+
@RequestMapping(value = "/list", method = RequestMethod.GET)
public Result<List<Map<String, Object>>> list(HttpServletRequest request) throws FileNotFoundException {
diff --git a/src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java b/src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java
index f0d93e5..91d67ef 100644
--- a/src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java
+++ b/src/main/java/com/highdatas/mdm/controller/MasterAuthorController.java
@@ -129,7 +129,7 @@
@RequestMapping(value = "/delete/{characterId}", method = RequestMethod.GET)
public Result delete(@PathVariable String characterId, @RequestParam MasterAuthorType type){
List<MasterAuthor> masterAuthorList = authorService.selectList(new EntityWrapper<MasterAuthor>()
- .eq(Constant.TYPE, type).eq(this.characterId, characterId));
+ .eq(Constant.TYPE, type).eq(this.character_id, characterId));
if (masterAuthorList.isEmpty()) {
return Result.success(null);
}
diff --git a/src/main/java/com/highdatas/mdm/controller/MasterAuthorDetailController.java b/src/main/java/com/highdatas/mdm/controller/MasterAuthorDetailController.java
index fe1cc4d..2c7e9c4 100644
--- a/src/main/java/com/highdatas/mdm/controller/MasterAuthorDetailController.java
+++ b/src/main/java/com/highdatas/mdm/controller/MasterAuthorDetailController.java
@@ -84,7 +84,9 @@
JSONObject resultObj = new JSONObject();
MasterAuthor masterAuthor = masterAuthorService.selectOne(new EntityWrapper<MasterAuthor>()
.eq(Constant.TYPE, type)
- .eq("character_id", characterId).eq("maintain_field_id", id));
+ .eq("table_name", tableName)
+ .eq("character_id", characterId)
+ .eq("maintain_field_id", id));
if (masterAuthor == null && type.equals(MasterAuthorType.user)) {
List<TUserRole> tUserRoles = userRoleService.selectList(new EntityWrapper<TUserRole>().eq(Constant.USERID, characterId));
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 8865ee7..554b86d 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,16 +1,14 @@
server:
port: 18090
-img:
- url: /usr/datagovernance/file/activiti/
spring:
datasource:
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/data_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
- username: root
- password: datacvg123!
+ url: jdbc:mysql://139.224.69.76:3306/data_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
+ username: dsmp
+ password: Datacvg123!
hikari:
minimum-idle: 3
max-lifetime: 30000
@@ -68,12 +66,12 @@
master:
unbigdata:
db:
- host: http://127.0.0.1
- url: jdbc:mysql://127.0.0.1:3306/data_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
+ host: http://139.224.69.76
type: MYSQL
port: 3306
schema: data_admin
- username: root
- password: datacvg123!
+ url: jdbc:mysql://139.224.69.76:3306/data_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
+ username: dsmp
+ password: Datacvg123!
bigdata:
db:hbase?
\ No newline at end of file
--
Gitblit v1.8.0