Compare commits

..

6 Commits

Author SHA1 Message Date
丁磊
31c469178d publish 2.0.17-scope-test-0.4
Some checks failed
/ local-deploy (push) Failing after 5s
2025-06-09 18:07:45 +08:00
丁磊
dae2759477 publish 2.0.17-scope-test-0.3
Some checks failed
/ local-deploy (push) Failing after 6s
2025-06-09 18:00:39 +08:00
丁磊
b9526c71dd publish 2.0.17-scope-test-0.2
All checks were successful
/ local-deploy (push) Successful in 18s
2025-06-09 17:54:42 +08:00
丁磊
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 42 additions and 57 deletions

17
.gitlab-ci.yml Normal file
View File

@@ -0,0 +1,17 @@
stages:
- deploy
deploy-jar:
stage: deploy
tags:
- zengos
rules:
- if: $CI_COMMIT_TAG
script:
- mvn clean deploy -Dmaven.test.skip -DaltDeploymentRepository=master::default::file:$TAG_REPO_FOLDER
- cd $TAG_REPO_FOLDER
- git checkout master
- git pull
- git add .
- git commit -m "deploy $CI_PROJECT_NAME $CI_COMMIT_TAG"
- git push origin master

22
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.17-test</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.17-test</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-login</artifactId>
<version>2.0.17-test</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-web</artifactId>
<version>2.0.17-test</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-util</artifactId>
<version>2.0.17-test</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-platform</artifactId>
<version>2.0.17-test</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-message</artifactId>
<version>2.0.17-test</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-role</artifactId>
<version>2.0.17-test</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-annotation</artifactId>
<version>2.0.17-test</version>
<version>2.0.17-scope-test</version>
</dependency>
<dependency>
@@ -120,8 +120,8 @@
<pluginRepositories>
<pluginRepository>
<id>kepai-repo-plugin</id>
<url>http://git.kepai365.com/tiesheng/repository/raw/master</url>
<id>tiesheng-repo-plugin</id>
<url>https://git.tieshengkeji.com/api/packages/tieshengkeji/maven</url>
</pluginRepository>
</pluginRepositories>

View File

@@ -6,11 +6,11 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.17-test</version>
<version>2.0.17-scope-test-0.2</version>
</parent>
<artifactId>springboot-ademo</artifactId>
<version>2.0.17-test</version>
<version>2.0.17-scope-test-0.2</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.17-test</version>
<version>2.0.17-scope-test-0.2</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.17-test</version>
<version>2.0.17-scope-test-0.2</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.17-test</version>
<version>2.0.17-scope-test-0.2</version>
</parent>
<artifactId>springboot-login</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.17-test</version>
<version>2.0.17-scope-test-0.2</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.17-test</version>
<version>2.0.17-scope-test-0.2</version>
</parent>
<artifactId>springboot-platform</artifactId>

View File

@@ -162,8 +162,7 @@ public class PlatformWxmpConfig {
///////////////////////////////////////////////////////////////////////////
// setter\getter
/// ////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
public Map<String, WxConfigBean> getConfigs() {
return configs;

View File

@@ -11,7 +11,6 @@ public class WxOAuth2AccessToken {
private String accessToken;
private String openid;
private String isSnapshotuser;
public static WxOAuth2AccessToken create(String appId, String secret, String code) {
String response = OkHttpUtil.get("https://api.weixin.qq.com/sns/oauth2/access_token" +
@@ -24,20 +23,10 @@ public class WxOAuth2AccessToken {
return oAuth2AccessToken;
}
/**
* 是否是真实用户
*
* @return
*/
public boolean isRealUser() {
return !"1".equals(isSnapshotuser);
}
///////////////////////////////////////////////////////////////////////////
// setter\getter
/// ////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
public String getAccessToken() {
return accessToken;
@@ -54,12 +43,4 @@ public class WxOAuth2AccessToken {
public void setOpenid(String openid) {
this.openid = openid;
}
public String getIsSnapshotuser() {
return isSnapshotuser;
}
public void setIsSnapshotuser(String isSnapshotuser) {
this.isSnapshotuser = isSnapshotuser;
}
}

View File

@@ -17,7 +17,6 @@ public class WxUserInfo {
private String headimgurl;
private String openid;
private String appId;
private boolean isRealUser;
///////////////////////////////////////////////////////////////////////////
// 逻辑方法
@@ -34,16 +33,13 @@ public class WxUserInfo {
String s = OkHttpUtil.get("https://api.weixin.qq.com/sns/userinfo"
+ "?access_token=" + oAuth2AccessToken.getAccessToken()
+ "&openid=" + oAuth2AccessToken.getOpenid() + "&lang=zh_CN");
WxUserInfo wxUserInfo = JSON.parseObject(s, WxUserInfo.class);
wxUserInfo.setRealUser(oAuth2AccessToken.isRealUser());
return wxUserInfo;
return JSON.parseObject(s, WxUserInfo.class);
}
///////////////////////////////////////////////////////////////////////////
// setter\getter
/// ////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
public String getAccessToken() {
return accessToken;
@@ -116,12 +112,4 @@ public class WxUserInfo {
public void setAppId(String appId) {
this.appId = appId;
}
public boolean isRealUser() {
return isRealUser;
}
public void setRealUser(boolean realUser) {
isRealUser = realUser;
}
}

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.tiesheng.springboot-parent</groupId>
<artifactId>springboot-parent</artifactId>
<version>2.0.17-test</version>
<version>2.0.17-scope-test-0.2</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.17-test</version>
<version>2.0.17-scope-test-0.2</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.17-test</version>
<version>2.0.17-scope-test-0.2</version>
</parent>
<artifactId>springboot-web</artifactId>