diff --git a/mdp-form-bootstrap/pom.xml b/mdp-form-bootstrap/pom.xml
index 5e7641b..f06a4fe 100644
--- a/mdp-form-bootstrap/pom.xml
+++ b/mdp-form-bootstrap/pom.xml
@@ -21,7 +21,12 @@
           <groupId>com.mdp</groupId>
           <artifactId>mdp-form</artifactId>
         </dependency>
-			 
+
+      <dependency>
+          <groupId>com.mdp</groupId>
+          <artifactId>mdp-oauth2-client-cloud</artifactId>
+          <version>${mdp.version}</version>
+      </dependency>
   </dependencies>
          
   <build>
diff --git a/mdp-form-bootstrap/src/main/java/com/mdp/WebSecurityConfig.java b/mdp-form-bootstrap/src/main/java/com/mdp/WebSecurityConfig.java
index 24ab1dd..93dd389 100644
--- a/mdp-form-bootstrap/src/main/java/com/mdp/WebSecurityConfig.java
+++ b/mdp-form-bootstrap/src/main/java/com/mdp/WebSecurityConfig.java
@@ -32,7 +32,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
      */
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-        http.authorizeRequests().mvcMatchers("/authorize","/authorized","/","/index","/oauth2/login/token","/oauth2/login/token/web").permitAll().and().oauth2Client().and().logout().disable();
+        http.authorizeRequests().anyRequest().authenticated().and().oauth2Client().and().logout().disable();
         http.formLogin().usernameParameter("userloginid");
         http.oauth2Login();
         http.oauth2ResourceServer().jwt().jwtAuthenticationConverter(jwtConverter);
diff --git a/mdp-form-bootstrap/src/main/resources/application-dev.properties b/mdp-form-bootstrap/src/main/resources/application-dev.properties
index 09961c3..d642d8b 100644
--- a/mdp-form-bootstrap/src/main/resources/application-dev.properties
+++ b/mdp-form-bootstrap/src/main/resources/application-dev.properties
@@ -38,6 +38,61 @@ mdp.arc.upload-root-path=C:/archive/attachment
 mdp.auth.ips=10.0.0.17
 
 
