custom gf-cli

Author: oldme-git

src/main/kotlin/com/github/oldmegit/goframehelper/gf/Gf.kt

@@ -11,9 +11,6 @@ object Gf {
     val goModMark = "github.com/gogf/gf/v2"
     val icon = IconLoader.getIcon("/icons/gf16.svg", Gf::class.java)
 
-    val gfGenCtrl = "gf gen ctrl"
-    val gfGenService = "gf gen service"
-
     val openApiTagGMeta = mapOf(
         "path" to "",
         "tags" to "",
@@ -70,4 +67,16 @@ object Gf {
         val settings = AppSettingsState.getInstance(project)
         return settings.gfEnableLogicWatch
     }
+    
+    // get gf gen ctrl command
+    fun gfGenCtrl(project: Project) : String {
+        val settings = AppSettingsState.getInstance(project)
+        return settings.gfCustomGfCli + " gen ctrl"
+    }
+
+    // get gf gen ctrl command
+    fun gfGenService(project: Project) : String {
+        val settings = AppSettingsState.getInstance(project)
+        return settings.gfCustomGfCli + " gen service"
+    }
 }

src/main/kotlin/com/github/oldmegit/goframehelper/listener/Listener.kt

@@ -31,9 +31,9 @@ class Listener(private val project: Project): BulkFileListener {
             val runtime = Runtime.getRuntime()
             try {
                 if (Gf.isApiFile(project, file) && Gf.enableApiWatch(project)) {
-                    runtime.exec(Gf.gfGenCtrl, null, File(project.basePath.toString()))
+                    runtime.exec(Gf.gfGenCtrl(project), null, File(project.basePath.toString()))
                 } else if (Gf.isLogicFile(project, file) && Gf.enableLogicWatch(project)) {
-                    runtime.exec(Gf.gfGenService, null, File(project.basePath.toString()))
+                    runtime.exec(Gf.gfGenService(project), null, File(project.basePath.toString()))
                 }
             } catch (_: Exception) {
                 val message = Bundle.getMessage("gfExecErrNotify")

src/main/kotlin/com/github/oldmegit/goframehelper/ui/AppSettingsComponent.kt

@@ -11,13 +11,15 @@ class AppSettingsComponent {
     val panel: JPanel
     private val apiDir = JBTextField()
     private val logicDir = JBTextField()
+    private val customGfCli = JBTextField()
     private val enableApiWatch = JBCheckBox(Bundle.getMessage("setting.api.watch"))
     private val enableLogicWatch = JBCheckBox(Bundle.getMessage("setting.service.watch"))
 
     init {
         panel = FormBuilder.createFormBuilder()
             .addLabeledComponent(JBLabel(Bundle.getMessage("setting.api.src")), apiDir, 1, false)
             .addLabeledComponent(JBLabel(Bundle.getMessage("setting.logic.src")), logicDir, 1, false)
+            .addLabeledComponent(JBLabel(Bundle.getMessage("setting.custom.gfCli")), customGfCli, 1, false)
             .addComponent(enableApiWatch)
             .addComponent(enableLogicWatch)
             .addComponentFillVertically(JPanel(), 0)
@@ -27,13 +29,19 @@ class AppSettingsComponent {
     var gfApiDir: String?
         get() = apiDir.getText()
         set(newText) {
-            apiDir.setText(newText)
+            apiDir.text = newText
         }
 
     var gfLogicDir: String?
         get() = logicDir.getText()
         set(newText) {
-            logicDir.setText(newText)
+            logicDir.text = newText
+        }
+
+    var gfCustomGfCli: String?
+        get() = customGfCli.getText()
+        set(newText) {
+            customGfCli.text = newText
         }
 
     var gfEnableApiWatch: Boolean?

src/main/kotlin/com/github/oldmegit/goframehelper/ui/AppSettingsConfigurable.kt

@@ -25,6 +25,7 @@ class AppSettingsConfigurable(private val project: Project) : Configurable {
         val settings = AppSettingsState.getInstance(project)
         var modified = appSettingsComponent!!.gfApiDir != settings.gfApiDir
         modified = modified or (appSettingsComponent!!.gfLogicDir != settings.gfLogicDir)
+        modified = modified or (appSettingsComponent!!.gfCustomGfCli != settings.gfCustomGfCli)
         modified = modified or (appSettingsComponent!!.gfEnableApiWatch != settings.gfEnableApiWatch)
         modified = modified or (appSettingsComponent!!.gfEnableLogicWatch != settings.gfEnableLogicWatch)
         return modified
@@ -34,6 +35,7 @@ class AppSettingsConfigurable(private val project: Project) : Configurable {
         val settings = AppSettingsState.getInstance(project)
         settings.gfApiDir = appSettingsComponent!!.gfApiDir!!
         settings.gfLogicDir = appSettingsComponent!!.gfLogicDir!!
+        settings.gfCustomGfCli = appSettingsComponent!!.gfCustomGfCli!!
         settings.gfEnableApiWatch = appSettingsComponent!!.gfEnableApiWatch!!
         settings.gfEnableLogicWatch = appSettingsComponent!!.gfEnableLogicWatch!!
     }
@@ -42,6 +44,7 @@ class AppSettingsConfigurable(private val project: Project) : Configurable {
         val settings = AppSettingsState.getInstance(project)
         appSettingsComponent!!.gfApiDir = settings.gfApiDir
         appSettingsComponent!!.gfLogicDir = settings.gfLogicDir
+        appSettingsComponent!!.gfCustomGfCli = settings.gfCustomGfCli
         appSettingsComponent!!.gfEnableApiWatch = settings.gfEnableApiWatch
         appSettingsComponent!!.gfEnableLogicWatch = settings.gfEnableLogicWatch
     }

src/main/kotlin/com/github/oldmegit/goframehelper/ui/AppSettingsState.kt

@@ -15,6 +15,7 @@ import com.intellij.util.xmlb.XmlSerializerUtil
 internal class AppSettingsState : PersistentStateComponent<AppSettingsState> {
     var gfApiDir = "api"
     var gfLogicDir = "internal/logic"
+    var gfCustomGfCli = "gf"
     var gfEnableApiWatch = true
     var gfEnableLogicWatch = true
 

src/main/resources/message/GoFrameHelperBundle.properties

@@ -4,6 +4,7 @@ init=Init GoFrame Helper
 # setting window
 setting.api.src=Api src folder:
 setting.logic.src=Logic src folder:
+setting.custom.gfCli=custom gf-cli:
 setting.api.watch=Enable Api watch, it will auto exec `gf gen ctrl`
 setting.service.watch=Enable Service watch, it will auto exec `gf gen service`
 

src/main/resources/message/GoFrameHelperBundle_zh.properties

@@ -4,6 +4,7 @@ init=\u521d\u59cb\u5316 GoFrame Helper
 # setting window
 setting.api.src=Api \u76ee\u5f55:
 setting.logic.src=Logic \u76ee\u5f55:
+setting.custom.gfCli=\u81ea\u5b9a\u4e49 gf-cli
 setting.api.watch=\u542f\u7528 Api watch, \u5b83\u4f1a\u81ea\u52a8\u6267\u884c `gf gen ctrl`
 setting.service.watch=\u542f\u7528 Service watch, \u5b83\u4f1a\u81ea\u52a8\u6267\u884c `gf gen service`