Skip to content

T
tagManager
Commit 8e440779 by linxu
Options

版本升级

parent 88a82232
Showing with 95 additions and 236 deletions
pom.xml
......@@ -6,7 +6,7 @@
<groupId>com.keymobile</groupId>
<artifactId>tagManager</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>2.0.0</version>
<packaging>jar</packaging>
<name>tagManager</name>
......@@ -32,6 +32,11 @@
<dependencies>
<dependency>
<groupId>com.github.ulisesbocchio</groupId>
<artifactId>jasypt-spring-boot-starter</artifactId>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
......@@ -44,15 +49,6 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
......@@ -125,7 +121,6 @@
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
......@@ -159,7 +154,7 @@
<groupId>auth</groupId>
<artifactId>auth-common</artifactId>
<scope>system</scope>
<systemPath>${project.basedir}/lib/auth-common-1.0.2-SNAPSHOT.jar</systemPath>
<systemPath>${project.basedir}/lib/auth-common-2.0.0.jar</systemPath>
<version>1.0.2</version>
</dependency>
......
src/main/resources/application-cgn.yml deleted 100644 → 0
mongodb:
database: tagManagerCGN
uri: dev-vm-00:27017
username: root
password: dataPlatform
maxConnectionIdleTime: 120000
eureka:
client:
registryFetchIntervalSeconds: 5
region: default
serviceUrl:
defaultZone: http://dev-vm-22:8081/eureka/
instance:
prefer-ip-address: false
hostname: dev-vm-22
spring:
application:
name: tagManager
session:
store-type: redis
redis:
namespace: cgn2
redis:
host: dev-vm-00
port: 6379
datasource:
url: jdbc:mysql://dev-vm-00:3306/cgn2?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
username: test
password: test
hikari:
maximum-pool-size: 3
server:
port: 8099
#security permit true :permitAll ;flase:authenticated
security:
authUser: root
authPwd: pwd
permit: false
feign:
client:
config:
default:
ReadTimeout: 30000
ConnectTimeout: 30000
src/main/resources/application-test.yml → src/main/resources/application-local.yml
mongodb:
database: tagManagerCGN_dev
uri: dev-vm-00:27017
username: root
password: dataPlatform
maxConnectionIdleTime: 120000
eureka:
client:
registryFetchIntervalSeconds: 5
region: default
serviceUrl:
defaultZone: http://dev-vm-22:8081/eureka/
instance:
prefer-ip-address: true
hostname: 192.168.0.215
spring:
application:
name: tagManager
session:
store-type: redis
redis:
namespace: cgn2
redis:
host: dev-vm-00
port: 6379
datasource:
url: jdbc:mysql://dev-vm-00:3306/cgn2_dev?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
username: test
password: test
hikari:
maximum-pool-size: 3
server:
port: 8072
#security permit true :permitAll ;flase:authenticated
security:
authUser: root
authPwd: pwd
permit: false
feign:
client:
config:
default:
ReadTimeout: 30000
ConnectTimeout: 30000
mongodb:
database: p0
uri: dev-vm-00:27017
username: p_test
password: p_test
maxConnectionIdleTime: 120000
eureka:
client:
registryFetchIntervalSeconds: 5
region: default
serviceUrl:
defaultZone: http://p-01:8081/eureka/
spring:
application:
name: tagManager
session:
store-type: redis
redis:
namespace: cgn2
redis:
host: dev-vm-00
port: 6379
datasource:
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://dev-vm-00:3306/p0?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
username: p_test
password: p_test
hikari:
maximum-pool-size: 3
server:
port: 8072
#security permit true :permitAll ;flase:authenticated
security:
authUser: root
authPwd: pwd
permit: false
feign:
client:
config:
default:
ReadTimeout: 30000
ConnectTimeout: 30000
src/main/resources/application-sentinel.yml deleted 100644 → 0
mongodb:
database: dataCatalogTest
uri: 192.168.0.192:27017
username: root
password: dataPlatform
maxConnectionIdleTime: 120000
essearch:
host: localhost
port: 9300
cluster: dataSharing
eureka:
client:
registryFetchIntervalSeconds: 5
region: default
serviceUrl:
defaultZone: http://139.198.126.96:8081/eureka/
enabled: true
instance:
prefer-ip-address: false
hostname: 127.0.0.1
spring:
application:
name: dataCatalog1
session:
store-type: redis
redis:
namespace: dataplatformdev
redis:
sentinel:
master: master-1
nodes: 127.0.0.1:63791,127.0.0.1:63792,127.0.0.1:63793
password: zombie
datasource:
url: jdbc:mysql://localhost:3306/test?autoReconnect=true&useUnicode=yes&characterEncoding=UTF-8
username: root
password: dataSharing
rabbitmq:
host: 127.0.0.1
port: 5672
username: guest
password: guest
virtualHost: dams
exchange: metadata-exchange
dataCatalogQueue: dataCatalog-mdqueue
sqlEngineExchange: sqlEngine-exchange
sqlEngineQueue: sqlEngine-queue
labelQueue: label-queue
sampleQueue: sample-queueTest
server:
port: 8079
logging:
level:
org:
springframework:
security: info
#security permit true :permitAll ;flase:authenticated
security:
authUser: root
authPwd: pwd
permit: false
hikari:
maximum-pool-size: 5
feign:
client:
config:
default:
connectTimeout: 40000
ReadTimeout: 40000
tableModel:
openCache: true
auditKey: audit
sampleQueueSize: 3
\ No newline at end of file
src/main/resources/application.properties 0 → 100644
jasypt.encryptor.algorithm=PBEWithMD5AndDES
jasypt.encryptor.iv-generator-classname=org.jasypt.iv.NoIvGenerator
\ No newline at end of file
src/main/resources/application.yml deleted 100644 → 0
spring:
profiles:
active: ${spring.profiles.active:test}
\ No newline at end of file
src/main/resources/bootstrap.yml
......@@ -2,7 +2,7 @@ spring:
application:
name: tagManager
profiles:
active: test
active: local
cloud:
config:
uri: http://localhost:8082
\ No newline at end of file
src/main/resources/logback-spring.xml → src/main/resources/logback-custom.xml
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<springProperty name="spring.datasource.driverClassName" source="spring.datasource.driverClassName"/>
<springProperty name="spring.datasource.url" source="spring.datasource.url"/>
<springProperty name="spring.datasource.username" source="spring.datasource.username"/>
<springProperty name="spring.datasource.password" source="spring.datasource.password"/>
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %X{user} %X{session} %-5level %logger{5} - %msg%n</pattern>
</encoder>
</appender>
<appender name="db" class="ch.qos.logback.classic.db.DBAppender">
<connectionSource
class="ch.qos.logback.core.db.DriverManagerConnectionSource">
<driverClass>com.mysql.jdbc.Driver</driverClass>
<url>jdbc:mysql://192.168.0.192:3306/cgn2_dev</url>
<user>test</user>
<password>test</password>
</connectionSource>
</appender>
<logger name="tagManager.OPTTAG">
<appender-ref ref="db" />
</logger>
<logger name="tagManager.OPTFILETAG">
<appender-ref ref="db" />
</logger>
<logger name="tagManager.OPTTAGREL">
<appender-ref ref="db" />
</logger>
<root level="INFO">
<appender-ref ref="stdout" />
</root>
</configuration>
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<springProperty name="spring.datasource.url" source="spring.datasource.url"/>
<springProperty name="spring.datasource.username" source="spring.datasource.username"/>
<springProperty name="spring.datasource.password" source="spring.datasource.password"/>
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %X{user} %X{session} %-5level %logger{5} - %msg%n</pattern>
</encoder>
</appender>
<appender name="db" class="ch.qos.logback.classic.db.DBAppender">
<connectionSource
class="ch.qos.logback.core.db.DriverManagerConnectionSource">
<driverClass>com.mysql.jdbc.Driver</driverClass>
<url>${spring.datasource.url}</url>
<user>${spring.datasource.username}</user>
<password>${spring.datasource.password}</password>
</connectionSource>
</appender>
<logger name="tagManager.OPTTAG">
<appender-ref ref="db" />
</logger>
<logger name="tagManager.OPTFILETAG">
<appender-ref ref="db" />
</logger>
<logger name="tagManager.OPTTAGREL">
<appender-ref ref="db" />
</logger>
<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