Procházet zdrojové kódy

Merge remote-tracking branch 'origin/master'

zq940222 před 5 dny
rodič
revize
4f183a05e9

+ 13 - 3
jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -166,9 +166,10 @@ spring:
           slow-sql-millis: 5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/adweb3?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          username: root
-          password: Initial0
+          # TODO: 待切换生产RDS
+          url: jdbc:mysql://127.0.0.1:3306/adweb3_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: adweb3_dev
+          password: Advich@2024,.
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -253,6 +254,15 @@ jeecg:
     minio_name: ??
     minio_pass: ??
     bucketName: otatest
+    dataPrefix: https://cutomer-static-bucket.s3.cn-northwest-1.amazonaws.com.cn/
+  minio_us:
+    minio_url: s3.amazonaws.com
+    minio_name: AKIA4NOAZAWYOT6RAF2F
+    minio_pass: IShWegPpmE3K0P1xbBv/qNJoWlPZMGxgueqyimcz
+    minio_region: us-east-1
+    bucketName: sync-adwebcloud-bucket
+    dataPrefix: https://data.adwebcloud.com/
+    originDataPrefix: https://advich-wordpress-static-resources.s3.us-west-2.amazonaws.com/
   #大屏报表参数设置
   jmreport:
     #多租户模式,默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增)