Update main.workflow

Author: purocean

.github/main.workflow

@@ -1,10 +1,12 @@
-workflow "New workflow" {
+workflow "publish" {
   on = "push"
   resolves = ["maven-publish"]
 }
 
 action "maven-publish" {
-  uses = "./gradlew"
-  runs = "./gradlew"
-  args = "build"
+  uses = "./"
+  secrets = [
+    "GNUPG_KEY",
+    "GRADLE_CONFIG",
+  ]
 }

Dockerfile

@@ -0,0 +1,5 @@
+FROM openjdk:8-jdk
+
+ADD . .
+
+ENTRYPOINT ["/entrypoint.sh"]

build.gradle

@@ -10,7 +10,7 @@ buildscript {
 }
 
 group 'info.purocean'
-version '1.1.0'
+version '1.2.0'
 
 apply plugin: 'kotlin'
 apply plugin: 'maven-publish'

entrypoint.sh

@@ -0,0 +1,6 @@
+#!/bin/sh -l
+
+echo $GNUPG_KEY | sed 's/ //g' | base64 -d > ./secring.gpg
+echo $GRADLE_CONFIG | sed 's/ //g' | base64 -d > ./gradle.properties
+
+./gradlew -Dgradle.user.home=./ publishMavenJavaPublicationToMavenRepository

gradlew

@@ -1,7 +1,5 @@
 package info.purocean.dbmigration
 
-import java.sql.Connection
-
 interface CodeMigration <in T> {
-    fun run(context: T, connection: Connection)
+    fun run(context: T, db: DB)
 }

src/main/kotlin/info/purocean/dbmigration/CodeMigration.kt

@@ -18,6 +18,26 @@ class DB(dbUrl: String, dbUsername: String, dbPassword: String) {
         this.conn = DriverManager.getConnection(url, dbUsername, dbPassword)
     }
 
+    fun exec (sql: String) {
+        this.conn.autoCommit = false
+        val stmt = this.conn.createStatement()
+
+        try {
+            println("Migrate ----------- 执行SQL ------------")
+            println(sql)
+
+            stmt.execute(sql)
+            this.conn.commit()
+        } catch (e: Exception) {
+            this.conn.rollback()
+            e.printStackTrace()
+            throw e
+        } finally {
+            stmt.close()
+            this.conn.autoCommit = true
+        }
+    }
+
     fun createScheme () {
         val stmt = this.getStmt()
 

src/main/kotlin/info/purocean/dbmigration/DB.kt

@@ -11,6 +11,10 @@ import java.util.regex.Pattern
 class Migrate(dbUrl: String, dbUsername: String, dbPassword: String, private var migrationPackage: String = "db.migrations") {
     private var db: DB = DB(dbUrl, dbUsername, dbPassword)
 
+    fun getDb (): DB {
+        return this.db
+    }
+
     fun run (dryRun: Boolean = false) {
         val newList = this.getNew()
         println("Migrate ${if (dryRun) "[dry run] " else ""}----------- start ${newList.size} ------------")
@@ -68,7 +72,7 @@ class Migrate(dbUrl: String, dbUsername: String, dbPassword: String, private var
 
             val obj = cls.newInstance()
 
-            cls.getMethod("run", Object::class.java).invoke(obj, context, this.db.getConnection())
+            cls.getMethod("run", Object::class.java).invoke(obj, context, this.db)
         }
 
         this.db.writeRecord(migration)