Merge branch 'master' into sim

# Conflicts: # deployment-sim.yaml # src/main/resources/application-sim.yml
2021-05-26 08:37:42 +08:00
parent c6a8b1a12f 88d5ca2fc3
commit a507074ec0
28 changed files with 212 additions and 85 deletions
--- a/2
+++ b/2
@ -4,4 +4,4 @@ ENV LANG=zh_CN.utf8
 ENV LANGUAGE=zh_CN.utf8
 RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8
 ADD /target/biz_service_ebtp_project-0.0.1.jar /biz_service_ebtp_project-0.0.1.jar
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-javaagent:/skywalking/agent/skywalking-agent.jar", "-Dspring.profiles.active=test", "-jar", "/biz_service_ebtp_project-0.0.1.jar"]
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-javaagent:/skywalking/agent/skywalking-agent.jar", "-jar", "/biz_service_ebtp_project-0.0.1.jar"]
--- a/7
+++ b/7
@ -1,7 +0,0 @@
-FROM harbor.dcos.guangzhou.unicom.local/eshop/skywalking_agent_springboot_8.1.0:v1.0
-ENV LC_ALL=zh_CN.utf8
-ENV LANG=zh_CN.utf8
-ENV LANGUAGE=zh_CN.utf8
-RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8
-ADD /target/biz_service_ebtp_project-0.0.1.jar /biz_service_ebtp_project-0.0.1.jar
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=uat", "-jar", "/biz_service_ebtp_project-0.0.1.jar"]
--- a/0
+++ b/0
--- a/2
+++ b/2
@ -0,0 +1,2 @@
+FROM harbor.dcos.guangzhou.unicom.local/eshop/jdk8_springboot_agent:v1.6
+ADD target/biz_service_ebtp_project-0.0.1.jar /app.jar
--- a/7
+++ b/7
@ -0,0 +1,7 @@
+FROM harbor.dcos.guangzhou.unicom.local/eshop/jdk8_springboot_agent:v1.6
+ENV LC_ALL=zh_CN.utf8
+ENV LANG=zh_CN.utf8
+ENV LANGUAGE=zh_CN.utf8
+RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8
+ADD /target/biz_service_ebtp_project-0.0.1.jar /biz_service_ebtp_project-0.0.1.jar
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom","-javaagent:/skywalking/agent/skywalking-agent.jar", "-jar", "/biz_service_ebtp_project-0.0.1.jar"]
--- a/0
+++ b/0
--- a/0
+++ b/0
--- a/17
+++ b/17
@ -0,0 +1,17 @@
+apiVersion: v1
+clusters:
+- cluster:
+    insecure-skip-tls-verify: true
+    server: https://10.172.48.16:44039
+  name: demok8s
+contexts:
+- context:
+    cluster: demok8s
+    user: cluster-admin
+  name: default
+current-context: default
+kind: Config
+users:
+- name: cluster-admin
+  user:
+    token: 2c00232d4e3b1498008315e8ab14283c
--- a/0
+++ b/0
--- a/deployment-test.yaml
+++ b/deployment-test.yaml
@ -47,10 +47,16 @@ spec:
        # Apollo 配置中心变量设置
        - name: APOLLO_CONFIGSERVICE
          value: http://10.242.37.148:6001
+        - name: APP_NAME
+          value: biz_service_ebtp_project_dev
        - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
          value: skywalking-oap-cluster.skywalking:11800
        - name: SW_AGENT_NAME
          value: biz-service-ebtp-project
+        - name: MY_POD_IP #自动获取pod ip作为agent id
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
 ---
 kind: Service
 apiVersion: v1
--- a/deployment-master.yaml
+++ b/deployment-master.yaml
@ -41,7 +41,7 @@ spec:
      containers:         
      - name: biz-service-ebtp-project        #[6] 必选，容器名称，可填写微服务名称
        image: harbor.dcos.xixian.unicom.local/eshop/biz-service-ebtp-project:latest   #[7] 镜像名称，请把biz-service-ebtp-project替换为服务名称
-        args: ["java","-Djava.security.egd=file:/dev/./urandom", "-javaagent:/pinpoint/tianyan-springboot-agent/pinpoint-bootstrap-1.8.0.jar", "-Dpinpoint.agentId=$(MY_POD_IP)", "-Dpinpoint.applicationName=$(APP_NAME)", "-Dpinpoint.licence=$(AGENT_LICENCE_DEV)", "-Dspring.profiles.active=pro", "-jar", "/app.jar"]
+        args: ["java","-Djava.security.egd=file:/dev/./urandom", "-javaagent:/pinpoint/tianyan-springboot-agent/pinpoint-bootstrap-1.8.0.jar", "-Dpinpoint.agentId=$(MY_POD_IP)", "-Dpinpoint.applicationName=$(APP_NAME)", "-Dpinpoint.licence=$(AGENT_LICENCE_DEV)", "-jar", "/app.jar"]
        volumeMounts:
          - name: log
            mountPath: /log
