20260821230656

code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/service/LoginLogService.java

@@ -10,13 +10,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.sql.Timestamp;
-import java.time.LocalDateTime;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
 /**
- * 登录日志服务：在登录成功或失败时采集客户端信息，并通过通用 saveobjt 机制写入 s_login_log 表。
+ * 登录日志服务：在登录成功或失败时采集客户端信息，并通过通用 saveobjt 机制写入 s_log_login 表。
  * 写日志失败不影响登录主流程；机构上下文通过 OrgContext 临时设置并在 finally 中清理。
  */
 @Service
@@ -24,6 +23,9 @@ public class LoginLogService {
 
     private static final Logger log = LoggerFactory.getLogger(LoginLogService.class);
 
+    /** 登录类型：密码登录（与 s_log_login.b_login_type 约定一致） */
+    private static final String LOGIN_TYPE_PASSWORD = "password";
+
     private final DataSaveService dataSaveService;
     private final ClientInfoExtractor clientInfoExtractor;
 
@@ -49,10 +51,10 @@ public class LoginLogService {
 
             Map<String, Object> row = new LinkedHashMap<>();
             row.put("b_id", IdGenerator.nextId());
-            row.put("b_org_id", orgId);
             row.put("b_user_id", userId);
             row.put("b_account", account);
-            row.put("b_login_time", Timestamp.valueOf(LocalDateTime.now()));
+            row.put("b_login_type", LOGIN_TYPE_PASSWORD);
+            row.put("b_occurdatetime", Timestamp.from(java.time.Instant.now()));
             row.put("b_ip", info.ip());
             row.put("b_ip_location", info.ipLocation());
             row.put("b_browser", info.browser());
@@ -66,7 +68,7 @@ public class LoginLogService {
             row.put("b_session_id", sessionId);
 
             Map<String, Object> tableOp = new LinkedHashMap<>();
-            tableOp.put("table", "s_login_log");
+            tableOp.put("table", "s_log_login");
             tableOp.put("key_field", "b_id");
             tableOp.put("inserts", List.of(row));
 

code/fms/fms-api/src/main/java/cn/g3soft/fmsapi/utils/DbUtils.java

@@ -166,33 +166,12 @@ public class DbUtils {
             String account
     ) throws SQLException {
         try (Connection connection = dataSourceManager.getConnection(orgId)) {
-            SQLException failure = null;
-            boolean privileged = false;
-            try {
-                setSystemUserVisibility(connection, 1);
-                privileged = true;
-                String sql = "SELECT [b_id], [b_account], [b_name], [b_password] "
-                        + "FROM [b_user] WHERE [b_account] = ? AND [b_canuse] = 1";
-                try (PreparedStatement statement = connection.prepareStatement(sql)) {
-                    statement.setString(1, account);
-                    try (ResultSet resultSet = statement.executeQuery()) {
-                        return readRows(resultSet);
-                    }
-                }
-            } catch (SQLException exception) {
-                failure = exception;
-                throw exception;
-            } finally {
-                if (privileged) {
-                    try {
-                        setSystemUserVisibility(connection, null);
-                    } catch (SQLException clearException) {
-                        if (failure != null) {
-                            failure.addSuppressed(clearException);
-                        } else {
-                            throw clearException;
-                        }
-                    }
+            String sql = "SELECT [b_id], [b_account], [b_name], [b_password] "
+                    + "FROM [b_user] WHERE [b_account] = ? AND [b_canuse] = 1";
+            try (PreparedStatement statement = connection.prepareStatement(sql)) {
+                statement.setString(1, account);
+                try (ResultSet resultSet = statement.executeQuery()) {
+                    return readRows(resultSet);
                 }
             }
         }
@@ -506,22 +485,6 @@ public class DbUtils {
         return result.toString();
     }
 
-    private void setSystemUserVisibility(
-            Connection connection,
-            Integer value
-    ) throws SQLException {
-        String sql = "EXEC sys.sp_set_session_context @key = ?, @value = ?";
-        try (PreparedStatement statement = connection.prepareStatement(sql)) {
-            statement.setString(1, "allow_g3soft");
-            if (value == null) {
-                statement.setNull(2, java.sql.Types.INTEGER);
-            } else {
-                statement.setInt(2, value);
-            }
-            statement.execute();
-        }
-    }
-
     private String buildColumns(List<String> searchColumns) {
         if (searchColumns == null || searchColumns.isEmpty()) {
             return "*";