Compare commits

..

3 Commits

Author SHA1 Message Date
丁磊
2fc24060ee build:移除 pom.xml 中的插件仓库配置
- 删除了 pom.xml 文件中的 pluginRepositories部分
- 移除了名为 kepai-repo-plugin 的插件仓库配置
2025-06-09 17:51:53 +08:00
丁磊
c3a03e48bd publish 2.0.17-scope-test
All checks were successful
/ local-deploy (push) Successful in 17s
2025-06-09 17:47:16 +08:00
丁磊
87bd4ab71a fix(login): 修改微信公众号授权类型
- 将 snsapi_userinfo 修改为 snsapi_base
-优化了微信公众号登录的授权流程
2025-06-09 17:40:46 +08:00
14 changed files with 30 additions and 51 deletions

24
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
<packaging>pom</packaging>
<name>springboot-parent</name>
<description>杭州铁晟科技有限公司基础依赖</description>
@@ -58,49 +58,49 @@
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-database</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-login</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-web</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-util</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-platform</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-message</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-role</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-annotation</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
@@ -118,12 +118,6 @@
</dependencies>
</dependencyManagement>
<pluginRepositories>
<pluginRepository>
<id>kepai-repo-plugin</id>
<url>http://git.kepai365.com/tiesheng/repository/raw/master</url>
</pluginRepository>
</pluginRepositories>
<distributionManagement>
<repository>

View File

@@ -1,7 +1,7 @@
#!/bin/sh
VERSION=$1
MESSAGE=$2
VERSION=2.0.17-scope-test
MESSAGE=test
## 更改版本号
mvn versions:set -DnewVersion=$VERSION

View File

@@ -6,11 +6,11 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-ademo</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-annotation</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-database</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-login</artifactId>

View File

@@ -170,7 +170,7 @@ public class LoginController {
extra = "";
}
String configUrl = globalConfig.buildPath("/login/wxmp/oauth2/" + service + "?extra=" + extra);
String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_userinfo");
String authorizationUrl = platformWxmpConfig.buildAuthorizationUrl(service, configUrl, "snsapi_base");
response.sendRedirect(authorizationUrl);
}

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-message</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-platform</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-role</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-util</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.18</version>
<version>2.0.17-scope-test</version>
</parent>
<artifactId>springboot-web</artifactId>

View File

@@ -1,7 +1,6 @@
package com.tiesheng.web.config.operation;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
@@ -20,7 +19,6 @@ import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.util.Date;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -102,18 +100,6 @@ public class OperationAspect {
subject = (StrUtil.isEmpty(insertVal) ? "添加" : "编辑") + subject;
}
for (String key : allParams.keySet()) {
Object value = allParams.get(key);
if (value == null || StrUtil.isEmpty(value.toString())) {
// 移除占位符对应的值为空或null的占位符
String placeholder = "{" + key + "}";
subject = subject.replace(placeholder, "");
} else if (value instanceof Date) {
//日期格式化
allParams.put(key, DateUtil.format((Date) value,"yyyy-MM-dd HH:mm:ss"));
}
}
// 占位符处理
subject = StrUtil.format(subject, allParams);
} else {

View File

@@ -68,20 +68,19 @@ public class CoreConfigService extends TsServiceBase<CoreConfigSystemMapper, Cor
* @param dto
*/
public void updateConfigSystem(ConfigSystemDTO dto) {
CoreConfigSystem coreConfigSystem = getOneByColumn("config_key", dto.getConfigKey());
if (coreConfigSystem == null) {
CoreConfigSystem configKey = getOneByColumn("config_key", dto.getConfigKey());
if (configKey == null) {
throw new ApiException("该配置不存在,请检查");
}
if (coreConfigSystem.getReadOnly() == 1) {
if (configKey.getReadOnly() == 1) {
throw new ApiException("该配置只读,不可修改");
}
coreConfigSystem.setConfigVal(dto.getConfigVal());
coreConfigSystem.setRemark(dto.getRemark());
coreConfigSystem.setExtra(dto.getExtra());
updateById(coreConfigSystem);
configKey.setConfigVal(dto.getConfigVal());
configKey.setRemark(dto.getRemark());
configKey.setExtra(dto.getExtra());
updateById(configKey);
tsCacheService.putObj(CONFIG_SYSTEM_PREFIX + coreConfigSystem.getConfigKey(),
coreConfigSystem, 10 * 60);
tsCacheService.putObj(CONFIG_SYSTEM_PREFIX + configKey, configKey, 10 * 60);
}