diff --git a/Dockerfile-gz b/Dockerfile-dev similarity index 57% rename from Dockerfile-gz rename to Dockerfile-dev index cb28f47..7267f32 100644 --- a/Dockerfile-gz +++ b/Dockerfile-dev @@ -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=uat", "-jar", "/biz_service_ebtp_project-0.0.1.jar"] \ No newline at end of file +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"] diff --git a/Dockerfile-pro b/Dockerfile-master similarity index 100% rename from Dockerfile-pro rename to Dockerfile-master diff --git a/Dockerfile-sim b/Dockerfile-sim new file mode 100644 index 0000000..c0f9f42 --- /dev/null +++ b/Dockerfile-sim @@ -0,0 +1,2 @@ +FROM harbor.dcos.xixian.unicom.local/eshop/jdk8_springboot_agent:v1.6 +ADD target/biz_service_ebtp_project-0.0.1.jar /app.jar \ No newline at end of file diff --git a/Dockerfile-test b/Dockerfile-test index 7267f32..cb28f47 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -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", "-Dspring.profiles.active=uat", "-jar", "/biz_service_ebtp_project-0.0.1.jar"] \ No newline at end of file diff --git a/config-test b/config-dev similarity index 100% rename from config-test rename to config-dev diff --git a/config-pro b/config-master similarity index 100% rename from config-pro rename to config-master diff --git a/config-sim b/config-sim new file mode 100644 index 0000000..cfa151b --- /dev/null +++ b/config-sim @@ -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 diff --git a/config-gz b/config-uat similarity index 100% rename from config-gz rename to config-uat diff --git a/deployment-test.yaml b/deployment-dev.yaml similarity index 91% rename from deployment-test.yaml rename to deployment-dev.yaml index 1babf28..0a59cf4 100644 --- a/deployment-test.yaml +++ b/deployment-dev.yaml @@ -48,11 +48,15 @@ spec: - name: APOLLO_CONFIGSERVICE value: http://10.242.37.148:6001 - name: APP_NAME - value: biz_service_ebtp_project_test + 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 + valueFrom: + fieldRef: + fieldPath: status.podIP --- kind: Service apiVersion: v1 diff --git a/pro.yaml b/deployment-master.yaml similarity index 97% rename from pro.yaml rename to deployment-master.yaml index 882e606..6a5ec81 100644 --- a/pro.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_service_ebtp_project_pro + value: biz_service_ebtp_project_master - name: AGENT_LICENCE value: 527BFA7B28577578 - name: APOLLO_CONFIGSERVICE diff --git a/deployment-sim.yaml b/deployment-sim.yaml new file mode 100644 index 0000000..7ae3b0f --- /dev/null +++ b/deployment-sim.yaml @@ -0,0 +1,114 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: biz-service-ebtp-project #[1] Deployment名称，可填写微服务名称 + namespace: default + labels: + app: biz-service-ebtp-project + +spec: + replicas: 3 + strategy: + rollingUpdate: + maxSurge: 1 + maxUnavailable: 1 + selector: + matchLabels: + app: biz-service-ebtp-project #[2] 选择器匹配时标签名称，可填写微服务名称 + template: + metadata: + labels: + app: biz-service-ebtp-project #[3] 模板名称，可填写微服务名称 + annotations: + prometheus.io/port: '18012' + prometheus.io/jl-pod: 'true' + spec: + volumes: + - name: log + persistentVolumeClaim: + claimName: log-pvc + readOnly: false + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app + operator: In + values: + - biz-service-ebtp-project + topologyKey: "kubernetes.io/hostname" + 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)", "-jar", "/app.jar"] + volumeMounts: + - name: log + mountPath: /log + ports: + - containerPort: 18012 #[8] 容器需要监听的端口号，与配置文件中的server.port参数相同，与参数[4]相同 +# livenessProbe: +# failureThreshold: 3 +# httpGet: +# port: 18012 #[11] pod存活检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同 +# path: /actuator/prometheus +# scheme: HTTP +# initialDelaySeconds: 300 +# periodSeconds: 60 +# successThreshold: 1 +# timeoutSeconds: 2 +# readinessProbe: +# failureThreshold: 1 +# httpGet: +# port: 18012 #[12] pod就绪检测端口,修改为该微服务配置文件中server.port的端口号,与参数[5]相同 +# path: /actuator/prometheus +# scheme: HTTP +# periodSeconds: 5 +# successThreshold: 2 +# timeoutSeconds: 2 + resources: + requests: + cpu: 1000m + memory: 2Gi + limits: + cpu: 3000m + memory: 6Gi + env: + - name: APP_NAME + value: biz_ebtp_project + - name: AGENT_LICENCE + value: 527BFA7B28577578 + - name: APOLLO_CONFIGSERVICE + value: http://apollo-configservice:8080 + - name: MY_POD_IP + 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 +metadata: + name: biz-service-ebtp-project-svc # [11] service的名字，格式为“服务名-svc” + namespace: default + labels: + service: biz-service-ebtp-project-svc # [12] service的标签，可与参数[11]相同 + annotations: + prometheus.io/port: '18012' #[13] prometheus自动发现service的端口，也是该微服务所使用的端口，与参数[4]相同 + prometheus.io/jl-svc: 'true' + +spec: + ports: + - port: 18012 #[15] 与参数4相同 + targetPort: 18012 #[16] 与参数4相同 + selector: + app: biz-service-ebtp-project #[17] 该service对应Deployment的名字，与参数[1]相同 +--- \ No newline at end of file diff --git a/deployment-gz.yaml b/deployment-uat.yaml similarity index 100% rename from deployment-gz.yaml rename to deployment-uat.yaml diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java b/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java index 53396ca..d37cccf 100644 --- 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 { diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-dev.yml similarity index 82% rename from src/main/resources/application-test.yml rename to src/main/resources/application-dev.yml index 8bcf108..13d4a4e 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-dev.yml @@ -2,18 +2,11 @@ server: port: 18012 servlet: context-path: / - -seata: - service: - vgroup-mapping: - biz-service-ebtp-project-service-group: default - grouplist: - default: 10.242.37.148:18035 - + # 对应 apollo 配置中心的应用名 app: - id: biz-service-ebtp-project - + id: biz-service-ebtp-project-dev + # Apollo 配置信息 apollo: meta: http://10.242.37.148:6001/ @@ -22,15 +15,22 @@ apollo: enabled: true eagerLoad: enabled: true - + +seata: + service: + vgroup-mapping: + biz-service-ebtp-project-dev-service-group: default + grouplist: + default: 10.242.37.148:18035 + spring: aop: auto: true #开启spring的aop配置 proxy-target-class: true - + application: - name: biz-service-ebtp-project - + name: biz-service-ebtp-project-dev + shardingsphere: datasource: names: ds0 @@ -64,22 +64,22 @@ spring: time-zone: GMT+8 serialization: write-dates-as-timestamps: false - - # 天宫Kafka增加了安全认证，需要配置安全属性 + + # 天宫Kafka增加了安全认证，需要配置安全属性 kafka: bootstrap-servers: 10.125.164.192:32005,10.125.164.193:32005,10.125.164.194:32005 template: default-topic: jl_test - + # 生产者配置参数 producer: client-id: core-service-ebtp-crypt - properties: + properties: security.protocol: SASL_PLAINTEXT sasl.mechanism: SCRAM-SHA-256 sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="jltest" password="Unicom#123"; - - # 消费者配置参数 + + # 消费者配置参数 consumer: group-id: core-service-ebtp-crypt-consumer auto-offset-reset: latest @@ -87,7 +87,7 @@ spring: security.protocol: SASL_PLAINTEXT sasl.mechanism: SCRAM-SHA-256 sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="jltest" password="Unicom#123"; - + # 天宫 redis 需要使用哨兵进行访问 redis: sentinel: @@ -99,20 +99,20 @@ spring: eureka: client: service-url: - defaultZone: http://eureka-1-svc:8080/eureka, http://eureka-2-svc:8080/eureka, http://eureka-3-svc:8080/eureka + defaultZone: http://10.242.37.148:5001/eureka instance: prefer-ip-address: true - instance-id: http://10.242.37.148:${server.port} - # 这是客户端的注册地址， eureka 会通过这个地址建立管道 - ip-address: 10.242.37.148 - + ip-address: 125.32.114.204 + hostname: 125.32.114.204 + instance-ip: 125.32.114.204:${server.port} + mybatis-plus: configuration: # 是否开启自动驼峰命名规则映射:从数据库列名到Java属性驼峰命名的类似映射 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: # 逻辑删除配置 @@ -121,7 +121,7 @@ mybatis-plus: logic-not-delete-value: normal # 逻辑删除标记：正常数据 logic-delete-value: deleted # 逻辑删除标记：已删除的数据 type-aliases-package: com.chinaunicom.mall.ebtp.project - + hystrix: command: default: @@ -135,13 +135,13 @@ hystrix: circuitBreaker: sleepWindowInMilliseconds: 20000 forceClosed: true - + ribbon: ReadTimeout: 20000 #请求处理的超时时间 ConnectTimeout: 20000 #请求连接超时时间 MaxAutoRetries: 0 #对当前实例的重试次数 MaxAutoRetriesNextServer: 1 #切换实例的重试次数 1 - + mconfig: swagger-ui-open: true exception-handle-enabled: true @@ -152,21 +152,21 @@ mconfig: service-name-purp: mall-purp #采购系统委托项目微服务 service-name-wfap: mall-wfap #重新评审 流程微服务 service-name-resu: mall-resu #重新评审 项目中心查询服务 - service-price-query: biz-service-price-query #商城询价服务 + service-price-query : biz-service-price-query #商城询价服务 service-price-usercenter: core-service-usercenter-public #用户中心服务 #内部服务 service-name-archive: biz-service-ebtp-archive #归档服务 service-name-auction: biz-service-ebtp-auction #竞拍服务API service-name-calibration: biz-service-ebtp-calibration #标段定标接口 - service-name-bid: biz-service-ebtp-bid #标段出始化流程 - service-name-process: biz-service-ebtp-process #标段出始化流程 - service-name-resps: biz-service-ebtp-resps #标段应答文件 - service-name-rsms: biz-service-ebtp-rsms #评审微服务 - service-name-tender: biz-service-ebtp-tender #标段投标微服务 + service-name-bid: biz-service-ebtp-bid #标段出始化流程 + service-name-process: biz-service-ebtp-process #标段出始化流程 + service-name-resps : biz-service-ebtp-resps #标段应答文件 + service-name-rsms : biz-service-ebtp-rsms #评审微服务 + service-name-tender : biz-service-ebtp-tender #标段投标微服务 wfSectionNo: '080' wfSectionName: 标段重新评审审批单 - -# 用户暴露给 prometheus 的健康数据 + +# 用户暴露给 prometheus 的健康数据 management: endpoints: web: @@ -175,4 +175,3 @@ management: cors: allowed-origins: "*" allowed-methods: "*" - \ No newline at end of file diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-master.yml similarity index 100% rename from src/main/resources/application-pro.yml rename to src/main/resources/application-master.yml diff --git a/src/main/resources/application-sim.yml b/src/main/resources/application-sim.yml new file mode 100644 index 0000000..6925480 --- /dev/null +++ b/src/main/resources/application-sim.yml @@ -0,0 +1,176 @@ +server: + port: 18012 + servlet: + context-path: / + +seata: + service: + vgroup-mapping: + biz-service-ebtp-project-service-group: seata-server-jl + registry: + type: eureka + eureka: + serviceUrl: http://eureka-1-svc:8080/eureka,http://eureka-2-svc:8080/eureka,http://eureka-3-svc:8080/eureka + +# 对应 apollo 配置中心的应用名 +app: + id: biz-service-ebtp-project + +# Apollo 配置信息 +apollo: + meta: http://10.242.31.54:6001 + bootstrap: + namespace: application + enabled: true + eagerLoad: + enabled: true + +spring: + aop: + auto: true #开启spring的aop配置 + proxy-target-class: true + + application: + name: biz-service-ebtp-project + + shardingsphere: + datasource: + names: ds0 + ds0: + type: com.alibaba.druid.pool.DruidDataSource + 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 + filters: stat,wall,log4j + maxActive: 20 + initialSize: 1 + maxWait: 60000 + minIdle: 1 + timeBetweenEvictionRunsMillis: 60000 + minEvictableIdleTimeMillis: 300000 + validationQuery: select 'x' + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + poolPreparedStatements: true + maxOpenPreparedStatements: 20 + connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000 + props: + sql: + show: false + + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + serialization: + write-dates-as-timestamps: false + + # 天宫Kafka增加了安全认证，需要配置安全属性 + kafka: + bootstrap-servers: 10.125.164.24:32002,10.125.164.192:32096,10.125.164.89:32002 + template: + default-topic: jl_eshop + + # 生产者配置参数 + producer: + client-id: core-service-ebtp-crypt + properties: + security.protocol: SASL_PLAINTEXT + sasl.mechanism: SCRAM-SHA-256 + sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="eshop-kafka-sim" password="Unicom#135"; + + # 消费者配置参数 + consumer: + group-id: core-service-ebtp-crypt-consumer + auto-offset-reset: latest + properties: + security.protocol: SASL_PLAINTEXT + sasl.mechanism: SCRAM-SHA-256 + sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="eshop-kafka-sim" password="Unicom#135"; + + # 生产区 redis 配置 + redis: + sentinel: + master: eshop-redis-sim + nodes: 10.125.164.24:32510,10.125.164.90:32515,10.125.164.89:32516 + password: Unicom#135 + +# 天宫Eureka配置 +eureka: + client: + service-url: + defaultZone: http://eureka-1-svc:8080/eureka,http://eureka-2-svc:8080/eureka,http://eureka-3-svc:8080/eureka + instance: + prefer-ip-address: true + instance-ip: ${spring.cloud.client.ip-address}:${server.port} + +mybatis-plus: + configuration: + # 是否开启自动驼峰命名规则映射:从数据库列名到Java属性驼峰命名的类似映射 + map-underscore-to-camel-case: true + auto-mapping-behavior: full + # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 + #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml + global-config: + # 逻辑删除配置 + db-config: + logic-not-delete-value: normal # 逻辑删除标记：正常数据 + logic-delete-value: deleted # 逻辑删除标记：已删除的数据 + type-aliases-package: com.chinaunicom.mall.ebtp.project + +hystrix: + command: + default: + execution: + timeout: + enabled: true + isolation: + strategy: SEMAPHORE + thread: + timeoutInMilliseconds: 200000 #熔断超时时间 + circuitBreaker: + sleepWindowInMilliseconds: 20000 + forceClosed: true + +ribbon: + ReadTimeout: 20000 #请求处理的超时时间 + ConnectTimeout: 20000 #请求连接超时时间 + MaxAutoRetries: 0 #对当前实例的重试次数 + MaxAutoRetriesNextServer: 1 #切换实例的重试次数 1 + +mconfig: + swagger-ui-open: true + exception-handle-enabled: true + seata-open-enabled: false + work-id: 1 #终端ID + datacenter-id: 1 #数据中心ID + host-name: http://10.242.31.54/ + service-name-purp: mall-purp #采购系统委托项目微服务 + service-name-wfap: mall-wfap #重新评审 流程微服务 + service-name-resu: mall-resu #重新评审 项目中心查询服务 + service-price-query: biz-service-price-query #商城询价服务 + service-price-usercenter: core-service-usercenter-public #用户中心服务 + #内部服务 + service-name-archive: biz-service-ebtp-archive #归档服务 + service-name-auction: biz-service-ebtp-auction #竞拍服务API + service-name-calibration: biz-service-ebtp-calibration #标段定标接口 + service-name-bid: biz-service-ebtp-bid #标段出始化流程 + service-name-process: biz-service-ebtp-process #标段出始化流程 + service-name-resps: biz-service-ebtp-resps #标段应答文件 + service-name-rsms: biz-service-ebtp-rsms #评审微服务 + service-name-tender: biz-service-ebtp-tender #标段投标微服务 + wfSectionNo: '080' + wfSectionName: 标段重新评审审批单 + +# 用户暴露给 prometheus 的健康数据 +management: + endpoints: + web: + exposure: + include: "*" + cors: + allowed-origins: "*" + allowed-methods: "*" \ No newline at end of file diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml index dd75844..0d25893 100644 --- 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&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 + 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 filters: stat,wall,log4j maxActive: 20 initialSize: 1 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f2b90d5..5a66e07 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,14 @@ -spring: - profiles: - active: uat \ No newline at end of file +# 对应 apollo 配置中心的应用名 +app: + id: biz-service-ebtp-bid + +# Apollo 配置信息 +apollo: + bootstrap: + enabled: true + namespace: application +# +#spring: +# profiles: +# active: test +