guoenzhou vor 3 Jahren
Ursprung
Commit
6aa225675e

+ 1 - 1
fiveep-controller/src/main/resources/application-dev.properties

@@ -17,7 +17,7 @@ mybatis.refresh.sleep-seconds=20
 # datasource
 spring.autoconfigure.exclude=com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
 spring.datasource.dynamic.primary=usky-power
-spring.datasource.dynamic.datasource.usky-power.url=jdbc:mysql://101.133.214.75:3306/usky-electricity?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=UTF-8
+spring.datasource.dynamic.datasource.usky-power.url=jdbc:mysql://usky-cloud-mysql:3306/usky-electricity?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=UTF-8
 spring.datasource.dynamic.datasource.usky-power.username=usky
 spring.datasource.dynamic.datasource.usky-power.password=Yt#75Usky
 spring.datasource.dynamic.druid.initial-size=5                                                                       

+ 1 - 1
fiveep-controller/src/main/resources/application-prod.properties

@@ -75,7 +75,7 @@ spring.cache.ehcache.config=classpath:ehcache.xml
 # redis
 spring.cache.redis.enabled=true
 spring.redis.database=0
-spring.redis.host=usky-cloud-redis
+spring.redis.host=usky-cloud-redist 
 spring.redis.port=6379
 spring.redis.password=123456
 spring.redis.timeout=10000

+ 3 - 0
fiveep.ipr

@@ -82,4 +82,7 @@
     </modules>
   </component>
   <component name="ProjectRootManager" version="2" project-jdk-name="1.8" />
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
 </project>

+ 27 - 4
fiveep.iws

@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="a29cbb71-d42d-449d-9ff0-42f54f931d12" name="Default Changelist" comment="" />
+    <list default="true" id="a29cbb71-d42d-449d-9ff0-42f54f931d12" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/fiveep-controller/src/main/resources/application-dev.properties" beforeDir="false" afterPath="$PROJECT_DIR$/fiveep-controller/src/main/resources/application-dev.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/fiveep-controller/src/main/resources/application-prod.properties" beforeDir="false" afterPath="$PROJECT_DIR$/fiveep-controller/src/main/resources/application-prod.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/fiveep.ipr" beforeDir="false" afterPath="$PROJECT_DIR$/fiveep.ipr" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/fiveep.iws" beforeDir="false" afterPath="$PROJECT_DIR$/fiveep.iws" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -165,6 +170,9 @@
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="HIDE_WARNINGS" value="false" />
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
   <component name="HierarchyBrowserManager">
     <option name="SHOW_PACKAGES" value="false" />
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -211,6 +219,8 @@
     <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
     <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
   </component>
+  <component name="ProjectId" id="2ACKEgjg2zZZYVywrt1s9tSLLCW" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewSettings">
     <navigator currentView="ProjectPane" flattenPackages="false" showMembers="false" showStructure="false" autoscrollToSource="false" splitterProportion="0.5" />
     <view id="ProjectPane">
@@ -219,13 +229,18 @@
     <view id="SourcepathPane" />
     <view id="ClasspathPane" />
   </component>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
   <component name="PropertiesComponent">
-    <property name="MemberChooser.copyJavadoc" value="false" />
     <property name="GoToClass.includeLibraries" value="false" />
+    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
     <property name="MemberChooser.sorted" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
   </component>
   <component name="RunManager">
     <configuration selected="false" default="true" type="Applet" factoryName="Applet">
@@ -256,6 +271,7 @@
       </method>
     </configuration>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="StarteamConfiguration">
     <option name="SERVER" value="" />
     <option name="PORT" value="49201" />
@@ -286,6 +302,13 @@
     <option name="AUTO_DEL_FILES" value="0" />
   </component>
   <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="a29cbb71-d42d-449d-9ff0-42f54f931d12" name="Default Changelist" comment="" />
+      <created>1654508019118</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1654508019118</updated>
+    </task>
     <servers />
   </component>
   <component name="TodoView" selected-index="0">