潘钊 / control_service_data_Interface · Commits

Commit b19ccaa2a036ebc9d1de14a6cf130862c48a84f8

Authored by 王通
1 parent e1dd566a
build: skipped

1.临港配置信息改变

Inline Side-by-side
Showing 3 changed files with 95 additions and 95 deletions
src/main/resources/application-prod.properties
  View file @b19ccaa
1 -server.port=9089  
2 -management.port= 9001  
3 -management.address= 127.0.0.1  
4 -  
5 -spring.jpa.hibernate.ddl-auto= none  
6 -spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy  
7 -#DATABASE  
8 -spring.jpa.database= MYSQL  
9 -spring.jpa.show-sql= false  
10 -spring.datasource.driver-class-name= com.mysql.jdbc.Driver  
11 -spring.datasource.url= jdbc:mysql://127.0.0.1:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false  
12 -spring.datasource.username= root  
13 -spring.datasource.password= root2jsp  
14 -#DATASOURCE  
15 -spring.datasource.max-active=100  
16 -spring.datasource.max-idle=8  
17 -spring.datasource.min-idle=8  
18 -spring.datasource.initial-size=3  
19 -  
20 -spring.datasource.test-on-borrow=true  
21 -spring.datasource.test-on-connect=true  
22 -spring.datasource.test-on-return=true  
23 -spring.datasource.test-while-idle=true  
24 -spring.datasource.validation-query=select 1  
25 -  
26 -#REDIS  
27 -spring.redis.database=0  
28 -spring.redis.host=172.17.16.126  
29 -spring.redis.password=bsth_control_001  
30 -spring.redis.port=28008  
31 -  
32 -http.control.service_data_url= http://106.14.30.180:9088/companyService  
33 -http.control.secret.key= dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki  
34 -  
35 -http.gps.real.url= http://106.14.30.180:18080/transport_server/rtgps/  
36 \ No newline at end of file 1 \ No newline at end of file
  2 +server.port=9089
  3 +management.port= 9001
  4 +management.address= 127.0.0.1
  5 +
  6 +spring.jpa.hibernate.ddl-auto= none
  7 +spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
  8 +#DATABASE
  9 +spring.jpa.database= MYSQL
  10 +spring.jpa.show-sql= false
  11 +spring.datasource.driver-class-name= com.mysql.jdbc.Driver
  12 +spring.datasource.url= jdbc:mysql://10.10.150.103/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  13 +spring.datasource.username= root
  14 +spring.datasource.password= Aa123456
  15 +#DATASOURCE
  16 +spring.datasource.max-active=100
  17 +spring.datasource.max-idle=8
  18 +spring.datasource.min-idle=8
  19 +spring.datasource.initial-size=3
  20 +
  21 +spring.datasource.test-on-borrow=true
  22 +spring.datasource.test-on-connect=true
  23 +spring.datasource.test-on-return=true
  24 +spring.datasource.test-while-idle=true
  25 +spring.datasource.validation-query=select 1
  26 +
  27 +#REDIS
  28 +spring.redis.database=0
  29 +spring.redis.host=172.17.16.126
  30 +spring.redis.password=bsth_control_001
  31 +spring.redis.port=28008
  32 +
  33 +http.control.service_data_url= http://10.10.150.103:9088/companyService
  34 +http.control.secret.key= dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki
  35 +
  36 +http.gps.real.url= http://10.10.150.103:8080/transport_server/rtgps/
