提交Linux环境配置信息

CZT

2023-11-27 021b71b0f977691035be3728f1db185030e97e58

提交Linux环境配置信息

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1403.java

@@ -53,7 +53,7 @@
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());
        try {
            List<Fz40InoutPlan> list = fzzy40Sync1403Rep.findDate("3", start, end);
            List<Fz40InoutPlan> list = fzzy40Sync1403Rep.findDateByTime(start, end);
            if (null == list || list.isEmpty()) {
                return;
            }

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1404.java

@@ -61,7 +61,7 @@
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());
        try {
            List<Fz40InoutPlan> list = fzzy35Sync1403Rep.findDate("3", start, end);
            List<Fz40InoutPlan> list = fzzy35Sync1403Rep.findDateByTime(start, end);

            if (null == list || list.isEmpty()) {
                return;

 src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1403Rep.java

@@ -23,4 +23,13 @@
     */
    @Query("from Fz40InoutPlan where type =:planType and createTime >=:start and createTime <:end order by createTime ")
    List<Fz40InoutPlan> findDate(@Param("planType") String planType, @Param("start") Date start, @Param("end") Date end);

    /**
     *
     * @param start
     * @param end
     * @return
     */
    @Query("from Fz40InoutPlan where createTime >=:start and createTime <:end order by createTime ")
    List<Fz40InoutPlan> findDateByTime(@Param("start") Date start, @Param("end") Date end);
}

 src/main/resources/application-dev.yml

@@ -7,6 +7,7 @@
    primary:
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8     #大湾区
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8     #上海嘉定
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5306?useUnicode=true&useSSL=false&characterEncoding=utf-8     #宁夏石嘴山
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8     #广澳
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8     #潮阳库
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_002?useUnicode=true&useSSL=false&characterEncoding=utf-8 #潮阳分库-濠江区租赁库
@@ -24,22 +25,25 @@
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8     #广东台山
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8     #广东韶关
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5322?useUnicode=true&useSSL=false&characterEncoding=utf-8     #广东徐闻
      url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8     #惠州惠新
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8     #武汉黄陂军粮
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8     #惠州惠新
      url: jdbc:mysql://127.0.0.1:3306/igds_api_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8     #武汉黄陂军粮
#      url: jdbc:mysql://127.0.0.1:3306/igds_api_5329?useUnicode=true&useSSL=false&characterEncoding=utf-8     #广东佛山禅城区
      username: root
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
    #次数据源
    secondary:
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8  #大湾区
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8  #上海嘉定
#      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8  #上海嘉定
#      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5306?useUnicode=true&useSSL=false&characterEncoding=utf-8  #宁夏石嘴山
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8  #广澳
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8  #潮阳
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8  #潮阳库
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5322?useUnicode=true&useSSL=false&characterEncoding=utf-8  #广东徐闻
      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8  #惠州惠新
#      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8  #武汉黄陂军粮
#      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8  #惠州惠新
      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8  #武汉黄陂军粮
#      url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5329?useUnicode=true&useSSL=false&characterEncoding=utf-8  #广东佛山禅城区
      username: root
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
@@ -62,7 +66,7 @@
          dialect: org.hibernate.dialect.MySQL5InnoDBDialect
  # Redis相关配置
  redis:
    database: 5
    database: 9
    host: 127.0.0.1
    port: 6379
    password: Abc123..

 src/main/resources/application-linux.yml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,56 @@
##########################  æ­¦æ±‰é»„陂军粮-Linux   ##########################
server:
  port: 8090
  jetty:
    max-http-post-size: 209715200
  tomcat:
    max-http-post-size: 209715200
spring:
  datasource:
    #主数据源
    primary:
      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
      username: root
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
    #次数据源
    secondary:
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
      username: root
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
  jpa:
    #主jpa配置
    primary:
      show-sql: true
      properties:
        hibernate:
          hbm2ddl:
            auto: update
          dialect: org.hibernate.dialect.MySQL5InnoDBDialect
    #次jpa配置
    secondary:
      show-sql: true
      properties:
        hibernate:
          hbm2ddl:
            auto: none
          dialect: org.hibernate.dialect.MySQL5InnoDBDialect
  # Redis相关配置
  redis:
    database: 1
    host: 127.0.0.1
    port: 6379
    password: Abc123..
    # è¿žæŽ¥æ± æœ€å¤§è¿žæŽ¥æ•°ï¼ˆä½¿ç”¨è´Ÿå€¼è¡¨ç¤ºæ²¡æœ‰é™åˆ¶ï¼‰
    pool:
      max-active: 200
      max-wait: -1
      max-idle: 10
      min-idle: 0
      timeout: 6000
igds:
  default:
    companyId: 5327
  file-path: /usr/local/igds-api/file/
  img-path: /usr/local/igds/file/

 src/main/resources/application-pro.yml

@@ -1,4 +1,4 @@
##########################  å¹¿ä¸œæƒ å·žæƒ é˜³   ##########################
##########################  å®å¤çŸ³å˜´å±±çº¢æžœå­ç²®åº“   ##########################
server:
  port: 8090
  jetty:
@@ -10,15 +10,15 @@
    #主数据源
    primary:
      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
      driver-class-name: com.mysql.jdbc.Driver
      username: root
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
    #次数据源
    secondary:
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
      driver-class-name: com.mysql.jdbc.Driver
      username: root
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
  jpa:
    #主jpa配置
    primary:
@@ -51,7 +51,11 @@
      timeout: 6000
igds:
  default:
    companyId: 5326

    companyId: 5306
  file-path: D:/IGDS-API/FILE/
  img-path: D:/IGDS/FILE/
  img-path: D:/IGDS/FILE/
  # çœå¹³å°RSA密钥对信息
  #公钥：MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
  # åŒºçº§å¹³å°RSA密钥对信息
  #公钥：MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMsCJyl6EkjUEfB9Otl0bNmFD0Gr3g/v8DYnoq66EIviDNKT+bo5Aj6BRFngns1aCy1uyWgC5/+PIQ3sxs25nWXxFBYXy7cTiGwCCPfnmmI3rkXRGqRo6uh9K3BsucSE0kyhB8Eq76bQ6BPa5XpMyyq8V2oN2i0LLYpDhV97j3BwIDAQAB
  #私钥：MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIywInKXoSSNQR8H062XRs2YUPQaveD+/wNieirroQi+IM0pP5ujkCPoFEWeCezVoLLW7JaALn/48hDezGzbmdZfEUFhfLtxOIbAII9+eaYjeuRdEapGjq6H0rcGy5xITSTKEHwSrvptDoE9rlekzLKrxXag3aLQstikOFX3uPcHAgMBAAECgYAOZvWPz4/ygvdYqt9zlNntsBsRci9f+hq3CPzCqg55K6WF+yQE1dCqrFZu7gfME+54gGIF4idgeGanbXd16WEtFslEJlFKGk3cF62gaX5Y/nZ4zS65CLTjQ650j6SJ7OC2QYjIejTWhJD0k1tSazXdzV70nP+X3DbGyyO3Rm+juQJBANMCi+9RnzcGvltN/AdWD0DgshRBNrqrHtDkmzRFSkFwIqVSL5J7qRvntjhSstQIBB5KCosCmwRYKxGWQ9Ou420CQQCqrz2byBz3w2pkEfPY3rv7T4zE/2CHC74XtW9sEUTieYaxqIKlnwJacactzx4ZOAg21dGCoqOG9Y9RIpH2mMfDAkEAlAucXIt61qOfmPXtFsSVrSI5LybWHEAFPfC2yAS5ZZIkbLNt9ytV6eM3oOq81zDMmue93+wzEOg/R3aTHgj9PQJALNGxUsu8V473y+ku596s6/PamgwZE70QoHcjF/R86x9QMCx4ifb0Dj3T0WKWm7ar6YJB7pS4bgLjLEHwpBlAMwJAUUG2NhfGXFxfyFOC+5BzFTEr7EdSeHPXJl7dIWmRHncHsv8Nl2yvWsIOfDOYKS3ynptMgeSZaJPnXhvFdX0TnQ==

 src/main/resources/application-pro5327.yml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,56 @@
##########################  æ­¦æ±‰é»„陂军粮-Linux   ##########################
server:
  port: 8090
  jetty:
    max-http-post-size: 209715200
  tomcat:
    max-http-post-size: 209715200
spring:
  datasource:
    #主数据源
    primary:
      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
      username: root
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
    #次数据源
    secondary:
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
      username: root
      password: Abc123..
      driver-class-name: com.mysql.jdbc.Driver
  jpa:
    #主jpa配置
    primary:
      show-sql: true
      properties:
        hibernate:
          hbm2ddl:
            auto: update
          dialect: org.hibernate.dialect.MySQL5InnoDBDialect
    #次jpa配置
    secondary:
      show-sql: true
      properties:
        hibernate:
          hbm2ddl:
            auto: none
          dialect: org.hibernate.dialect.MySQL5InnoDBDialect
  # Redis相关配置
  redis:
    database: 1
    host: 127.0.0.1
    port: 6379
    password: Abc123..
    # è¿žæŽ¥æ± æœ€å¤§è¿žæŽ¥æ•°ï¼ˆä½¿ç”¨è´Ÿå€¼è¡¨ç¤ºæ²¡æœ‰é™åˆ¶ï¼‰
    pool:
      max-active: 200
      max-wait: -1
      max-idle: 10
      min-idle: 0
      timeout: 6000
igds:
  default:
    companyId: 5327
  file-path: /usr/local/igds-api/file/
  img-path: /usr/local/igds/file/

 src/main/resources/application.yml

@@ -1,7 +1,7 @@
##########################  Server   ##########################
spring:
  profiles:
    active: pro
    active: linux
  application:
    name: igds-api
  main:

 src/main/resources/logback-spring.xml

@@ -10,7 +10,7 @@
    <!-- pro文件路径 -->
    <property name="PRO_LOG_HOME" value="C:/app/igds-api/log" />
    <!-- linux文件路径 -->
    <property name="PRO_LINUX_HOME" value="/usr/local/fzzy/igds-api/log" />
    <property name="PRO_LINUX_HOME" value="/usr/local/igds-api/log" />

    <!-- æ—¥å¿—输出格式 -->
    <property name="PATTERN" value="[${APP_MODEL}]|%-12(%d{yyyy-MM-dd HH:mm:ss.SSS}) |-%-5level [%thread] %c [%L] -| %msg%n"/>
@@ -67,8 +67,7 @@
        </root>
    </springProfile>


    <!-- ç”Ÿäº§çŽ¯å¢ƒ -->
    <!-- ç”Ÿäº§çŽ¯å¢ƒ-linux -->
    <springProfile name="linux">
        <!-- æ¯å¤©äº§ç”Ÿä¸€ä¸ªæ–‡ä»¶ -->
        <appender name="PRO_LINUX_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -77,7 +76,7 @@
            <!-- æ—¥å¿—记录器的滚动策略，按日期，按大小记录 -->
            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
                <!-- æ–‡ä»¶åç§° -->
                <fileNamePattern>${PRO_LINUX_HOME}/${APP_MODEL}-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
                <fileNamePattern>${PRO_LINUX_HOME}/${APP_MODEL}-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
                <!--日志文件保留天数 -->
                <maxHistory>60</maxHistory>
                <!-- æ—¥å¿—大小 -->
@@ -101,138 +100,4 @@
            <appender-ref ref="PRO_LINUX_FILE"/>
        </root>
    </springProfile>
    <!-- ç”Ÿäº§çŽ¯å¢ƒ -->
    <springProfile name="pro5005">
        <!-- æ¯å¤©äº§ç”Ÿä¸€ä¸ªæ–‡ä»¶ -->
        <appender name="PRO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
            <!-- æ–‡ä»¶è·¯å¾„ -->
            <file>${PRO_LOG_HOME}/${APP_MODEL}-info.log</file>
            <!-- æ—¥å¿—记录器的滚动策略，按日期，按大小记录 -->
            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
                <!-- æ–‡ä»¶åç§° -->
                <fileNamePattern>${PRO_LOG_HOME}/${APP_MODEL}-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
                <!--日志文件保留天数 -->
                <maxHistory>60</maxHistory>
                <!-- æ—¥å¿—大小 -->
                <timeBasedFileNamingAndTriggeringPolicy
                        class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                    <maxFileSize>100MB</maxFileSize>
                </timeBasedFileNamingAndTriggeringPolicy>
            </rollingPolicy>
            <encoder>
                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
                <charset>UTF-8</charset>
            </encoder>
            <layout class="ch.qos.logback.classic.PatternLayout">
                <pattern>${PATTERN}</pattern>
            </layout>
        </appender>

        <logger name="org.hibernate.tool" level="WARN"/>
        <logger name="com.bstek.dorado" level="WARN"/>
        <root level="info">
            <appender-ref ref="UAT_FILE"/>
        </root>
    </springProfile>


    <!-- ç”Ÿäº§çŽ¯å¢ƒ -->
    <springProfile name="linux">
        <!-- æ¯å¤©äº§ç”Ÿä¸€ä¸ªæ–‡ä»¶ -->
        <appender name="PRO_LINUX_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
            <!-- æ–‡ä»¶è·¯å¾„ -->
            <file>${PRO_LINUX_HOME}/${APP_MODEL}.log</file>
            <!-- æ—¥å¿—记录器的滚动策略，按日期，按大小记录 -->
            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
                <!-- æ–‡ä»¶åç§° -->
                <fileNamePattern>${PRO_LINUX_HOME}/${APP_MODEL}-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
                <!--日志文件保留天数 -->
                <maxHistory>60</maxHistory>
                <!-- æ—¥å¿—大小 -->
                <timeBasedFileNamingAndTriggeringPolicy
                        class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                    <maxFileSize>100MB</maxFileSize>
                </timeBasedFileNamingAndTriggeringPolicy>
            </rollingPolicy>
            <encoder>
                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
                <charset>UTF-8</charset>
            </encoder>
            <layout class="ch.qos.logback.classic.PatternLayout">
                <pattern>${PATTERN}</pattern>
            </layout>
        </appender>

        <logger name="org.hibernate.tool" level="WARN"/>
        <logger name="com.bstek.dorado" level="WARN"/>
        <root level="info">
            <appender-ref ref="PRO_FILE"/>
        </root>
    </springProfile>
    <!-- ç”Ÿäº§çŽ¯å¢ƒ -->
    <springProfile name="pro5308">
        <!-- æ¯å¤©äº§ç”Ÿä¸€ä¸ªæ–‡ä»¶ -->
        <appender name="PRO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
            <!-- æ–‡ä»¶è·¯å¾„ -->
            <file>${PRO_LOG_HOME}/${APP_MODEL}-info.log</file>
            <!-- æ—¥å¿—记录器的滚动策略，按日期，按大小记录 -->
            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
                <!-- æ–‡ä»¶åç§° -->
                <fileNamePattern>${PRO_LOG_HOME}/${APP_MODEL}-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
                <!--日志文件保留天数 -->
                <maxHistory>60</maxHistory>
                <!-- æ—¥å¿—大小 -->
                <timeBasedFileNamingAndTriggeringPolicy
                        class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                    <maxFileSize>100MB</maxFileSize>
                </timeBasedFileNamingAndTriggeringPolicy>
            </rollingPolicy>
            <encoder>
                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
                <charset>UTF-8</charset>
            </encoder>
            <layout class="ch.qos.logback.classic.PatternLayout">
                <pattern>${PATTERN}</pattern>
            </layout>
        </appender>

        <logger name="org.hibernate.tool" level="WARN"/>
        <logger name="com.bstek.dorado" level="WARN"/>
        <root level="info">
            <appender-ref ref="PRO_FILE"/>
        </root>
    </springProfile>
    <!-- ç”Ÿäº§çŽ¯å¢ƒ -->
    <springProfile name="pro5016">
        <!-- æ¯å¤©äº§ç”Ÿä¸€ä¸ªæ–‡ä»¶ -->
        <appender name="PRO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
            <!-- æ–‡ä»¶è·¯å¾„ -->
            <file>${PRO_LOG_HOME}/${APP_MODEL}-info.log</file>
            <!-- æ—¥å¿—记录器的滚动策略，按日期，按大小记录 -->
            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
                <!-- æ–‡ä»¶åç§° -->
                <fileNamePattern>${PRO_LOG_HOME}/${APP_MODEL}-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
                <!--日志文件保留天数 -->
                <maxHistory>60</maxHistory>
                <!-- æ—¥å¿—大小 -->
                <timeBasedFileNamingAndTriggeringPolicy
                        class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                    <maxFileSize>100MB</maxFileSize>
                </timeBasedFileNamingAndTriggeringPolicy>
            </rollingPolicy>
            <encoder>
                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
                <charset>UTF-8</charset>
            </encoder>
            <layout class="ch.qos.logback.classic.PatternLayout">
                <pattern>${PATTERN}</pattern>
            </layout>
        </appender>

        <logger name="org.hibernate.tool" level="WARN"/>
        <logger name="com.bstek.dorado" level="WARN"/>
        <root level="info">
            <appender-ref ref="PRO_FILE"/>
        </root>
    </springProfile>
</configuration>