+mdp.api-gate=http://134.175.57.249:7015
+mdp.platform-branch-id=platform-branch-001
+
+# 权限自动注册接口，云环境下 http://微服务名称/sys/qx/autoRegist，本地调试 http://ip:port/sys/qx/autoRegist
+mdp.auth.qx-regist-url=${mdp.api-gate}/sys/sys/qx/autoRegist
+# 审计日志收集，云环境下 http://微服务名称/audit/base/operLog/add，本地调试 http://ip:port/audit/base/operLog/add
+mdp.audit.audit-log-url=${mdp.api-gate}/audit/audit/base/operLog/add
+# 元数据/系统参数等接口 云环境下 http://微服务名称/sys/meta/itemOption/list/byItemCode，本地调试 http://ip:port/meta/itemOption/list/byItemCode
+mdp.meta.item-options-query-uri= ${mdp.api-gate}/sys/meta/itemOption/list/byItemCode
+# 元数据/系统参数等接口 云环境下 http://微服务名称/sys/meta/item/list，本地调试 http://ip:port/meta/item/list
+mdp.meta.items-query-uri= ${mdp.api-gate}//sys/meta/item/list
+# 第三方授权登陆参数配置数据访问接口 云环境下 http://微服务名称/app/appTpAuth/list，本地调试 http://ip:port/app/appTpAuth/list
+mdp.tpa.app-tp-auth-query-uri= ${mdp.api-gate}/sys/app/appTpAuth/list
+# 第三方授权支付参数配置数据访问接口 云环境下 http://微服务名称/app/appTpPay/list，本地调试 http://ip:port/app/appTpPay/list
+mdp.tpa.app-tp-pay-query-uri= ${mdp.api-gate}/sys/app/appTpPay/list
+# 第三方授权登陆登陆用户查询接口 云环境下 http://微服务名称/sys/userTpa/list，本地调试 http://ip:port/sys/userTpa/list
+mdp.tpa.user-tpa-query-uri= ${mdp.api-gate}/sys/sys/userTpa/list
+
+
+# mdp平台授权验证服务器访问地址 cloud环境下换成 http://oauth2server，本地调试http://127.0.0.1:7000，本地如果不起验证服务器，可改为 https://www.qingqinkj.com/api/m1/oauth2server
+mdp.oauth2.server.uri=http://134.175.57.249:7000
+# 客户端必须在数据库表adm.oauth_client_details中配置，否则无法访问
+
+# 下面配置 password 模式
+spring.security.oauth2.client.registration.password-client.provider=oauth2server
+spring.security.oauth2.client.registration.password-client.client-id=${spring.application.name}
+spring.security.oauth2.client.registration.password-client.client-secret= ${spring.application.name}-8888
+spring.security.oauth2.client.registration.password-client.authorization-grant-type= password
+spring.security.oauth2.client.registration.password-client.scope= all
+
+# 下面配置 client_credentials 模式
+spring.security.oauth2.client.registration.def-client.provider=oauth2server
+spring.security.oauth2.client.registration.def-client.client-id=${spring.application.name}
+spring.security.oauth2.client.registration.def-client.client-secret= ${spring.application.name}-8888
+spring.security.oauth2.client.registration.def-client.authorization-grant-type= client_credentials
+spring.security.oauth2.client.registration.def-client.scope= all
+
+# 下面配置authorization_code模式
+spring.security.oauth2.client.registration.code-client.provider=oauth2server
+spring.security.oauth2.client.registration.code-client.client-id=${spring.application.name}
+spring.security.oauth2.client.registration.code-client.client-secret= ${spring.application.name}-8888
+spring.security.oauth2.client.registration.code-client.authorization-grant-type= authorization_code
+# 授权码模式下需要配置重定向地址
+spring.security.oauth2.client.registration.code-client.redirect-uri= ${messages.base-uri}/authorized
+spring.security.oauth2.client.registration.code-client.scope= all
+
+# 授权码方式获取code
+spring.security.oauth2.client.provider.oauth2server.authorization-uri= ${mdp.oauth2.server.uri}/oauth2/authorize
+# 获取token接口
+spring.security.oauth2.client.provider.oauth2server.token-uri= ${mdp.oauth2.server.uri}/oauth2/token
+
+# 资源服务器
+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:mysql://193.112.138.144:3306/adm
diff --git a/mdp-form-bootstrap/src/main/resources/application-m1prod.properties b/mdp-form-bootstrap/src/main/resources/application-m1prod.properties
index e4c28a9..39b0248 100644
--- a/mdp-form-bootstrap/src/main/resources/application-m1prod.properties
+++ b/mdp-form-bootstrap/src/main/resources/application-m1prod.properties
@@ -2,7 +2,7 @@
 spring.application.name=form
 
 server.port=7013
-server.context-path=/${spring.application.name}
+#server.context-path=/${spring.application.name}
 #session失效时间 秒
 server.session.timeout=43200
 spring.session.store-type=none
@@ -37,6 +37,61 @@ mdp.arc.upload-root-path=C:/archive/attachment
 mdp.auth.ips=172.18.153.152
 
 
