zhba/zhba_management_w_bf.git

parent: 875ba469 | patch | commit | ignore whitespace

Administrator

2022-04-12 6b428b9b3fb413928c888e5a5fa792caac9b0e3b

日志文件 prod 修改，生产环境配置文件修改（docker 部署方式）

4 files modified

	docker-compose.yml	32 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/application-prod.yml	35 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/application-test.yml	6 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/log/logback-prod.xml	32 ●●●●● patch \| view \| raw \| blame \| history

 docker-compose.yml

@@ -4,22 +4,24 @@
    # 从 Harbor 私有仓库拉取镜像
    image: 192.168.0.191/zhbaw/zhbaw:SNAPSHOT-$BUILD_NUMBER
    container_name: zhbaw
    deploy:
      replicas: 1
      update_config:
        parallelism: 2
        delay: 30s
    depends_on:
      - redis
#    deploy:
#      replicas: 1
#      update_config:
#        parallelism: 2
#        delay: 30s
#    depends_on:
#      - redis
    ports:
      - "81:81"
    volumes:
      - /home/zhongsong/anbao:/home/zhbaw/anbao
    # 容器停止后会重启
    restart: always
  redis:
    image: "redis:alpine"
    container_name: reids-alpine
    deploy:
      replicas: 1
    ports:
      - "6379:6379"
    restart: always
#  redis:
#    image: "redis:alpine"
#    container_name: reids-alpine
#    deploy:
#      replicas: 1
#    ports:
#      - "6379:6379"
#    restart: always

 src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@
spring:
  redis:
    ##redis 单机环境配置
    host: redis.zhba
    host: 127.0.0.1
    port: 6379
    password:
    database: 0
@@ -11,11 +11,22 @@
    #cluster:
    #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
    #  commandTimeout: 5000
  #  datasource:
  #    # MySql
  #    url: jdbc:mysql://localhost:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
  #    username: root
  #    password: ZHba@0112
  #  rabbitmq:
  #    host: 192.168.0.191
  #    port: 5672
  #    username: admin
  #    password: admin

  datasource:
    # MySql
    url: jdbc:mysql://mysql.zhba:3306/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    url: jdbc:mysql://61.131.136.25:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: 123456
    password: ZHba@0112

    # PostgreSQL
    #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
@@ -26,29 +37,30 @@
    #username: BLADEX_BOOT
    #password: BLADEX_BOOT
    # SqlServer
    #url: jdbc:sqlserver://61.131.136.25:1433;DatabaseName=zhbaw
    #url: jdbc:sqlserver://223.82.109.183:1433;DatabaseName=zhbaw
    #username: sa
    #password: zhbaw@2021
#


#图片批量上传zip
upload:
  localtion: ${UPLOAD_DIR:/home/zhongsong/anbao}
  localtion: ${UPLOAD_DIR:/home/zhbaw/anbao}
  maxFileSize: 10240KB
  maxRequestSize: 102400KB

#ftp 设置
ftp:
  sqlConnect: jdbc:mysql://mysql.zhba:3306/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
  sqlConnect: jdbc:mysql://61.131.136.25:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
  ftpHost: 117.40.91.118
  ftpPort: 21
  ftpUserName: zhbain
  ftpPassword: zhbain@123
  ftpPath: yly/anbao/
  localPath: /home/zhongsong/anbao/
  localPath: /home/zhbaw/anbao/
  ip: http://47.49.36.190:9000
  jsonUrl: /home/zhongsong/anbao/
  jsonUrl: /home/zhbaw/anbao/
  username: root
  password: 123456
  password: ZHba@0112
  #  qfqkBaseApiUrl: http://61.131.136.25:2082/api
  qfqkBaseApiUrl: http://localhost:83

@@ -70,6 +82,3 @@
    remote-mode: true
    upload-domain: http://localhost:8999
    remote-path: /usr/share/nginx/html




 src/main/resources/application-test.yml

@@ -40,10 +40,10 @@
#ftp 设置
ftp:
  sqlConnect: jdbc:mysql://61.131.136.25:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
  ftpHost: 192.168.0.198
  ftpHost: 117.40.91.118
  ftpPort: 21
  ftpUserName: arsn
  ftpPassword: 123456
  ftpUserName: zhbain
  ftpPassword: zhbain@123
  ftpPath: anbao/
  localPath: E:\\anbao\\
  ip: http://61.131.136.25:2081

 src/main/resources/log/logback-prod.xml

