上传代码

2025-04-14 09:12:19 +08:00
parent a7317b1e8a
commit e572a04951
3 changed files with 129 additions and 19 deletions
--- a/pom.xml
+++ b/pom.xml
@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.chinaunicom.ebtp</groupId>
 		<artifactId>mall-ebtp-cloud-parent</artifactId>
-		<version>2.3.0-SNAPSHOT</version>
+		<version>2.4.1-zyhy-SNAPSHOT</version>
 	</parent>
 	<groupId>com.chinaunicom.mall.ebtp</groupId>
 	<artifactId>biz_service_ebtp_project</artifactId>
@ -18,7 +18,7 @@
 		<dependency>
 			<groupId>com.chinaunicom.mall.ebtp</groupId>
 			<artifactId>uboot-core</artifactId>
-			<version>2.3.0-SNAPSHOT</version>
+			<version>2.4.1-zyhy-SNAPSHOT</version>
 		</dependency>
 	</dependencies>

--- a/src/main/resources/application-master.yml
+++ b/src/main/resources/application-master.yml
@ -10,7 +10,7 @@ seata:
  registry:
    type: eureka
    eureka:
-      serviceUrl: http://eureka-1-svc:8080/eureka,http://eureka-2-svc:8080/eureka,http://eureka-3-svc:8080/eureka
+      serviceUrl: http://localhost:8080/eureka/

 # 对应 apollo 配置中心的应用名
 app:
@ -18,7 +18,7 @@ app:

 # Apollo 配置信息
 apollo:
-  meta: http://10.238.25.112:6001/
+  meta: http://localhost:8070
  bootstrap:
    namespace: application
    enabled: true
@ -39,10 +39,10 @@ spring:
      ds0:
        type: com.alibaba.druid.pool.DruidDataSource
        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&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
+        username: root
+        password: Unicom@2024
+        jdbc-url: jdbc:mysql://59.110.10.99:53306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+        url: jdbc:mysql://59.110.10.99:53306/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
@ -67,7 +67,7 @@ spring:
    serialization:
      write-dates-as-timestamps: false

-  # 天宫Kafka增加了安全认证，需要配置安全属性  
+  # 天宫Kafka增加了安全认证，需要配置安全属性
  kafka:
    bootstrap-servers: 10.172.48.110:32050,10.172.48.109:32050,10.172.48.111:32050
    template:
@ -81,7 +81,7 @@ spring:
        sasl.mechanism: SCRAM-SHA-256
        sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="eshop-kafka" password="Unicom#135";

-    # 消费者配置参数  
+    # 消费者配置参数
    consumer:
      group-id: core-service-ebtp-crypt-consumer
      auto-offset-reset: latest
@ -94,14 +94,14 @@ spring:
  redis:
    sentinel:
      master: eshop-redis2
-      nodes: 10.172.48.83:32521,10.172.48.100:32521,10.172.48.94:32561
+      nodes: localhost:6379
    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
+      defaultZone: http://localhost:8080/eureka/
  instance:
    prefer-ip-address: true
    instance-ip: ${spring.cloud.client.ip-address}:${server.port}
@ -165,7 +165,7 @@ mconfig:
  wfSectionNo: '080'
  wfSectionName: 标段重新评审审批单

-# 用户暴露给 prometheus 的健康数据  
+# 用户暴露给 prometheus 的健康数据
 management:
  endpoints:
    web:
@ -173,4 +173,4 @@ management:
        include: "*"
      cors:
        allowed-origins: "*"
-        allowed-methods: "*"
+        allowed-methods: "*"
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@ -7,11 +7,121 @@ apollo:
  bootstrap:
    enabled: true
    namespace: application
-#
-#spring:
-#  profiles:
-#    active: test
+
+spring:
+  profiles:
+    active: master

 jasypt:
  encryptor:
-    bean: stringEncryptor
+    bean: stringEncryptor
+
+client:
+  notification-url: 1
+  clientHttpUrl: 1
+
+check:
+  porject:
+    num-value: 1
+    name-value: 1
+    length: 1
+    checkBoolen: 1
+
+
+user:
+  auth:
+    resource:
+      serviceId:mall-auth: 1
+
+
+
+unifast:
+  sso:
+    getCode:
+      url: 1
+    redirectUrl: 1
+    clientId: 1
+    public-key: 1
+
+jury:
+  loginCheck:
+    privateKey: 1
+
+message:
+  privateKey: 1
+  callBackUrl: 1
+  appCode: 1
+  checkVerifycodeHttpUrl: 1
+  sendVerifycodeHttpUrl: 1
+
+oss:
+  bucketName: 1
+  accessKeySecret: 1
+  accessKeyId: 1
+  endpoint: 1
+
+KingSoftWps:
+  downloadUrl: 1
+  downloadUrl2: 1
+  publicKey: 1
+  privateKey: 1
+  host: 1
+  time_limit: 1
+  kswpsurl: 1
+  kswpsurl-preview: 1
+  tempDocFileId: 1
+
+
+
+mconfig:
+  rsa:
+    field:
+      pivate_key: 1
+  wps:
+    bss:
+      appTokenUrl: 1
+      previewUrl: 1
+      editUrl: 1
+    url:
+      appTokenUrl: 1
+      previewUrl: 1
+      downFileUrl: 1
+      editUrl: 1
+    bssAppId: 1
+    bssAppSecret: 1
+    bssAppUrl: 1
+    appid: 1
+    appKey: 1
+
+  bss:
+    app-url: 1
+    app-url-test: 1
+    app-secret: 1
+    app-id: 1
+  feign:
+    name:
+      usercenter: 1
+      tender: 1
+      rsms: 1
+      strategy-center: 1
+      resps: 1
+      project: 2
+      process: 1
+      notification: 1
+      documentcenter: 2
+  service-name-wfap: 1
+  service-price-usercenter: 1
+  service-price-query: 1
+  service-name-notification: 1
+  service-name-resu: 1
+  service-name-purp: 1
+  service-name-tender: 1
+  service-name-rsms: 1
+  service-name-resps: 1
+  service-name-proces: 1
+  service-name-open: 1
+  service-name-bid: 1
+  service-name-evaluation: 1
+  service-name-calibration: 1
+  service-name-auction: 1
+  service-name-archive: 1