+mdp.api-gate=http://gate
+mdp.platform-branch-id=platform-branch-001
+
+# 权限自动注册接口，云环境下 http://微服务名称/sys/qx/autoRegist，本地调试 http://ip:port/sys/qx/autoRegist
+mdp.auth.qx-regist-url=http://sys/sys/qx/autoRegist
+# 审计日志收集，云环境下 http://微服务名称/audit/base/operLog/add，本地调试 http://ip:port/audit/base/operLog/add
+mdp.audit.audit-log-url=http://audit/audit/base/operLog/add
+# 元数据/系统参数等接口 云环境下 http://微服务名称/sys/meta/itemOption/list/byItemCode，本地调试 http://ip:port/meta/itemOption/list/byItemCode
+mdp.meta.item-options-query-uri= http://sys/meta/itemOption/list/byItemCode
+# 元数据/系统参数等接口 云环境下 http://微服务名称/sys/meta/item/list，本地调试 http://ip:port/meta/item/list
+mdp.meta.items-query-uri= http://sys/meta/item/list
+# 第三方授权登陆参数配置数据访问接口 云环境下 http://微服务名称/app/appTpAuth/list，本地调试 http://ip:port/app/appTpAuth/list
+mdp.tpa.app-tp-auth-query-uri= http://sys/app/appTpAuth/list
+# 第三方授权支付参数配置数据访问接口 云环境下 http://微服务名称/app/appTpPay/list，本地调试 http://ip:port/app/appTpPay/list
+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
+
+# 下面配置 password 模式
+spring.security.oauth2.client.registration.password-client.provider=def-oauth-server
+spring.security.oauth2.client.registration.password-client.client-id=${spring.application.name}
+spring.security.oauth2.client.registration.password-client.client-secret= ${spring.application.name}-8888
+spring.security.oauth2.client.registration.password-client.authorization-grant-type= password
+spring.security.oauth2.client.registration.password-client.scope= all
+
+# 下面配置 client_credentials 模式
+spring.security.oauth2.client.registration.def-client.provider=def-oauth-server
+spring.security.oauth2.client.registration.def-client.client-id=${spring.application.name}
+spring.security.oauth2.client.registration.def-client.client-secret= ${spring.application.name}-8888
+spring.security.oauth2.client.registration.def-client.authorization-grant-type= client_credentials
+spring.security.oauth2.client.registration.def-client.scope= all
+
+# 下面配置authorization_code模式
+spring.security.oauth2.client.registration.code-client.provider=def-oauth-server
+spring.security.oauth2.client.registration.code-client.client-id=${spring.application.name}
+spring.security.oauth2.client.registration.code-client.client-secret= ${spring.application.name}-8888
+spring.security.oauth2.client.registration.code-client.authorization-grant-type= authorization_code
+# 授权码模式下需要配置重定向地址
+spring.security.oauth2.client.registration.code-client.redirect-uri= ${messages.base-uri}/authorized
+spring.security.oauth2.client.registration.code-client.scope= all
+
+# 授权码方式获取code
+spring.security.oauth2.client.provider.def-oauth-server.authorization-uri= ${mdp.oauth2.server.uri}/oauth2/authorize
+# 获取token接口
+spring.security.oauth2.client.provider.def-oauth-server.token-uri= ${mdp.oauth2.server.uri}/oauth2/token
+
+# 资源服务器
+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
diff --git a/mdp-form-bootstrap/src/main/resources/mybatis/mybatis-config.xml b/mdp-form-bootstrap/src/main/resources/mybatis/mybatis-config.xml
deleted file mode 100644
index 8c92d0f..0000000
--- a/mdp-form-bootstrap/src/main/resources/mybatis/mybatis-config.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD SQL Map Config 3.0//EN"  
-	"http://mybatis.org/dtd/mybatis-3-config.dtd">
-<configuration>
-	<settings> 
-  		<setting name="cacheEnabled" value="true" /><!-- 全局映射器启用缓存 -->
-        <setting name="useGeneratedKeys" value="true" /> 
-        <setting name="defaultExecutorType" value="REUSE" /> 
-        <setting name="mapUnderscoreToCamelCase" value="true" />  
-        <setting name="callSettersOnNulls" value="true" />
-        <setting name="jdbcTypeForNull" value="NULL"/>   
-    </settings>
-    <typeHandlers>   
-		<typeHandler javaType="String" jdbcType="CLOB" handler="org.apache.ibatis.type.ClobTypeHandler"/> 
-		<!--<typeHandler javaType="oracle.sql.CLOB" jdbcType="CLOB" handler="org.apache.ibatis.type.ClobTypeHandler"/>-->  
-		<!--<typeHandler javaType="oracle.sql.TIMESTAMP" jdbcType="TIMESTAMP" handler="org.apache.ibatis.type.DateTypeHandler"/>-->  
-	</typeHandlers>
-	<objectWrapperFactory type="com.mdp.mybatis.MapWrapperFactory"></objectWrapperFactory>
-	<plugins> 
-		<!-- com.github.pagehelper为PageHelper类所在包名 -->
-        <plugin interceptor="com.github.pagehelper.PageInterceptor">
-            <!-- 4.0.0以后版本可以不设置该参数-->
-            <!--<property name="dialect" value="oracle"/> -->
-            <!-- 该参数默认为false -->
-            <!-- 设置为true时，会将RowBounds第一个参数offset当成pageNum页码使用 -->
-            <!-- 和startPage中的pageNum效果一样-->
-            <property name="offsetAsPageNum" value="true"/>
-            <!-- 该参数默认为false -->
-            <!-- 设置为true时，使用RowBounds分页会进行count查询 -->
-            <property name="rowBoundsWithCount" value="true"/>
-            <!-- 设置为true时，如果pageSize=0或者RowBounds.limit = 0就会查询出全部的结果 -->
-            <!-- （相当于没有执行分页查询，但是返回结果仍然是Page类型）-->
-            <property name="pageSizeZero" value="true"/>
-            <!-- 3.3.0版本可用 - 分页参数合理化，默认false禁用 -->
-            <!-- 启用合理化时，如果pageNum<1会查询第一页，如果pageNum>pages会查询最后一页 -->
-            <!-- 禁用合理化时，如果pageNum<1或pageNum>pages会返回空数据 -->
-            <property name="reasonable" value="true"/>
-            <!-- 3.5.0版本可用 - 为了支持startPage(Object params)方法 -->
-            <!-- 增加了一个`params`参数来配置参数映射，用于从Map或ServletRequest中取值 -->
-            <!-- 可以配置pageNum,pageSize,count,pageSizeZero,reasonable,orderBy,不配置映射的用默认值 -->
-            <!-- 不理解该含义的前提下，不要随便复制该配置 -->
-             <!-- <property name="params" value="pageNum=currentPage;pageSize=limit;"/> -->
-            <!-- 支持通过Mapper接口参数来传递分页参数 -->
-             <!-- <property name="supportMethodsArguments" value="true"/>-->
-            <!-- always总是返回PageInfo类型,check检查返回类型是否为PageInfo,none返回Page -->
-             <!-- <property name="returnPageInfo" value="check"/>-->
-        </plugin>
-		<plugin interceptor="com.mdp.safe.mybatis.plugin.DbAccessAuthPlugin"></plugin>
-	</plugins>
-</configuration>
\ No newline at end of file
diff --git a/mdp-form/src/main/resources/application-dev.properties b/mdp-form/src/main/resources/application-dev.properties
index d801465..745b843 100644
--- a/mdp-form/src/main/resources/application-dev.properties
+++ b/mdp-form/src/main/resources/application-dev.properties
@@ -17,6 +17,62 @@ spring.jackson.parser.allow_single_quotes=true
 mdp.arc.upload.root-path=C:/archive/attachment
 
 mdp.settings[file.saveDir]=C:/work/file/
