测试，生产数据库配置修改

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

@@ -224,7 +224,7 @@ jeecg:
   #签名拦截接口
   signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys,/sys/sendChangePwdSms,/sys/user/sendChangePhoneSms,/sys/sms,/desform/api/sendVerifyCode
   # local\minio\alioss
-  uploadType: alioss
+  uploadType: minio
   # 前端访问地址
   domainUrl:
     pc: http://localhost:3100

jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml

@@ -1,12 +1,12 @@
 server:
-  port: 8080
+  port: 8081
   undertow:
     # 平替 tomcat server.tomcat.max-swallow-siz， undertow该值默认为-1
     #    max-http-post-size: 10MB
-    worker-threads: 16 # 4核CPU标准配置
-    buffers:
-      websocket: 8192 # WebSocket缓冲 以字节为单位，这里设置为8 KB
-      io: 16384 # IO操作缓冲 以字节为单位，这里设置为16 KB
+    threads:
+      io: 16 # 4核CPU标准配置
+      worker: 256
+    buffer-size: 8192 # 以字节为单位，这里设置为8 KB
   error:
     include-exception: true
     include-stacktrace: ALWAYS
@@ -28,7 +28,7 @@ spring:
   # flyway配置
   flyway:
     # 是否启用flyway
-    enabled: false
+    enabled: true
     # 编码格式，默认UTF-8
     encoding: UTF-8
     # 迁移sql脚本文件存放路径，官方默认db/migration
@@ -95,10 +95,10 @@ spring:
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
-  aop:
-    proxy-target-class: true
   jpa:
     open-in-view: false
+  aop:
+    proxy-target-class: true
   #配置freemarker
   freemarker:
     # 设置模板后缀名
@@ -148,7 +148,7 @@ spring:
         timeBetweenEvictionRunsMillis: 60000
         # 配置一个连接在池中最小生存的时间，单位是毫秒
         minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
+        validationQuery: SELECT 1
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -177,11 +177,12 @@ spring:
           #password: root
           #driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
-  redis:
-    database: 0
-    host: 192.168.1.188
-    port: 6379
-    password: ''
+  data:
+    redis:
+      database: 0
+      host: 127.0.0.1
+      port: 6379
+      password:
   # rabbit mq配置
   rabbitmq:
     host: rabbit-mq.v3.adwebcloud.com
@@ -190,7 +191,7 @@ spring:
     port: 5672
     publisher-confirm-type: correlated
     publisher-returns: true
-    virtual-host: /adweb3-test
+    virtual-host: /adweb3-dev
 #mybatis plus 设置
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml
@@ -198,13 +199,13 @@ mybatis-plus:
     # 关闭MP3.0自带的banner
     banner: false
     db-config:
-      #主键类型
+      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
       id-type: ASSIGN_ID
       # 默认数据库表下划线命名
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置
@@ -221,7 +222,7 @@ jeecg:
   signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
   #签名拦截接口
   signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys,/sys/sendChangePwdSms,/sys/user/sendChangePhoneSms,/sys/sms,/desform/api/sendVerifyCode
-  # local\minio\alioss
+  # 本地：local、Minio：minio、阿里云：alioss
   uploadType: local
   # 前端访问地址
   domainUrl:
@@ -229,29 +230,37 @@ jeecg:
     app: http://localhost:8051
   path:
     #文件上传根目录 设置
-    upload: D://opt//upFiles
+    upload: /opt/adweb3_test/upload
     #webapp文件路径
-    webapp: D://opt//webapp
+    webapp: /opt/adweb3_test/webapp
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??
     secretKey: ??
     endpoint: oss-cn-beijing.aliyuncs.com
     bucketName: jeecgdev
-    staticDomain: https://static.jeecg.com
-  # ElasticSearch 设置
+  # ElasticSearch 6设置
   elasticsearch:
     cluster-name: jeecg-ES
-    cluster-nodes: 192.168.1.188:9200
+    cluster-nodes: 127.0.0.1:9200
     check-enabled: false
   # 在线预览文件服务器地址配置
-  file-view-domain: http://127.0.0.1:8012
+  file-view-domain: http://fileview.jeecg.com
   # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com
     minio_name: ??
     minio_pass: ??
-    bucketName: ??
+    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+ 新增)
@@ -259,12 +268,12 @@ jeecg:
     # 平台上线安全配置(v1.6.2+ 新增)
     firewall:
       # 数据源安全 (开启后，不允许使用平台数据源、SQL解析加签并且不允许查询数据库)
-      dataSourceSafe: true
+      dataSourceSafe: false
       # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制）
-      lowCodeMode: prod
+      lowCodeMode: dev
   #xxl-job配置 - jeecg-boot-starter3-job
   xxljob:
-    enabled: true
+    enabled: false
     adminAddresses: http://localhost:8090/xxl-job-admin/
     appname: ${spring.application.name}
     accessToken: 4j9Z@FapJQKLuQtG
@@ -276,20 +285,36 @@ jeecg:
     ## XxlJobConfiguration.xxlJobExecutor暂不支持配置
     port: 9999
     logPath: logs/jeecg/job/jobhandler/
-    logRetentionDays: 30  #分布式锁配置
+    logRetentionDays: 30
+  #分布式锁配置
   redisson:
     address: 127.0.0.1:6379
     password:
     type: STANDALONE
     enabled: true
