소스 검색

bug修复

CX 2 년 전
부모
커밋
4de36bb018
4개의 변경된 파일7개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 1
      pom.xml
  2. 4 4
      src/main/java/org/pentaho/di/core/database/Database.java
  3. 1 1
      src/main/resources/resource/db-DEV.properties
  4. 1 1
      src/main/webapp/static/js/my/main.js

+ 1 - 1
pom.xml

@@ -33,7 +33,7 @@
33 33
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
34 34
         <org.springframework-version>4.3.1.RELEASE</org.springframework-version>
35 35
         <beetlsql-version>2.10.18</beetlsql-version>
36
-        <mysql-connector-java-version>5.1.38</mysql-connector-java-version>
36
+        <mysql-connector-java-version>5.1.49</mysql-connector-java-version>
37 37
         <druid-version>1.0.29</druid-version>
38 38
         <commons-configuration.version>1.10</commons-configuration.version>
39 39
         <commons.fileupload-version>1.3.2</commons.fileupload-version>

+ 4 - 4
src/main/java/org/pentaho/di/core/database/Database.java

@@ -362,10 +362,10 @@ public class Database implements VariableSpace, LoggingObjectInterface {
362 362
             }
363 363
 
364 364
             Properties properties = this.databaseMeta.getConnectionProperties();
365
-            System.out.println("********** 初始化数据库连接,追加参数&characterEncoding=utf8 **********");
366
-            url += "&characterEncoding=utf8";
367
-            System.out.println("");
368
-            System.out.println("********** 初始化数据库连接,追加参数&characterEncoding=utf8 **********");
365
+//            System.out.println("********** 初始化数据库连接,追加参数&characterEncoding=utf8 **********");
366
+            url += "&characterEncoding=utf8&autoReconnect=true";
367
+//            System.out.println("");
368
+//            System.out.println("********** 初始化数据库连接,追加参数&characterEncoding=utf8 **********");
369 369
             if(this.databaseMeta.supportsOptionsInURL()) {
370 370
                 if(Utils.isEmpty(username) && Utils.isEmpty(password)) {
371 371
                     this.connection = DriverManager.getConnection(url, properties);

+ 1 - 1
src/main/resources/resource/db-DEV.properties

@@ -2,7 +2,7 @@
2 2
 datasource.type=mysql
3 3
 beetl.db.style=org.beetl.sql.core.db.MySqlStyle
4 4
 jdbc.driver=com.mysql.jdbc.Driver
5
-jdbc.url=jdbc:mysql://192.168.3.109:3306/kettle?autoReconnect=true&serverTimezone=UTC&characterEncoding=utf8&useUnicode=true&useSSL=false
5
+jdbc.url=jdbc:mysql://192.168.3.110:3306/kettle-bug?autoReconnect=true&serverTimezone=UTC&characterEncoding=utf8&useUnicode=true&useSSL=false
6 6
 jdbc.username=root
7 7
 jdbc.password=100100
8 8
 

+ 1 - 1
src/main/webapp/static/js/my/main.js

@@ -119,7 +119,7 @@ $(document).ready(function () {
119 119
     	    $(window).resize(lineChart.resize);
120 120
         },
121 121
         error: function () {
122
-        	window.location.href="view/loginUI.shtml";
122
+        	// window.location.href="view/loginUI.shtml";
123 123
         },
124 124
         dataType: 'json'
125 125
     });