zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-08 12:39:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/lei_dev' into leng_dev

Browse Source
This commit is contained in:
lbw committed 2023-02-12 08:05:22 +08:00
2 parents 4d8389601c 98d5acdf48
commit 5b9aa7199f
2 files changed
+5 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigResourceServerConfiguration.java
+2
View File
@@ -22,6 +22,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Bean;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector;
@@ -36,6 +37,7 @@ import org.springframework.security.web.SecurityFilterChain;
@Slf4j
@EnableWebSecurity
@RequiredArgsConstructor
@EnableGlobalMethodSecurity(prePostEnabled = true)
public class PigResourceServerConfiguration {
protected final ResourceAuthExceptionEntryPoint resourceAuthExceptionEntryPoint;
pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java
+3 -1
View File
@@ -19,6 +19,7 @@
package com.pig4cloud.pigx.admin.service.impl;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -111,7 +112,8 @@ public class SysOauthClientDetailsServiceImpl extends ServiceImpl<SysOauthClient
JSONObject informationObj = JSONUtil.parseObj(information)
.set(CommonConstants.CAPTCHA_FLAG, clientDetailsDTO.getCaptchaFlag())
.set(CommonConstants.ENC_FLAG, clientDetailsDTO.getEncFlag())
.set(CommonConstants.ONLINE_QUANTITY, clientDetailsDTO.getOnlineQuantity());
.set(CommonConstants.ONLINE_QUANTITY,
StrUtil.isEmpty(clientDetailsDTO.getOnlineQuantity())? "0": clientDetailsDTO.getOnlineQuantity());
clientDetails.setAdditionalInformation(informationObj.toString());
// 更新数据库