+  # ai-chat
+  ai-chat:
+    # 是否开启；必须。
+    enabled: true
+    # openAi接口秘钥，填写自己的apiKey；必须。
+    apiKey: sk-qiRbJ62llvdWtFPF74B4C398B0D049A4A5B001E9B1C18e4f
+    # openAi域名，有代理就填代理的域名。默认：openAI官方apiHost
+    apiHost: https://api.cinfohubs.buzz/
+    # 超时时间单位:s。默认 60s
+    timeout: 60
+
+  # 本地代理地址
+#    proxy:
+#      host: "http://127.0.0.1"
+#      port: "7890"
+#cas单点登录
+cas:
+  prefixUrl: http://cas.example.org:8443/cas
 #Mybatis输出sql日志
 logging:
   level:
     org.flywaydb: debug
-    org.jeecg.modules.system.mapper: info
-#cas单点登录
-cas:
-  prefixUrl: http://cas.example.org:8443/cas
+    org.jeecg.modules.system.mapper: debug
 #swagger
 knife4j:
   #开启增强配置
@@ -297,7 +322,7 @@ knife4j:
   #开启生产环境屏蔽
   production: false
   basic:
-    enable: true
+    enable: false
     username: jeecg
     password: jeecg1314
 #第三方登录
@@ -345,8 +370,107 @@ data-bridge:
   ga:
     account-id: 191734056
 
+##GEOIP MMDB 静态数据库文件
+geoip:
+  static:
+    city:
+      mmdb: /opt/adweb3/sharing/GeoLite2-City.mmdb
+
+# 机器人预警url
+robot:
+  enquiry-url: https://open.feishu.cn/open-apis/bot/v2/hook/042cf8d0-0072-435c-bf5c-656b9368a5ac  #询盘拉取失败通知
+  market-plan-missing-url: https://open.feishu.cn/open-apis/bot/v2/hook/4a7110ff-9121-49fc-b0b6-0d809b548ad4  #缺少营销方案导致的拉取站点失败
+  flow-abnormal-url: https://open.feishu.cn/open-apis/bot/v2/hook/81ec5829-ba64-43d7-9662-2054e80a4ebe  #流量异常通知
+  keyword-preOrSuffix-url: https://open.feishu.cn/open-apis/bot/v2/hook/325b4b0a-df54-4c7f-adaf-c5da61bb12b3  #关键词前后缀通知
+  localize-product-fail-url: https://open.feishu.cn/open-apis/bot/v2/hook/46e780fc-6ed9-45ec-b39f-1e332a236386 #产品图片本地化失败通知
+  gtm-url: https://open.feishu.cn/open-apis/bot/v2/hook/e29a515d-7331-428e-b890-5b5549ffcab5 #跟踪gtm通知
+
+#垃圾询盘判断规则
+judge_waste_enquiry:
+  email:
+    tenMinNum: 3 # 10分钟内最多发送3次
+    oneDayNum: 5 # 一天最多发送5封邮件
+    notBlackListNum: 3 #不在黑名单中的邮箱发送次数
+    notBlackListDate: 7 #不在邮箱黑名单中的垃圾询盘计数的天数
+  ip:
+    tenMinNum: 3 # 10分钟内最多发送次数 >
+    oneDayNum: 5 # 一天内最多发送次数 >
+    notBlackListNum: 3 #不在Ip黑名单中垃圾询盘计数次数 >
+    notBlackListDate: 7 #不在Ip黑名单中垃圾询盘计数的天数
+    delOrdIpDate: 90 #删除时效性低的Ip时间
+
 ### dataforseo
 dataforseo:
   username: advichdev@gmail.com
   password: 0845d3de83295cca
-  api-path: https://api.dataforseo.com
+  api-path: https://api.dataforseo.com
+
+### 询盘列表配置
+enquiry:
+  disable-admin-read: false
+  demoFlag: false
+  token: zQ3jJqtIexedIw6tZGk6p
+  pullCount: 5
+
+# 亚马逊翻译api
+aws:
+  translate:
+    accessKey: AKIAS37NJDKDETZ7PPEN
+    secretKey: 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
+
+### 自定义 start, TODO 改位置配置将要再数据库中配置
+###配置测试文件上传路径
+adcloud:
+  file:
+    rootpath: /home/jiangning/adweb2.1/static/
+  picture:
+    ###图片压缩程度
+    size: 0.8
+
+#物料收集打包临时存放路径
+admp:
+  #脚本
+  shell:
+    path: /home/jiangning/adweb2.1/shell/
+
+#跳板机配置
+jumpServer:
+  pulicIp: 52.11.145.237
+  privateIp: 10.10.54.109
+  username: ubuntu
+  pem: /home/jiangning/adweb2.1/static/jumpserver.pem
+#建站链接生产环境配置
+AdwebSiteProdConnect:
+  privateIp: 10.10.182.222
+
+#118机器信息
+usWest118Server:
+  ip: 44.227.32.118
+  username: centos
+  pem: D:/Advich/pem/197529246342-oregon.cer
+  port: 50002
+  shellpath: /usr/local/adweb-v2/shell
+
+#v2项目路径
+v2:
+  projectPath: /opt/adweb3/pem
+  seoReportPath: /seopdf/report/
+  domainUrl: https://cyan.feishu.adwebcloud.com
+  pdfExportServiceUrl: https://puppeteer.advichcloud.com:7020
+
+#建站链接测试环境配置
+AdwebSiteConnect:
+  host: 35.87.155.71
+  port: 22
+  username: ubuntu
+  password: adweb123@2024
+  tempDomain: adweb3.topxuetang.com
+  tempCname: devci2.adwebcloud.com
+
+serverIp:
+  new: 52.83.132.56
+  old: 52.83.52.93
+#pem文件上传公网地址前缀
+pemFileDownLoad:
+  prefix: https://v2.adwebcloud.com/keys/
+### 自定义 end TODO 改位置配置将要再数据库中配置