diff --git a/tongran-auth/src/main/resources/bootstrap.yml b/tongran-auth/src/main/resources/bootstrap.yml
index 6236ee2..6819cb8 100644
--- a/tongran-auth/src/main/resources/bootstrap.yml
+++ b/tongran-auth/src/main/resources/bootstrap.yml
@@ -20,9 +20,11 @@ spring:
         password: ${spring.cloud.nacos.config.password}
       config:
         # 配置中心地址
-        server-addr: 172.16.15.52:8848
-#        server-addr: 172.16.15.103:8848
+        #测试环境
+#        server-addr: 172.16.15.52:8848
 #        namespace: public
+        #生产环境
+        server-addr: 172.16.15.103:8848
         namespace: saas-prod
         username: nacos
         password: nacos
diff --git a/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/UserConstants.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/UserConstants.java
index 0a0f63e..af131a8 100644
--- a/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/UserConstants.java
+++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/UserConstants.java
@@ -83,7 +83,7 @@ public class UserConstants
 
     public static boolean isAdmin(Long userId)
     {
-        return userId != null && 1L == userId;
+        return userId != null && (1L == userId || 6L == userId);
         //TODO 权限控制
 //        return true;
     }
diff --git a/tongran-gateway/src/main/resources/bootstrap.yml b/tongran-gateway/src/main/resources/bootstrap.yml
index cd517df..946a816 100644
--- a/tongran-gateway/src/main/resources/bootstrap.yml
+++ b/tongran-gateway/src/main/resources/bootstrap.yml
@@ -20,9 +20,11 @@ spring:
         password: ${spring.cloud.nacos.config.password}
       config:
         # 配置中心地址
-        server-addr: 172.16.15.52:8848
-#        server-addr: 172.16.15.103:8848
+        #测试环境
+#        server-addr: 172.16.15.52:8848
 #        namespace: public
+        #生产环境
+        server-addr: 172.16.15.103:8848
         namespace: saas-prod
         username: nacos
         password: nacos
diff --git a/tongran-modules/tongran-file/src/main/resources/bootstrap.yml b/tongran-modules/tongran-file/src/main/resources/bootstrap.yml
index 6988e29..2b73287 100644
--- a/tongran-modules/tongran-file/src/main/resources/bootstrap.yml
+++ b/tongran-modules/tongran-file/src/main/resources/bootstrap.yml
@@ -20,9 +20,11 @@ spring:
         password: ${spring.cloud.nacos.config.password}
       config:
         # 配置中心地址
+        #测试环境
 #        server-addr: 172.16.15.52:8848
-        server-addr: 172.16.15.103:8848
 #        namespace: public
+        #生产环境
+        server-addr: 172.16.15.103:8848
         namespace: saas-prod
         username: nacos
         password: nacos
diff --git a/tongran-modules/tongran-gen/src/main/resources/bootstrap.yml b/tongran-modules/tongran-gen/src/main/resources/bootstrap.yml
index 5545e4c..8cad456 100644
--- a/tongran-modules/tongran-gen/src/main/resources/bootstrap.yml
+++ b/tongran-modules/tongran-gen/src/main/resources/bootstrap.yml
@@ -13,18 +13,19 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 172.16.15.52:8848
         # 服务注册地址
-#        server-addr: 172.16.15.103:8848
+        server-addr: ${spring.cloud.nacos.config.server-addr}
         namespace: ${spring.cloud.nacos.config.namespace}
         username: ${spring.cloud.nacos.config.username}
         password: ${spring.cloud.nacos.config.password}
       config:
-        server-addr: 172.16.15.52:8848
         # 配置中心地址
-#        server-addr: 172.16.15.103:8848
+        #测试环境
+        server-addr: 172.16.15.52:8848
         namespace: public
-#        namespace: saas-local
+        #生产环境
+#        server-addr: 172.16.15.103:8848
+#        namespace: saas-prod
         username: nacos
         password: nacos
         # 配置文件格式
diff --git a/tongran-modules/tongran-mtragent/src/main/resources/bootstrap.yml b/tongran-modules/tongran-mtragent/src/main/resources/bootstrap.yml
index adf8d9d..c36f949 100644
--- a/tongran-modules/tongran-mtragent/src/main/resources/bootstrap.yml
+++ b/tongran-modules/tongran-mtragent/src/main/resources/bootstrap.yml
@@ -20,9 +20,11 @@ spring:
         password: ${spring.cloud.nacos.config.password}
       config:
         # 配置中心地址
