diff --git a/db/2pigxx.sql b/db/2pigxx.sql
index a7eec10f8..cf2aa69f9 100644
--- a/db/2pigxx.sql
+++ b/db/2pigxx.sql
@@ -204,6 +204,7 @@ INSERT INTO `sys_dict_item` VALUES (58, 19, '0', '关', 'captcha_flag_types', '
 INSERT INTO `sys_dict_item` VALUES (59, 19, '1', '开', 'captcha_flag_types', '校验验证码', 1, '2020-11-18 06:54:15', '2020-11-18 06:54:15', '不校验验证码-1', '0', 1);
 INSERT INTO `sys_dict_item` VALUES (60, 20, '0', '否', 'enc_flag_types', '不加密', 0, '2020-11-18 06:55:31', '2020-11-18 06:55:31', '不加密-0', '0', 1);
 INSERT INTO `sys_dict_item` VALUES (61, 20, '1', '是', 'enc_flag_types', '加密', 1, '2020-11-18 06:55:51', '2020-11-18 06:55:51', '加密-1', '0', 1);
+INSERT INTO `sys_dict_item` VALUES (62, 15, 'MERGE_PAY', '聚合支付', 'channel_id', '聚合支付', 1, '2019-05-30 19:08:08', '2019-06-18 13:51:53', '聚合支付', '0', 1);
 COMMIT;
 
 -- ----------------------------
diff --git a/db/Dockerfile b/db/Dockerfile
index 3c9bff35e..9b88af324 100644
--- a/db/Dockerfile
+++ b/db/Dockerfile
@@ -1,4 +1,4 @@
-FROM mysql:8.0.23
+FROM mysql/mysql-server:8.0.27
 
 MAINTAINER lengleng(wangiegie@gmail.com)
 
diff --git a/db/v4.1_v4.2_update.sql b/db/v4.1_v4.2_update.sql
index 031b902d2..9ec0d221f 100644
--- a/db/v4.1_v4.2_update.sql
+++ b/db/v4.1_v4.2_update.sql
@@ -4,6 +4,8 @@ UPDATE `config_info` SET `data_id` = 'pigx-gateway-dev.yml', `group_id` = 'DEFAU
 UPDATE `config_info` SET `data_id` = 'pigx-upms-biz-dev.yml', `group_id` = 'DEFAULT_GROUP', `content` = '## spring security 配置\nsecurity:\n  oauth2:\n    client:\n      client-id: ENC(ltJPpR50wT0oIY9kfOe1Iw==)\n      client-secret: ENC(ltJPpR50wT0oIY9kfOe1Iw==)\n      scope: server\n      ignore-urls:\n        - /error\n        - /druid/**\n        - /actuator/**\n        - /v2/api-docs\n\n# 数据源\nspring:\n  autoconfigure:\n    exclude: org.springframework.cloud.gateway.config.GatewayAutoConfiguration,org.springframework.cloud.gateway.config.GatewayClassPathWarningAutoConfiguration\n  datasource:\n    type: com.alibaba.druid.pool.DruidDataSource\n    druid:\n      driver-class-name: com.mysql.cj.jdbc.Driver\n      username: ${MYSQL_USER:root}\n      password: ${MYSQL_PWD:root}\n      url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true\n      stat-view-servlet:\n        enabled: true\n        allow: \"\"\n        url-pattern: /druid/*\n        #login-username: admin\n        #login-password: admin\n      filter:\n        stat:\n          enabled: true\n          log-slow-sql: true\n          slow-sql-millis: 10000\n          merge-sql: false\n        wall:\n          config:\n            multi-statement-allow: true\n\n# 文件系统 (minio测试环境，不可当生产使用)\noss:\n  endpoint: http://minio.pig4cloud.com\n  access-key: lengleng\n  secret-key: lengleng\n  bucket-name: tmp\n\n# Logger Config\nlogging:\n  level:\n    com.pig4cloud.pigx.admin.mapper: debug\n\n# 租户表维护\npigx:\n  tenant:\n    column: tenant_id\n    tables:\n      - sys_user\n      - sys_role\n      - sys_menu\n      - sys_dept\n      - sys_log\n      - sys_social_details\n      - sys_dict\n      - sys_dict_item\n      - sys_public_param\n      - sys_log\n      - sys_file\n      - sys_oauth_client_details', `md5` = 'd80383a5e111c923f65d1edeb5ee18aa', `gmt_create` = '2019-04-18 02:32:44', `gmt_modified` = '2021-10-07 13:28:09', `src_user` = '', `src_ip` = '127.0.0.1', `app_name` = '', `tenant_id` = '', `c_desc` = 'admin 服务配置', `c_use` = 'null', `effect` = 'null', `type` = 'yaml', `c_schema` = 'null' WHERE `id` = 7;
 
 USE pigxx;
--- 更新历史菜单排序避免空指针
+-- 插入大屏设计的功能菜单
 INSERT INTO `sys_menu` VALUES (10000, '大屏设计', NULL, 'http://127.0.0.1:9095/', -1, 'icon-shuju', 2, '0', '0', '2019-08-16 10:08:56', '2020-03-24 08:58:53', '0', 1);
 INSERT INTO `sys_role_menu` VALUES (1, 10000);
+-- 插入聚合支付相关的菜单
+INSERT INTO `sys_dict_item` (`dict_id`,`value`,`label`,`type`,`description`,`sort`,`create_time`,`update_time`,`remarks`,`del_flag`,`tenant_id`) VALUES (15,'MERGE_PAY','聚合支付','channel_id','聚合支付',1,'2019-05-30 19:08:08','2019-06-18 13:51:53','聚合支付','0',1);
diff --git a/docker-compose.yml b/docker-compose.yml
index 4c87ef670..8b2a843a6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-# 使用说明 V4.0.0
+# 使用说明 V4.2.0
 # 1. 使用docker-compose  宿主机不需要配置host来发现
 # 2. 无需修改源码，根目录  docker-compose up 即可
 # 3. 静静等待服务启动
@@ -9,6 +9,7 @@ services:
     build:
       context: ./db
     environment:
+      MYSQL_ROOT_HOST: "%"
       MYSQL_ROOT_PASSWORD: root
     restart: always
     container_name: pigx-mysql
@@ -21,7 +22,7 @@ services:
 
   pigx-redis:
     container_name: pigx-redis
-    image: redis:5.0.7
+    image: redis:6.2.6
     restart: always
     ports:
       - 6379:6379
@@ -42,9 +43,6 @@ services:
       - MINIO_SECRET_KEY=lengleng
 
   pigx-register:
-    build:
-      context: ./pigx-register
-    restart: always
     container_name: pigx-register
     image: pigx-register
     ports: