From 85c588fe68cb76265c9d91273f0a95e9b66e3ecf Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期二, 31 三月 2020 14:15:59 +0800
Subject: [PATCH] no message
---
/dev/null | 25 --------
src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java | 2
src/main/resources/application-dev.yml | 11 ++-
pom.xml | 108 ++++++++++++++++++------------------
4 files changed, 61 insertions(+), 85 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6e9ec07..a06a7cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -423,60 +423,60 @@
<systemPath>${pom.basedir}/src/main/resources/lib/common-1.0.jar</systemPath>
</dependency>
<!--hbase-->
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-hadoop-boot</artifactId>
- <version>2.5.0.RELEASE</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-hadoop</artifactId>
- <version>2.5.0.RELEASE</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- <version>1.4.4</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- <version>2.11.0</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.springframework.data</groupId>-->
+ <!--<artifactId>spring-data-hadoop-boot</artifactId>-->
+ <!--<version>2.5.0.RELEASE</version>-->
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<groupId>javax.servlet</groupId>-->
+ <!--<artifactId>servlet-api</artifactId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.springframework.data</groupId>-->
+ <!--<artifactId>spring-data-hadoop</artifactId>-->
+ <!--<version>2.5.0.RELEASE</version>-->
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<groupId>org.slf4j</groupId>-->
+ <!--<artifactId>slf4j-log4j12</artifactId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<groupId>log4j</groupId>-->
+ <!--<artifactId>log4j</artifactId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<groupId>javax.servlet</groupId>-->
+ <!--<artifactId>servlet-api</artifactId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.hbase</groupId>-->
+ <!--<artifactId>hbase-client</artifactId>-->
+ <!--<version>1.4.4</version>-->
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<groupId>org.slf4j</groupId>-->
+ <!--<artifactId>slf4j-log4j12</artifactId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<groupId>log4j</groupId>-->
+ <!--<artifactId>log4j</artifactId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<groupId>javax.servlet</groupId>-->
+ <!--<artifactId>servlet-api</artifactId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.logging.log4j</groupId>-->
+ <!--<artifactId>log4j-1.2-api</artifactId>-->
+ <!--<version>2.11.0</version>-->
+ <!--</dependency>-->
</dependencies>
diff --git a/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java
index cb5d458..0d6c2ff 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java
@@ -206,7 +206,7 @@
List<SysField> maxFieldList = getFieldByMaintainField(maxVersion.getId());
List<SysField> createdFieldList = getFieldByTable(tableName);
result.fluentPut("list", packageFieldList(createdFieldList, maxFieldList));
- result.fluentPut("aduit", false);
+ result.fluentPut("aduit", true);
result.fluentPut("flowStatus", null);
result.fluentPut("maintainFieldId", maxVersion.getId());
String flowId = maxVersion.getFlowId();
diff --git a/src/main/java/com/highdatas/mdm/util/HbaseConfig.java b/src/main/java/com/highdatas/mdm/util/HbaseConfig.java
deleted file mode 100644
index cd8124c..0000000
--- a/src/main/java/com/highdatas/mdm/util/HbaseConfig.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.highdatas.mdm.util;
-
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.hadoop.hbase.HbaseTemplate;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author kimi
- * @description
- * @date 2019-12-12 16:45
- */
-
-@Configuration
-@EnableConfigurationProperties(HbaseProperties.class)
-public class HbaseConfig {
- private final HbaseProperties properties;
-
- public HbaseConfig(HbaseProperties properties) {
- this.properties = properties;
- }
- @Bean
- public HbaseTemplate hbaseTemplate() {
- HbaseTemplate hbaseTemplate = new HbaseTemplate();
- hbaseTemplate.setConfiguration(configuration());
- hbaseTemplate.setAutoFlush(true);
- return hbaseTemplate;
- }
-
- public org.apache.hadoop.conf.Configuration configuration() {
-
- org.apache.hadoop.conf.Configuration configuration = HBaseConfiguration.create();
-
- Map<String, String> config = properties.getConfig();
- Set<String> keySet = config.keySet();
- for (String key : keySet) {
- configuration.set(key, config.get(key));
- }
-
- return configuration;
- }
-
-}
diff --git a/src/main/java/com/highdatas/mdm/util/HbaseProperties.java b/src/main/java/com/highdatas/mdm/util/HbaseProperties.java
deleted file mode 100644
index 969fdb8..0000000
--- a/src/main/java/com/highdatas/mdm/util/HbaseProperties.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.highdatas.mdm.util;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-import java.util.Map;
-
-/**
- * @author kimi
- * @description
- * @date 2019-12-12 16:45
- */
-
-@ConfigurationProperties(prefix = "hbase")
-public class HbaseProperties {
- private Map<String, String> config;
-
- public Map<String, String> getConfig() {
- return config;
- }
-
- public void setConfig(Map<String, String> config) {
- this.config = config;
- }
-
-}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index f375cf4..29f495b 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -10,10 +10,6 @@
password: 123456
type: com.alibaba.druid.pool.DruidDataSource
-hbase:
- config:
- hbase.zookeeper.quorum: kimi
- hbase.zookeeper.property.clientPort: 2181
activiti:
database-schema-update: true
@@ -80,4 +76,9 @@
username: root
password: 123456
bigdata:
- db:hbase?
\ No newline at end of file
+ db:hbase?
+
+hbase:
+ config:
+ hbase.zookeeper.quorum: kimi
+ hbase.zookeeper.property.clientPort: 2181
--
Gitblit v1.8.0