From d18a87cc496f7a9d0fc0c170082c52ba5b74f67f Mon Sep 17 00:00:00 2001 From: lishangbu Date: Fri, 31 Dec 2021 17:08:18 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BB=88=E7=AB=AF=E7=BC=93=E5=AD=98=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :bug: Fixing a bug.兼容先前代码，将dict的itemValue序列化成value返回 --- .../pig4cloud/pigx/admin/api/entity/SysDictItem.java | 2 ++ pigx-upms/pigx-upms-biz/pom.xml | 6 +++--- .../pigx/admin/controller/SysClientController.java | 10 ++++++++++ .../admin/controller/SysPublicParamController.java | 2 +- .../admin/service/SysOauthClientDetailsService.java | 7 +++++++ .../pigx/admin/service/SysPublicParamService.java | 2 +- .../service/impl/SysOauthClientDetailsServiceImpl.java | 7 +++++++ .../admin/service/impl/SysPublicParamServiceImpl.java | 2 +- 8 files changed, 32 insertions(+), 6 deletions(-) diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java index e3899c2a7..d026ab3bd 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java @@ -18,6 +18,7 @@ package com.pig4cloud.pigx.admin.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -55,6 +56,7 @@ public class SysDictItem extends Model { * 数据值 */ @ApiModelProperty(value = "数据值") + @JsonProperty(value = "value") private String itemValue; /** diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index 8c7d389c0..1aef5b2a7 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -33,10 +33,10 @@ pigx 通用用户权限管理系统业务处理模块 - + - com.oracle.database.jdbc - ojdbc8 + mysql + mysql-connector-java diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java index 55fb5396b..5c2564ee5 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java @@ -125,4 +125,14 @@ public class SysClientController { return R.ok(clientDetailsService.list()); } + /** + * 同步缓存字典 + * @return R + */ + @SysLog("同步终端") + @PutMapping("/sync") + public R sync() { + return clientDetailsService.syncClientCache(); + } + } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPublicParamController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPublicParamController.java index 149855043..307a4e9a7 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPublicParamController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPublicParamController.java @@ -125,7 +125,7 @@ public class SysPublicParamController { @SysLog("同步参数") @PutMapping("/sync") public R sync() { - return sysPublicParamService.syncDictCache(); + return sysPublicParamService.syncParamCache(); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java index d56fa4962..bf46c5152 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java @@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.dto.SysOauthClientDetailsDTO; import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; +import com.pig4cloud.pigx.common.core.util.R; /** *

@@ -63,4 +64,10 @@ public interface SysOauthClientDetailsService extends IService { * 同步缓存 * @return R */ - R syncDictCache(); + R syncParamCache(); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java index 0cd065123..a37f93c1b 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java @@ -31,6 +31,7 @@ import com.pig4cloud.pigx.admin.mapper.SysOauthClientDetailsMapper; import com.pig4cloud.pigx.admin.service.SysOauthClientDetailsService; import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.constant.CommonConstants; +import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.core.util.SpringContextHolder; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; @@ -151,4 +152,10 @@ public class SysOauthClientDetailsServiceImpl extends ServiceImpl