liuyupeng/saas-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

区分配置文件、修复通知报错问题

Browse Source
This commit is contained in:
gaoyutao
2026-03-30 17:59:06 +08:00
parent 011a93585c
commit 4839ea178b
9 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tongran-auth/src/main/resources/bootstrap.yml
+4 -2
View File
@@ -20,9 +20,11 @@ spring:
password: ${spring.cloud.nacos.config.password} password: ${spring.cloud.nacos.config.password}
config: 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: public
#生产环境
server-addr: 172.16.15.103:8848
namespace: saas-prod namespace: saas-prod
username: nacos username: nacos
password: nacos password: nacos
tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/UserConstants.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class UserConstants
public static boolean isAdmin(Long userId) public static boolean isAdmin(Long userId)
{ {
return userId != null && 1L == userId; return userId != null && (1L == userId || 6L == userId);
//TODO 权限控制 //TODO 权限控制
// return true; // return true;
} }
tongran-gateway/src/main/resources/bootstrap.yml
+4 -2
View File
@@ -20,9 +20,11 @@ spring:
password: ${spring.cloud.nacos.config.password} password: ${spring.cloud.nacos.config.password}
config: 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: public
#生产环境
server-addr: 172.16.15.103:8848
namespace: saas-prod namespace: saas-prod
username: nacos username: nacos
password: nacos password: nacos
tongran-modules/tongran-file/src/main/resources/bootstrap.yml
+3 -1
View File
@@ -20,9 +20,11 @@ spring:
password: ${spring.cloud.nacos.config.password} password: ${spring.cloud.nacos.config.password}
config: config:
# 配置中心地址 # 配置中心地址
#测试环境
# server-addr: 172.16.15.52:8848 # server-addr: 172.16.15.52:8848
server-addr: 172.16.15.103:8848
# namespace: public # namespace: public
#生产环境
server-addr: 172.16.15.103:8848
namespace: saas-prod namespace: saas-prod
username: nacos username: nacos
password: nacos password: nacos
tongran-modules/tongran-gen/src/main/resources/bootstrap.yml
+6 -5
View File
@@ -13,18 +13,19 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: 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} namespace: ${spring.cloud.nacos.config.namespace}
username: ${spring.cloud.nacos.config.username} username: ${spring.cloud.nacos.config.username}
password: ${spring.cloud.nacos.config.password} password: ${spring.cloud.nacos.config.password}
config: 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: public
# namespace: saas-local #生产环境
# server-addr: 172.16.15.103:8848
# namespace: saas-prod
username: nacos username: nacos
password: nacos password: nacos
# 配置文件格式 # 配置文件格式
tongran-modules/tongran-mtragent/src/main/resources/bootstrap.yml
+4 -2
View File
@@ -20,9 +20,11 @@ spring:
password: ${spring.cloud.nacos.config.password} password: ${spring.cloud.nacos.config.password}
config: 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: public
#生产环境
server-addr: 172.16.15.103:8848
namespace: saas-prod namespace: saas-prod
username: nacos username: nacos
password: nacos password: nacos
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysNoticeController.java
+17 -7
View File
@@ -2,7 +2,6 @@ package com.tongran.system.controller;
import com.tongran.common.core.web.controller.BaseController; import com.tongran.common.core.web.controller.BaseController;
import com.tongran.common.core.web.domain.AjaxResult; 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.core.web.page.TableDataInfo;
import com.tongran.common.log.annotation.Log; import com.tongran.common.log.annotation.Log;
import com.tongran.common.log.enums.BusinessType; import com.tongran.common.log.enums.BusinessType;
@@ -32,16 +31,27 @@ public class SysNoticeController extends BaseController
* 获取通知公告列表 * 获取通知公告列表
*/ */
@RequiresPermissions("system:notice:list") @RequiresPermissions("system:notice:list")
@PostMapping("/list") @GetMapping("/list")
public TableDataInfo list(@RequestBody SysNotice notice) public TableDataInfo list(SysNotice notice)
{ {
PageDomain pageDomain = new PageDomain(); startPage();
pageDomain.setPageNum(notice.getPageNum());
pageDomain.setPageSize(notice.getPageSize());
startPage(pageDomain);
List<SysNotice> list = noticeService.selectNoticeList(notice); List<SysNotice> list = noticeService.selectNoticeList(notice);
return getDataTable(list); 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);
// }
/** /**
* 根据通知公告编号获取详细信息 * 根据通知公告编号获取详细信息
tongran-modules/tongran-system/src/main/resources/bootstrap.yml
+5 -3
View File
@@ -19,10 +19,12 @@ spring:
password: ${spring.cloud.nacos.config.password} password: ${spring.cloud.nacos.config.password}
config: config:
# 配置中心地址 # 配置中心地址
server-addr: 172.16.15.52:8848 #测试环境
# server-addr: 172.16.15.103:8848 # server-addr: 172.16.15.52:8848
namespace: saas-prod
# namespace: public # namespace: public
#生产环境
server-addr: 172.16.15.103:8848
namespace: saas-prod
username: nacos username: nacos
password: nacos password: nacos
# 配置文件格式 # 配置文件格式
tongran-rocketmq/src/main/resources/bootstrap.yml
+5 -3
View File
@@ -20,10 +20,12 @@ spring:
password: ${spring.cloud.nacos.config.password} password: ${spring.cloud.nacos.config.password}
config: config:
# 配置中心地址 # 配置中心地址
server-addr: 172.16.15.52:8848 #测试环境
# server-addr: 172.16.15.103:8848 # server-addr: 172.16.15.52:8848
namespace: saas-prod
# namespace: public # namespace: public
#生产环境
server-addr: 172.16.15.103:8848
namespace: saas-prod
username: nacos username: nacos
password: nacos password: nacos
# 配置文件格式 # 配置文件格式