From 4839ea178b85c5dd8e2b89fb74fddb621fe2085f Mon Sep 17 00:00:00 2001 From: gaoyutao Date: Mon, 30 Mar 2026 17:59:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E3=80=81=E4=BF=AE=E5=A4=8D=E9=80=9A=E7=9F=A5=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tongran-auth/src/main/resources/bootstrap.yml | 6 +++-- .../common/core/constant/UserConstants.java | 2 +- .../src/main/resources/bootstrap.yml | 6 +++-- .../src/main/resources/bootstrap.yml | 4 +++- .../src/main/resources/bootstrap.yml | 11 +++++---- .../src/main/resources/bootstrap.yml | 6 +++-- .../controller/SysNoticeController.java | 24 +++++++++++++------ .../src/main/resources/bootstrap.yml | 8 ++++--- .../src/main/resources/bootstrap.yml | 8 ++++--- 9 files changed, 49 insertions(+), 26 deletions(-) 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 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 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 # 配置文件格式