diff --git a/mdp-form-bootstrap/src/main/resources/application-m1prod.properties b/mdp-form-bootstrap/src/main/resources/application-m1prod.properties
index cd3dfae..8e0c130 100644
--- a/mdp-form-bootstrap/src/main/resources/application-m1prod.properties
+++ b/mdp-form-bootstrap/src/main/resources/application-m1prod.properties
@@ -3,6 +3,8 @@ spring.application.name=form
 
 server.port=7013
 #server.context-path=/${spring.application.name}
+spring.aop.proxy-target-class=true
+server.tomcat.util.http.parser.HttpParser.requestTargetAllow=|[]{}
 #session失效时间 秒
 server.session.timeout=43200
 spring.session.store-type=none
@@ -11,16 +13,38 @@ spring.cloud.inetutils.preferredNetworks[0]=^10\.
 spring.cloud.inetutils.preferredNetworks[1]=^172\.
 #eureka.client.serviceUrl.defaultZone=http://172.16.16.16:6110/eureka/
 
-spring.cloud.consul.host=172.16.16.16
+spring.cloud.consul.host=localhost
 spring.cloud.consul.port=8500
 
-
 #服务跟踪
 spring.zipkin.enabled=false
 spring.zipkin.base-url=http://172.16.16.16:6119/
 spring.sleuth.sampler.percentage=1.0
 
 
+
+#配置数据源
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.jdbc-url=jdbc:mysql://10.0.0.5:3306/form?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
+spring.datasource.url=jdbc:mysql://10.0.0.5:3306/form?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
+
+spring.datasource.username=root
+spring.datasource.password=1qaz@WSX
+spring.datasource.validation-query=SELECT 1
+spring.datasource.test-on-borrow=true
+spring.datasource.validation-interval=30000
+#限制文件上传大小
+spring.http.multipart.maxFileSize=10Mb
+spring.http.multipart.maxRequestSize=10Mb
+
+
+#更多数据源
+mdp.datasource.names=adm-ds
+spring.datasource.adm-ds.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.adm-ds.jdbc-url=jdbc:mysql://123.207.117.5:3306/adm?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT&allowPublicKeyRetrieval=true
+spring.datasource.adm-ds.username=root
+spring.datasource.adm-ds.password=1qaz@WSX
+
 spring.jackson.mapper.default-view-inclusion=false
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.mvc.date-format=yyyy-MM-dd HH:mm:ss
@@ -31,11 +55,23 @@ spring.jackson.deserialization.fail_on_unknown_properties=false
 spring.jackson.parser.allow_unquoted_control_chars=true
 spring.jackson.parser.allow_single_quotes=true
 
-mdp.arc.upload-root-path=C:/archive/attachment
 
 #mdp.auth.ips=ip1,ip2,ip3,授权ip地址列表，如果非授权ip应用只允许使用24小时
 mdp.auth.ips=172.18.153.152
 
+mdp.arc.upload-root-path=C:/archive/attachment
+
+#配置图片文件上传下载的相关参数，如果此次配置将覆盖数据库系统参数中的 arcImageUploadRootPath 及 arcImageDownloadBaseUri两个参数
+mdp.arc.image-upload-root-path=D:/arc/image
+mdp.arc.image-download-base-uri=arc/
+mdp.arc.file-upload-root-path=D:/arc/files
+mdp.arc.file-download-base-uri=arc/
+#begin ac 会计核心账户相关配置
+#账户金额数据签名用于生成md5的key值
+mdp.ac.account-key=LFt1f0EtISBDkqVk9H90rSKVixXhw9eDECClaly2Mj5
+mdp.ac.account-check-sign=true
+###end ac##########
+
 
 mdp.api-gate=http://gate
 mdp.platform-branch-id=platform-branch-001
@@ -55,11 +91,9 @@ mdp.tpa.app-tp-pay-query-uri= http://sys/app/appTpPay/list
 # 第三方授权登陆登陆用户查询接口 云环境下 http://微服务名称/sys/userTpa/list，本地调试 http://ip:port/sys/userTpa/list
 mdp.tpa.user-tpa-query-uri= http://sys/sys/userTpa/list
 
-
-
 # mdp平台授权验证服务器访问地址 cloud环境下换成 http://oauth2server，本地调试如果不起验证服务器，可改为 https://www.qingqinkj.com/api/m1/oauth2server
 # oauth2client服务比较特殊，oauth2client工程访问oauth2server要通过非cloud方式访问。即http://ip:port/的方式，或者https://www.qingqinkj.com/api/m1/oauth2server
-mdp.oauth2.server.uri=http://172.16.16.16:7000
+mdp.oauth2.server.uri= http://oauth2server
 
 # 下面配置 password 模式
 spring.security.oauth2.client.registration.password-client.provider=def-oauth-server
@@ -92,37 +126,13 @@ spring.security.oauth2.client.provider.def-oauth-server.token-uri= ${mdp.oauth2.
 # 资源服务器
 spring.security.oauth2.resourceserver.jwt.jwk-set-uri= ${mdp.oauth2.server.uri}/oauth2/jwks
 
-#配置数据源
-#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.jdbc-url=jdbc:oracle:thin:@193.112.138.144:1521:KEYUNSITDB
-#spring.datasource.username=root
-#spring.datasource.password=lqaz@WSX
-#spring.datasource.validation-query=select 1
-#spring.datasource.test-on-borrow=true
-#spring.datasource.validation-interval=30000
-
+##begin 商户相关配置###顶级商户###########################################################
+mdp.topMech.mechId=m1000
+mdp.topMech.userid=m1000
+mdp.topMech.accountId=m1000
+##end 商户相关配置################################################################
 
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://123.207.117.5:3306/form?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
-spring.datasource.username=root
-spring.datasource.password=1qaz@WSX
-spring.datasource.validation-query=SELECT 1
-spring.datasource.test-on-borrow=true
-spring.datasource.validation-interval=30000
-
-#更多数据源
-#custom.datasource.names=ds1
-#custom.datasource.ds1.driver-class-name=net.ucanaccess.jdbc.UcanaccessDriver
-#custom.datasource.ds1.mdb-path=./mdb/FileScanData.mdb
-#custom.datasource.ds1.url=jdbc:ucanaccess://./mdb/FileScanData.mdb;memory=false;
-#custom.datasource.ds1.username=xb21cn
-#custom.datasource.ds1.password=
-#custom.datasource.ds1.validation-query=select 1
-#custom.datasource.ds1.test-on-borrow=false
-#custom.datasource.ds1.test-while-idle=true
-#custom.datasource.ds1.time-between-eviction-runs-millis=5000
-
- # REDIS (RedisProperties)
+# REDIS (RedisProperties)
 # Redis数据库索引（默认为0）
 spring.redis.database=0
 # Redis服务器地址