[Bug][dinky-admin] Database postgresql adaptation problem

Author: Jam804

dinky-admin/src/main/java/org/dinky/service/impl/TenantServiceImpl.java

@@ -45,6 +45,7 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.fasterxml.jackson.databind.JsonNode;
 
@@ -175,8 +176,10 @@ public Result<Void> removeTenantById(Integer tenantId) {
         if (CollectionUtil.isNotEmpty(userTenants)) {
             return Result.failed(Status.TENANT_BINDING_USER);
         }
-        Integer deleteByIdResult = baseMapper.deleteById(tenantId);
-        if (deleteByIdResult > 0) {
+        LambdaUpdateWrapper<Tenant> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(Tenant::getId, tenantId);
+        updateWrapper.set(Tenant::getIsDelete, true);
+        if (update(updateWrapper)) {
             return Result.succeed(Status.DELETE_SUCCESS);
         } else {
             return Result.failed(Status.DELETE_FAILED);

dinky-admin/src/main/java/org/dinky/service/impl/UserServiceImpl.java

@@ -68,6 +68,7 @@
 import org.springframework.util.CollectionUtils;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 
 import cn.dev33.satoken.secure.SaSecureUtil;
 import cn.dev33.satoken.stp.StpUtil;
@@ -162,7 +163,10 @@ public Boolean removeUser(Integer id) {
         if (user.getSuperAdminFlag()) {
             throw new BusException(Status.USER_SUPERADMIN_CANNOT_DELETE);
         }
-        return baseMapper.deleteById(id) > 0;
+        LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(User::getId, id);
+        updateWrapper.set(User::getIsDelete, true);
+        return update(updateWrapper);
     }
 
     /**

dinky-admin/src/main/resources/mapper/UserMapper.xml

@@ -49,7 +49,7 @@
 
 <!--    recoveryUser -->
     <update id="recoveryUser" parameterType="java.lang.Integer" >
-        update dinky_user set is_delete = 0 where id = #{id}
+        update dinky_user set is_delete = false where id = #{id}
     </update>
 
 </mapper>

dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesGateway.java

@@ -118,7 +118,6 @@ protected void initConfig() {
         final String oldContainerImageKey = "kubernetes.container.image";
         if (k8sConfiguration.containsKey(oldContainerImageKey)) {
             String containerImageValue = k8sConfiguration.get(oldContainerImageKey);
-            k8sConfiguration.remove(oldContainerImageKey);
             k8sConfiguration.put(KubernetesConfigOptions.CONTAINER_IMAGE.key(), containerImageValue);
         }
         // -------------------Note: the sequence can not be changed, priority problem----------------