From 28c5cf41c5064579dd62f79fd40dc5990e9565b2 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期一, 09 九月 2024 20:52:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
.idea/workspace.xml | 144 +++++------------------------------------------
1 files changed, 17 insertions(+), 127 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5974bc7..d901054 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,17 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="919111b8-f2aa-4154-8db0-88e76c9af55d" name="Default Changelist" comment="1銆佷慨鏀规煡璇㈢瓥鐣� 2銆佷慨鏀瑰湴鍧�缁熻绛栫暐">
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/config/config.go" beforeDir="false" afterPath="$PROJECT_DIR$/config/config.go" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/config/rulemodelengine.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/config/rulemodelengine.yaml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/data/prepare.go" beforeDir="false" afterPath="$PROJECT_DIR$/data/prepare.go" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/db/elastic.go" beforeDir="false" afterPath="$PROJECT_DIR$/db/elastic.go" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/rule/engine.go" beforeDir="false" afterPath="$PROJECT_DIR$/rule/engine.go" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/rule/service.go" beforeDir="false" afterPath="$PROJECT_DIR$/rule/service.go" afterDir="false" />
+ <list default="true" id="919111b8-f2aa-4154-8db0-88e76c9af55d" name="Default Changelist" comment="">
+ <change beforePath="$PROJECT_DIR$/cache/device.go" beforeDir="false" afterPath="$PROJECT_DIR$/cache/device.go" afterDir="false" />
</list>
- <ignored path="$PROJECT_DIR$/out/" />
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -19,109 +11,6 @@
</component>
<component name="FavoritesManager">
<favorites_list name="ruleModelEngine" />
- </component>
- <component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <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="179">
- <caret line="11" column="4" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="4" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/data/prepare.go">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="71">
- <caret line="17" column="36" lean-forward="true" selection-start-line="17" selection-start-column="36" selection-end-line="17" selection-end-column="36" />
- <folding>
- <element signature="e#14#61#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/rule/identityEngine.go">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="48">
- <caret line="5" column="1" lean-forward="true" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/config/config.go">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="737">
- <caret line="46" column="48" lean-forward="true" selection-start-line="46" selection-start-column="48" selection-end-line="46" selection-end-column="48" />
- <folding>
- <element signature="e#16#89#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/config/rulemodelengine.yaml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="337">
- <caret line="30" column="19" selection-start-line="30" selection-start-column="17" selection-end-line="30" selection-end-column="19" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/db/elastic.go">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="192">
- <caret line="29" column="70" selection-start-line="29" selection-start-column="70" selection-end-line="29" selection-end-column="70" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/db/elasticScriptToId.go">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="840">
- <caret line="39" column="46" lean-forward="true" selection-start-line="39" selection-start-column="46" selection-end-line="39" selection-end-column="46" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/rule/engine.go">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="189">
- <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
- </state>
- </provider>
- </entry>
- </file>
- <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="193">
- <caret line="152" column="11" selection-start-line="152" selection-start-column="11" selection-end-line="152" selection-end-column="11" />
- </state>
- </provider>
- </entry>
- </file>
- <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="162">
- <caret line="105" column="5" selection-start-line="105" selection-start-column="5" selection-end-line="105" selection-end-column="5" />
- <folding>
- <element signature="e#12#78#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
@@ -164,9 +53,17 @@
<find>time</find>
</findStrings>
</component>
- <component name="GOROOT" path="C:/Program Files/Go" />
+ <component name="GOROOT" url="file://D:/Go" />
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+ </component>
+ <component name="GitSEFilterConfiguration">
+ <file-type-list>
+ <filtered-out-file-type name="LOCAL_BRANCH" />
+ <filtered-out-file-type name="REMOTE_BRANCH" />
+ <filtered-out-file-type name="TAG" />
+ <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
+ </file-type-list>
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
@@ -292,7 +189,7 @@
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="restartRequiresConfirmation" value="false" />
- <property name="settings.editor.selected.configurable" value="go.sdk" />
+ <property name="settings.editor.selected.configurable" value="watcher.settings" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
@@ -301,18 +198,6 @@
<key name="CopyFile.RECENT_KEYS">
<recent name="F:\workspace\golang\cloud_ai\ruleModelEngine" />
</key>
- </component>
- <component name="RunDashboard">
- <option name="ruleStates">
- <list>
- <RuleState>
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
- </RuleState>
- <RuleState>
- <option name="name" value="StatusDashboardGroupingRule" />
- </RuleState>
- </list>
- </option>
</component>
<component name="RunManager" selected="Go Build.go build main.go">
<configuration name="go build elastic.go" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true">
@@ -550,6 +435,11 @@
</component>
<component name="VgoProject">
<integration-enabled>true</integration-enabled>
+ <environment>
+ <map>
+ <entry key="GOPROXY" value="https://goproxy.cn,direct" />
+ </map>
+ </environment>
<proxy>https://goproxy.cn,direct</proxy>
</component>
<component name="XDebuggerManager">
--
Gitblit v1.8.0