Merge remote-tracking branch 'refs/remotes/origin/master' into dev

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/controller/SchisandraAuthUserController.java

@@ -149,11 +149,21 @@ public class SchisandraAuthUserController {
             schisandraAuthAddressBO.setAgent(userAgent.toString());
             schisandraAuthAddressBO.setUserId(result.getId());
             schisandraAuthAddressBO.setIp(ip);
+            if (userAgent.getBrowser() != null) {
                 schisandraAuthAddressBO.setBrowser(userAgent.getBrowser().toString());
-            schisandraAuthAddressBO.setBrowserVersion(userAgent.getBrowserVersion().getVersion());
+            }
+            if (userAgent.getBrowserVersion() != null) {
+                schisandraAuthAddressBO.setBrowserVersion(userAgent.getBrowserVersion().toString());
+            }
             schisandraAuthAddressBO.setLocation(ip2region);
+            SchisandraAuthAddressBO authAddressBO = schisandraAuthAddressDomainService.queryByUserId(result.getId());
+            if (ObjectUtils.isNotEmpty(authAddressBO)) {
+                schisandraAuthAddressBO.setId(authAddressBO.getId());
+                schisandraAuthAddressDomainService.update(schisandraAuthAddressBO);
+            } else {
                 Boolean add = schisandraAuthAddressDomainService.add(schisandraAuthAddressBO);
                 assert add;
+            }
             map.put("user", result);
             if (login != null) {
                 if (StpUtil.isLogin(result.getId())) {
@@ -211,12 +221,21 @@ public class SchisandraAuthUserController {
                 schisandraAuthAddressBO.setAgent(userAgent.toString());
                 schisandraAuthAddressBO.setUserId(result.getId());
                 schisandraAuthAddressBO.setIp(ip);
+                if (userAgent.getBrowser() != null) {
                     schisandraAuthAddressBO.setBrowser(userAgent.getBrowser().toString());
-                schisandraAuthAddressBO.setBrowserVersion(userAgent.getBrowserVersion().getVersion());
+                }
+                if (userAgent.getBrowserVersion() != null) {
+                    schisandraAuthAddressBO.setBrowserVersion(userAgent.getBrowserVersion().toString());
+                }
                 schisandraAuthAddressBO.setLocation(ip2region);
+                SchisandraAuthAddressBO authAddressBO = schisandraAuthAddressDomainService.queryByUserId(result.getId());
+                if (ObjectUtils.isNotEmpty(authAddressBO)) {
+                    schisandraAuthAddressBO.setId(authAddressBO.getId());
+                    schisandraAuthAddressDomainService.update(schisandraAuthAddressBO);
+                } else {
                     Boolean add = schisandraAuthAddressDomainService.add(schisandraAuthAddressBO);
                     assert add;
-
+                }
                 map.put("user", result);
                 if (loginByPhone != null) {
                     if (StpUtil.isLogin(result.getId())) {
@@ -420,6 +439,7 @@ public class SchisandraAuthUserController {
 
     /**
      * 用户设置安全信息
+     *
      * @param schisandraAuthUserDTO
      * @return
      */
@@ -429,5 +449,10 @@ public class SchisandraAuthUserController {
         return Result.ok(schisandraAuthUserDomainService.update(schisandraAuthUserBO));
     }
 
+    @PostMapping("logout")
+    public Result logout(@RequestParam("userId") String userId) {
+        StpUtil.logout(userId);
+        return Result.ok();
+    }
 
 }

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthUserDomainService.java

@@ -49,7 +49,7 @@ public interface SchisandraAuthUserDomainService {
      * @author: landaiqing
      * @date: 2024/5/26 17:28
      */
-    SchisandraAuthUserBO login(SchisandraAuthUserBO schisandraAuthUserBO);
+    SchisandraAuthUserBO login(SchisandraAuthUserBO schisandraAuthUserB);
 
     /**
      * @description: 通过手机号登录

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java

@@ -235,10 +235,14 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo
      */
     @Override
     public Boolean wechatRegister(String appId, String openId,String clientId, HttpServletRequest httpServletRequest) {
-        SchisandraSocialUser socialUser = schisandraSocialUserService.selectByOpenId(openId);
+        SchisandraSocialUser socialUser = schisandraSocialUserService.selectByOpenId(appId,openId);
         if (ObjectUtils.isNotEmpty(socialUser)) {
-            String userId = socialUser.getId();
+            String SocialUserId = socialUser.getId();
-
+            SchisandraSocialUserAuth schisandraSocialUserAuth= schisandraSocialUserAuthService.queryBySocialUserId(SocialUserId);
+            if(ObjectUtils.isEmpty(schisandraSocialUserAuth)){
+                return false;
+            }
+            String userId = schisandraSocialUserAuth.getUserId();
 
             // 加入登录IP地址
             String ip = IPUtil.getIp(httpServletRequest);
@@ -250,8 +254,12 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo
             schisandraAuthAddressBO.setAgent(userAgent.toString());
             schisandraAuthAddressBO.setUserId(userId);
             schisandraAuthAddressBO.setIp(ip);
+            if(userAgent.getBrowser() != null) {
                 schisandraAuthAddressBO.setBrowser(userAgent.getBrowser().toString());
-            schisandraAuthAddressBO.setBrowserVersion(userAgent.getBrowserVersion().getVersion());
+            }
+            if(userAgent.getBrowserVersion() != null){
+                schisandraAuthAddressBO.setBrowserVersion(userAgent.getBrowserVersion().toString());
+            }
             schisandraAuthAddressBO.setLocation(ip2region);
             SchisandraAuthAddress schisandraAuthAddress = SchisandraAuthAddressBOConverter.INSTANCE.convertBOToEntity(schisandraAuthAddressBO);
             int insert = schisandraAuthAddressService.update(schisandraAuthAddress);
@@ -268,6 +276,7 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo
         }else{
             // 插入社会用户信息表
             SchisandraSocialUserBO socialUserBO = new SchisandraSocialUserBO();
+            socialUserBO.setUuid(appId);
             socialUserBO.setOpenId(openId);
             SchisandraSocialUser schisandraSocialUser = SchisandraSocialUserBOConverter.INSTANCE.convertBOToEntity(socialUserBO);
             int result = schisandraSocialUserService.insertSocialUser(schisandraSocialUser);
@@ -299,8 +308,12 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo
             schisandraAuthAddressBO.setAgent(userAgent.toString());
             schisandraAuthAddressBO.setUserId(authUserId);
             schisandraAuthAddressBO.setIp(ip);
+            if(userAgent.getBrowser() != null) {
                 schisandraAuthAddressBO.setBrowser(userAgent.getBrowser().toString());
-            schisandraAuthAddressBO.setBrowserVersion(userAgent.getBrowserVersion().getVersion());
+            }
+            if(userAgent.getBrowserVersion() != null){
+                schisandraAuthAddressBO.setBrowserVersion(userAgent.getBrowserVersion().toString());
+            }
             schisandraAuthAddressBO.setLocation(ip2region);
             SchisandraAuthAddress schisandraAuthAddress = SchisandraAuthAddressBOConverter.INSTANCE.convertBOToEntity(schisandraAuthAddressBO);
             int insertIp = schisandraAuthAddressService.insert(schisandraAuthAddress);
@@ -359,6 +372,12 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo
         AuthToken token = data.getToken();
         SchisandraSocialUser socialUser = schisandraSocialUserService.selectByUuidAndType(uuid, type);
         if (ObjectUtils.isNotEmpty(socialUser)) {
+
+            SchisandraSocialUserAuth schisandraSocialUserAuth= schisandraSocialUserAuthService.queryBySocialUserId(socialUser.getId());
+            if(ObjectUtils.isEmpty(schisandraSocialUserAuth)){
+                return Result.fail();
+            }
+            String userId = schisandraSocialUserAuth.getUserId();
             // 更新用户信息
             SchisandraSocialUserBO socialUserBO = new SchisandraSocialUserBO();
             socialUserBO.setAccessToken(token.getAccessToken());
@@ -383,7 +402,6 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo
                 }
                 return Result.fail("Social User update fail");
             }
-            String userId = socialUser.getId();
 
             // 加入登录IP地址
             String ip = IPUtil.getIp(httpServletRequest);
@@ -395,8 +413,12 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo
             schisandraAuthAddressBO.setAgent(userAgent.toString());
             schisandraAuthAddressBO.setUserId(userId);
             schisandraAuthAddressBO.setIp(ip);
+            if(userAgent.getBrowser() != null) {
                 schisandraAuthAddressBO.setBrowser(userAgent.getBrowser().toString());
-            schisandraAuthAddressBO.setBrowserVersion(userAgent.getBrowserVersion().getVersion());
+            }
+            if(userAgent.getBrowserVersion() != null){
+                schisandraAuthAddressBO.setBrowserVersion(userAgent.getBrowserVersion().toString());
+            }
             schisandraAuthAddressBO.setLocation(ip2region);
             SchisandraAuthAddress schisandraAuthAddress = SchisandraAuthAddressBOConverter.INSTANCE.convertBOToEntity(schisandraAuthAddressBO);
             int insert = schisandraAuthAddressService.update(schisandraAuthAddress);
@@ -463,8 +485,12 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo
             schisandraAuthAddressBO.setAgent(userAgent.toString());
             schisandraAuthAddressBO.setUserId(authUserId);
             schisandraAuthAddressBO.setIp(ip);
+            if(userAgent.getBrowser() != null) {
                 schisandraAuthAddressBO.setBrowser(userAgent.getBrowser().toString());
-            schisandraAuthAddressBO.setBrowserVersion(userAgent.getBrowserVersion().getVersion());
+            }
+            if(userAgent.getBrowserVersion() != null){
+                schisandraAuthAddressBO.setBrowserVersion(userAgent.getBrowserVersion().toString());
+            }
             schisandraAuthAddressBO.setLocation(ip2region);
             SchisandraAuthAddress schisandraAuthAddress = SchisandraAuthAddressBOConverter.INSTANCE.convertBOToEntity(schisandraAuthAddressBO);
             int insertIp = schisandraAuthAddressService.insert(schisandraAuthAddress);

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSocialUserAuthService.java

@@ -43,4 +43,5 @@ public interface SchisandraSocialUserAuthService {
     boolean deleteById(String id);
 
 
+    SchisandraSocialUserAuth queryBySocialUserId(String socialUserId);
 }

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraSocialUserService.java

@@ -53,5 +53,5 @@ public interface SchisandraSocialUserService {
 
     int insertSocialUser(SchisandraSocialUser schisandraSocialUser);
 
-    SchisandraSocialUser selectByOpenId(String openId);
+    SchisandraSocialUser selectByOpenId(String appId,String openId);
 }

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSocialUserAuthServiceImpl.java

@@ -1,7 +1,8 @@
 package com.schisandra.auth.infra.basic.service.impl;
 
-import com.schisandra.auth.infra.basic.entity.SchisandraSocialUserAuth;
 import com.schisandra.auth.infra.basic.dao.SchisandraSocialUserAuthDao;
+import com.schisandra.auth.infra.basic.entity.SchisandraSocialUserAuth;
+import com.schisandra.auth.infra.basic.entity.table.SchisandraSocialUserAuthTableDef;
 import com.schisandra.auth.infra.basic.service.SchisandraSocialUserAuthService;
 import org.springframework.stereotype.Service;
 
@@ -63,5 +64,10 @@ public class SchisandraSocialUserAuthServiceImpl implements SchisandraSocialUser
         return this.schisandraSocialUserAuthDao.deleteById(id) > 0;
     }
 
+    @Override
+    public SchisandraSocialUserAuth queryBySocialUserId(String socialUserId) {
+        return this.schisandraSocialUserAuthDao.selectOneByCondition(SchisandraSocialUserAuthTableDef.SCHISANDRA_SOCIAL_USER_AUTH.SOCIAL_USER_ID.eq(socialUserId));
+    }
+
 
 }

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraSocialUserServiceImpl.java

@@ -115,8 +115,8 @@ public class SchisandraSocialUserServiceImpl implements SchisandraSocialUserServ
      * @date: 2024/6/27 下午3:05
      */
     @Override
-    public SchisandraSocialUser selectByOpenId(String openId) {
+    public SchisandraSocialUser selectByOpenId(String appId,String openId) {
-        return schisandraSocialUserDao.selectOneByCondition(SchisandraSocialUserTableDef.SCHISANDRA_SOCIAL_USER.OPEN_ID.eq(openId));
+        return schisandraSocialUserDao.selectOneByCondition(SchisandraSocialUserTableDef.SCHISANDRA_SOCIAL_USER.OPEN_ID.eq(openId).and(SchisandraSocialUserTableDef.SCHISANDRA_SOCIAL_USER.UUID.eq(appId)));
     }
 
 

schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml

@@ -43,7 +43,7 @@ spring:
     # Redis服务器连接密码（默认为空）
     password: LDQ20020618xxx
     # 连接超时时间
-    timeout: 2s
+    timeout: 10s
     lettuce:
       pool:
         # 连接池最大连接数
@@ -102,7 +102,7 @@ mybatis-flex:
 
 # 前端地址
 web:
-  url: http://127.0.0.1:5173/
+  url: https://landaiqing.cn/
 
 # MD5加密salt
 cipher:

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java

@@ -3,30 +3,20 @@ package com.schisandra.oss.application.controller;
 import cn.hutool.core.util.ZipUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
 import com.google.common.base.Preconditions;
-import com.google.gson.Gson;
-import com.mybatisflex.annotation.RelationOneToMany;
 import com.schisandra.oss.application.convert.SchisandraOssMinioDTOConverter;
-import com.schisandra.oss.application.convert.SchisandraOssQiniuDTOConverter;
 import com.schisandra.oss.application.dto.SchisandraOssMinioDTO;
-import com.schisandra.oss.application.dto.SchisandraOssQiniuDTO;
 import com.schisandra.oss.application.oss.constant.OssConstant;
 import com.schisandra.oss.application.oss.core.minio.MinioOssClient;
 import com.schisandra.oss.application.oss.core.minio.MinioOssConfiguration;
 import com.schisandra.oss.application.oss.model.OssInfo;
 import com.schisandra.oss.common.entity.Result;
 import com.schisandra.oss.common.utils.CaffeineUtil;
-import com.schisandra.oss.domain.bo.SchisandraOssAliBO;
 import com.schisandra.oss.domain.bo.SchisandraOssMinioBO;
 import com.schisandra.oss.domain.redis.RedisUtil;
 import com.schisandra.oss.domain.service.SchisandraOssMinioDomainService;
 import io.minio.errors.*;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.cache.annotation.Caching;
 import org.springframework.http.MediaType;
 import org.springframework.util.StreamUtils;
 import org.springframework.web.bind.annotation.*;
@@ -42,7 +32,6 @@ import java.net.URLEncoder;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -88,9 +77,9 @@ public class SchisandraOssMinioController {
     }
 
 
-
     /**
      * 返回当前用户minio表所有数据
+     *
      * @param userId
      * @return
      */

schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-starter/src/main/resources/application.yml

@@ -43,7 +43,7 @@ spring:
     # Redis服务器连接密码（默认为空）
     password: LDQ20020618xxx
     # 连接超时时间
-    timeout: 2s
+    timeout: 10s
     lettuce:
       pool:
         # 连接池最大连接数
@@ -78,6 +78,6 @@ xxl:
       appname: schisandra-cloud-storage-oss
       address:
       ip: 1.95.0.111
-      port: 9998
+      port: 9997
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 30

schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCircleController.java

@@ -73,7 +73,6 @@ public class SchisandraShareCircleController {
     /**
      * 分享圈列表返回
      */
-    @Cacheable(value = "sharelist", key = "'sharelist'")
     @GetMapping("sharelist")
     public Result<List<SchisandraShareCircleDTO>> getShareList() {
         try {

schisandra-cloud-storage-share/schisandra-cloud-storage-share-starter/src/main/resources/application.yml

@@ -38,7 +38,7 @@ spring:
     # Redis服务器连接密码（默认为空）
     password: LDQ20020618xxx
     # 连接超时时间
-    timeout: 2s
+    timeout: 10s
     lettuce:
       pool:
         # 连接池最大连接数

schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/pom.xml

@@ -69,11 +69,6 @@
             <artifactId>schisandra-cloud-storage-system-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.xuxueli</groupId>
-            <artifactId>xxl-job-core</artifactId>
-            <version>2.4.0</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>

schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/config/XxlJobConfig.java

@@ -1,78 +0,0 @@
-package com.schisandra.system.domain.config;
-
-import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * xxl-job config
- *
- * @author xuxueli 2017-04-28
- */
-@Configuration
-public class XxlJobConfig {
-    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
-
-    @Value("${xxl.job.admin.addresses}")
-    private String adminAddresses;
-
-    @Value("${xxl.job.accessToken}")
-    private String accessToken;
-
-    @Value("${xxl.job.executor.appname}")
-    private String appname;
-
-    @Value("${xxl.job.executor.address}")
-    private String address;
-
-    @Value("${xxl.job.executor.ip}")
-    private String ip;
-
-    @Value("${xxl.job.executor.port}")
-    private int port;
-
-    @Value("${xxl.job.executor.logpath}")
-    private String logPath;
-
-    @Value("${xxl.job.executor.logretentiondays}")
-    private int logRetentionDays;
-
-
-    @Bean
-    public XxlJobSpringExecutor xxlJobExecutor() {
-        logger.info(">>>>>>>>>>> xxl-job config init.");
-        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
-        xxlJobSpringExecutor.setAppname(appname);
-        xxlJobSpringExecutor.setAddress(address);
-        xxlJobSpringExecutor.setIp(ip);
-        xxlJobSpringExecutor.setPort(port);
-        xxlJobSpringExecutor.setAccessToken(accessToken);
-        xxlJobSpringExecutor.setLogPath(logPath);
-        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
-
-        return xxlJobSpringExecutor;
-    }
-
-    /**
-     * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
-     *
-     *      1、引入依赖：
-     *          <dependency>
-     *             <groupId>org.springframework.cloud</groupId>
-     *             <artifactId>spring-cloud-commons</artifactId>
-     *             <version>${version}</version>
-     *         </dependency>
-     *
-     *      2、配置文件，或者容器启动变量
-     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
-     *
-     *      3、获取IP
-     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
-     */
-
-
-}

schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/application.yml

@@ -38,7 +38,7 @@ spring:
     # Redis服务器连接密码（默认为空）
     password: LDQ20020618xxx
     # 连接超时时间
-    timeout: 2s
+    timeout: 10s
     lettuce:
       pool:
         # 连接池最大连接数
@@ -82,17 +82,3 @@ mybatis-flex:
   mapper-locations:
     - "classpath*:/mapper/**/*.xml"
 
-# xxl-job配置
-xxl:
-  job:
-    admin:
-      addresses: http://1.95.0.111:8088/xxl-job-admin
-    accessToken: default_token
-    executor:
-      appname: schisandra-cloud-storage-system
-      address:
-      ip: 1.95.0.111
-      port: 9999
-      logpath: /data/applogs/xxl-job/jobhandler
-      logretentiondays: 30
-

schisandra-cloud-storage-wechat/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
     # Redis服务器连接密码（默认为空）
     password: LDQ20020618xxx
     # 连接超时时间
-    timeout: 2s
+    timeout: 10s
     lettuce:
       pool:
         # 连接池最大连接数
@@ -28,8 +28,8 @@ spring:
 wx:
   mp:
     token: LDQ20020618xxx
-    appid: wx55251c2f83b9fc25
+    appid: wx7c3b1f52f460e5dd
-    secret: d511800cd53d248afe1260bb8aeed230
+    secret: f924c42c90223a0013908e204863c3b8
     codeExpire: 3600
     encodingAESKey:
 
@@ -37,12 +37,12 @@ wx:
 xxl:
   job:
     admin:
-      addresses: http://127.0.0.1:8081/xxl-job-admin
+      addresses: http://1.95.0.111:8088/xxl-job-admin
     accessToken: default_token
     executor:
       appname: schisandra-cloud-storage-wechat
       address:
-      ip: 127.0.0.1
+      ip: 1.95.0.111
-      port: 9998
+      port: 9996
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 30