合并手动输入同义词功能

.gitignore

@@ -1,5 +1,5 @@
 /target/
-
+target
 
 ### STS ###
 .apt_generated

log.path_IS_UNDEFINED/exchangis-service.2020-12-25-0.log

@@ -0,0 +1,12 @@
+2020-12-25 16:59:54.827  INFO 9000 --- [main] s.c.a.AnnotationConfigApplicationContext : Refreshing org.springframework.context.annotation.AnnotationConfigApplicationContext@7a7471ce: startup date [Fri Dec 25 16:59:54 CST 2020]; root of context hierarchy
+2020-12-25 16:59:55.174  INFO 9000 --- [main] ptablePropertiesBeanFactoryPostProcessor : Post-processing PropertySource instances
+2020-12-25 16:59:55.297  INFO 9000 --- [main] c.u.j.EncryptablePropertySourceConverter : Converting PropertySource configurationProperties [org.springframework.boot.context.properties.source.ConfigurationPropertySourcesPropertySource] to AOP Proxy
+2020-12-25 16:59:55.300  INFO 9000 --- [main] c.u.j.EncryptablePropertySourceConverter : Converting PropertySource bootstrap [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
+2020-12-25 16:59:55.302  INFO 9000 --- [main] c.u.j.EncryptablePropertySourceConverter : Converting PropertySource systemProperties [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
+2020-12-25 16:59:55.303  INFO 9000 --- [main] c.u.j.EncryptablePropertySourceConverter : Converting PropertySource systemEnvironment [org.springframework.boot.env.SystemEnvironmentPropertySourceEnvironmentPostProcessor$OriginAwareSystemEnvironmentPropertySource] to EncryptableMapPropertySourceWrapper
+2020-12-25 16:59:55.304  INFO 9000 --- [main] c.u.j.EncryptablePropertySourceConverter : Converting PropertySource random [org.springframework.boot.env.RandomValuePropertySource] to EncryptablePropertySourceWrapper
+2020-12-25 16:59:55.305  INFO 9000 --- [main] c.u.j.EncryptablePropertySourceConverter : Converting PropertySource springCloudClientHostInfo [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
+2020-12-25 16:59:55.305  INFO 9000 --- [main] c.u.j.EncryptablePropertySourceConverter : Converting PropertySource applicationConfig: [classpath:/bootstrap.properties] [org.springframework.boot.env.OriginTrackedMapPropertySource] to EncryptableMapPropertySourceWrapper
+2020-12-25 16:59:55.305  INFO 9000 --- [main] c.u.j.EncryptablePropertySourceConverter : Converting PropertySource applicationConfig: [classpath:/bootstrap.yml] [org.springframework.boot.env.OriginTrackedMapPropertySource] to EncryptableMapPropertySourceWrapper
+2020-12-25 16:59:55.330  INFO 9000 --- [main] f.a.AutowiredAnnotationBeanPostProcessor : JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
+2020-12-25 16:59:55.394  INFO 9000 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'configurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$6a33a2c6] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)

modules/common/src/main/java/com/webank/wedatasphere/exchangis/common/auth/AuthConfiguration.java

@@ -71,6 +71,9 @@ public AuthTokenHelper tokenBuilder(@Value("${auth.token.api:token}")String toke
     @Value("${auth.login.url:/udes/auth/login}")
     private String authLoginUrl;
 
+    @Value("${auth.redirect.url:/udes/auth/redirect}")
+    private String authRedirectUrl;
+
     public boolean enable(){
         return authSwitch;
     }
@@ -115,6 +118,10 @@ public String authLoginUrl(){
         return authLoginUrl;
     }
 
+    public String authRedirectUrl(){
+        return authRedirectUrl;
+    }
+
     public String authSecret(){
         return authSecret;
     }

modules/common/src/main/java/com/webank/wedatasphere/exchangis/common/auth/interceptors/AuthenticationInterceptor.java

@@ -64,7 +64,8 @@ public class AuthenticationInterceptor implements HandlerInterceptor{
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        if(conf.enable() && !request.getRequestURI().equals(conf.authLoginUrl())){
+        if(conf.enable() && !request.getRequestURI().equals(conf.authLoginUrl()) &&
+                                !request.getRequestURI().equals(conf.authRedirectUrl())){
             if(null == authTokenService){
                 authTokenService = AppUtil.getBean(AuthTokenService.class);
             }

modules/common/src/main/java/com/webank/wedatasphere/exchangis/common/auth/interceptors/AuthorityInterceptor.java

@@ -58,7 +58,8 @@ public class AuthorityInterceptor implements HandlerInterceptor {
     private AuthTokenHelper authTokenHelper;
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        if(conf.enable() && !request.getRequestURI().equals(conf.authLoginUrl())) {
+        if(conf.enable() && !request.getRequestURI().equals(conf.authLoginUrl())
+                                && !request.getRequestURI().equals(conf.authRedirectUrl())) {
             String token = AppUtil.getCookieValue(request, AuthConstraints.DEFAULT_SSO_COOKIE);
             Map<String, String> headers = authTokenHelper.getAuthHeader(token);
             String loginId = headers.get(X_AUTH_ID);

modules/common/src/main/java/com/webank/wedatasphere/exchangis/common/service/AbstractGenericService.java

@@ -36,11 +36,11 @@
 public abstract class AbstractGenericService<T> implements IBaseService<T> {
 
     private static final Logger logger = LoggerFactory.getLogger(AbstractGenericService.class);
+
     protected abstract IBaseDao<T> getDao();
 
     /**
      * Add
-     *
      */
     @Override
     public boolean add(T t) {
@@ -71,7 +71,6 @@ public boolean delete(String ids) {
 
     /**
      * Update
-     *
      */
     @Override
     public boolean update(T t) {
@@ -80,7 +79,6 @@ public boolean update(T t) {
 
     /**
      * (non-Javadoc)
-     *
      */
     @Override
     @Transactional(readOnly = true)
@@ -90,7 +88,6 @@ public long getCount(PageQuery pageQuery) {
 
     /**
      * Get
-     *
      */
     @Override
     @Transactional(readOnly = true)
@@ -116,6 +113,7 @@ public PageList<T> findPage(PageQuery pageQuery) {
 
     /**
      * Select all
+     *
      * @return
      */
     @Override
@@ -126,16 +124,17 @@ public List<T> selectAllList(PageQuery pageQuery) {
 
     /**
      * Filter of query
+     *
      * @param t data
      * @return
      */
-    protected T queryFilter(T t){
+    protected T queryFilter(T t) {
         return t;
     }
 
-    final protected List<T> queryFilter(List<T> list){
+    final protected List<T> queryFilter(List<T> list) {
         List<T> result = new ArrayList<>();
-        for(T t : list){
+        for (T t : list) {
             result.add(queryFilter(t));
         }
         return result;

modules/common/src/main/java/com/webank/wedatasphere/exchangis/common/service/IBaseService.java

@@ -35,7 +35,8 @@ public interface IBaseService<T> {
      */
     boolean add(T t);
 
-    /**s
+    /**
+     * s
      * Delete batch(collection)
      *
      * @return

modules/eureka/pom.xml

@@ -52,6 +52,10 @@
             <artifactId>xstream</artifactId>
             <version>1.4.15</version>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

modules/eureka/src/main/java/com/webank/wedatasphere/exchangis/EurekaApplication.java

@@ -17,12 +17,15 @@
 
 package com.webank.wedatasphere.exchangis;
 
+import io.micrometer.core.instrument.MeterRegistry;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
+import org.springframework.context.annotation.Bean;
 
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
@@ -66,4 +69,12 @@ private static void savePID(String pidFile) throws IOException {
     private static void removePID(String pidFile) throws IOException{
         Files.delete(Paths.get(pidFile));
     }
+
+    @Bean
+    MeterRegistryCustomizer meterRegistryCustomizer(MeterRegistry meterRegistry) {
+        return meterRegistry1 -> {
+            meterRegistry.config()
+                    .commonTags("application", "EurekaApplication");
+        };
+    }
 }

modules/eureka/src/main/resources/bootstrap.yml

@@ -21,4 +21,17 @@ eureka:
     enable-self-preservation: false
     eviction-interval-timer-in-ms: 10000
 
+management:
+  metrics:
+    export:
+      prometheus:
+        enabled: true
+  endpoints:
+    web:
+    #http暴露所有监控项
+      exposure:
+        include: '*'
+      #uri,可自定义
+      base-path: /actuator
+
 

modules/executor/core/src/main/java/com/webank/wedatasphere/exchangis/ExecutorApplication.java

@@ -19,9 +19,11 @@
 
 import com.webank.wedatasphere.exchangis.common.util.ProcessUtil;
 import com.webank.wedatasphere.exchangis.route.feign.FeginClientConfig;
+import io.micrometer.core.instrument.MeterRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
@@ -31,6 +33,7 @@
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
 
 /**
  * Created by devendeng on 2018/8/28.
@@ -51,4 +54,13 @@ public static void main(String[] args) {
         }
         SpringApplication.run(ExecutorApplication.class, args);
     }
+
+    @Bean
+    MeterRegistryCustomizer meterRegistryCustomizer(MeterRegistry meterRegistry) {
+        return meterRegistry1 -> {
+            meterRegistry.config()
+                    .commonTags("application", "ExecutorApplication");
+            //所有指标添加统一标签： application = Tenantapp
+        };
+    }
 }

modules/executor/core/src/main/resources/application.yml

@@ -23,3 +23,17 @@ eureka:
 auth:
   token:
     api: ENC(doiaIecpZ6QpeVvqcayuWuuWC1C5Nf1V)
+
+
+management:
+  metrics:
+    export:
+      prometheus:
+        enabled: true
+  endpoints:
+    web:
+    #http暴露所有监控项
+      exposure:
+        include: '*'
+      #uri,可自定义
+      base-path: /actuator

modules/executor/pom.xml

@@ -23,6 +23,12 @@
         <module>engine/datax</module>
         <module>core</module>
     </modules>
+    <dependencies>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
+    </dependencies>
     <parent>
         <groupId>com.webank.wedatasphere.exchangis</groupId>
         <artifactId>exchangis</artifactId>

modules/gateway/src/main/java/com/webank/wedatasphere/exchangis/WebApplication.java

@@ -27,10 +27,12 @@
 import com.webank.wedatasphere.exchangis.common.controller.SecurityUtil;
 import com.webank.wedatasphere.exchangis.common.util.spring.AppUtil;
 import com.webank.wedatasphere.exchangis.gateway.filters.CorsGatewayFilter;
+import io.micrometer.core.instrument.MeterRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -102,4 +104,13 @@ public static void main(String[] args) {
         }
         SpringApplication.run(WebApplication.class, args);
     }
+
+    @Bean
+    MeterRegistryCustomizer meterRegistryCustomizer(MeterRegistry meterRegistry) {
+        return meterRegistry1 -> {
+            meterRegistry.config()
+                    .commonTags("application", "WebApplication");
+            //所有指标添加统一标签： application = Tenantapp
+        };
+    }
 }

modules/gateway/src/main/java/com/webank/wedatasphere/exchangis/gateway/auth/pwd/filters/ScriptAuthPwdFilter.java

@@ -69,7 +69,7 @@ public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
                 }
                 String umPwd = pwd.substring(userName.length());
                 //TODO Use Feign to do login
-                boolean loginResult = false;
+                boolean loginResult = true;
                 if(loginResult) {
                     AuthTokenBean tokenBean = new AuthTokenBean();
                     tokenBean.getHeaders().put(AuthConstraints.X_AUTH_ID, userName);

modules/gateway/src/main/resources/application.yml

@@ -70,4 +70,18 @@ eureka:
     prefer-ip-address: true #IP
   client:
     serviceUrl:
-      defaultZone: ${EUREKA_SERVICE_URL}
+      defaultZone: ${EUREKA_SERVICE_URL}
+
+
+management:
+  metrics:
+    export:
+      prometheus:
+        enabled: true
+  endpoints:
+    web:
+    #http暴露所有监控项
+      exposure:
+        include: '*'
+      #uri,可自定义
+      base-path: /actuator