Commit 12b8e4fa by linxu

调整POM

parent 8b9a480b
...@@ -12,21 +12,34 @@ ...@@ -12,21 +12,34 @@
<description>Relation-Neo4j</description> <description>Relation-Neo4j</description>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>com.keymobile</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>parent</artifactId>
<version>2.0.4.RELEASE</version> <version>1.1.0-release</version>
<relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <auth.version>3.0.9-release</auth.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
<docker.image.prefix>springio</docker.image.prefix>
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>com.keymobile</groupId>
<artifactId>config</artifactId>
</dependency>
<dependency>
<groupId>com.keymobile</groupId>
<artifactId>crypto</artifactId>
</dependency>
<dependency>
<groupId>com.keymobile.auth</groupId>
<artifactId>common</artifactId>
<version>${auth.version}</version>
</dependency>
<dependency>
<groupId>com.keymobile.auth</groupId>
<artifactId>security</artifactId>
<version>${auth.version}</version>
</dependency>
<!-- 添加neo4j的jar包 --> <!-- 添加neo4j的jar包 -->
<dependency> <dependency>
...@@ -45,19 +58,26 @@ ...@@ -45,19 +58,26 @@
<artifactId>neo4j-ogm-embedded-driver</artifactId> <artifactId>neo4j-ogm-embedded-driver</artifactId>
<version>3.0.0</version> <version>3.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.neo4j.driver</groupId>
<artifactId>neo4j-java-driver</artifactId>
<version>1.7.5</version>
</dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>io.springfox</groupId>
<artifactId>commons-codec</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>2.6.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>io.springfox</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>springfox-swagger-ui</artifactId>
<version>2.6.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>commons-codec</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>commons-codec</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.json-lib</groupId> <groupId>net.sf.json-lib</groupId>
...@@ -70,22 +90,25 @@ ...@@ -70,22 +90,25 @@
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>org.dom4j</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>dom4j</artifactId>
<version>2.6.1</version> <version>2.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>com.google.guava</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>guava</artifactId>
<version>2.6.1</version> <version>20.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>com.steelbridgelabs.oss</groupId>
<artifactId>spring-boot-configuration-processor</artifactId> <artifactId>neo4j-gremlin-bolt</artifactId>
<version>0.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> <artifactId>spring-boot-configuration-processor</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.session</groupId> <groupId>org.springframework.session</groupId>
...@@ -97,24 +120,6 @@ ...@@ -97,24 +120,6 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>20.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId> <artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency> </dependency>
<dependency> <dependency>
...@@ -125,89 +130,25 @@ ...@@ -125,89 +130,25 @@
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId> <artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config-client</artifactId>
</dependency>
<dependency>
<groupId>com.kakawait</groupId>
<artifactId>cas-security-spring-boot-starter</artifactId>
<version>1.0.0-beta-1</version>
</dependency>
<dependency>
<groupId>com.keymobile.auth</groupId>
<artifactId>common</artifactId>
<version>3.0.8-beta</version>
</dependency>
<dependency>
<groupId>com.keymobile.auth</groupId>
<artifactId>security</artifactId>
<version>3.0.8-beta</version>
</dependency>
<dependency>
<groupId>com.github.ulisesbocchio</groupId>
<artifactId>jasypt-spring-boot-starter</artifactId>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>com.steelbridgelabs.oss</groupId>
<artifactId>neo4j-gremlin-bolt</artifactId>
<version>0.3.1</version>
</dependency>
<dependency>
<groupId>org.neo4j.driver</groupId>
<artifactId>neo4j-java-driver</artifactId>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>com.keymobile</groupId>
<artifactId>config</artifactId>
<version>1.0.2-release</version>
</dependency>
<dependency>
<groupId>com.keymobile</groupId>
<artifactId>crypto</artifactId>
<version>1.0.2-release</version>
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>com.keymobile</groupId>
<artifactId>spring-cloud-dependencies</artifactId> <artifactId>config</artifactId>
<version>${spring-cloud.version}</version> <version>1.1.0-release</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-bom</artifactId>
<version>${spring-security.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>com.keymobile</groupId>
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>crypto</artifactId>
<version>1.1.0-release</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<build> <build>
<finalName>metadatarelation</finalName>
<resources> <resources>
<resource> <resource>
<directory>lib</directory> <directory>lib</directory>
...@@ -231,23 +172,6 @@ ...@@ -231,23 +172,6 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.13</version>
<configuration>
<imageName>${docker.image.prefix}/${project.artifactId}</imageName>
<dockerDirectory>src/main/docker</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>${project.build.finalName}.jar</include>
</resource>
</resources>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<configuration> <configuration>
<descriptors> <descriptors>
...@@ -266,25 +190,4 @@ ...@@ -266,25 +190,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<repositories>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>nexus</id>
<url>http://139.198.127.28:18081/repository/maven-public/</url>
<name>keymobile</name>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</project> </project>
<settings>
<mirrors>
<mirror>
<id>nexus</id>
<mirrorOf>nexus</mirrorOf>
<url>http://139.198.127.28:18081/repository/maven-public/</url>
</mirror>
</mirrors>
<servers>
<server>
<id>nexus-snapshots</id>
<username>admin</username>
<password>dataSharing</password>
</server>
<server>
<id>nexus-releases</id>
<username>admin</username>
<password>dataSharing</password>
</server>
</servers>
</settings>
\ No newline at end of file
<settings>
<mirrors>
<mirror>
<id>nexus</id>
<mirrorOf>*</mirrorOf>
<url>http://mgr-00:8081/repository/maven-public/</url>
</mirror>
</mirrors>
<servers>
<server>
<id>nexus-snapshots</id>
<username>admin</username>
<password>dataSharing</password>
</server>
<server>
<id>nexus-releases</id>
<username>admin</username>
<password>dataSharing</password>
</server>
</servers>
</settings>
\ No newline at end of file
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
</appender> </appender>
<appender name="fileout" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="fileout" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>/data/logs/iapdgneo4jRelation/neo4jRelation.log</file> <file>/data/logs/iapdgmetadatarelation/metadatarelation.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<maxHistory>30</maxHistory> <maxHistory>30</maxHistory>
<fileNamePattern>/data/logs/iapdgneo4jRelation/neo4jRelation.log.%{yyyy-MM-dd}.%i.log</fileNamePattern> <fileNamePattern>/data/logs/iapdgmetadatarelation/metadatarelation.log.%{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBaseFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> <timeBaseFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSzie>5MB</maxFileSzie> <maxFileSzie>5MB</maxFileSzie>
</timeBaseFileNamingAndTriggeringPolicy> </timeBaseFileNamingAndTriggeringPolicy>
...@@ -38,12 +38,8 @@ ...@@ -38,12 +38,8 @@
</additionalField> </additionalField>
</appender> </appender>
<logger name="dataModeler.AUDIT">
<appender-ref ref="logstash" />
</logger>
<root level="INFO"> <root level="INFO">
<appender-ref ref="stdout" /> <appender-ref ref="fileout" />
</root> </root>
</configuration> </configuration>
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
TEMP_DIR="-Djava.io.tmpdir=/tmp" TEMP_DIR="-Djava.io.tmpdir=/tmp"
APP_NAME="neo4jRelation" APP_NAME="metadatarelation"
OS_USER_NAME="iapdg$APP_NAME" OS_USER_NAME="iapdg$APP_NAME"
BASE_LOC="/home/$OS_USER_NAME/$APP_NAME" BASE_LOC="/home/$OS_USER_NAME/$APP_NAME"
JAR_NAME="$APP_NAME.jar" JAR_NAME="$APP_NAME.jar"
......
package com.keymobile.metadata.metadataRelation; package com.keymobile.metadata.metadataRelation;
import com.keymobile.config.security.ApplicationHelper;
import com.ulisesbocchio.jasyptspringboot.environment.StandardEncryptableEnvironment; import com.ulisesbocchio.jasyptspringboot.environment.StandardEncryptableEnvironment;
import org.jasypt.encryption.StringEncryptor; import org.jasypt.encryption.StringEncryptor;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
import com.keymobile.config.security.ApplicationHelper;
@EnableFeignClients @EnableFeignClients
@SpringBootApplication @SpringBootApplication
...@@ -15,10 +15,8 @@ public class MetadataRelationApplication { ...@@ -15,10 +15,8 @@ public class MetadataRelationApplication {
new SpringApplicationBuilder() new SpringApplicationBuilder()
.environment(StandardEncryptableEnvironment.builder().encryptor(stringEncryptor()).build()) .environment(StandardEncryptableEnvironment.builder().encryptor(stringEncryptor()).build())
.sources(MetadataRelationApplication.class).run(args); .sources(MetadataRelationApplication.class).run(args);
// SpringApplication.run(MetadataRelationApplication.class, args);
} }
private static StringEncryptor stringEncryptor() { private static StringEncryptor stringEncryptor() {
return new StringEncryptor() { return new StringEncryptor() {
@Override @Override
...@@ -32,4 +30,5 @@ public class MetadataRelationApplication { ...@@ -32,4 +30,5 @@ public class MetadataRelationApplication {
} }
}; };
} }
} }
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<springProperty name="spring.redis.host" source="spring.redis.host"/>
<springProperty name="spring.redis.port" source="spring.redis.port"/>
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
<encoder charset="UTF-8">
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %X{user} %X{session} %-5level %logger{5} - %msg%n</pattern>
</encoder>
</appender>
<appender name="fileout" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>./metadatarelation.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<maxHistory>30</maxHistory>
<fileNamePattern>./metadatarelation.log.%{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBaseFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSzie>5MB</maxFileSzie>
</timeBaseFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder charset="UTF-8">
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %X{user} %X{session} %-5level %logger{5} - %msg%n</pattern>
</encoder>
</appender>
<appender name="logstash" class="com.cwbase.logback.RedisAppender">
<host>${spring.redis.host}</host>
<port>${spring.redis.port}</port>
<key>logstash</key>
<additionalField>
<key>user</key>
<value>@{user}</value>
</additionalField>
<additionalField>
<key>session</key>
<value>@{session}</value>
</additionalField>
</appender>
<root level="INFO">
<appender-ref ref="stdout" />
</root>
</configuration>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment