Merge branch 'master' of http://124.70.43.205:3000/wangb/runeconomy-nx

.gitignore

@@ -47,4 +47,3 @@ nbdist/
 !*/build/*.xml
 
 /log
-/.idea

.idea/compiler.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="true" />
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="common" />
-        <module name="generationXK-service" />
-        <module name="runeconomy-xk" />
-        <module name="data-adapter" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="common" options="-parameters" />
-      <module name="data-adapter" options="-parameters" />
-      <module name="generationXK-service" options="-parameters" />
-      <module name="runeconomy-xk" options="-parameters" />
-    </option>
-  </component>
-</project>

.idea/dataSources.local.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-242.22855.74">
-    <data-source name="admin_1" uuid="2ec8658d-a635-4464-ba73-a1bc060beb5e">
-      <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="POSTGRES" />
-      <schema-mapping />
-    </data-source>
-    <data-source name="postgres@123.60.219.66" uuid="43053514-c798-46b8-9730-774126a5f46e">
-      <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="POSTGRES" />
-      <schema-mapping />
-    </data-source>
-    <data-source name="postgres@123.60.219.66 [2]" uuid="855613aa-fd31-4a63-b3a3-1c2d70df693e">
-      <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="POSTGRES" />
-      <schema-mapping />
-    </data-source>
-    <data-source name="TDData Source3.3.2" uuid="98fdb21b-6c01-4360-ba17-a912c461a279">
-      <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="UNKNOWN" />
-      <secret-storage>master_key</secret-storage>
-      <user-name>root</user-name>
-      <schema-mapping />
-    </data-source>
-  </component>
-</project>

.idea/dataSources.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="admin_1" uuid="2ec8658d-a635-4464-ba73-a1bc060beb5e">
-      <driver-ref>postgresql</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
-      <jdbc-url>jdbc:postgresql://rm-cn-adn3tj2bu00032so.rwlb.rds.aliyuncs.com:5432/admin_1</jdbc-url>
-      <working-dir>$ProjectFileDir$</working-dir>
-    </data-source>
-    <data-source source="LOCAL" name="postgres@123.60.219.66" uuid="43053514-c798-46b8-9730-774126a5f46e">
-      <driver-ref>postgresql</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
-      <jdbc-url>jdbc:postgresql://123.60.219.66:5432/postgres</jdbc-url>
-      <working-dir>$ProjectFileDir$</working-dir>
-    </data-source>
-    <data-source source="LOCAL" name="postgres@123.60.219.66 [2]" uuid="855613aa-fd31-4a63-b3a3-1c2d70df693e">
-      <driver-ref>postgresql</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
-      <jdbc-url>jdbc:postgresql://123.60.219.66:5432/postgres</jdbc-url>
-      <working-dir>$ProjectFileDir$</working-dir>
-    </data-source>
-    <data-source source="LOCAL" name="TDData Source3.3.2" uuid="98fdb21b-6c01-4360-ba17-a912c461a279">
-      <driver-ref>32cedcb1-ba4b-45b2-8a73-afb0e89cadeb</driver-ref>
-      <synchronize>true</synchronize>
-      <configured-by-url>true</configured-by-url>
-      <jdbc-driver>com.taosdata.jdbc.rs.RestfulDriver</jdbc-driver>
-      <jdbc-url>jdbc:TAOS-RS://10.220.1.8:6041/</jdbc-url>
-      <jdbc-additional-properties>
-        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
-      </jdbc-additional-properties>
-      <working-dir>$ProjectFileDir$</working-dir>
-    </data-source>
-  </component>
-</project>

.idea/encodings.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/java" charset="UTF-8" />
-    <file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/common/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/common/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/data-adapter/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/generationXK-service/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/runeconomy-xk/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-  </component>
-</project>

.idea/jarRepositories.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="alimaven" />
-      <option name="name" value="aliyun maven" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="nexus" />
-      <option name="name" value="nexus" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="nexus" />
-      <option name="name" value="nexus" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="alimaven" />
-      <option name="name" value="aliyun maven" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
-  </component>
-</project>

.idea/misc.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

.idea/mybatisx/templates.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="TemplatesSettings">
-    <option name="templateConfigs">
-      <TemplateContext>
-        <option name="projectPath" value="$PROJECT_DIR$" />
-      </TemplateContext>
-    </option>
-  </component>
-</project>

.idea/uiDesigner.xml

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

.idea/workspace.xml

@@ -1,443 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="c9251c3e-9f2f-4b6c-a5f7-503156fe13c0" name="Changes" comment="null问题">
-      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/gyee/common/model/PointData2.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/gyee/common/model/TsDataType.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil2.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/gyee/common/config/GeneratorCodeConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/gyee/common/config/GeneratorCodeConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/data-adapter/src/main/resources/application.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/data-adapter/src/main/resources/application.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/config/GeneratorCodeConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/config/GeneratorCodeConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/service/InputOrOutPutService.java" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/service/InputOrOutPutService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo1Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo1Service.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/service/initalcache/CacheService.java" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/service/initalcache/CacheService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/IEdosUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/IEdosUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/application-nxf.yml" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/main/resources/application-nxf.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-7001.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-7002.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-7003.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-accuracy.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-analyNew.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-efficiency.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executor.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executor2.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executor3.properties" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executor3.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executor4.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executor5.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executor6.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF000.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF001.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF002.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF003.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF004.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF005.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF006.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF007.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorGF008.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorJN.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorRG.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorWPGD.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorWPGH.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorWPLY.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-executorWPXNY.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-irradiation.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/main/resources/xxl-job-region.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/generationXK-service/src/test/java/com/gyee/generation/SaticScheduleCALTaskTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/generationXK-service/src/test/java/com/gyee/generation/SaticScheduleCALTaskTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="GitToolBoxStore">
-    <option name="projectConfigVersion" value="5" />
-  </component>
-  <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/generationXK-service/src/test/java/com/gyee/generation/SaticScheduleCALTaskTest.java" root0="FORCE_HIGHLIGHTING" />
-  </component>
-  <component name="KubernetesApiPersistence">{}</component>
-  <component name="KubernetesApiProvider">{
-  &quot;isMigrated&quot;: true
-}</component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="MavenRunner">
-    <option name="skipTests" value="true" />
-  </component>
-  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 1
-}</component>
-  <component name="ProjectId" id="2iwn3jPr2YFMSRwqKgOLfEkwsXR" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="autoscrollFromSource" value="true" />
-    <option name="autoscrollToSource" value="true" />
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;HTTP 请求.generated-requests | #259.executor&quot;: &quot;Run&quot;,
-    &quot;HTTP 请求.generated-requests | #260.executor&quot;: &quot;Run&quot;,
-    &quot;HTTP 请求.generated-requests | #261.executor&quot;: &quot;Run&quot;,
-    &quot;HTTP 请求.generated-requests | #262.executor&quot;: &quot;Run&quot;,
-    &quot;HTTP 请求.generated-requests | #263.executor&quot;: &quot;Run&quot;,
-    &quot;HTTP 请求.generated-requests | #264.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.SaticScheduleCALTaskTest.all.executor&quot;: &quot;Debug&quot;,
-    &quot;JUnit.SaticScheduleCALTaskTest.initialRedis_PG.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.test.test1.executor&quot;: &quot;Debug&quot;,
-    &quot;Maven.common [clean].executor&quot;: &quot;Run&quot;,
-    &quot;Maven.common [compile].executor&quot;: &quot;Run&quot;,
-    &quot;Maven.common [package].executor&quot;: &quot;Run&quot;,
-    &quot;Maven.runeconmy-nx [clean].executor&quot;: &quot;Run&quot;,
-    &quot;Maven.runeconomy-xk [clean].executor&quot;: &quot;Run&quot;,
-    &quot;Maven.runeconomy-xk [compile].executor&quot;: &quot;Run&quot;,
-    &quot;Maven.runeconomy-xk [package].executor&quot;: &quot;Run&quot;,
-    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
-    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
-    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
-    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;Spring Boot.DataAdapterApp.executor&quot;: &quot;Debug&quot;,
-    &quot;Spring Boot.DataAdapterApplication.executor&quot;: &quot;Debug&quot;,
-    &quot;Spring Boot.GenerationMain.executor&quot;: &quot;Debug&quot;,
-    &quot;Spring Boot.RunEconomyApplication.executor&quot;: &quot;Debug&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;database.data.extractors.current.export.id&quot;: &quot;SQL 插入&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/宁夏新项目/数据库备份&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;SDK&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
-    &quot;run.configurations.included.in.services&quot;: &quot;true&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
-  },
-  &quot;keyToStringList&quot;: {
-    &quot;DatabaseDriversLRU&quot;: [
-      &quot;32cedcb1-ba4b-45b2-8a73-afb0e89cadeb&quot;
-    ]
-  }
-}</component>
-  <component name="ReactorSettings">
-    <option name="notificationShown" value="true" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\ruoyi\runeconomy-nx\generationXK-service\src\test\java\com\gyee\generation" />
-      <recent name="D:\ruoyi\runeconomy-nx" />
-      <recent name="D:\ruoyi\runeconomy-nx\data-adapter\src\main\java\com\gyee\dataadapter\entity" />
-      <recent name="D:\work\workspaces\runeconomy-nx\runeconomy-xk\src\main\java\com\gyee\runeconomy" />
-    </key>
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.gyee.common.model" />
-      <recent name="com.gyee.generation.util" />
-      <recent name="com.gyee.dataadapter.dao" />
-      <recent name="com.gyee.dataadapter.config" />
-      <recent name="com.gyee.dataadapter.service" />
-    </key>
-  </component>
-  <component name="RunDashboard">
-    <option name="configurationTypes">
-      <set>
-        <option value="MicronautRunConfigurationType" />
-        <option value="SpringBootApplicationConfigurationType" />
-      </set>
-    </option>
-  </component>
-  <component name="RunManager" selected="Spring Boot.GenerationMain">
-    <configuration name="generated-requests | #259" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" temporary="true" nameIsGenerated="true" path="$APPLICATION_CONFIG_DIR$/scratches/generated-requests.http" index="259" requestIdentifier="#259" runType="运行单个请求">
-      <method v="2" />
-    </configuration>
-    <configuration name="generated-requests | #263" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" temporary="true" nameIsGenerated="true" path="$APPLICATION_CONFIG_DIR$/scratches/generated-requests.http" index="263" requestIdentifier="#263" runType="运行单个请求">
-      <method v="2" />
-    </configuration>
-    <configuration name="generated-requests | #264" type="HttpClient.HttpRequestRunConfigurationType" factoryName="HTTP Request" temporary="true" nameIsGenerated="true" path="$APPLICATION_CONFIG_DIR$/scratches/generated-requests.http" index="264" requestIdentifier="#264" runType="运行单个请求">
-      <method v="2" />
-    </configuration>
-    <configuration name="SaticScheduleCALTaskTest.all" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="generationXK-service" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.gyee.generation.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="com.gyee.generation" />
-      <option name="MAIN_CLASS_NAME" value="com.gyee.generation.SaticScheduleCALTaskTest" />
-      <option name="METHOD_NAME" value="all" />
-      <option name="TEST_OBJECT" value="method" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="SaticScheduleCALTaskTest.initialRedis_PG" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="generationXK-service" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.gyee.generation.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="com.gyee.generation" />
-      <option name="MAIN_CLASS_NAME" value="com.gyee.generation.SaticScheduleCALTaskTest" />
-      <option name="METHOD_NAME" value="initialRedis_PG" />
-      <option name="TEST_OBJECT" value="method" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="JetRunConfigurationType">
-      <module name="runeconomy-nx" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
-      <module name="runeconomy-nx" />
-      <option name="filePath" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="CommonMain" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
-      <module name="common" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.gyee.common.CommonMain" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="DataAdapterApp" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
-      <module name="data-adapter" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.gyee.dataadapter.DataAdapterApp" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="GenerationMain" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
-      <module name="generationXK-service" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.gyee.generation.GenerationMain" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="RunEconomyApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
-      <module name="runeconomy-xk" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.gyee.RunEconomyApplication" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="JUnit.SaticScheduleCALTaskTest.initialRedis_PG" />
-        <item itemvalue="JUnit.SaticScheduleCALTaskTest.all" />
-        <item itemvalue="HTTP 请求.generated-requests | #264" />
-        <item itemvalue="HTTP 请求.generated-requests | #259" />
-        <item itemvalue="HTTP 请求.generated-requests | #263" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SharedIndexes">
-    <attachedChunks>
-      <set>
-        <option value="bundled-jdk-9823dce3aa75-28b599e66164-intellij.indexing.shared.core-IU-242.22855.74" />
-      </set>
-    </attachedChunks>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="c9251c3e-9f2f-4b6c-a5f7-503156fe13c0" name="Changes" comment="" />
-      <created>1720410312095</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1720410312095</updated>
-      <workItem from="1720410313228" duration="3048000" />
-      <workItem from="1720420026232" duration="1223000" />
-      <workItem from="1720421274226" duration="3826000" />
-      <workItem from="1720573941117" duration="16513000" />
-      <workItem from="1720660217604" duration="5841000" />
-      <workItem from="1720788195694" duration="597000" />
-      <workItem from="1721005075742" duration="4647000" />
-      <workItem from="1721110176692" duration="2709000" />
-      <workItem from="1721266032572" duration="3438000" />
-      <workItem from="1721609765138" duration="2308000" />
-      <workItem from="1721696474474" duration="586000" />
-      <workItem from="1722317965884" duration="4144000" />
-      <workItem from="1722406210722" duration="132000" />
-      <workItem from="1722999793754" duration="327000" />
-      <workItem from="1726121000186" duration="2113000" />
-      <workItem from="1726128426495" duration="6375000" />
-      <workItem from="1726275498465" duration="21935000" />
-      <workItem from="1726622318617" duration="13588000" />
-      <workItem from="1726642901861" duration="8316000" />
-      <workItem from="1726708351953" duration="14726000" />
-      <workItem from="1726731645761" duration="7456000" />
-      <workItem from="1726794107135" duration="17673000" />
-    </task>
-    <task id="LOCAL-00001" summary="宁夏风公司">
-      <option name="closed" value="true" />
-      <created>1720423579183</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1720423579183</updated>
-    </task>
-    <task id="LOCAL-00002" summary="适配器适配">
-      <option name="closed" value="true" />
-      <created>1726304049440</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1726304049440</updated>
-    </task>
-    <task id="LOCAL-00003" summary="读取调试">
-      <option name="closed" value="true" />
-      <created>1726640662521</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1726640662521</updated>
-    </task>
-    <task id="LOCAL-00004" summary="读取调试">
-      <option name="closed" value="true" />
-      <created>1726643253281</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1726643253281</updated>
-    </task>
-    <task id="LOCAL-00005" summary="bug修复">
-      <option name="closed" value="true" />
-      <created>1726725051595</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1726725051595</updated>
-    </task>
-    <task id="LOCAL-00006" summary="bug修复2">
-      <option name="closed" value="true" />
-      <created>1726731399306</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1726731399306</updated>
-    </task>
-    <task id="LOCAL-00007" summary="taos读取">
-      <option name="closed" value="true" />
-      <created>1726803282337</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1726803282337</updated>
-    </task>
-    <task id="LOCAL-00008" summary="null问题">
-      <option name="closed" value="true" />
-      <created>1726813400017</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1726813400017</updated>
-    </task>
-    <option name="localTasksCounter" value="9" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="宁夏风公司" />
-    <MESSAGE value="适配器适配" />
-    <MESSAGE value="读取调试" />
-    <MESSAGE value="bug修复" />
-    <MESSAGE value="bug修复2" />
-    <MESSAGE value="taos读取" />
-    <MESSAGE value="null问题" />
-    <option name="LAST_COMMIT_MESSAGE" value="null问题" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/controller/AdapterController.java</url>
-          <line>94</line>
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/dao_mqtt_influxdb_taos/MqttTaosLatestDao.java</url>
-          <line>43</line>
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/data-adapter/src/main/java/com/gyee/dataadapter/dao_mqtt_influxdb_taos/MqttTaosLatestDao.java</url>
-          <line>45</line>
-          <option name="timeStamp" value="7" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo1Service.java</url>
-          <line>1258</line>
-          <option name="timeStamp" value="8" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/generationXK-service/src/test/java/com/gyee/generation/SaticScheduleCALTaskTest.java</url>
-          <line>52</line>
-          <option name="timeStamp" value="9" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/generationXK-service/src/main/java/com/gyee/generation/task/SaticScheduleCALTask.java</url>
-          <line>205</line>
-          <option name="timeStamp" value="20" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-    <watches-manager>
-      <configuration name="SpringBootApplicationConfigurationType">
-        <watch expression="sb" />
-      </configuration>
-    </watches-manager>
-  </component>
-  <component name="XSLT-Support.FileAssociations.UIState">
-    <expand />
-    <select />
-  </component>
-</project>