Browse Source

update tag

dekun.yuan 2 years ago
parent
commit
2923472af1
5 changed files with 33 additions and 80 deletions
  1. 1 0
      .idea/vcs.xml
  2. 26 74
      .idea/workspace.xml
  3. 2 2
      go.mod
  4. 3 3
      main.go
  5. 1 1
      utils/base/mysql.go

+ 1 - 0
.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

+ 26 - 74
.idea/workspace.xml

@@ -1074,78 +1074,22 @@
       <change afterPath="$PROJECT_DIR$/../pachong/.idea/workspace.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/../pachong/bin/go_build_main_go" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/../pachong/main.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/product-definition.iml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/conf/conf.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/conf/conf.yaml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/controller/getConfig.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/controller/productdefinition.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/go.mod" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/go.sum" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/helpers/elastic.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/helpers/mysql.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/helpers/nsq.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/helpers/redis.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/main.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/model/config.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/router/http.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/service/testGet.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/sql/init.sql" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/utils/base/env.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/utils/base/error.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/utils/base/logger.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/utils/base/mysql.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/utils/base/render.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/utils/base/tracer.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/utils/bootstrap.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/utils/middleware/logger.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/utils/middleware/tracer.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/utils/pprof/pprof.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/github.com/jinzhu/gorm/dialects/mysql/mysql.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/github.com/jinzhu/inflection/LICENSE" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/github.com/jinzhu/inflection/README.md" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/github.com/jinzhu/inflection/inflections.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/github.com/jinzhu/inflection/wercker.yml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/License" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/README.md" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/association.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/callback.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/callback_create.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/callback_delete.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/callback_query.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/callback_query_preload.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/callback_row_query.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/callback_save.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/callback_update.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/dialect.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/dialect_common.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/dialect_mysql.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/dialect_postgres.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/dialect_sqlite3.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/docker-compose.yml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/errors.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/field.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/interface.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/join_table_handler.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/logger.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/main.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/model.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/model_struct.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/naming.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/scope.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/search.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/test_all.sh" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/utils.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/vendor/gorm/wercker.yml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../product-definition/.idea/misc.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../product-definition/.idea/modules.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../product-definition/.idea/product-definition.iml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../product-definition/.idea/vcs.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../product-definition/.idea/workspace.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/../test/pachong/haha3.txt" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/../test111/.idea/misc.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/../test111/.idea/modules.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/../test111/.idea/test111.iml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/../test111/.idea/vcs.xml" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/../test111/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/go.mod" beforeDir="false" afterPath="$PROJECT_DIR$/go.mod" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/main.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/utils/base/mysql.go" beforeDir="false" afterPath="$PROJECT_DIR$/utils/base/mysql.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1161,9 +1105,10 @@
   </component>
   <component name="GOROOT" path="$USER_HOME$/sdk/go1.17.3/go1.17.3" />
   <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="GoLibraries">
+    <option name="indexEntireGoPath" value="false" />
     <option name="urls">
       <list>
         <option value="file://$PROJECT_DIR$/../../.." />
@@ -1186,7 +1131,8 @@
     <property name="configurable.Project.GOPATH.is.expanded" value="true" />
     <property name="go.import.settings.migrated" value="true" />
     <property name="go.sdk.automatically.set" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/vendor/github.com" />
+    <property name="go.tried.to.enable.integration.vgo.integrator" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="settings.editor.selected.configurable" value="go.vgo" />
   </component>
   <component name="RecentsManager">
@@ -1237,7 +1183,7 @@
     <option name="version" value="1" />
   </component>
   <component name="VgoProject">
-    <proxy>https://goproxy.io,direct</proxy>
+    <proxy>direct</proxy>
   </component>
   <component name="WindowStateProjectService">
     <state x="320" y="84" key="#GOROOT" timestamp="1657681654122">
@@ -1327,10 +1273,11 @@
     </state>
     <state width="1398" height="227" key="GridCell.Tab.1.right/0.25.1440.791@0.25.1440.791" timestamp="1657787161164" />
     <state width="1398" height="229" key="GridCell.Tab.1.right/0.25.1440.797@0.25.1440.797" timestamp="1657777172695" />
