From 6597287fc412ce914aba41fe571ed05817cf371c Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期一, 27 五月 2024 11:34:58 +0800
Subject: [PATCH] fix script
---
db/repository.go | 14 ++--
.idea/workspace.xml | 127 ++++++++++++++++++++++--------------------
2 files changed, 74 insertions(+), 67 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 26f86f9..bb6f0cb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,8 @@
<component name="ChangeListManager">
<list default="true" id="919111b8-f2aa-4154-8db0-88e76c9af55d" name="Default Changelist" comment="del DSL fmt source">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/db/repository.go" beforeDir="false" afterPath="$PROJECT_DIR$/db/repository.go" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/main.go" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -31,11 +33,20 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/rule/service.go">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="528">
- <caret line="70" column="12" lean-forward="true" selection-start-line="70" selection-start-column="12" selection-end-line="70" selection-end-column="12" />
+ <state relative-caret-position="164">
+ <caret line="156" column="38" lean-forward="true" selection-start-line="156" selection-start-column="33" selection-end-line="156" selection-end-column="44" />
<folding>
<element signature="e#14#107#0" expanded="true" />
</folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/data/prepare.go">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="407">
+ <caret line="137" column="46" selection-start-line="137" selection-start-column="46" selection-end-line="137" selection-end-column="46" />
</state>
</provider>
</entry>
@@ -64,8 +75,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/db/models.go">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="254">
- <caret line="39" column="29" lean-forward="true" selection-start-line="39" selection-start-column="29" selection-end-line="39" selection-end-column="30" />
+ <state relative-caret-position="164">
+ <caret line="76" column="42" lean-forward="true" selection-start-line="76" selection-start-column="42" selection-end-line="76" selection-end-column="42" />
</state>
</provider>
</entry>
@@ -73,8 +84,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/db/repository.go">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-1104">
- <caret line="35" column="5" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
+ <state relative-caret-position="335">
+ <caret line="296" column="24" lean-forward="true" selection-start-line="296" selection-start-column="24" selection-end-line="296" selection-end-column="24" />
<folding>
<element signature="e#12#78#0" expanded="true" />
</folding>
@@ -94,8 +105,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/main.go">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="340">
- <caret line="60" lean-forward="true" selection-start-line="60" selection-end-line="60" />
+ <state relative-caret-position="135">
+ <caret line="60" column="45" selection-start-line="60" selection-start-column="45" selection-end-line="60" selection-end-column="45" />
<folding>
<element signature="e#14#333#0" expanded="true" />
</folding>
@@ -111,15 +122,6 @@
<folding>
<element signature="e#21#109#0" expanded="true" />
</folding>
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$USER_HOME$/go/pkg/mod/basic.com/!cloud!a!i/protomsg.git@v0.0.0-20240524094225-61cfc0043e88/analysis.proto">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="96">
- <caret line="4" column="18" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="18" />
</state>
</provider>
</entry>
@@ -181,7 +183,6 @@
<option value="$PROJECT_DIR$/cache/cache.go" />
<option value="$PROJECT_DIR$/cache/device.go" />
<option value="$PROJECT_DIR$/task/tool.go" />
- <option value="$PROJECT_DIR$/db/repository.go" />
<option value="$PROJECT_DIR$/rule/engine.go" />
<option value="$PROJECT_DIR$/db/elasticScriptToId.go" />
<option value="$PROJECT_DIR$/db/models.go" />
@@ -193,8 +194,9 @@
<option value="$PROJECT_DIR$/rule/service.go" />
<option value="$PROJECT_DIR$/config/app.yaml" />
<option value="$PROJECT_DIR$/config/config.go" />
- <option value="$PROJECT_DIR$/main.go" />
<option value="$PROJECT_DIR$/db/database.go" />
+ <option value="$PROJECT_DIR$/db/repository.go" />
+ <option value="$PROJECT_DIR$/main.go" />
</list>
</option>
</component>
@@ -216,6 +218,11 @@
<path>
<item name="ruleModelEngine" type="b2602c69:ProjectViewProjectNode" />
<item name="ruleModelEngine" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="ruleModelEngine" type="b2602c69:ProjectViewProjectNode" />
+ <item name="ruleModelEngine" type="462c0819:PsiDirectoryNode" />
+ <item name=".idea" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ruleModelEngine" type="b2602c69:ProjectViewProjectNode" />
@@ -259,7 +266,7 @@
<property name="GO_FMT" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
- <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1716777171014" />
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1716780828570" />
<property name="configurable.Global.GOPATH.is.expanded" value="true" />
<property name="configurable.Module.GOPATH.is.expanded" value="false" />
<property name="configurable.Project.GOPATH.is.expanded" value="true" />
@@ -327,7 +334,7 @@
<option name="presentableId" value="Default" />
<updated>1713166065668</updated>
<workItem from="1713166068218" duration="121229000" />
- <workItem from="1714960004642" duration="111004000" />
+ <workItem from="1714960004642" duration="113412000" />
</task>
<task id="LOCAL-00001" summary="鏂板杩佸叆杩佸嚭锛屽睘鎬у垎鏋愶紝韬唤鍒嗘瀽绛�">
<created>1714471841345</created>
@@ -424,7 +431,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="232233000" />
+ <option name="totallyTimeSpent" value="234641000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
@@ -439,13 +446,13 @@
<window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
- <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.30326295" />
+ <window_info anchor="bottom" id="Run" order="2" weight="0.30326295" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.39923224" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
- <window_info anchor="bottom" id="Terminal" order="8" weight="0.63147795" />
+ <window_info anchor="bottom" id="Terminal" order="8" visible="true" weight="0.2715931" />
<window_info anchor="bottom" id="Version Control" order="9" />
<window_info anchor="bottom" id="Database Changes" order="10" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
@@ -548,13 +555,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/data/prepare.go">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="42">
- <caret line="103" column="8" lean-forward="true" selection-start-line="103" selection-start-column="8" selection-end-line="103" selection-end-column="8" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/cache/device.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
@@ -639,13 +639,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/db/models.go">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="254">
- <caret line="39" column="29" lean-forward="true" selection-start-line="39" selection-start-column="29" selection-end-line="39" selection-end-column="30" />
- </state>
- </provider>
- </entry>
<entry file="file://$USER_HOME$/go/pkg/mod/basic.com/!cloud!a!i/protomsg.git@v0.0.0-20240524094225-61cfc0043e88/analysis/analysis_grpc.pb.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="179">
@@ -663,32 +656,12 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/db/repository.go">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-1104">
- <caret line="35" column="5" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
- <folding>
- <element signature="e#12#78#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/db/elastic.go">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="70" column="17" selection-start-line="70" selection-start-column="17" selection-end-line="70" selection-end-column="17" />
<folding>
<element signature="e#12#114#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/rule/service.go">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="528">
- <caret line="70" column="12" lean-forward="true" selection-start-line="70" selection-start-column="12" selection-end-line="70" selection-end-column="12" />
- <folding>
- <element signature="e#14#107#0" expanded="true" />
</folding>
</state>
</provider>
@@ -717,10 +690,44 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/db/models.go">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="164">
+ <caret line="76" column="42" lean-forward="true" selection-start-line="76" selection-start-column="42" selection-end-line="76" selection-end-column="42" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/rule/service.go">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="164">
+ <caret line="156" column="38" lean-forward="true" selection-start-line="156" selection-start-column="33" selection-end-line="156" selection-end-column="44" />
+ <folding>
+ <element signature="e#14#107#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/data/prepare.go">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="407">
+ <caret line="137" column="46" selection-start-line="137" selection-start-column="46" selection-end-line="137" selection-end-column="46" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/db/repository.go">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="335">
+ <caret line="296" column="24" lean-forward="true" selection-start-line="296" selection-start-column="24" selection-end-line="296" selection-end-column="24" />
+ <folding>
+ <element signature="e#12#78#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/main.go">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="340">
- <caret line="60" lean-forward="true" selection-start-line="60" selection-end-line="60" />
+ <state relative-caret-position="135">
+ <caret line="60" column="45" selection-start-line="60" selection-start-column="45" selection-end-line="60" selection-end-column="45" />
<folding>
<element signature="e#14#333#0" expanded="true" />
</folding>
diff --git a/db/repository.go b/db/repository.go
index 1353cf1..e067ba3 100644
--- a/db/repository.go
+++ b/db/repository.go
@@ -298,14 +298,14 @@
if err != nil {
return err
}
- } else {
- // 濡傛灉璁板綍涓嶅瓨鍦紝鍒欐彃鍏ユ柊璁板綍
- err := db.Create(&person).Error
- if err != nil {
- return err
- }
}
-
+ //else {
+ // // 濡傛灉璁板綍涓嶅瓨鍦紝鍒欐彃鍏ユ柊璁板綍
+ // err := db.Create(&person).Error
+ // if err != nil {
+ // return err
+ // }
+ //}
}
return nil
--
Gitblit v1.8.0