+
+
+mdp.api-gate=http://134.175.57.249:7015
+mdp.platform-branch-id=platform-branch-001
+
+# 权限自动注册接口，云环境下 http://微服务名称/sys/qx/autoRegist，本地调试 http://ip:port/sys/qx/autoRegist
+mdp.auth.qx-regist-url=${mdp.api-gate}/sys/sys/qx/autoRegist
+# 审计日志收集，云环境下 http://微服务名称/audit/base/operLog/add，本地调试 http://ip:port/audit/base/operLog/add
+mdp.audit.audit-log-url=${mdp.api-gate}/audit/audit/base/operLog/add
+# 元数据/系统参数等接口 云环境下 http://微服务名称/sys/meta/itemOption/list/byItemCode，本地调试 http://ip:port/meta/itemOption/list/byItemCode
+mdp.meta.item-options-query-uri= ${mdp.api-gate}/sys/meta/itemOption/list/byItemCode
+# 元数据/系统参数等接口 云环境下 http://微服务名称/sys/meta/item/list，本地调试 http://ip:port/meta/item/list
+mdp.meta.items-query-uri= ${mdp.api-gate}//sys/meta/item/list
+# 第三方授权登陆参数配置数据访问接口 云环境下 http://微服务名称/app/appTpAuth/list，本地调试 http://ip:port/app/appTpAuth/list
+mdp.tpa.app-tp-auth-query-uri= ${mdp.api-gate}/sys/app/appTpAuth/list
+# 第三方授权支付参数配置数据访问接口 云环境下 http://微服务名称/app/appTpPay/list，本地调试 http://ip:port/app/appTpPay/list
+mdp.tpa.app-tp-pay-query-uri= ${mdp.api-gate}/sys/app/appTpPay/list
+# 第三方授权登陆登陆用户查询接口 云环境下 http://微服务名称/sys/userTpa/list，本地调试 http://ip:port/sys/userTpa/list
+mdp.tpa.user-tpa-query-uri= ${mdp.api-gate}/sys/sys/userTpa/list
+
+
+# mdp平台授权验证服务器访问地址 cloud环境下换成 http://oauth2server，本地调试http://127.0.0.1:7000，本地如果不起验证服务器，可改为 https://www.qingqinkj.com/api/m1/oauth2server
+mdp.oauth2.server.uri=http://134.175.57.249:7000
+# 客户端必须在数据库表adm.oauth_client_details中配置，否则无法访问
+
+# 下面配置 password 模式
+spring.security.oauth2.client.registration.password-client.provider=oauth2server
+spring.security.oauth2.client.registration.password-client.client-id=${spring.application.name}
+spring.security.oauth2.client.registration.password-client.client-secret= ${spring.application.name}-8888
+spring.security.oauth2.client.registration.password-client.authorization-grant-type= password
+spring.security.oauth2.client.registration.password-client.scope= all
+
+# 下面配置 client_credentials 模式
+spring.security.oauth2.client.registration.def-client.provider=oauth2server
+spring.security.oauth2.client.registration.def-client.client-id=${spring.application.name}
+spring.security.oauth2.client.registration.def-client.client-secret= ${spring.application.name}-8888
+spring.security.oauth2.client.registration.def-client.authorization-grant-type= client_credentials
+spring.security.oauth2.client.registration.def-client.scope= all
+
+# 下面配置authorization_code模式
+spring.security.oauth2.client.registration.code-client.provider=oauth2server
+spring.security.oauth2.client.registration.code-client.client-id=${spring.application.name}
+spring.security.oauth2.client.registration.code-client.client-secret= ${spring.application.name}-8888
+spring.security.oauth2.client.registration.code-client.authorization-grant-type= authorization_code
+# 授权码模式下需要配置重定向地址
+spring.security.oauth2.client.registration.code-client.redirect-uri= ${messages.base-uri}/authorized
+spring.security.oauth2.client.registration.code-client.scope= all
+
+# 授权码方式获取code
+spring.security.oauth2.client.provider.oauth2server.authorization-uri= ${mdp.oauth2.server.uri}/oauth2/authorize
+# 获取token接口
+spring.security.oauth2.client.provider.oauth2server.token-uri= ${mdp.oauth2.server.uri}/oauth2/token
+
+# 资源服务器
+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:@203.195.131.73:1521:mdpdb
diff --git a/mdp-form/src/main/resources/mybatis/mybatis-config.xml b/mdp-form/src/main/resources/mybatis/mybatis-config.xml
index 4cc6f30..360642d 100644
--- a/mdp-form/src/main/resources/mybatis/mybatis-config.xml
+++ b/mdp-form/src/main/resources/mybatis/mybatis-config.xml
@@ -16,8 +16,4 @@
 		<!--<typeHandler javaType="oracle.sql.TIMESTAMP" jdbcType="TIMESTAMP" handler="org.apache.ibatis.type.DateTypeHandler"/>-->  
 	</typeHandlers>
 	<objectWrapperFactory type="com.mdp.mybatis.MapWrapperFactory"></objectWrapperFactory>
