Browse Source

make beetlsql dbservice share the datasource with pgsql dbservice (#2704)

Green Luo 8 years ago
parent
commit
db64071835

+ 16 - 0
frameworks/Java/act/pom.xml

@@ -16,6 +16,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <act.version>1.1.2</act.version>
         <act-morphia.version>1.1.0</act-morphia.version>
+        <act-sql-common.version>1.0.3</act-sql-common.version>
         <act-ebean2.version>1.0.4</act-ebean2.version>
         <mysql.version>5.1.41</mysql.version>
         <postgres-jdbc.version>9.4.1212</postgres-jdbc.version>
@@ -77,6 +78,21 @@
             <artifactId>beetlsql</artifactId>
             <version>${beetlsql.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.actframework</groupId>
+            <artifactId>act-sql-common</artifactId>
+            <version>${act-sql-common.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.avaje.ebean</groupId>
+                    <artifactId>ebean</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.avaje.ebean</groupId>
+                    <artifactId>ebean-agent</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>

+ 2 - 12
frameworks/Java/act/src/main/resources/conf/common/db.properties

@@ -22,19 +22,9 @@ db.pgsql.url=jdbc:postgresql://${pgsql.host}:5432/hello_world
 db.pgsql.username=benchmarkdbuser
 db.pgsql.password=benchmarkdbpass
 db.pgsql.maxConnections=256
-db.pgsql.minConnections=64
+db.pgsql.minConnections=128
 db.pgsql.useServerPrepStmts=true
-db.pgsql.beetlsql.nc=org.beetl.sql.core.DefaultNameConversion
-
-beetl.host=localhost
 
 db.beetl.impl=act.db.beetlsql.BeetlSqlPlugin
-db.beetl.url=jdbc:postgresql://${pgsql.host}:5432/hello_world
-db.beetl.username=benchmarkdbuser
-db.beetl.password=benchmarkdbpass
-db.beetl.maxConnections=256
-db.beetl.minConnections=64
-db.beetl.useServerPrepStmts=true
+db.beetl.datasource.provider=shared:pgsql
 db.beetl.beetlsql.nc=org.beetl.sql.core.DefaultNameConversion
-db.ddl.create=false
-db.interceptor.debug=true

+ 2 - 2
frameworks/Java/act/src/main/resources/logback.xml

@@ -11,7 +11,7 @@
         </encoder>
     </appender>
 
-    <logger name="act" level="INFO" additivity="false">
+    <logger name="act" level="OFF" additivity="false">
         <appender-ref ref="STDOUT" />
     </logger>
 
@@ -20,7 +20,7 @@
     </logger>
 
     <!-- By default, the level of the root level is set to DEBUG -->
-    <root level="INFO">
+    <root level="OFF">
         <appender-ref ref="STDOUT" />
     </root>
 </configuration>