@@ -21,11 +21,14 @@
        </encoder>
    </appender>


    <!-- 生成日志文件 -->
    <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 日志文件输出的文件名 -->
            <FileNamePattern>target/blade/log/info-%d{yyyy-MM-dd}.log</FileNamePattern>
            <!-- 日志文件输出的文件名 -->
            <FileNamePattern>/home/zhbaw/log/info/info-%d{yyyy-MM-dd}.log</FileNamePattern>
            <maxHistory>3</maxHistory>
        </rollingPolicy>
        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
            <pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
@@ -39,10 +42,30 @@
    </appender>

    <!-- 生成日志文件 -->
    <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 日志文件输出的文件名 -->
            <!-- 日志文件输出的文件名 -->
            <FileNamePattern>/home/zhbaw/log/warn/warn-%d{yyyy-MM-dd}.log</FileNamePattern>
            <maxHistory>7</maxHistory>
        </rollingPolicy>
        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
            <pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
        </encoder>
        <!-- 打印日志级别 -->
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <level>WARN</level>
            <onMatch>ACCEPT</onMatch>
            <onMismatch>DENY</onMismatch>
        </filter>
    </appender>

    <!-- 生成日志文件 -->
    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 日志文件输出的文件名 -->
            <FileNamePattern>target/blade/log/error-%d{yyyy-MM-dd}.log</FileNamePattern>
            <FileNamePattern>/home/zhbaw/log/error/error-%d{yyyy-MM-dd}.log</FileNamePattern>
            <maxHistory>30</maxHistory>
        </rollingPolicy>
        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
            <pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
