From ff95764824c54c10f0b435508948a563437a3192 Mon Sep 17 00:00:00 2001 From: AMEN Date: Sun, 18 May 2025 23:00:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8E=E7=AB=AF=20=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E5=8F=82=E6=95=B0=EF=BC=9A?= =?UTF-8?q?=20server.beian=5Ficp=5Fnum=20server.beian=5Fga=5Fnum=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=E5=8F=82=E6=95=B0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=94=AF=E6=8C=81=E5=A4=87=E6=B3=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/security/controller/LoginController.java | 2 ++ .../modules/sys/controller/SysParamsController.java | 2 +- .../modules/sys/service/impl/SysParamsServiceImpl.java | 4 +++- .../src/main/resources/db/changelog/202505182232.sql | 3 +++ .../main/resources/db/changelog/db.changelog-master.yaml | 7 +++++++ 5 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 main/manager-api/src/main/resources/db/changelog/202505182232.sql diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java b/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java index d0d84e66..e792fc0f 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java @@ -203,6 +203,8 @@ public class LoginController { config.put("allowUserRegister", sysUserService.getAllowUserRegister()); List list = sysDictDataService.getDictDataByType("MOBILE_AREA"); config.put("mobileAreaList", list); + config.put("beianIcpNum", sysParamsService.getValue("beian_icp_num", true)); + config.put("beianGaNum", sysParamsService.getValue("beian_ga_num", true)); return new Result>().ok(config); } diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysParamsController.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysParamsController.java index 9b80c76c..e1774280 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysParamsController.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysParamsController.java @@ -59,7 +59,7 @@ public class SysParamsController { @Parameter(name = Constant.LIMIT, description = "每页显示记录数", in = ParameterIn.QUERY, required = true, ref = "int"), @Parameter(name = Constant.ORDER_FIELD, description = "排序字段", in = ParameterIn.QUERY, ref = "String"), @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)", in = ParameterIn.QUERY, ref = "String"), - @Parameter(name = "paramCode", description = "参数编码", in = ParameterIn.QUERY, ref = "String") + @Parameter(name = "paramCode", description = "参数编码或参数备注", in = ParameterIn.QUERY, ref = "String") }) @RequiresPermissions("sys:role:superAdmin") public Result> page(@Parameter(hidden = true) @RequestParam Map params) { diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysParamsServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysParamsServiceImpl.java index 2187a8b4..8a43753b 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysParamsServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysParamsServiceImpl.java @@ -55,7 +55,9 @@ public class SysParamsServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("param_type", 1); - wrapper.like(StringUtils.isNotBlank(paramCode), "param_code", paramCode); + wrapper.nested(StringUtils.isNotBlank(paramCode),i->i.like("param_code", paramCode) + .or() + .like("remark", paramCode)); return wrapper; } diff --git a/main/manager-api/src/main/resources/db/changelog/202505182232.sql b/main/manager-api/src/main/resources/db/changelog/202505182232.sql new file mode 100644 index 00000000..24bf5808 --- /dev/null +++ b/main/manager-api/src/main/resources/db/changelog/202505182232.sql @@ -0,0 +1,3 @@ +delete from sys_params where id in (700,701); +INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (700, 'beian_icp_num', '', 'string', 1, 'ipc备案号'); +INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (701, 'beian_ga_num', '', 'string', 1, '公安备案号'); diff --git a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml index 30dbd888..f0a337a5 100755 --- a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml @@ -149,3 +149,10 @@ databaseChangeLog: - sqlFile: encoding: utf8 path: classpath:db/changelog/202505142037.sql + - changeSet: + id: 202505182232 + author: amen + changes: + - sqlFile: + encoding: utf8 + path: classpath:db/changelog/202505182232.sql \ No newline at end of file From 31fc731af6d170f877fc7b9458b8743d0fd1d886 Mon Sep 17 00:00:00 2001 From: AMEN Date: Sun, 18 May 2025 23:33:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=89=8D=E7=AB=AF=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=9F=A5=E8=AF=A2=E7=9A=84input=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=20=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=AE=89=E5=A4=87?= =?UTF-8?q?=E6=A1=88=E5=8F=B7=E5=92=8C=E7=BD=91=E7=AB=99=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=8F=B7=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/changelog/202505182232.sql | 4 +-- .../src/components/VersionFooter.vue | 28 +++++++++++++++++-- main/manager-web/src/store/index.js | 2 ++ .../src/views/ParamsManagement.vue | 2 +- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/main/manager-api/src/main/resources/db/changelog/202505182232.sql b/main/manager-api/src/main/resources/db/changelog/202505182232.sql index 24bf5808..7b2da074 100644 --- a/main/manager-api/src/main/resources/db/changelog/202505182232.sql +++ b/main/manager-api/src/main/resources/db/changelog/202505182232.sql @@ -1,3 +1,3 @@ delete from sys_params where id in (700,701); -INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (700, 'beian_icp_num', '', 'string', 1, 'ipc备案号'); -INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (701, 'beian_ga_num', '', 'string', 1, '公安备案号'); +INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (700, 'beian_icp_num', 'null', 'string', 1, 'ipc备案号，填写null则不设置'); +INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (701, 'beian_ga_num', 'null', 'string', 1, '公安备案号，填写null则不设置'); diff --git a/main/manager-web/src/components/VersionFooter.vue b/main/manager-web/src/components/VersionFooter.vue index 6226bcc0..ece85512 100644 --- a/main/manager-web/src/components/VersionFooter.vue +++ b/main/manager-web/src/components/VersionFooter.vue @@ -1,6 +1,18 @@ @@ -11,7 +23,9 @@ export default { name: 'VersionFooter', computed: { ...mapState({ - version: state => state.pubConfig.version + version: state => state.pubConfig.version, + beianIcpNum: state => state.pubConfig.beianIcpNum, + beianGaNum: state => state.pubConfig.beianGaNum }) }, mounted() { @@ -20,4 +34,14 @@ export default { } - \ No newline at end of file + \ No newline at end of file diff --git a/main/manager-web/src/store/index.js b/main/manager-web/src/store/index.js index 7a33ed61..08dd5042 100644 --- a/main/manager-web/src/store/index.js +++ b/main/manager-web/src/store/index.js @@ -13,6 +13,8 @@ export default new Vuex.Store({ isSuperAdmin: false, // 添加superAdmin状态 pubConfig: { // 添加公共配置存储 version: '', + beianIcpNum: 'null', + beianGaNum: 'null', allowUserRegister: false } }, diff --git a/main/manager-web/src/views/ParamsManagement.vue b/main/manager-web/src/views/ParamsManagement.vue index afb0dc1d..71d0866b 100644 --- a/main/manager-web/src/views/ParamsManagement.vue +++ b/main/manager-web/src/views/ParamsManagement.vue @@ -5,7 +5,7 @@

参数管理

- 搜索