更新系统参数配置的适配

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/consts/service/impl/SysConfigServiceImpl.java

@@ -12,7 +12,6 @@ import cn.stylefeng.guns.sys.modular.consts.service.SysConfigService;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -80,8 +79,6 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
         SysConfig newEntity = getEntity(param);
         ToolUtil.copyProperties(newEntity, oldEntity);
 
-        UpdateWrapper<SysConfig> updateWrapper = new UpdateWrapper<SysConfig>().eq("id", param.getId());
-
         //如果是字典类型
         if (ToolUtil.isNotEmpty(param.getDictFlag())
                 && param.getDictFlag().equalsIgnoreCase("Y")) {
@@ -90,13 +87,12 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
 
             //如果是非字典，则标识位置为空
             newEntity.setDictFlag("N");
-            updateWrapper.set(true, "dict_type_id", null);
         }
 
         //添加字典context
         ConstantsContext.putConstant(newEntity.getCode(), newEntity.getValue());
 
-        this.update(newEntity, updateWrapper);
+        this.updateById(newEntity);
     }
 
     @Override

guns-base-support/guns-sys/src/main/webapp/assets/modular/sysConfig/sysConfig_edit.js

@@ -135,8 +135,8 @@ layui.use(['form', 'admin', 'ax'], function () {
         window.location.href = Feng.ctxPath + '/sysConfig'
     });
 
-    //如果当前字典有dictTypeId则初始化字典类型选择
-    if (result.data.dictTypeId) {
+    //如果当前配置是带字典类型，则初始化字典类型选择
+    if (result.data.dictFlag === 'Y') {
         activeDictSelect();
 
         //更新选项

guns-vip-main/src/main/java/cn/stylefeng/guns/config/datasource/DataSourceConfig.java

@@ -26,6 +26,8 @@ import org.springframework.context.annotation.Primary;
 
 import javax.sql.DataSource;
 
+import java.util.Properties;
+
 import static cn.stylefeng.guns.base.db.context.DataSourceContext.MASTER_DATASOURCE_NAME;
 
 /**
@@ -61,7 +63,17 @@ public class DataSourceConfig {
         atomikosDataSourceBean.setUniqueResourceName(MASTER_DATASOURCE_NAME);
         atomikosDataSourceBean.setMaxPoolSize(100);
         atomikosDataSourceBean.setBorrowConnectionTimeout(60);
-        atomikosDataSourceBean.setXaProperties(druidProperties.createProperties());
+
+        Properties properties = druidProperties.createProperties();
+
+        //解决oracle数据库包connection holder is null
+        if (druidProperties.getUrl().contains("oracle")) {
+            properties.setProperty("removeAbandoned", "true");
+            properties.setProperty("removeAbandonedTimeoutMillis", "10000");
+            properties.setProperty("poolPreparedStatements", "false");
+        }
+
+        atomikosDataSourceBean.setXaProperties(properties);
 
         return atomikosDataSourceBean;
     }