-        server-addr: 172.16.15.52:8848
-#        server-addr: 172.16.15.103:8848
+        #测试环境
+#        server-addr: 172.16.15.52:8848
 #        namespace: public
+        #生产环境
+        server-addr: 172.16.15.103:8848
         namespace: saas-prod
         username: nacos
         password: nacos
diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysNoticeController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysNoticeController.java
index b19c421..8c4fe78 100644
--- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysNoticeController.java
+++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysNoticeController.java
@@ -2,7 +2,6 @@ package com.tongran.system.controller;
 
 import com.tongran.common.core.web.controller.BaseController;
 import com.tongran.common.core.web.domain.AjaxResult;
-import com.tongran.common.core.web.page.PageDomain;
 import com.tongran.common.core.web.page.TableDataInfo;
 import com.tongran.common.log.annotation.Log;
 import com.tongran.common.log.enums.BusinessType;
@@ -32,16 +31,27 @@ public class SysNoticeController extends BaseController
      * 获取通知公告列表
      */
     @RequiresPermissions("system:notice:list")
-    @PostMapping("/list")
-    public TableDataInfo list(@RequestBody SysNotice notice)
+    @GetMapping("/list")
+    public TableDataInfo list(SysNotice notice)
     {
-        PageDomain pageDomain = new PageDomain();
-        pageDomain.setPageNum(notice.getPageNum());
-        pageDomain.setPageSize(notice.getPageSize());
-        startPage(pageDomain);
+        startPage();
         List<SysNotice> list = noticeService.selectNoticeList(notice);
         return getDataTable(list);
     }
+    /**
+     * 获取通知公告列表
+     */
+//    @RequiresPermissions("system:notice:list")
+//    @PostMapping("/list")
+//    public TableDataInfo list(@RequestBody SysNotice notice)
+//    {
+//        PageDomain pageDomain = new PageDomain();
+//        pageDomain.setPageNum(notice.getPageNum());
+//        pageDomain.setPageSize(notice.getPageSize());
+//        startPage(pageDomain);
+//        List<SysNotice> list = noticeService.selectNoticeList(notice);
+//        return getDataTable(list);
+//    }
 
     /**
      * 根据通知公告编号获取详细信息
diff --git a/tongran-modules/tongran-system/src/main/resources/bootstrap.yml b/tongran-modules/tongran-system/src/main/resources/bootstrap.yml
index 00e429b..5a7b3e3 100644
--- a/tongran-modules/tongran-system/src/main/resources/bootstrap.yml
+++ b/tongran-modules/tongran-system/src/main/resources/bootstrap.yml
@@ -19,10 +19,12 @@ spring:
         password: ${spring.cloud.nacos.config.password}
       config:
         # 配置中心地址
-        server-addr: 172.16.15.52:8848
-#        server-addr: 172.16.15.103:8848
-        namespace: saas-prod
+        #测试环境
+#        server-addr: 172.16.15.52:8848
 #        namespace: public
+        #生产环境
+        server-addr: 172.16.15.103:8848
+        namespace: saas-prod
         username: nacos
         password: nacos
         # 配置文件格式
diff --git a/tongran-rocketmq/src/main/resources/bootstrap.yml b/tongran-rocketmq/src/main/resources/bootstrap.yml
index 891e620..0901c16 100644
--- a/tongran-rocketmq/src/main/resources/bootstrap.yml
+++ b/tongran-rocketmq/src/main/resources/bootstrap.yml
@@ -20,10 +20,12 @@ spring:
         password: ${spring.cloud.nacos.config.password}
       config:
         # 配置中心地址
-        server-addr: 172.16.15.52:8848
-#        server-addr: 172.16.15.103:8848
-        namespace: saas-prod
+        #测试环境
+#        server-addr: 172.16.15.52:8848
 #        namespace: public
+        #生产环境
+        server-addr: 172.16.15.103:8848
+        namespace: saas-prod
         username: nacos
         password: nacos
         # 配置文件格式