Merge branch 'refs/heads/master' into herb

baoshiwei

2024-12-11 7c585586e9bea943161676bd9d127e81123891c3

 jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml

old mode 100644
new mode 100755
@@ -12,7 +12,7 @@
db:
  num: 1
  password:
    '0': ${MYSQL-PWD:123456}
    '0': ${MYSQL-PWD:root}
  url:
    '0': jdbc:mysql://${MYSQL-HOST:localhost}:${MYSQL-PORT:3306}/${MYSQL-DB:nacos-herb}?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
  user: