Merge pull request #287 from ArtisanCloud/dev/michaelhu

Dev/michaelhu
ArtisanCloud · Jan 18, 2025 · d2478b4 · d2478b4
2 parents d04004d + 2aacfdd
commit d2478b4
Show file tree

Hide file tree

Showing 39 changed files with 1,187 additions and 2,463 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,7 @@ logs
 *.log
 .logs/
 .var
-.run
+#.run
 temp
 
 resource/static
@@ -22,4 +22,4 @@ powerx
 !internal/uc/powerx
 !cmd/server/powerx.go
 /plugins
-./wechat
+wechat
diff --git a/.run/Test_EncodePassword in PowerX_pkg_securityx.run.xml b/.run/Test_EncodePassword in PowerX_pkg_securityx.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Test_EncodePassword in PowerX/pkg/securityx" type="GoTestRunConfiguration" factoryName="Go Test" nameIsGenerated="true">
+    <module name="PowerX" />
+    <working_directory value="$PROJECT_DIR$/pkg/securityx" />
+    <EXTENSION ID="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </EXTENSION>
+    <root_directory value="$PROJECT_DIR$" />
+    <kind value="PACKAGE" />
+    <package value="PowerX/pkg/securityx" />
+    <directory value="$PROJECT_DIR$" />
+    <filePath value="$PROJECT_DIR$" />
+    <framework value="gotest" />
+    <pattern value="^\QTest_EncodePassword\E$" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/Test_GenerateInviteCode in PowerX_pkg_securityx.run.xml b/.run/Test_GenerateInviteCode in PowerX_pkg_securityx.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Test_GenerateInviteCode in PowerX/pkg/securityx" type="GoTestRunConfiguration" factoryName="Go Test" nameIsGenerated="true">
+    <module name="PowerX" />
+    <working_directory value="$PROJECT_DIR$/pkg/securityx" />
+    <EXTENSION ID="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </EXTENSION>
+    <root_directory value="$PROJECT_DIR$" />
+    <kind value="PACKAGE" />
+    <package value="PowerX/pkg/securityx" />
+    <directory value="$PROJECT_DIR$" />
+    <filePath value="$PROJECT_DIR$" />
+    <framework value="gotest" />
+    <pattern value="^\QTest_GenerateInviteCode\E$" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/Test_HashPlainPassword in PowerX_pkg_securityx.run.xml b/.run/Test_HashPlainPassword in PowerX_pkg_securityx.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Test_HashPlainPassword in PowerX/pkg/securityx" type="GoTestRunConfiguration" factoryName="Go Test" nameIsGenerated="true">
+    <module name="PowerX" />
+    <working_directory value="$PROJECT_DIR$/pkg/securityx" />
+    <EXTENSION ID="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </EXTENSION>
+    <root_directory value="$PROJECT_DIR$" />
+    <kind value="PACKAGE" />
+    <package value="PowerX/pkg/securityx" />
+    <directory value="$PROJECT_DIR$" />
+    <filePath value="$PROJECT_DIR$" />
+    <framework value="gotest" />
+    <pattern value="^\QTest_HashPlainPassword\E$" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/app-build-linux.run.xml b/.run/app-build-linux.run.xml
@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="app-build-linux" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile">
+    <makefile filename="$PROJECT_DIR$/Makefile" target="app-build-linux" workingDirectory="" arguments="">
+      <envs />
+    </makefile>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/app-build-windows.run.xml b/.run/app-build-windows.run.xml
@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="app-build-windows" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile">
+    <makefile filename="$PROJECT_DIR$/Makefile" target="app-build-windows" workingDirectory="" arguments="">
+      <envs />
+    </makefile>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/app-init-db.run.xml b/.run/app-init-db.run.xml
@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="app-init-db" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile">
+    <makefile filename="$PROJECT_DIR$/Makefile" target="app-init-db" workingDirectory="" arguments="">
+      <envs />
+    </makefile>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/app-init.run.xml b/.run/app-init.run.xml
@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="app-init" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile">
+    <makefile filename="$PROJECT_DIR$/Makefile" target="app-init" workingDirectory="" arguments="">
+      <envs />
+    </makefile>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/build-goctl-powerx-apis.run.xml b/.run/build-goctl-powerx-apis.run.xml
@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="build-goctl-powerx-apis" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile">
+    <makefile filename="$PROJECT_DIR$/Makefile" target="build-goctl-powerx-apis" workingDirectory="" arguments="">
+      <envs />
+    </makefile>
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/go build powerx.go.run.xml b/.run/go build powerx.go.run.xml
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="go build powerx.go" type="GoApplicationRunConfiguration" factoryName="Go Application" nameIsGenerated="true">
+    <module name="PowerX" />
+    <working_directory value="$PROJECT_DIR$" />
+    <EXTENSION ID="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </EXTENSION>
+    <kind value="FILE" />
+    <package value="PowerX" />
+    <directory value="$PROJECT_DIR$" />
+    <filePath value="$PROJECT_DIR$/cmd/server/powerx.go" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/go build powerxctl.go api-gen.run.xml b/.run/go build powerxctl.go api-gen.run.xml
@@ -0,0 +1,22 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="go build powerxctl.go api-gen" type="GoApplicationRunConfiguration" factoryName="Go Application">
+    <module name="PowerX" />
+    <working_directory value="$PROJECT_DIR$" />
+    <parameters value="api-gen" />
+    <EXTENSION ID="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </EXTENSION>
+    <kind value="FILE" />
+    <package value="PowerX" />
+    <directory value="$PROJECT_DIR$" />
+    <filePath value="$PROJECT_DIR$/cmd/ctl/powerxctl.go" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/go build powerxctl.go database migrate.run.xml b/.run/go build powerxctl.go database migrate.run.xml
@@ -0,0 +1,22 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="go build powerxctl.go database migrate" type="GoApplicationRunConfiguration" factoryName="Go Application">
+    <module name="PowerX" />
+    <working_directory value="$PROJECT_DIR$" />
+    <parameters value="database migrate -f ./etc/powerx.yaml" />
+    <EXTENSION ID="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </EXTENSION>
+    <kind value="FILE" />
+    <package value="PowerX" />
+    <directory value="$PROJECT_DIR$" />
+    <filePath value="$PROJECT_DIR$/cmd/ctl/powerxctl.go" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/go build powerxctl.go database seed.run.xml b/.run/go build powerxctl.go database seed.run.xml
@@ -0,0 +1,22 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="go build powerxctl.go database seed" type="GoApplicationRunConfiguration" factoryName="Go Application">
+    <module name="PowerX" />
+    <working_directory value="$PROJECT_DIR$" />
+    <parameters value="database seed -f ./etc/powerx.yaml" />
+    <EXTENSION ID="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </EXTENSION>
+    <kind value="FILE" />
+    <package value="PowerX" />
+    <directory value="$PROJECT_DIR$" />
+    <filePath value="$PROJECT_DIR$/cmd/ctl/powerxctl.go" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.run/go test server.run.xml b/.run/go test server.run.xml
@@ -0,0 +1,22 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="go test server" type="GoTestRunConfiguration" factoryName="Go Test" nameIsGenerated="true">
+    <module name="PowerX" />
+    <working_directory value="$PROJECT_DIR$" />
+    <EXTENSION ID="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </EXTENSION>
+    <kind value="DIRECTORY" />
+    <package value="PowerX" />
+    <directory value="$PROJECT_DIR$/cmd/server" />
+    <filePath value="$PROJECT_DIR$" />
+    <framework value="gotest" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,40 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Build and Run powerx.go",
+            "type": "go",
+            "request": "launch",
+            "mode": "debug",
+            "program": "${workspaceFolder}/cmd/server/powerx.go",
+            "args": [
+                "-f",
+                "${workspaceFolder}/etc/powerx.yaml"
+            ]
+        },
+        {
+            "name": "powerxctl.go api-gen",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/cmd/ctl/powerxctl.go",
+            "args": [
+                "api-gen"
+            ]
+        },
+        {
+            "name": "Test HashPassword",
+            "type": "go",
+            "request": "launch",
+            "mode": "test",
+            "program": "${workspaceFolder}/internal/model/organization",
+            "args": [
+                "-test.run",
+                "Test_HashPassword"
+            ]
+        }
+    ]
+}