Merge branch 'develop' of http://cppdisciple.f3322.org:65310/cpicxm/disaster-warning into develop
切换git
This commit is contained in:
		
							
								
								
									
										51
									
								
								code/java/天气灾害预警/.idea/workspace.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										51
									
								
								code/java/天气灾害预警/.idea/workspace.xml
									
									
									
										generated
									
									
									
								
							@@ -1,51 +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="1399a125-f7fb-4049-9379-a5580edc7bb6" name="Changes" comment="">
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations/compile.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/runConfigurations/compile.xml" afterDir="false" />
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/.idea/天气灾害预警.iml" beforeDir="false" />
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/src/main/java/AppMain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/AppMain.java" afterDir="false" />
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/src/main/java/com/cpic/xim/disaster_warning/QWeatherDisasterWarningItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/cpic/xim/disaster_warning/QWeatherDisasterWarningItem.java" afterDir="false" />
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/src/main/java/com/cpic/xim/disaster_warning/QWeatherDisasterWarningRefer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/cpic/xim/disaster_warning/QWeatherDisasterWarningRefer.java" afterDir="false" />
 | 
			
		||||
      <change beforePath="$PROJECT_DIR$/src/main/java/com/cpic/xim/disaster_warning/WeatherDisasterWarningGrabber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/cpic/xim/disaster_warning/WeatherDisasterWarningGrabber.java" 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="Git.Settings">
 | 
			
		||||
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../.." />
 | 
			
		||||
  </component>
 | 
			
		||||
  <component name="ProjectId" id="26WTxuMLNNXqjSb9bdxduBEX1vn" />
 | 
			
		||||
  <component name="ProjectViewState">
 | 
			
		||||
    <option name="hideEmptyMiddlePackages" value="true" />
 | 
			
		||||
    <option name="showLibraryContents" value="true" />
 | 
			
		||||
  </component>
 | 
			
		||||
  <component name="PropertiesComponent">
 | 
			
		||||
    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
 | 
			
		||||
    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
 | 
			
		||||
    <property name="WebServerToolWindowFactoryState" value="false" />
 | 
			
		||||
    <property name="settings.editor.selected.configurable" value="File.Encoding" />
 | 
			
		||||
  </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="1399a125-f7fb-4049-9379-a5580edc7bb6" name="Changes" comment="" />
 | 
			
		||||
      <created>1647538598524</created>
 | 
			
		||||
      <option name="number" value="Default" />
 | 
			
		||||
      <option name="presentableId" value="Default" />
 | 
			
		||||
      <updated>1647538598524</updated>
 | 
			
		||||
      <workItem from="1647538613178" duration="203000" />
 | 
			
		||||
    </task>
 | 
			
		||||
    <servers />
 | 
			
		||||
  </component>
 | 
			
		||||
  <component name="TypeScriptGeneratedFilesManager">
 | 
			
		||||
    <option name="version" value="3" />
 | 
			
		||||
  </component>
 | 
			
		||||
</project>
 | 
			
		||||
@@ -278,7 +278,7 @@
 | 
			
		||||
      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
 | 
			
		||||
      <option name="VM_PARAMETERS" />
 | 
			
		||||
    </configuration>
 | 
			
		||||
    <configuration name="AppMain" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
 | 
			
		||||
    <configuration name="AppMain" type="Application" factoryName="Application" nameIsGenerated="true">
 | 
			
		||||
      <option name="MAIN_CLASS_NAME" value="AppMain" />
 | 
			
		||||
      <module name="disaster_warning" />
 | 
			
		||||
      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
 | 
			
		||||
@@ -303,11 +303,6 @@
 | 
			
		||||
        <option name="Make" enabled="true" />
 | 
			
		||||
      </method>
 | 
			
		||||
    </configuration>
 | 
			
		||||
    <recent_temporary>
 | 
			
		||||
      <list>
 | 
			
		||||
        <item itemvalue="Application.AppMain" />
 | 
			
		||||
      </list>
 | 
			
		||||
    </recent_temporary>
 | 
			
		||||
  </component>
 | 
			
		||||
  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
 | 
			
		||||
  <component name="StarteamConfiguration">
 | 
			
		||||
@@ -459,15 +454,4 @@
 | 
			
		||||
  <component name="WebViewSettings">
 | 
			
		||||
    <webview flattenPackages="false" showMembers="false" autoscrollToSource="false" />
 | 
			
		||||
  </component>
 | 
			
		||||
  <component name="XDebuggerManager">
 | 
			
		||||
    <breakpoint-manager>
 | 
			
		||||
      <breakpoints>
 | 
			
		||||
        <line-breakpoint enabled="true" type="java-line">
 | 
			
		||||
          <url>file://$PROJECT_DIR$/src/main/java/com/cpic/xim/config/WeatherDisasterNotifyConfig.java</url>
 | 
			
		||||
          <line>40</line>
 | 
			
		||||
          <option name="timeStamp" value="2" />
 | 
			
		||||
        </line-breakpoint>
 | 
			
		||||
      </breakpoints>
 | 
			
		||||
    </breakpoint-manager>
 | 
			
		||||
  </component>
 | 
			
		||||
</project>
 | 
			
		||||
		Reference in New Issue
	
	Block a user