修复分组异常问题

flow-common/flow-common-oauth2-starter/src/main/java/com/flow/common/oauth2/configure/AuthorizationServerConfigure.java

@@ -157,6 +157,10 @@ public class AuthorizationServerConfigure extends AuthorizationServerConfigurerA
                 return super.createAccessToken(authentication);
             }
         };
+
+        // 设置 Token 的有效期为一年（365 天 × 24 小时 × 60 分钟 × 60 秒）
+        tokenServices.setAccessTokenValiditySeconds(365 * 24 * 60 * 60);
+
         // 请求回来的token都会变.但是请求的refresh token不会续期(false)或者重置为初始化时间(true)
         tokenServices.setReuseRefreshToken(true);
         // 支持刷新令牌（默认false）

flow-oauth/flow-oauth-biz/src/main/java/com/flow/service/impl/AuthServiceImpl.java

@@ -11,6 +11,7 @@ import com.flow.model.*;
 import com.flow.service.AuthService;
 import com.wf.captcha.ArithmeticCaptcha;
 import lombok.extern.slf4j.Slf4j;
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -103,7 +104,8 @@ public class AuthServiceImpl implements AuthService {
         try {
             decryptedData = decrypt(saltData);
         } catch (Exception e) {
-            throw new BaseException("盐值解析异常，请联系管理员" + e.getMessage());
+            log.error("盐值解析异常", e);
+            throw new BaseException("盐值解析异常，请联系管理员");
         }
         log.info("解密后的数据: " + decryptedData);
 
@@ -112,7 +114,12 @@ public class AuthServiceImpl implements AuthService {
         } else {
             JSONObject jsonObject = new JSONObject(decryptedData);
 
-            String user = jsonObject.getString("user");
+            String user = null;
+            try {
+                user = jsonObject.getString("user");
+            } catch (JSONException e) {
+                throw new BaseException("用户信息异常，请联系管理员");
+            }
             long time = jsonObject.getLong("time");
             String form = jsonObject.getString("form");
 

flow-workflow/flow-workflow-biz/src/main/java/com/flow/service/impl/FlowModelServiceImpl.java

@@ -147,7 +147,28 @@ public class FlowModelServiceImpl extends BaseServiceImpl<FlowModelDao, FlowMode
     @Transactional(rollbackFor = Exception.class)
     @Override
     public FlowModel update(FlowModel flowModel) {
+        // 更新 FlowModel 表
         flowModelDao.updateById(flowModel);
+
+        Long modelId = flowModel.getId();
+        Long groupId = flowModel.getGroupId();
+
+        // 查询与 FlowModel 关联的所有 FlowDefine 记录
+        List<FlowDefine> flowDefineList = flowDefineService.lambdaQuery()
+                .eq(FlowDefine::getModelId, modelId)
+                .list();
+
+        // 如果没有找到对应的 FlowDefine 记录，抛出异常
+        if (flowDefineList.isEmpty()) {
+            throw new BaseException("模版数据更新失败，流程id：" + modelId);
+        }
+
+        // 更新 FlowDefine 记录的 groupId
+        flowDefineList.forEach(flowDefine -> flowDefine.setGroupId(groupId));
+
+        // 批量更新 FlowDefine 表
+        flowDefineService.updateBatchById(flowDefineList);
+
         return flowModel;
     }