111

jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/system/controller/CommonController.java

@@ -472,8 +472,9 @@ public class CommonController {
 			Map<String,Object> map1=new HashMap<>();
 //			map1.put("url","http://10.0.0.112:3000/jeecg-boot/sys/common/downloadFile/"+dbpath);
 //			map1.put("url","http://oa.cuidiansoft.com/jeecg-boot/sys/common/downloadFile/"+dbpath);
-			map1.put("url","http://127.0.0.1:8087/jeecg-boot/sys/common/downloadFile/"+dbpath);
 //			map1.put("url","http://106.15.206.14:8090/jeecg-boot/sys/common/downloadFile/"+dbpath);
+//			map1.put("url","http://127.0.0.1:8090/jeecg-boot/sys/common/downloadFile/"+dbpath);
+			map1.put("url","http://220.191.168.86:18087/jeecg-boot/sys/common/downloadFile/"+dbpath);//森语外网
 			map.put("data",map1);
 			result.setData(map1);
 		} catch (IOException e) {

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/config/ActivitiConfig.java

@@ -0,0 +1,33 @@
+package org.jeecg.config;
+
+import org.activiti.spring.SpringProcessEngineConfiguration;
+import org.activiti.spring.boot.ProcessEngineConfigurationConfigurer;
+import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
+import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class ActivitiConfig implements ProcessEngineConfigurationConfigurer {
+
+    /**
+     * 解決工作流生成图片乱码问题
+     *
+     * @param processEngineConfiguration processEngineConfiguration
+     */
+    @Override
+    public void configure(SpringProcessEngineConfiguration processEngineConfiguration) {
+        processEngineConfiguration.setActivityFontName("宋体");
+        processEngineConfiguration.setAnnotationFontName("宋体");
+        processEngineConfiguration.setLabelFontName("宋体");
+    }
+
+    @Bean
+    public ConfigurableServletWebServerFactory webServerFactory() {
+        TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
+        factory.addConnectorCustomizers((TomcatConnectorCustomizer) connector -> connector.setProperty("relaxedQueryChars", "|{}[]!@#$%^&*()_+:',./\\"));
+        return factory;
+    }
+}
+

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/config/ActivitiDataSourceConfig.java

@@ -2,6 +2,7 @@ package org.jeecg.config;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import org.activiti.engine.ProcessEngineConfiguration;
+import org.activiti.spring.SpringAsyncExecutor;
 import org.activiti.spring.SpringProcessEngineConfiguration;
 import org.activiti.spring.boot.AbstractProcessEngineAutoConfiguration;
 import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
@@ -14,48 +15,61 @@ import org.springframework.transaction.PlatformTransactionManager;
 
 import javax.annotation.Resource;
 import javax.sql.DataSource;
-
-@Configuration
-public class ActivitiDataSourceConfig extends AbstractProcessEngineAutoConfiguration {
-    @Resource
-    private ActivitiDataSourceProperties activitiDataSourceProperties;
-
-    @Bean
-    public DataSource activitiDataSource() {
-        DruidDataSource DruiddataSource = new DruidDataSource();
-        DruiddataSource.setUrl(activitiDataSourceProperties.getUrl());
-        DruiddataSource.setDriverClassName(activitiDataSourceProperties.getDriverClassName());
-        DruiddataSource.setPassword(activitiDataSourceProperties.getPassword());
-        DruiddataSource.setUsername(activitiDataSourceProperties.getUsername());
-        return DruiddataSource;
-    }
-
-    @Bean
-    public ConfigurableServletWebServerFactory webServerFactory() {
-        TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
-        factory.addConnectorCustomizers((TomcatConnectorCustomizer) connector -> connector.setProperty("relaxedQueryChars", "|{}[]!@#$%^&*()_+:',./\\"));
-        return factory;
-    }
-
-    @Bean
-    public PlatformTransactionManager transactionManager() {
-        return new DataSourceTransactionManager(activitiDataSource());
-    }
-
-    @Bean
-    public SpringProcessEngineConfiguration springProcessEngineConfiguration() {
-        SpringProcessEngineConfiguration configuration = new SpringProcessEngineConfiguration();
-        configuration.setDataSource(activitiDataSource());
-        configuration.setDatabaseSchemaUpdate(ProcessEngineConfiguration.DB_SCHEMA_UPDATE_TRUE);
-        configuration.setJobExecutorActivate(true);
-        configuration.setTransactionManager(transactionManager());
-        configuration.setActivityFontName("宋体");
-        configuration.setLabelFontName("宋体");
-        configuration.setAnnotationFontName("宋体");
-        //id生成器
-        //configuration.setIdGenerator(new MyUUIDgenerator());
-        return configuration;
-    }
-
-
-}
+import java.io.IOException;
+//
+//@Configuration
+//public class ActivitiDataSourceConfig extends AbstractProcessEngineAutoConfiguration {
+//    @Resource
+//    private ActivitiDataSourceProperties activitiDataSourceProperties;
+//    @Resource
+//    DataSource activitiDataSource;//注入配置好的数据源
+//
+//    @Resource
+//    PlatformTransactionManager activitiTransactionManager;//注入配置好的事物管理器
+//
+//    //注入数据源和事务管理器（此单个方法为外来方法，仅用于接管数据源分配）
+//    @Bean
+//    public SpringProcessEngineConfiguration springProcessEngineConfiguration(
+//            SpringAsyncExecutor springAsyncExecutor) throws IOException {
+//        return this.baseSpringProcessEngineConfiguration(activitiDataSource, activitiTransactionManager, springAsyncExecutor);
+//    }
+//
+////    @Bean
+////    public DataSource activitiDataSource() {
+////        DruidDataSource DruiddataSource = new DruidDataSource();
+////        DruiddataSource.setUrl(activitiDataSourceProperties.getUrl());
+////        DruiddataSource.setDriverClassName(activitiDataSourceProperties.getDriverClassName());
+////        DruiddataSource.setPassword(activitiDataSourceProperties.getPassword());
+////        DruiddataSource.setUsername(activitiDataSourceProperties.getUsername());
+////        return DruiddataSource;
+////    }
+//
+//    @Bean
+//    public ConfigurableServletWebServerFactory webServerFactory() {
+//        TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
+//        factory.addConnectorCustomizers((TomcatConnectorCustomizer) connector -> connector.setProperty("relaxedQueryChars", "|{}[]!@#$%^&*()_+:',./\\"));
+//        return factory;
+//    }
+//
+////    @Bean
+////    public PlatformTransactionManager transactionManager() {
+////        return new DataSourceTransactionManager(activitiDataSource());
+////    }
+////
+////    @Bean
+////    public SpringProcessEngineConfiguration springProcessEngineConfiguration() {
+////        SpringProcessEngineConfiguration configuration = new SpringProcessEngineConfiguration();
+////        configuration.setDataSource(activitiDataSource());
+////        configuration.setDatabaseSchemaUpdate(ProcessEngineConfiguration.DB_SCHEMA_UPDATE_TRUE);
+////        configuration.setJobExecutorActivate(true);
+////        configuration.setTransactionManager(transactionManager());
+////        configuration.setActivityFontName("宋体");
+////        configuration.setLabelFontName("宋体");
+////        configuration.setAnnotationFontName("宋体");
+////        //id生成器
+////        //configuration.setIdGenerator(new MyUUIDgenerator());
+////        return configuration;
+////    }
+//
+//
+//}

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/config/ActivitiDataSourceProperties.java

@@ -17,6 +17,18 @@ public class ActivitiDataSourceProperties {
 
     @Value("${spring.datasource.dynamic.datasource.master.driver-class-name}")
     private String driverClassName;
+//
+//    @Value("${spring.datasource.dynamic.datasource.master2.url}")
+//    private String url2;
+//
+//    @Value("${spring.datasource.dynamic.datasource.master2.username}")
+//    private String username2;
+//
+//    @Value("${spring.datasource.dynamic.datasource.master2.password}")
+//    private String password2;
+//
+//    @Value("${spring.datasource.dynamic.datasource.master2.driver-class-name}")
+//    private String driverClassName2;
 
     public String getUrl() {
         return url;
@@ -49,4 +61,36 @@ public class ActivitiDataSourceProperties {
     public void setDriverClassName(String driverClassName) {
         this.driverClassName = driverClassName;
     }
+
+//    public String getUrl2() {
+//        return url2;
+//    }
+//
+//    public void setUrl2(String url2) {
+//        this.url2 = url2;
+//    }
+//
+//    public String getUsername2() {
+//        return username2;
+//    }
+//
+//    public void setUsername2(String username2) {
+//        this.username2 = username2;
+//    }
+//
+//    public String getPassword2() {
+//        return password2;
+//    }
+//
+//    public void setPassword2(String password2) {
+//        this.password2 = password2;
+//    }
+//
+//    public String getDriverClassName2() {
+//        return driverClassName2;
+//    }
+//
+//    public void setDriverClassName2(String driverClassName2) {
+//        this.driverClassName2 = driverClassName2;
+//    }
 }