-	<plugins> 
-		<plugin interceptor="com.mdp.core.dao.plugin.PagePlugin"></plugin><!-- 一定要放在第一位-->
-		<plugin interceptor="com.mdp.safe.mybatis.plugin.DbAccessAuthPlugin"></plugin>
-	</plugins>
 </configuration>
\ No newline at end of file
diff --git a/mdp-form/src/test/java/com/mdp/WebSecurityConfig.java b/mdp-form/src/test/java/com/mdp/WebSecurityConfig.java
index 24ab1dd..93dd389 100644
--- a/mdp-form/src/test/java/com/mdp/WebSecurityConfig.java
+++ b/mdp-form/src/test/java/com/mdp/WebSecurityConfig.java
@@ -32,7 +32,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
      */
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-        http.authorizeRequests().mvcMatchers("/authorize","/authorized","/","/index","/oauth2/login/token","/oauth2/login/token/web").permitAll().and().oauth2Client().and().logout().disable();
+        http.authorizeRequests().anyRequest().authenticated().and().oauth2Client().and().logout().disable();
         http.formLogin().usernameParameter("userloginid");
         http.oauth2Login();
         http.oauth2ResourceServer().jwt().jwtAuthenticationConverter(jwtConverter);
diff --git a/pom.xml b/pom.xml
index 2642edd..ff9027f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,11 @@
     <artifactId>mdp-products</artifactId>
     <version>M.1.0.0-RELEASE</version>
   </parent>
+
+	<modules>
+		<module>mdp-form</module>
+		<module>mdp-form-bootstrap</module>
+	</modules>
   <dependencies>
 
   </dependencies>
@@ -28,8 +33,4 @@
 		</dependencies>
 	</dependencyManagement>
   <description>智能表单系统</description>
-  <modules>
-  		<module>mdp-form</module>
-	  <module>mdp-form-bootstrap</module>
-  </modules>
 </project>
\ No newline at end of file