weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-ty1.2

Browse Source 
# Conflicts:
#	mhd-modules/mhd-system/src/main/resources/bootstrap.yml
This commit is contained in:
王奎兴
2026-08-26 14:11:45 +08:00
parent 42ab5160ed b1840c8965
commit a5a222a78e
27 changed files with 527 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-modules/mhd-system/src/main/java/com/mhd/system/controller/SysConfigController.java
+14 -14
View File
@@ -40,14 +40,14 @@ public class SysConfigController extends BaseController
/**
* 获取参数配置列表
*/
@RequiresPermissions("system:config:list")
@GetMapping("/list")
public TableDataInfo list(SysConfig config)
{
startPage();
List<SysConfig> list = configService.selectConfigList(config);
return getDataTable(list);
}
// @RequiresPermissions("system:config:list")
// @GetMapping("/list")
// public TableDataInfo list(SysConfig config)
// {
// startPage();
// List<SysConfig> list = configService.selectConfigList(config);
// return getDataTable(list);
// }
@Log(title = "参数管理", businessType = BusinessType.EXPORT)
@RequiresPermissions("system:config:export")
@@ -71,11 +71,11 @@ public class SysConfigController extends BaseController
/**
* 根据参数键名查询参数值
*/
@GetMapping(value = "/configKey/{configKey}")
public AjaxResult getConfigKey(@PathVariable String configKey)
{
return AjaxResult.success(configService.selectConfigByKey(configKey));
}
// @GetMapping(value = "/configKey/{configKey}")
// public AjaxResult getConfigKey(@PathVariable String configKey)
// {
// return AjaxResult.success(configService.selectConfigByKey(configKey));
// }
/**
* 新增参数配置
@@ -132,4 +132,4 @@ public class SysConfigController extends BaseController
configService.resetConfigCache();
return AjaxResult.success();
}
}
}
mhd-modules/mhd-system/src/main/java/com/mhd/system/controller/SysUserController.java
+4 -1
View File
@@ -85,6 +85,9 @@ public class SysUserController extends BaseController
}
}
List<SysUser> list = userService.selectUserList(user);
for (SysUser sysUser : list) {
sysUser.setPassword("******");
}
return getDataTable(list);
}
@@ -323,4 +326,4 @@ public class SysUserController extends BaseController
userService.insertUserAuth(userId, roleIds);
return success();
}
}
}
mhd-modules/mhd-system/src/main/resources/bootstrap.yml
+4 -4
View File
@@ -14,16 +14,16 @@ spring:
nacos:
discovery:
# server-addr: 127.0.0.1:8848
server-addr: 10.33.0.129:6010
# server-addr: 10.102.192.30:6848
# server-addr: 10.33.0.129:6010
server-addr: 10.102.192.30:6848
username: nacos
password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.105:6848
config:
# server-addr: 127.0.0.1:8848
server-addr: 10.33.0.129:6010
# server-addr: 10.102.192.30:6848
# server-addr: 10.33.0.129:6010
server-addr: 10.102.192.30:6848
username: nacos
password: manhuoda@2023
#线上正式环境