37 \ No newline at end of file 37 \ No newline at end of file
src/main/resources/logback.xml
  View file @b19ccaa
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/2002/xmlspec/dtd/2.10/xmlspec.dtd"> -->  
3 -<configuration>  
4 -  
5 - <!-- <property resource="application.properties" /> -->  
6 - <property name="LOG_BASE" value="E:/control_interface_logs" />  
7 - <!-- 控制台输出 -->  
8 - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">  
9 -  
10 - <layout class="ch.qos.logback.classic.PatternLayout">  
11 - <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->  
12 - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line]  
13 - %-5level-%msg%n  
14 - </pattern>  
15 - </layout>  
16 - </appender>  
17 -  
18 - <!-- 主日志文件 -->  
19 - <appender name="FILE"  
20 - class="ch.qos.logback.core.rolling.RollingFileAppender">  
21 - <file>${LOG_BASE}/main/main.log</file>  
22 - <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">  
23 - <fileNamePattern>${LOG_BASE}/main/main-%d{yyyy-MM-dd}.%i.log</fileNamePattern>  
24 - <timeBasedFileNamingAndTriggeringPolicy  
25 - class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">  
26 - <maxFileSize>100MB</maxFileSize>  
27 - </timeBasedFileNamingAndTriggeringPolicy>  
28 - </rollingPolicy>  
29 - <encoder>  
30 - <pattern>%msg%n</pattern>  
31 - </encoder>  
32 -  
33 - <layout class="ch.qos.logback.classic.PatternLayout">  
34 - <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->  
35 - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line]  
36 - %-5level-%msg%n  
37 - </pattern>  
38 - </layout>  
39 - </appender>  
40 -  
41 -  
42 - <!-- 日志输出级别 -->  
43 - <root level="info">  
44 - <appender-ref ref="STDOUT" />  
45 - <appender-ref ref="FILE" />  
46 - </root>  
47 - <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>  
48 - <logger name="org.springframework.jdbc.core" additivity="false" level="DEBUG" >  
49 - <appender-ref ref="CONSOLE" />  
50 - <appender-ref ref="FILE" />  
51 - </logger>--> 1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/2002/xmlspec/dtd/2.10/xmlspec.dtd"> -->
  3 +<configuration>
  4 +
  5 + <!-- <property resource="application.properties" /> -->
  6 + <property name="LOG_BASE" value="/home/control/control_interface_logs" />
  7 + <!-- 控制台输出 -->
  8 + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
  9 +
  10 + <layout class="ch.qos.logback.classic.PatternLayout">
  11 + <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
  12 + <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line]
  13 + %-5level-%msg%n
  14 + </pattern>
  15 + </layout>
  16 + </appender>
  17 +
  18 + <!-- 主日志文件 -->
  19 + <appender name="FILE"
  20 + class="ch.qos.logback.core.rolling.RollingFileAppender">
  21 + <file>${LOG_BASE}/main/main.log</file>
  22 + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
  23 + <fileNamePattern>${LOG_BASE}/main/main-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
  24 + <timeBasedFileNamingAndTriggeringPolicy
  25 + class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
  26 + <maxFileSize>100MB</maxFileSize>
  27 + </timeBasedFileNamingAndTriggeringPolicy>
  28 + </rollingPolicy>
  29 + <encoder>
  30 + <pattern>%msg%n</pattern>
  31 + </encoder>
  32 +
  33 + <layout class="ch.qos.logback.classic.PatternLayout">
  34 + <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
  35 + <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%file:%line]
  36 + %-5level-%msg%n
  37 + </pattern>
  38 + </layout>
  39 + </appender>
  40 +
  41 +
  42 + <!-- 日志输出级别 -->
  43 + <root level="info">
  44 + <appender-ref ref="STDOUT" />
  45 + <appender-ref ref="FILE" />
  46 + </root>
  47 + <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>
  48 + <logger name="org.springframework.jdbc.core" additivity="false" level="DEBUG" >
  49 + <appender-ref ref="CONSOLE" />
  50 + <appender-ref ref="FILE" />
  51 + </logger>-->
52 </configuration> 52 </configuration>
53 \ No newline at end of file 53 \ No newline at end of file
src/main/resources/ms-jdbc.properties
  View file @b19ccaa
1 -#ms.mysql.driver= com.mysql.jdbc.Driver  
2 -#ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8  
3 -#ms.mysql.username= root  
4 -#ms.mysql.password= panzhao  
5 -  
6 -ms.mysql.driver= com.mysql.jdbc.Driver  
7 -ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8  
8 -ms.mysql.username= root  
9 -ms.mysql.password= root2jsp  
10 \ No newline at end of file 1 \ No newline at end of file
  2 +#ms.mysql.driver= com.mysql.jdbc.Driver
  3 +#ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8
  4 +#ms.mysql.username= root
  5 +#ms.mysql.password= panzhao
  6 +
  7 +ms.mysql.driver= com.mysql.jdbc.Driver
  8 +ms.mysql.url= jdbc:mysql://10.10.150.103/ms?useUnicode=true&characterEncoding=utf-8
  9 +ms.mysql.username= root
  10 +ms.mysql.password= Aa123456
11 \ No newline at end of file 11 \ No newline at end of file