@@ -144,6 +167,11 @@

    <logger name="net.sf.ehcache" level="INFO"/>
    <logger name="druid.sql" level="INFO"/>
    <logger name="org.springblade.modules" level="DEBUG">
        <appender-ref ref="ERROR"/>
        <appender-ref ref="WARN"/>
        <appender-ref ref="INFO"/>
    </logger>

    <!-- 减少nacos日志 -->
    <logger name="com.alibaba.nacos" level="ERROR"/>

			@@ -4,22 +4,24 @@
			# 从 Harbor 私有仓库拉取镜像
			image: 192.168.0.191/zhbaw/zhbaw:SNAPSHOT-$BUILD_NUMBER
			container_name: zhbaw
			deploy:
			replicas: 1
			update_config:
			parallelism: 2
			delay: 30s
			depends_on:
			- redis
			# deploy:
			# replicas: 1
			# update_config:
			# parallelism: 2
			# delay: 30s
			# depends_on:
			# - redis
			ports:
			- "81:81"
			volumes:
			- /home/zhongsong/anbao:/home/zhbaw/anbao
			# 容器停止后会重启
			restart: always
			redis:
			image: "redis:alpine"
			container_name: reids-alpine
			deploy:
			replicas: 1
			ports:
			- "6379:6379"
			restart: always
			# redis:
			# image: "redis:alpine"
			# container_name: reids-alpine
			# deploy:
			# replicas: 1
			# ports:
			# - "6379:6379"
			# restart: always

			@@ -2,7 +2,7 @@
			spring:
			redis:
			##redis 单机环境配置
			host: redis.zhba
			host: 127.0.0.1
			port: 6379
			password:
			database: 0
			@@ -11,11 +11,22 @@
			#cluster:
			# nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
			# commandTimeout: 5000
			# datasource:
			# # MySql
			# url: jdbc:mysql://localhost:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
			# username: root
			# password: ZHba@0112
			# rabbitmq:
			# host: 192.168.0.191
			# port: 5672
			# username: admin
			# password: admin

			datasource:
			# MySql
			url: jdbc:mysql://mysql.zhba:3306/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
			url: jdbc:mysql://61.131.136.25:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
			username: root
			password: 123456
			password: ZHba@0112

			# PostgreSQL
			#url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
			@@ -26,29 +37,30 @@
			#username: BLADEX_BOOT
			#password: BLADEX_BOOT
			# SqlServer
			#url: jdbc:sqlserver://61.131.136.25:1433;DatabaseName=zhbaw
			#url: jdbc:sqlserver://223.82.109.183:1433;DatabaseName=zhbaw
			#username: sa
			#password: zhbaw@2021
			#


			#图片批量上传zip
			upload:
			localtion: ${UPLOAD_DIR:/home/zhongsong/anbao}
			localtion: ${UPLOAD_DIR:/home/zhbaw/anbao}
			maxFileSize: 10240KB
			maxRequestSize: 102400KB

			#ftp 设置
			ftp:
			sqlConnect: jdbc:mysql://mysql.zhba:3306/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
			sqlConnect: jdbc:mysql://61.131.136.25:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
			ftpHost: 117.40.91.118
			ftpPort: 21
			ftpUserName: zhbain
			ftpPassword: zhbain@123
			ftpPath: yly/anbao/
			localPath: /home/zhongsong/anbao/
			localPath: /home/zhbaw/anbao/
			ip: http://47.49.36.190:9000
			jsonUrl: /home/zhongsong/anbao/
			jsonUrl: /home/zhbaw/anbao/
			username: root
			password: 123456
			password: ZHba@0112
			# qfqkBaseApiUrl: http://61.131.136.25:2082/api
			qfqkBaseApiUrl: http://localhost:83

			@@ -70,6 +82,3 @@
			remote-mode: true
			upload-domain: http://localhost:8999
			remote-path: /usr/share/nginx/html

			@@ -40,10 +40,10 @@
			#ftp 设置
			ftp:
			sqlConnect: jdbc:mysql://61.131.136.25:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
			ftpHost: 192.168.0.198
			ftpHost: 117.40.91.118
			ftpPort: 21
			ftpUserName: arsn
			ftpPassword: 123456
			ftpUserName: zhbain
			ftpPassword: zhbain@123
			ftpPath: anbao/
			localPath: E:\\anbao\\
			ip: http://61.131.136.25:2081

			@@ -21,11 +21,14 @@
			</encoder>
			</appender>


			<!-- 生成日志文件 -->
			<appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
			<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
			<!-- 日志文件输出的文件名 -->
			<FileNamePattern>target/blade/log/info-%d{yyyy-MM-dd}.log</FileNamePattern>
			<!-- 日志文件输出的文件名 -->
			<FileNamePattern>/home/zhbaw/log/info/info-%d{yyyy-MM-dd}.log</FileNamePattern>
			<maxHistory>3</maxHistory>
			</rollingPolicy>
			<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
			<pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
			@@ -39,10 +42,30 @@
			</appender>

			<!-- 生成日志文件 -->
			<appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
			<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
			<!-- 日志文件输出的文件名 -->
			<!-- 日志文件输出的文件名 -->
			<FileNamePattern>/home/zhbaw/log/warn/warn-%d{yyyy-MM-dd}.log</FileNamePattern>
			<maxHistory>7</maxHistory>
			</rollingPolicy>
			<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
			<pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
			</encoder>
			<!-- 打印日志级别 -->
			<filter class="ch.qos.logback.classic.filter.LevelFilter">
			<level>WARN</level>
			<onMatch>ACCEPT</onMatch>
			<onMismatch>DENY</onMismatch>
			</filter>
			</appender>

			<!-- 生成日志文件 -->
			<appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
			<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
			<!-- 日志文件输出的文件名 -->
			<FileNamePattern>target/blade/log/error-%d{yyyy-MM-dd}.log</FileNamePattern>
			<FileNamePattern>/home/zhbaw/log/error/error-%d{yyyy-MM-dd}.log</FileNamePattern>
			<maxHistory>30</maxHistory>
			</rollingPolicy>
			<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
			<pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
			@@ -144,6 +167,11 @@

			<logger name="net.sf.ehcache" level="INFO"/>
			<logger name="druid.sql" level="INFO"/>
			<logger name="org.springblade.modules" level="DEBUG">
			<appender-ref ref="ERROR"/>
			<appender-ref ref="WARN"/>
			<appender-ref ref="INFO"/>
			</logger>

			<!-- 减少nacos日志 -->
			<logger name="com.alibaba.nacos" level="ERROR"/>