@ -75,7 +75,7 @@ spec:
            memory: 6Gi
        env:
        - name: APP_NAME
-          value: biz_ebtp_project
+          value: biz_service_ebtp_project_master
        - name: AGENT_LICENCE
          value: 527BFA7B28577578
        - name: APOLLO_CONFIGSERVICE
--- a/deployment-sim.yaml
+++ b/deployment-sim.yaml
@ -41,7 +41,7 @@ spec:
      containers:         
      - name: biz-service-ebtp-project        #[6] 必选，容器名称，可填写微服务名称
        image: harbor.dcos.guangzhou.unicom.local/eshop/biz-service-ebtp-project:latest   #[7] 镜像名称，请把biz-service-ebtp-project替换为服务名称
-        args: ["java","-Djava.security.egd=file:/dev/./urandom", "-javaagent:/pinpoint/tianyan-springboot-agent/pinpoint-bootstrap-1.8.0.jar", "-Dpinpoint.agentId=$(MY_POD_IP)", "-Dpinpoint.applicationName=$(APP_NAME)", "-Dpinpoint.licence=$(AGENT_LICENCE_DEV)", "-Dspring.profiles.active=sim", "-jar", "/app.jar"]
+        args: ["java","-Djava.security.egd=file:/dev/./urandom", "-javaagent:/pinpoint/tianyan-springboot-agent/pinpoint-bootstrap-1.8.0.jar", "-Dpinpoint.agentId=$(MY_POD_IP)", "-Dpinpoint.applicationName=$(APP_NAME)", "-Dpinpoint.licence=$(AGENT_LICENCE_DEV)", "-jar", "/app.jar"]
        volumeMounts:
          - name: log
            mountPath: /log
@ -75,7 +75,7 @@ spec:
            memory: 6Gi
        env:
        - name: APP_NAME
-          value: biz_ebtp_project
+          value: biz_ebtp_project_sim
        - name: AGENT_LICENCE
          value: 527BFA7B28577578
        - name: APOLLO_CONFIGSERVICE
--- a/deployment-uat.yaml
+++ b/deployment-uat.yaml
@ -53,15 +53,31 @@ spec:
        # 需要暴露的端口库号列表
        ports:
        - containerPort: 18012
+        resources:
+          requests:
+            cpu: 2000m
+            memory: 4Gi
+          limits:
+            cpu: 4000m
+            memory: 8Gi
        # 容器运行前需设置的环境变量列表
        env:
        # Apollo 配置中心变量设置
        - name: APOLLO_CONFIGSERVICE
          value: http://apollo-configservice:8080
+        - name: APP_NAME
+          value: biz_service_ebtp_project_uat
        - name: MY_POD_IP #自动获取pod ip作为agent id
          valueFrom:
            fieldRef:
              fieldPath: status.podIP
+        - name: JAVA_TOOL_OPTIONS
+          value: -XX:+UnlockExperimentalVMOptions
+            -XX:+UseContainerSupport
+            -XX:+UseCGroupMemoryLimitForHeap
+            -XX:InitialRAMPercentage=40.0
+            -XX:MinRAMPercentage=20.0
+            -XX:MaxRAMPercentage=80.0
 ---
 kind: Service
 apiVersion: v1
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java
@ -1,6 +1,7 @@
 package com.chinaunicom.mall.ebtp.project;

 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
+import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
 import io.micrometer.core.instrument.MeterRegistry;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Value;
@ -19,6 +20,7 @@ import org.springframework.context.annotation.ComponentScan;
 })
@EnableFeignClients
@EnableEurekaClient
+@EnableApolloConfig
@MapperScan({"com.chinaunicom.mall.ebtp.project.**.dao"})
@ComponentScan("com.chinaunicom.mall.ebtp.*")
 public class BizServiceEbtpProjectApplication {
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
@ -235,7 +235,6 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
    }

    @Override
