更换git仓库后的提交

event_smart/src/main/resources/application-dev.yml

@@ -0,0 +1,53 @@
+spring:
+  application:
+    name: event_smart
+
+  datasource:
+    dynamic:
+      primary: master
+      strict: false  # 是否严格匹配数据源，默认false
+      druid: # 如果使用Druid连接池
+        validation-query: SELECT 1 FROM DUAL  # 达梦专用校验SQL
+        initial-size: 10
+        # 初始化大小，最小，最大
+        min-idle: 20
+        maxActive: 500
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间，单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        testWhileIdle: true
+        testOnBorrow: true
+        testOnReturn: false
+        # 打开PSCache，并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+      datasource:
+        master:
+          url: jdbc:oracle:thin:@192.168.1.51:1521:pqsbase
+          username: pqsadmin_bj
+          password: pqsadmin
+          driver-class-name: oracle.jdbc.OracleDriver
+#        salve:
+#          driver-class-name: dm.jdbc.driver.DmDriver
+#          url: jdbc:dm://192.168.1.21:5236/PQSADMIN?useUnicode=true&characterEncoding=utf-8
+#          username: PQSADMINLN
+#          password: Pqsadmin123
+
+
+
+  redis:
+    database: 10
+    host: localhost
+    port: 6379
+    timeout:  5000
+    lettuce:
+      pool:
+        max-active: 8
+        max-wait: 8000
+        max-idle: 8
+        min-idle: 0
+
+

event_smart/src/main/resources/application-prod.yml

@@ -0,0 +1,55 @@
+server:
+  port: 18093
+spring:
+  application:
+    name: event_smart
+  datasource:
+    dynamic:
+      primary: master
+      strict: false  # 是否严格匹配数据源，默认false
+      druid: # 如果使用Druid连接池
+        validation-query: SELECT 1 FROM DUAL  # 达梦专用校验SQL
+        initial-size: 10
+        # 初始化大小，最小，最大
+        min-idle: 20
+        maxActive: 500
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间，单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        testWhileIdle: true
+        testOnBorrow: true
+        testOnReturn: false
+        # 打开PSCache，并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+      datasource:
+        master:
+          url: jdbc:oracle:thin:@192.168.10.34:11521:pqsbase
+          username: pqsadmin
+          password: Pqsadmin_123
+          driver-class-name: oracle.jdbc.OracleDriver
+#        salve:
+#          driver-class-name: dm.jdbc.driver.DmDriver
+#          url: jdbc:dm://192.168.1.21:5236/PQSADMIN?useUnicode=true&characterEncoding=utf-8
+#          username: PQSADMINLN
+#          password: Pqsadmin123
+
+
+
+  redis:
+    database: 10
+    host: localhost
+    port: 16379
+    password: "Pqsadmin@#1qaz"
+    timeout:  5000
+    lettuce:
+      pool:
+        max-active: 20
+        max-wait: 8000
+        max-idle: 8
+        min-idle: 0
+
+

event_smart/src/main/resources/application.yml

