diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4b115a47e..da47387a7 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,60 +1,151 @@
-http.port=12351
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/wisdomsite_zjwj?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
-spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
-spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V)
-server.port=42342
-basePath=C:/zhgd/service/zjwj/itbgpImage/
-server.tomcat.basedir=C:/zhgd/service/zjwj/itbgpImage/
-arcsoft.dllPath=C:/zhgd/dll
-security.enable=false
-isGetStandardData=false
-isGetEnvironmentData=false
-isGetFaceFeatureDate=false
-#海康视频报警图片ip端口替换
-video.alarm.newUrl=223.82.100.80:6040
-wx-appid=
-wx-AppSecret=
-mqtt-scope=zjsjTopic
-serverUrl=http://124.71.67.160:8088/
-#视频分析url
-video-analysis-url=
-server.ssl.enabled=false
-#默认政务创建项目所属企业
-defaultZwComapnySn=
-#文件存储配置
-#默认使用的存储平台
-spring.file-storage.default-platform=local
-#".min.jpg" #缩略图后缀，例如【.min.jpg】【.png】
-spring.file-storage.thumbnail-suffix=.jpg
-# 本地存储，不使用的情况下可以不写
-# 存储平台标识
-spring.file-storage.local[0].platform=local
-#启用存储
-spring.file-storage.local[0].enable-storage=true
-#启用访问（线上请使用 nginx 配置，效率更高）
-spring.file-storage.local[0].enable-access=false
-# 访问域名，例如：“http://127.0.0.1:6023/image/”，注意后面要和 path-patterns 保持一致，“/”结尾，本地存储建议使用相对路径，方便后期更换域名
-spring.file-storage.local[0].domain=
-# 存储地址
-spring.file-storage.local[0].base-path=C:/zhgd/service/zjwj/itbgpImage/
-# 访问路径，开启 enable-access 后，通过此路径可以访问到上传的文件
-spring.file-storage.local[0].path-patterns=
-spring.file-storage.aliyun-oss[0].platform=aliyun-oss
-spring.file-storage.aliyun-oss[0].enable-storage=false
-spring.file-storage.aliyun-oss[0].access-key=
-spring.file-storage.aliyun-oss[0].secret-key=
-spring.file-storage.aliyun-oss[0].end-point=
-spring.file-storage.aliyun-oss[0].bucket-name=
-# 访问域名，注意“/”结尾，例如：https://abc.oss-cn-shanghai.aliyuncs.com/
-spring.file-storage.aliyun-oss[0].domain=
-spring.file-storage.aliyun-oss[0].base-path=
-# admin中对应的地址及实例名
-spring.boot.admin.client.instance.service-url=http://localhost:18070
-spring.boot.admin.client.instance.name=zjsj
-# 水电数据推送地址
-double-carbon.water-data-url=http://test.cesms.net
-double-carbon.ammeter-data-url=http://test.cesms.net
-license.licensePath=C:/jxj/prod/backEnd/license/license.lic
-license.publicKeysStorePath=C:/jxj/prod/backEnd/license/publicCerts.keystore
-#高支模的tcp服务端的端口号
-high_formwork.netty.port=15333
+# 环境选择
+spring.profiles.active=zjsj-gsx
+# 国际化配置
+spring.messages.basename=i18n/messages
+spring.messages.encoding=utf-8
+# 后发现的bean会覆盖之前相同名称的bean
+spring.main.allow-bean-definition-overriding=true
+# 数据库驱动类
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+# 数据库连接池配置
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=20
+spring.datasource.hikari.maximum-pool-size=500
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=40000
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.max-lifetime=1800000
+spring.datasource.hikari.validation-timeout=3000
+#(wait_timeout-30)*1000
+spring.datasource.hikari.connection-timeout=50000
+spring.datasource.hikari.connection-test-query=SELECT 1
+# 数据库加密签名
+jasypt.encryptor.password=JXJZHGDPT
+# 如果查询结果中包含空值的列，则 mybatis 在映射的时候，会不会映射这个字段
+mybatis-plus.configuration.call-setters-on-nulls=true
+# 序列化配置
+spring.jackson.defaultPropertyInclusion=ALWAYS
+# mybatis 配置
+mybatis-plus.mapper-locations=classpath*:com/zhgd/xmgl/**/*.xml,classpath*:com/zhwl/zw/**/*.xml
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+# 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2)
+#mybatis-plus.global-config.db-config.logic-delete-field=flag
+mybatis-plus.global-config.db-config.logic-delete-value=1
+mybatis-plus.global-config.db-config.logic-not-delete-value=0
+# mvc 视图对象配置
+spring.mvc.view.prefix=/
+spring.mvc.view.suffix=.html
+spring.mvc.dispatch-options-request=true
+# jwt签名
+security.jwt.token.secret-key=zhgd
+# 文件上传配置
+spring.servlet.multipart.enabled=true
+spring.servlet.multipart.file-size-threshold=0
+spring.servlet.multipart.max-file-size=1024MB
+spring.servlet.multipart.max-request-size=1024MB
+spring.servlet.multipart.resolve-lazily=false
+# mqtt服务器配置
+mqtt.username=admin
+mqtt.password=public
+#mqtt.url=tcp://139.159.226.224:1883
+#mqtt.url=ws://139.159.226.224:8083/mqtt
+mqtt.url=tcp://182.90.224.147:1883
+# 消费者和提供者对应的客户端id以及默认topic
+mqtt.producer.clientId=mqttProd
+mqtt.producer.defaultTopic=topic1
+mqtt.consumer.clientId=mqttConsumer
+mqtt.consumer.defaultTopic=topic1
+#mqtt.consumer.defaultTopic=/P114101/202203010084
+#server.http2.enabled=true
+server.ssl.key-store=classpath:www.cscec1b1.com.jks
+server.ssl.key-store-password=Un8&yP!o^Nyd*gm#
+server.ssl.key-store-type=JKS
+server.ssl.enabled=true
+image.visit.url=
+# 华为云配置
+hw-ocr-username=szjxjzh
+hw-ocr-password=jxj27696951
+hw-ocr-domainname=szjxjzh
+hw-ocr-projectid=0633b705cc000f3e2f55c010af021eec
+hw-ocr-endpoint=cn-east-3
+hw-ocr-enable=false
+# 虹软配置
+arcsoft.appId=4F9jmKsCYKsQskYBTXK7sQZLH8dFdT7LK5Yjx5XA8gkB
+arcsoft.sdkKey=FUPhPPfPXrAmFrecmCSiG5BjmHSwp86QogvdCM7g8B5k
+arcsoft.linux.sdkKey=FUPhPPfPXrAmFrecmCSiG5BjdAskGRSejyGzUuVj4F6V
+arcsoft.ufaceSorce=80
+# 授权校验
+checkAuthEnable=false
+# 华为云短信服务配置
+sms.hw.appKey=JxU82mBx1x4l4RC78ynN1D9Q3neI
+sms.hw.appSecret=c9wi20z1z5N1YZ2T6UH2BJuTUAF4
+sms.hw.verify.signchannel=88200413256
+sms.hw.verify.verifyCode=f273233ff3224adbbbc85cd53d58fc50
+sms.hw.notice.signchannel=8821051731025
+sms.hw.notice.templateId.standardAlarm=790d907f70594b4893227fc1d97e78bc
+sms.hw.notice.templateId.standardDevState=10930770f5954d12881143e548f8483b
+sms.hw.notice.templateId.carPass=
+swagger.enable=true
+# redis集群
+#spring.redis.database=0
+#spring.redis.cluster.nodes=127.0.0.1:6379,192.168.40.156:6380
+#spring.redis.cluster.max-redirects=3
+#spring.redis.timeout=6000ms
+#spring.redis.lettuce.pool.max-active=1000
+#spring.redis.lettuce.pool.max-wait=60s
+#spring.redis.lettuce.pool.max-idle=10
+#spring.redis.lettuce.pool.min-idle=5
+#\u4E2A\u63A8\u914D\u7F6E
+getui.baseUrl=https://restapi.getui.com/v2/
+# 新配置
+getui.appId=vTqRdzRpeI8SnXKDawStZ3
+getui.appKey=wlPjAki13R8STuofcjnXM1
+getui.appSecret=Wy3FFyaXzb9MUl94FMrLo1
+getui.masterSecret=zZ5bMTOjUe5v3MFhm8gLL
+#\u5224\u65AD\u8003\u52E4\u56DE\u8C03\u662F\u5426\u9700\u8981\u56FE\u7247,1\u662F
+# 人员考勤图片类型 1：base64
+imageType=1
+# jxj设备图片类型
+jxj.dev.image.type=1
+pdf.watermark=\u5B9E\u540D\u5236
+# bimface请求url
+bim.getTokenURL=https://api.bimface.com/oauth2/token
+bim.deleteFileURL=https://file.bimface.com/file?fileId=%s
+bim.uploadURL=https://file.bimface.com/upload?name=%s&url=%s
+# redis 单体配置
+spring.redis.database=1
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+#spring.redis.password=JXJ@admin
+spring.redis.password=
+spring.redis.timeout=2000s
+spring.redis.lettuce.pool.max-active=8
+spring.redis.lettuce.pool.max-wait=60s
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=10
+# spring  boot admin 所在服务器
+spring.boot.admin.client.url=http://localhost:9091
+# actuator 配置内容
+management.endpoints.web.exposure.include=*
+management.endpoints.enabled-by-default=true
+management.endpoints.web.base-path=/actuator
+management.endpoint.health.show-details=always
+management.endpoint.logfile.external-file=logs/logs/zhgd-all.log
+# 携稳电箱获取最后一条数据
+xiwon.postElectricRealTimeData=http://openapi.xiwon588.com/electric/realTimeData
+# 携稳密钥
+#xiwon.appId=1638947489842
+#xiwon.appSecret=36e0a5cf-02e6-421b-bf92-3b1ace11e1a2
+# 正式
+xiwon.appId=1672383573694
+xiwon.appSecret=5dfe1664-51fd-40af-8fbb-a15bbcaae1d1
+# 光伏发电客户信息
+koyoe.clientId=btxny
+koyoe.secret=akdu5sar7w
+# 光伏发电请求地址
+koyoe.base-url=https://solar.koyoe.com
+koyoe.get-token=${koyoe.base-url}/third-party/api/token?grant_type=client_credentials
+koyoe.nowData=${koyoe.base-url}/third-party/api/nowData?sn=%s
+# 是否证书验证
+is-license=false