-    @Transactional(rollbackFor = Exception.class)
    @GlobalTransactional
    public boolean submitProject(String id){

--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java
@ -393,4 +393,16 @@ public class ProjectSectionController{
 		return BaseResponse.success(projectSectionService.getMaxBusinessModule(projectId));
 	}

+	/**
+	 * 提供报表查询标段接口（西延专用）
+	 * @param sectionIds 标段ID集合
+	 * @return 返回结果
+	 */
+	@ApiOperation("提供报表查询标段接口（西延专用）")
+	@PostMapping("/selectListByChart")
+	public BaseResponse<List<ProjectSectionVO>> selectListByChart(@ApiParam(value = "主键id集合", required = true) @RequestBody List<String> sectionIds){
+
+		return BaseResponse.success(projectSectionService.selectListByChart(sectionIds));
+	}
+	
 }
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/ProjectSectionMapper.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/ProjectSectionMapper.java
@ -66,4 +66,11 @@ public interface ProjectSectionMapper extends IBaseMapper<ProjectSection> {
     * @return 返回结果
     */
    List<ProjectSectionVO> selectArchiveById(@Param(value = "section") ProjectSectionVO projectSection);
+
+    /**
+     * 查询统计标段信息直接回显字典值
+     * @param sectionIds 标段ID集合
+     * @return 返回结果
+     */
+    List<ProjectSectionVO> selectListByChart(@Param(value = "sectionIds") List<String> sectionIds);
 }
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/dao/mapper/ProjectSectionMapper.xml
@ -31,7 +31,6 @@
            <result column="eval_method_dict"  jdbcType="VARCHAR" property="evalMethodDict"/>
            <result column="procurement_type_dict"  jdbcType="VARCHAR" property="procurementTypeDict"/>
            <result column="miit_section_id"  jdbcType="VARCHAR" property="miitSectionId"/>
-            <result column="bid_evaluation_method"  jdbcType="DECIMAL"  property="bidEvaluationMethod"/>
            <result column="monetary_unit"  jdbcType="VARCHAR" property="monetaryUnit"/>
            <result column="remarks"  jdbcType="VARCHAR" property="remarks"/>
            <result column="parent_section_id"  jdbcType="VARCHAR" property="parentSectionId"/>
@ -76,7 +75,6 @@
        <result column="eval_method_dict"  jdbcType="VARCHAR" property="evalMethodDict"/>
        <result column="procurement_type_dict"  jdbcType="VARCHAR" property="procurementTypeDict"/>
        <result column="miit_section_id"  jdbcType="VARCHAR" property="miitSectionId"/>
-        <result column="bid_evaluation_method"  jdbcType="DECIMAL"  property="bidEvaluationMethod"/>
        <result column="monetary_unit"  jdbcType="VARCHAR" property="monetaryUnit"/>
        <result column="remarks"  jdbcType="VARCHAR" property="remarks"/>
        <result column="parent_section_id"  jdbcType="VARCHAR" property="parentSectionId"/>
@ -192,4 +190,24 @@
        </where>
    </select>

+    <select id="selectListByChart"
+            resultType="com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSectionVO">
+        select t.*,
+        p.project_name,
+        p.bid_method_dict,
+        p.tenderee_org_name,
+        d.provinces_remark as province
+        from biz_project_section t
+        left join biz_project_record p on t.project_id = p.id
+        left join dict_provinces_code d on d.provinces_number = p.province
+        <where>
+            <if test="null != sectionIds and sectionIds.size() > 0 " >
+                and t.id in
+                <foreach item="item" index="index" collection="sectionIds" open="(" separator="," close=" )">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
 </mapper>
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/entity/ProjectSectionVO.java
@ -104,4 +104,16 @@ public class ProjectSectionVO extends ProjectSection implements Serializable {

    @ApiModelProperty(value = "当前环节数")
    private Integer currentLink;
+
+    @ApiModelProperty(value = "所属机构")
+    private String tendereeOrgName;
+
+    @ApiModelProperty(value = "所属省份名称")
+    private String province;
+
+    @ApiModelProperty(value = "当前环节字典回显")
+    private String businessModuleValue;
+
+    @ApiModelProperty(value = "采购方式字典回显")
+    private String bidMethodDictValue;
 }
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/IProjectSectionService.java
@ -201,4 +201,11 @@ public interface IProjectSectionService extends IBaseService<ProjectSection>{
     * @return 返回业务流程
     */
    Integer getMaxBusinessModule(String projectId);
+
+    /**
+     * 提供报表查询标段接口（西延专用）
+     * @param sectionIds 标段ID集合
+     * @return 返回结果
+     */
+    List<ProjectSectionVO> selectListByChart(List<String> sectionIds);
 }
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java
@ -14,6 +14,8 @@ import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
 import com.chinaunicom.mall.ebtp.project.common.ProjectCommonUtil;
 import com.chinaunicom.mall.ebtp.project.common.ProjectExceptionEnum;
+import com.chinaunicom.mall.ebtp.project.dict.entity.DictProject;
+import com.chinaunicom.mall.ebtp.project.dict.service.IDictProjectService;
 import com.chinaunicom.mall.ebtp.project.dictchooseprocess.entity.DictChooseProcess;
 import com.chinaunicom.mall.ebtp.project.dictchooseprocess.service.IDictChooseProcessService;
 import com.chinaunicom.mall.ebtp.project.feign.EbtpArchiveApi;
@ -81,6 +83,9 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
    @Resource
    private EbtpTenderApi tenderApi;

+    @Resource
+    private IDictProjectService dictProjectService;
+
    /**
     * 默认轮次
     */