@@ -0,0 +1,72 @@
+#当前服务的基本信息
+microservice:
+  ename: 12345
+  name: 12345
+server:
+  port: 18093
+spring:
+  application:
+    name: event_smart
+  profiles:
+    active: dev
+
+
+#mybatis配置信息
+mybatis-plus:
+  mapper-locations: classpath*:com/njcn/**/mapping/*.xml
+  #别名扫描
+  type-aliases-package: com.njcn.product.event.**.pojo
+  configuration:
+    #驼峰命名
+    map-underscore-to-camel-case: true
+    #配置sql日志输出
+    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    #关闭日志输出
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+  global-config:
+    db-config:
+      #指定主键生成策略
+      id-type: assign_uuid
+
+
+SYS_TYPE_ZT: 1cfcd6e2-c5fe-4b15-988a-32b90f1170c1
+SYS_TYPE_WT: 983f9dfe-4f9a-4c96-89d8-7d425a1f1d6c
+db:
+  type: oracle
+
+#文件位置配置
+business:
+  #处理波形数据位置
+  wavePath: D://Comtrade
+  #wavePath: /usr/local/comtrade
+  #处理临时数据
+  tempPath: D://file
+  #tempPath: /usr/local/file
+  #文件存储的方式 3.本地存储
+  file:
+    storage: 3
+#oss服务器配置
+min:
+  io:
+    endpoint: http://192.168.1.13:9009
+    accessKey: minio
+    secretKey: minio@123
+    bucket: excelreport
+    #华为obs服务器配置
+huawei:
+  access-key: J9GS9EA79PZ60OK23LWP
+  security-key: BirGrAFDSLxU8ow5fffyXgZRAmMRb1R1AdqCI60d
+  obs:
+    bucket: test-8601
+    endpoint: https://obs.cn-east-3.myhuaweicloud.com
+    # 单位为秒
+    expire: 3600
+#线程池配置信息
+threadPool:
+  corePoolSize: 10
+  maxPoolSize: 20
+  queueCapacity: 500
+  keepAliveSeconds: 60
+WAVEPATH: D:/Comtrade
+
+

event_smart/src/main/resources/logback.xml

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="20 seconds" debug="false">
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+
+    <springProperty scope="context" name="log.projectName" source="spring.application.name" defaultValue="event_msg"/>
+    <springProperty scope="context" name="logCommonLevel" source="log.commonLevel" defaultValue="info"/>
+    <springProperty scope="context" name="logHomeDir" source="log.homeDir" defaultValue="D:\logs"/>
+
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+    <conversionRule conversionWord="ec"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+
+
+    <!--日志输出格式-->
+    <property name="log.pattern"
+              value="|-%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%level} ${log.projectName} -- %t %logger{100}.%M ==> %m%n${Log_EXCEPTION_CONVERSION_WORD:-%ec}}}"/>
+    <property name="log.maxHistory" value="30"/>
+    <!-- 控制台输出（可选） -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <charset>UTF-8</charset> <!-- 控制台也建议指定 -->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!--客户端输出日志-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--系统中常规的debug日志-->
+    <!-- 滚动记录文件，先将日志记录到指定文件，当符合某个条件时，将日志记录到其他文件 RollingFileAppender -->
+    <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>
+            ${logHomeDir}/${log.projectName}/debug/debug.log
+        </file>
+        <!-- 如果日志级别等于配置级别，过滤器会根据onMath 和 onMismatch接收或拒绝日志。 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 设置过滤级别 -->
+            <level>DEBUG</level>
+            <!-- 用于配置符合过滤条件的操作 -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 用于配置不符合过滤条件的操作 -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <!-- 最常用的滚动策略，它根据时间来制定滚动策略.既负责滚动也负责触发滚动  SizeAndTimeBasedRollingPolicy-->
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志输出位置 可相对、和绝对路径 -->
+            <fileNamePattern>
+                ${logHomeDir}/${log.projectName}/debug/debug.log.%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
+            <maxFileSize>10MB</maxFileSize>
+            <!-- 可选节点，控制保留的归档文件的最大数量，超出数量就删除旧文件,假设设置每个月滚动，且<maxHistory>是6，
+            则只保存最近6个月的文件，删除之前的旧文件。注意，删除旧文件是，那些为了归档而创建的目录也会被删除 -->
+            <maxHistory>${log.maxHistory:-30}</maxHistory>
+            <!--重启清理日志文件-->
+            <!--            <cleanHistoryOnStart>true</cleanHistoryOnStart>-->
+            <!--每个文件最多100MB，保留N天的历史记录，但最多20GB-->
+            <!--<totalSizeCap>20GB</totalSizeCap>-->
+            <!--日志文件最大的大小-->
+            <!--<MaxFileSize>${log.maxSize}</MaxFileSize>-->
+        </rollingPolicy>
+        <encoder>
+            <pattern>
+                ${log.pattern}
+            </pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--系统中常规的info日志-->
+    <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <file>
+            ${logHomeDir}/${log.projectName}/info/info.log
+        </file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>
+                ${logHomeDir}/${log.projectName}/info/info.log.%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
+            <maxFileSize>10MB</maxFileSize>
+            <maxHistory>${log.maxHistory:-30}</maxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>
+                ${log.pattern}
+            </pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+
+    <!--系统中常规的error日志-->
+    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>
+            ${logHomeDir}/${log.projectName}/error/error.log
+        </file>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>
+                ${logHomeDir}/${log.projectName}/error/error.log.%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
+            <maxFileSize>10MB</maxFileSize>
+            <maxHistory>${log.maxHistory:-30}</maxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>
+                ${log.pattern}
+            </pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <logger name="org.apache.catalina.startup.DigesterFactory"  level="ERROR"/>
+    <logger name="org.apache.catalina.util.LifecycleBase"  level="ERROR"/>
+    <logger name="org.apache.coyote.http11.Http11NioProtocol"  level="WARN"/>
+
+
+
+    <logger name="com.njcn" level="INFO" additivity="false">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="DEBUG"/>
+        <appender-ref ref="INFO"/>
+        <appender-ref ref="ERROR"/>
+    </logger>
+
+    <root level="${logCommonLevel}">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="DEBUG"/>
+        <appender-ref ref="INFO"/>
+        <appender-ref ref="ERROR"/>
+    </root>
+</configuration>