modify: 环境配置

f9d55407 · “zcwang” · 059d4dad · f9d55407 · f9d55407 · f9d55407
Commit f9d55407 authored Jan 04, 2023 by “zcwang”
9 changed files
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -130,3 +130,52 @@ online_image_upload:
    - master
  dependencies:
    - online_package
+
+################
+#   Regression
+################
+regression_package:
+  stage: package
+  script:
+    - mvn clean -U package -Ponline -Dmaven.test.skip=true -Dencoding=UTF-8
+    - mv $TARGET_FILE_PATH/$TARGET_FILE_NAME $ARTIFACT_NAME
+    - mv $REGRESSION_SETENV_FILE_PATH ./setenv.sh
+    - zip $CI_PROJECT_NAME.zip ./setenv.sh $ARTIFACT_NAME
+  tags:
+    - ci-backend
+  artifacts:
+    paths:
+      - $CI_PROJECT_NAME.zip
+      - swagger/
+    expire_in: 1d
+  only:
+    - master
+
+regression_upload_bee:
+  stage: upload-bee
+  script:
+    - cd swagger
+    - beeUpload $SERVICE_CODE $CI_BUILD_REF_NAME $GITLAB_USER_NAME $GITLAB_USER_EMAIL
+  tags:
+    - ci-backend
+  only:
+    - master
+  dependencies:
+    - regression_package
+
+regression_image_upload:
+  stage: upload
+  script:
+    - version_tools time && CURRENT_TIMESTAMP=$(version_tools result)
+    - version_tools version && PROJECT_VERSION=$(version_tools result)
+    - IMAGE_TAG="${PROJECT_VERSION}-${CI_COMMIT_REF_NAME##*/}-${CURRENT_TIMESTAMP}-${CI_PIPELINE_ID}"
+    - IMAGE_NAME="${HARBOR_URL}/${HARBOR_APP_DIRECTOR}/${SERVICE_CODE}:${IMAGE_TAG}"
+    - unzip -o -q $CI_PROJECT_NAME.zip -d .
+    - docker build -t ${IMAGE_NAME}  .
+    - eval opera docker $OPERA_ARGS --env=regression --imageName=${IMAGE_NAME} --imageTag=${IMAGE_TAG}
+  tags:
+    - ci-backend
+  only:
+    - master
+  dependencies:
+    - regression_package
--- a/yanxuan-qc-change-system-assembly/src/main/resources/config/dev/setenv.sh
+++ b/yanxuan-qc-change-system-assembly/src/main/resources/config/dev/setenv.sh
 jvm_opts_base="-cp . -ea -Xms4096m -Xmx4096m"
 jvm_opts_gc="-XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=15 -XX:InitiatingHeapOccupancyPercent=45 -XX:MaxTenuringThreshold=7 -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=368m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UnlockExperimentalVMOptions -XX:G1LogLevel=finest -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/home/logs/yanxuan-sc-ehc -XX:-OmitStackTraceInFastThrow -Xloggc:/home/logs/yanxuan-sc-ehc/gc-%t.log"
 jvm_opts_property="-Dspring.profiles.active=test -Denv=test -Dserver.port=8080"
-jvm_opts_ext="-javaagent:/home/caesar-agent/caesar-agent-router-1.0.0.jar -Dapp.id=yanxuan-sc-ehc"
+jvm_opts_ext="-javaagent:/home/caesar-agent/caesar-agent-router-1.0.0.jar -Dapp.id=yanxuan-qc-change-system"
 consul_service_tags=test
 consul_service_port=8080
 consul_health_url="/i/health"
-consul_service_name="yanxuan-sc-ehc"
+consul_service_name="yanxuan-qc-change-system"
--- a/yanxuan-qc-change-system-assembly/src/main/resources/config/online/application.properties
+++ b/yanxuan-qc-change-system-assembly/src/main/resources/config/online/application.properties
@@ -45,7 +45,7 @@ spring.redis.host=yx-cust23-online.ncr.cn-east-p1.internal.
 spring.redis.port=32427

 # supplier
-supplier.url=http://127.0.0.1:8550/proxy/test-v1.yanxuan-supplier-ms.service.mailsaas
+supplier.url=http://127.0.0.1:8550/proxy/online.yanxuan-supplier-ms.service.mailsaas

 ### des\u914D\u7F6E
 # \u5BFC\u51FA\u6587\u4EF6\u4E0A\u4F20\u5230\u54EA\u4E2A\u670D\u52A1\u5668\uFF0C\u6709test\u548Conline\u53EF\u9009

--- a/yanxuan-qc-change-system-assembly/src/main/resources/config/online/setenv.sh
+++ b/yanxuan-qc-change-system-assembly/src/main/resources/config/online/setenv.sh
 jvm_opts_base="-cp . -ea -Xms8192m -Xmx8192m"
 jvm_opts_gc="-XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=15 -XX:InitiatingHeapOccupancyPercent=45 -XX:MaxTenuringThreshold=7 -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=368m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UnlockExperimentalVMOptions -XX:G1LogLevel=finest -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/home/logs/yanxuan-sc-ehc -XX:-OmitStackTraceInFastThrow -Xloggc:/home/logs/yanxuan-sc-ehc/gc-%t.log"
 jvm_opts_property="-Dspring.profiles.active=online -Denv=online -Dserver.port=8080"