@ -554,6 +559,21 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
        return maxBusinessModule;
    }

+    @Override
+    public List<ProjectSectionVO> selectListByChart(List<String> sectionIds) {
+
+        List<DictProject> dictProjectList = dictProjectService.list();
+        Map<String,DictProject> dictMap = dictProjectList.stream().collect(Collectors.toMap(key -> key.getParentType()+"_"+key.getCode(),dict -> dict));
+
+        List<ProjectSectionVO> sectionVOList = projectSectionMapper.selectListByChart(sectionIds);
+        sectionVOList.forEach(n -> {
+            n.setBusinessModuleValue(dictMap.get("business_module="+n.getBidMethodDict()+"_"+n.getBusinessModule()).getDicName());
+            n.setBidMethodDictValue(dictMap.get("procurement_mode=entrust"+"_"+n.getBidMethodDict()).getDicName());
+        });
+
+        return sectionVOList;
+    }
+
    /**
     * 拼装标段模块修改流程实体并插入数据
     * @param sectionId 标段ID
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@ -39,8 +39,8 @@ spring:
        driver-class-name: com.mysql.cj.jdbc.Driver
        username: mall
        password: unicom
-        jdbc-url: jdbc:mysql://10.125.160.26:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-        url: jdbc:mysql://10.125.160.26:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+        jdbc-url: jdbc:mysql://10.125.160.26:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+        url: jdbc:mysql://10.125.160.26:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
        filters: stat,wall,log4j
        maxActive: 20
        initialSize: 1
@ -175,4 +175,3 @@ management:
      cors:
        allowed-origins: "*"
        allowed-methods: "*"
-      
--- a/src/main/resources/application-local.yml
+++ b/src/main/resources/application-local.yml
@ -39,8 +39,8 @@ spring:
        driver-class-name: com.mysql.cj.jdbc.Driver
        username: mall
        password: unicom
-        jdbc-url: jdbc:mysql://10.125.160.26:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-        url: jdbc:mysql://10.125.160.26:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+        jdbc-url: jdbc:mysql://10.125.160.26:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+        url: jdbc:mysql://10.125.160.26:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
        filters: stat,wall,log4j
        maxActive: 20
        initialSize: 1
@ -112,7 +112,7 @@ mybatis-plus:
    map-underscore-to-camel-case: true
    auto-mapping-behavior: full
    # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
  mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml
  global-config:
    # 逻辑删除配置
--- a/src/main/resources/application-master.yml
+++ b/src/main/resources/application-master.yml
@ -41,8 +41,8 @@ spring:
        driver-class-name: com.mysql.cj.jdbc.Driver
        username: profilb
        password: ProdMall3_0118profilb
-        jdbc-url: jdbc:mysql://10.168.9.36:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-        url: jdbc:mysql://10.168.9.36:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+        jdbc-url: jdbc:mysql://10.168.9.36:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+        url: jdbc:mysql://10.168.9.36:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
        filters: stat,wall,log4j
        maxActive: 20
        initialSize: 1
--- a/src/main/resources/application-sim.yml
+++ b/src/main/resources/application-sim.yml
@ -41,8 +41,8 @@ spring:
        driver-class-name: com.mysql.cj.jdbc.Driver
        username: mall
        password: unicom
-        jdbc-url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-        url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+        jdbc-url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+        url: jdbc:mysql://10.125.160.37:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
        filters: stat,wall,log4j
        maxActive: 20
        initialSize: 1
--- a/src/main/resources/application-uat.yml
+++ b/src/main/resources/application-uat.yml
@ -41,8 +41,8 @@ spring:
        driver-class-name: com.mysql.cj.jdbc.Driver
        username: mall
        password: unicom
-        jdbc-url: jdbc:mysql://10.125.160.30:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-        url: jdbc:mysql://10.125.160.30:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+        jdbc-url: jdbc:mysql://10.125.160.30:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+        url: jdbc:mysql://10.125.160.30:3306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
        filters: stat,wall,log4j
        maxActive: 20
        initialSize: 1
@ -175,4 +175,3 @@ management:
      cors:
        allowed-origins: "*"
        allowed-methods: "*"
-      
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@ -1,3 +1,14 @@
-spring:
-  profiles:
-    active: uat
+# 对应 apollo 配置中心的应用名
+app:
+  id: biz-service-ebtp-project
+
+# Apollo 配置信息
+apollo:
+  bootstrap:
+    enabled: true
+    namespace: application
+#
+#spring:
+#  profiles:
+#    active: test
+
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@ -2,7 +2,7 @@
 <configuration scan="true" scanPeriod="60 seconds" debug="true">

    <property name="logback.logdir" value="/log" />
-    <property name="logback.appname" value="biz_service_ebtp_project" />
+    <property name="logback.appname" value="${APP_NAME}" />

    <contextName>${logback.appname}</contextName>