-    <state x="229" y="58" key="SettingsEditor" timestamp="1657784532030">
-      <screen x="0" y="25" width="1440" height="791" />
+    <state x="229" y="58" key="SettingsEditor" timestamp="1658112489354">
+      <screen x="0" y="25" width="1440" height="797" />
     </state>
     <state x="229" y="58" key="SettingsEditor/0.25.1440.791@0.25.1440.791" timestamp="1657784532030" />
+    <state x="229" y="58" key="SettingsEditor/0.25.1440.797@0.25.1440.797" timestamp="1658112489354" />
     <state x="229" y="58" key="SettingsEditor/0.25.1440.799@0.25.1440.799" timestamp="1657612366556" />
     <state x="229" y="58" key="SettingsEditor/0.25.1440.801@0.25.1440.801" timestamp="1657683891428" />
     <state x="229" y="58" key="SettingsEditor/0.25.1440.804@0.25.1440.804" timestamp="1657678246385" />
@@ -1353,12 +1300,12 @@
       <screen x="0" y="25" width="1440" height="794" />
     </state>
     <state x="482" y="29" key="refactoring.ChangeSignatureDialog/0.25.1440.794@0.25.1440.794" timestamp="1657701542486" />
-    <state x="385" y="153" width="670" height="664" key="search.everywhere.popup" timestamp="1657786461503">
-      <screen x="0" y="25" width="1440" height="791" />
+    <state x="385" y="154" width="670" height="669" key="search.everywhere.popup" timestamp="1658112492445">
+      <screen x="0" y="25" width="1440" height="797" />
     </state>
     <state x="385" y="153" width="670" height="664" key="search.everywhere.popup/0.25.1440.791@0.25.1440.791" timestamp="1657786461503" />
     <state x="385" y="154" width="670" height="666" key="search.everywhere.popup/0.25.1440.794@0.25.1440.794" timestamp="1657700930875" />
-    <state x="385" y="154" width="670" height="669" key="search.everywhere.popup/0.25.1440.797@0.25.1440.797" timestamp="1657762384063" />
+    <state x="385" y="154" width="670" height="669" key="search.everywhere.popup/0.25.1440.797@0.25.1440.797" timestamp="1658112492445" />
     <state x="385" y="154" width="670" height="671" key="search.everywhere.popup/0.25.1440.799@0.25.1440.799" timestamp="1657704079115" />
     <state x="385" y="156" width="670" height="676" key="search.everywhere.popup/0.25.1440.807@0.25.1440.807" timestamp="1657620701788" />
     <state x="450" y="331" key="vcs.readOnlyHandler.ReadOnlyStatusDialog" timestamp="1657693492772">
@@ -1394,6 +1341,11 @@
           <line>54</line>
           <option name="timeStamp" value="9" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="DlvLineBreakpoint">
+          <url>file://$PROJECT_DIR$/utils/base/mysql.go</url>
+          <line>2</line>
+          <option name="timeStamp" value="10" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="DlvErrorBreakpoint" />

+ 2 - 2
go.mod

@@ -40,6 +40,6 @@ require (
 	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
 )
 
-replace github.com/gin-gonic/gin v1.8.1 => github.com/cloudnative/gin v1.8.1
+replace github.com/gin-gonic/gin v1.8.1 => github.com/goldenerr/gin v1.8.1
 
-replace github.com/jinzhu/inflection v1.0.0 => github.com/cloudnative/inflection v1.0.0
+replace github.com/jinzhu/inflection v1.0.0 => github.com/goldenerr/inflection v1.0.0

+ 3 - 3
main.go

@@ -1,13 +1,13 @@
 package main
 
 import (
-	"fmt"
-	"github.com/fvbock/endless"
-	"github.com/gin-gonic/gin"
 	"base-gin/conf"
 	"base-gin/helpers"
 	"base-gin/router"
 	"base-gin/utils"
+	"fmt"
+	"github.com/fvbock/endless"
+	"github.com/gin-gonic/gin"
 )
 func main()  {
 	r := gin.New()

+ 1 - 1
utils/base/mysql.go

@@ -6,7 +6,7 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/opentracing/opentracing-go"
 	"github.com/opentracing/opentracing-go/ext"
-	"base-gin/pkg/gorm"
+
 	"time"
 )