-jvm_opts_ext="-javaagent:/home/caesar-agent/caesar-agent-router-1.0.0.jar -Dapp.id=yanxuan-sc-ehc"
+jvm_opts_ext="-javaagent:/home/caesar-agent/caesar-agent-router-1.0.0.jar -Dapp.id=yanxuan-qc-change-system"
 consul_service_tags=online
 consul_service_port=8080
-consul_service_name="yanxuan-sc-ehc"
+consul_service_name="yanxuan-qc-change-system"
 consul_health_url="/i/health"
--- a/yanxuan-qc-change-system-assembly/src/main/resources/config/regression/application.properties
+++ b/yanxuan-qc-change-system-assembly/src/main/resources/config/regression/application.properties
+env=regression
+
+dschedule.enable=true
+dschedule.env=regression
+dschedule.app-id=yanxuan-qc-change-system
+dschedule.job-group=736
+dschedule.enable-auto-register=true
+dschedule.executor-fail-strategy=fail_alarm
+dschedule.alarm-email=wb.tanglongwei@mesg.corp.netease.com
+dschedule.adminAddresses=http://127.0.0.1:8550/proxy/test.dschedule-admin.service.mailsaas/
+spring.http.multipart.max-file-size=100MB
+spring.http.multipart.max-request-size=100MB
+
+# mysql
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.url=jdbc:mysql://10.170.155.148:4306/qc_ecr_system?useUnicode=true&characterEncoding=UTF-8&autoReconnet=true
+spring.datasource.username=qc_ecr_system
+spring.datasource.password=qc_ecr_system
+
+#tomcat
+server.tomcat.max-threads=600
+server.tomcat.uri-encoding=UTF-8
+server.tomcat.basedir=/home/logs/access
+server.tomcat.accesslog.enabled=true
+server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %{X-Forwarded-For}i %D %{P_INFO}c  %{Referer}i  %{User-Agent}i  %{Host}i
+
+
+# mybatis
+mybatis.mapper-locations=classpath:mybatis/mapper/*.xml
+mybatis.configuration.cache-enabled=true
+mybatis.configuration.map-underscore-to-camel-case=true
+
+
+# redis
+spring.redis.password=xc0CdqWMzMj6hBvpIY5HrciHX85txmftyXukMnyKdK8X
+spring.redis.timeout=20000
+spring.redis.sentinel.master=paas-redis/yx-common-repl-1-test
+spring.redis.sentinel.nodes=yx-cust23-test.ncr.cn-east-p1.internal:31461
+spring.redis.pool.max-active=50
+spring.redis.pool.max-idle=20
+spring.redis.pool.max-wait=10000
+spring.redis.host=yx-cust23-test.ncr.cn-east-p1.internal
+spring.redis.port=31461
+
+# supplier
+supplier.url=http://127.0.0.1:8550/proxy/test-v1.yanxuan-supplier-ms.service.mailsaas
+
+### des\u914D\u7F6E
+# \u5BFC\u51FA\u6587\u4EF6\u4E0A\u4F20\u5230\u54EA\u4E2A\u670D\u52A1\u5668\uFF0C\u6709test\u548Conline\u53EF\u9009
+des.prop.env=test
\ No newline at end of file
--- a/yanxuan-qc-change-system-assembly/src/main/resources/config/regression/logback-spring.xml
+++ b/yanxuan-qc-change-system-assembly/src/main/resources/config/regression/logback-spring.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="true" scan="true" scanPeriod="60 seconds">
+    <contextName>yanxuan-sc-ehc</contextName>
+    <include resource="logback-missa.xml"/>
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="log.productName" value="yanxuan-qc-change-system"/>
+    <property name="log.path" value="/home/logs"/>
+    <property name="log.path.holmes" value="/home/logs/holmes"/>
+    <property name="log.level" value="debug"/>
+    <property name="log.pattern"
+              value="{time=%d{yyyy-MM-dd HH:mm:ss.SSS}, traceId=%X{XTraceId}, level=%p} [%c{0}] %m%n"/>
+    <!-- custom coloring conversion -->
+    <conversionRule conversionWord="highlightex"
+                    converterClass="com.netease.mail.yanxuan.qc.api.common.common.HighlightingCompositeConverterEx"/>
+
+    <!--appender-->
+    <appender name="query-internal" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/${log.productName}/query.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>90</maxHistory>
+            <!--            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">-->
+            <!--                &lt;!&ndash; maxFileSize:这是活动文件的大小，默认值是10MB,本篇设置为1KB，只是为了演示 &ndash;&gt;-->
+            <!--                <maxFileSize>500MB</maxFileSize>-->
+            <!--            </timeBasedFileNamingAndTriggeringPolicy>-->
+        </rollingPolicy>
+    </appender>
+    <appender name="query" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>512</queueSize>
+        <discardingThreshold>0</discardingThreshold>
+        <includeCallerData>true</includeCallerData>
+        <appender-ref ref="query-internal"/>
+    </appender>
+    <appender name="stdout-internal"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/${log.productName}/stdout.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>14</maxHistory>
+        </rollingPolicy>
+    </appender>
+    <appender name="stdout" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>512</queueSize>
+        <discardingThreshold>0</discardingThreshold>
+        <includeCallerData>true</includeCallerData>
+        <appender-ref ref="stdout-internal"/>
+    </appender>
+    <appender name="holmes-appender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder>
+            <pattern>%msg</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path.holmes}/${log.productName}/yanxuan.${log.productName}.%d{yyyy-MM-dd}.log
+            </fileNamePattern>
+            <maxHistory>7</maxHistory>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="rpc" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/${log.productName}/rpc.log.%d{yyyy-MM-dd}</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="task" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/${log.productName}/task.log.%d{yyyy-MM-dd}
+            </fileNamePattern>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="stderr"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/${log.productName}/stderr.log.%d{yyyy-MM-dd}
+            </fileNamePattern>
+        </rollingPolicy>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 定时任务 -->
+    <appender name="dschedule"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%p] [%c{0}] %m%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/dschedule.log.%d{yyyy-MM-dd}.gz
+            </fileNamePattern>
+        </rollingPolicy>
+    </appender>
+
+    <logger name="com.netease.mail.yanxuan.change.integration" additivity="false" level="${log.level}">
+        <appender-ref ref="rpc"/>
+        <appender-ref ref="stderr"/>
+    </logger>
+
+    <logger name="com.netease.mail.yanxuan.change" additivity="false" level="${log.level}">
+        <appender-ref ref="query"/>
+        <appender-ref ref="stderr"/>
+    </logger>
+
+    <!-- 日志输出级别 -->
+    <root level="${log.level}">
+        <appender-ref ref="stdout"/>
+        <appender-ref ref="stderr"/>
+    </root>
+</configuration>
--- a/yanxuan-qc-change-system-assembly/src/main/resources/config/regression/setenv.sh
+++ b/yanxuan-qc-change-system-assembly/src/main/resources/config/regression/setenv.sh
+jvm_opts_base="-cp . -ea -Xms4096m -Xmx4096m"
+jvm_opts_gc="-XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=15 -XX:InitiatingHeapOccupancyPercent=45 -XX:MaxTenuringThreshold=7 -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=368m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UnlockExperimentalVMOptions -XX:G1LogLevel=finest -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/home/logs/yanxuan-sc-ehc -XX:-OmitStackTraceInFastThrow -Xloggc:/home/logs/yanxuan-sc-ehc/gc-%t.log"
+jvm_opts_property="-Dspring.profiles.active=regression -Denv=regression -Dserver.port=8080"
+jvm_opts_ext="-javaagent:/home/caesar-agent/caesar-agent-router-1.0.0.jar -Dapp.id=yanxuan-qc-change-system"
+consul_service_tags=test
+consul_service_port=8080
+consul_health_url="/i/health"
+consul_service_name="yanxuan-qc-change-system"
--- a/yanxuan-qc-change-system-assembly/src/main/resources/config/test/setenv.sh
+++ b/yanxuan-qc-change-system-assembly/src/main/resources/config/test/setenv.sh
 jvm_opts_base="-cp . -ea -Xms4096m -Xmx4096m"
 jvm_opts_gc="-XX:+UseG1GC -XX:MaxGCPauseMillis=100 -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=15 -XX:InitiatingHeapOccupancyPercent=45 -XX:MaxTenuringThreshold=7 -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=368m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UnlockExperimentalVMOptions -XX:G1LogLevel=finest -XX:+PrintHeapAtGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/home/logs/yanxuan-sc-ehc -XX:-OmitStackTraceInFastThrow -Xloggc:/home/logs/yanxuan-sc-ehc/gc-%t.log"
 jvm_opts_property="-Dspring.profiles.active=test -Denv=test -Dserver.port=8080"
-jvm_opts_ext="-javaagent:/home/caesar-agent/caesar-agent-router-1.0.0.jar -Dapp.id=yanxuan-sc-ehc"
+jvm_opts_ext="-javaagent:/home/caesar-agent/caesar-agent-router-1.0.0.jar -Dapp.id=yanxuan-qc-change-system"
 consul_service_tags=test
 consul_service_port=8080
 consul_health_url="/i/health"
-consul_service_name="yanxuan-sc-ehc"
+consul_service_name="yanxuan-qc-change-system"
--- a/yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/supplier/FlowRpcSupplierSendService.java
+++ b/yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/supplier/FlowRpcSupplierSendService.java
@@ -45,12 +45,6 @@ public interface FlowRpcSupplierSendService {
    AjaxResult<List<SupplierSimpleRsp>> queryByConditionForQc(@RequestBody SupplierSearchRemoteReq req);

    /**
-     * 查询供应商+商品对应的跟进采购  ?有存疑参数不对
-     */
-    @PostMapping("/api/initiateProject/source/batchGetRelatedSupplier.json")
-    String batchGetRelatedSupplier(@RequestBody List<Integer> req);
-
-    /**
     * 跟进供应商ID 互殴去供应商的商品
     * @return
     */