From 64bec6a3d75dc414170005c5ecf97b22ea1f6691 Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Tue, 28 Feb 2023 23:38:19 +0800
Subject: [PATCH] fixed bert

---
 .idea/workspace.xml              | 117 ++++++++++++++++++-------------
 src/main/resources/bf.properties |   4 +-
 2 files changed, 72 insertions(+), 49 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b8940b2..efddfbd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,13 +9,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="0225a0e2-2a97-4880-9f19-3a2b4b9c3157" name="默认变更列表" comment="">
+    <list default="true" id="d38a1a39-11ab-49f3-ba5c-d4ebbf69bdaf" name="Changes" comment="fixed img_scale;comment delete">
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/bf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/bf_dev.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf_dev.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/bf_local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf_local.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/bf_real.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf_real.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -31,30 +28,9 @@
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="GitToolBoxStore">
-    <option name="recentBranches">
-      <RecentBranches>
-        <option name="branchesForRepo">
-          <list>
-            <RecentBranchesForRepo>
-              <option name="branches">
-                <list>
-                  <RecentBranch>
-                    <option name="branchName" value="dev_jason" />
-                    <option name="lastUsedInstant" value="1676794156" />
-                  </RecentBranch>
-                  <RecentBranch>
-                    <option name="branchName" value="main" />
-                    <option name="lastUsedInstant" value="1676794155" />
-                  </RecentBranch>
-                </list>
-              </option>
-              <option name="repositoryRootUrl" value="file://$PROJECT_DIR$" />
-            </RecentBranchesForRepo>
-          </list>
-        </option>
-      </RecentBranches>
-    </option>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/main/resources/bf.properties" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="LogFilters">
     <option name="FILTER_ERRORS" value="false" />
@@ -73,15 +49,12 @@
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="project.structure.last.edited" value="项目" />
-    <property name="project.structure.proportion" value="0.17" />
+    <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.50605655" />
-    <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
+    <property name="settings.editor.selected.configurable" value="editor.preferences.tabs" />
   </component>
-  <component name="RunManager" selected="Smart Tomcat.tomcat8(2)">
+  <component name="RunManager" selected="Smart Tomcat.tomcat8_535">
     <configuration default="true" type="JetRunConfigurationType">
       <module name="bf-git" />
       <method v="2">
@@ -95,13 +68,31 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration default="true" type="com.poratu.idea.plugins.tomcat" factoryName="SMART_TOMCAT_FACTORY">
+      <option name="adminPort" value="8005" />
+      <option name="contextPath" value="" />
+      <option name="docBase" value="" />
+      <option name="envOptions" />
+      <option name="passParentEnvironmentVariables" value="true" />
+      <option name="port" value="8080" />
+      <option name="tomcatInfo">
+        <TomcatInfo>
+          <option name="name" value="Apache Tomcat/8.5.85" />
+          <option name="number" value="0" />
+          <option name="path" value="$PROJECT_DIR$/../tomcat-8.5.85" />
+          <option name="version" value="8.5.85.0" />
+        </TomcatInfo>
+      </option>
+      <option name="vmOptions" value="" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="tomcat8" type="com.poratu.idea.plugins.tomcat" factoryName="SMART_TOMCAT_FACTORY">
       <option name="adminPort" value="8005" />
       <option name="contextPath" value="/bf" />
       <option name="docBase" value="$PROJECT_DIR$/src/main/webapp" />
-      <option name="envOptions">
-        <map />
-      </option>
+      <option name="envOptions" />
       <option name="passParentEnvironmentVariables" value="true" />
       <option name="port" value="8080" />
       <option name="tomcatInfo">
@@ -112,18 +103,16 @@
           <option name="version" value="8.5.85.0" />
         </TomcatInfo>
       </option>
-      <option name="vmOptions" value="-Dfile.encoding=UTF-8" />
+      <option name="vmOptions" value="" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="tomcat8(2)" type="com.poratu.idea.plugins.tomcat" factoryName="SMART_TOMCAT_FACTORY">
+    <configuration name="tomcat8_535" type="com.poratu.idea.plugins.tomcat" factoryName="SMART_TOMCAT_FACTORY">
       <option name="adminPort" value="8005" />
       <option name="contextPath" value="/bf" />
       <option name="docBase" value="$PROJECT_DIR$/src/main/webapp" />
-      <option name="envOptions">
-        <map />
-      </option>
+      <option name="envOptions" />
       <option name="passParentEnvironmentVariables" value="true" />
       <option name="port" value="8080" />
       <option name="tomcatInfo">
@@ -141,16 +130,16 @@
     </configuration>
     <list>
       <item itemvalue="Smart Tomcat.tomcat8" />
-      <item itemvalue="Smart Tomcat.tomcat8(2)" />
+      <item itemvalue="Smart Tomcat.tomcat8_535" />
     </list>
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
-    <configuration>$USER_HOME$/.subversion</configuration>
+    <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="0225a0e2-2a97-4880-9f19-3a2b4b9c3157" name="默认变更列表" comment="" />
+      <changelist id="d38a1a39-11ab-49f3-ba5c-d4ebbf69bdaf" name="Changes" comment="" />
       <created>1672126962178</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
@@ -161,6 +150,21 @@
       <workItem from="1672925731411" duration="386000" />
       <workItem from="1672972791115" duration="12394000" />
     </task>
+    <task id="LOCAL-00001" summary="fixed img_scale;comment delete">
+      <created>1677397507818</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1677397507819</updated>
+    </task>
+    <task id="LOCAL-00002" summary="fixed img_scale;comment delete">
+      <created>1677598297317</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1677598297318</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -174,10 +178,10 @@
             <State>
               <option name="FILTERS">
                 <map>
-                  <entry key="text">
+                  <entry key="branch">
                     <value>
                       <list>
-                        <option value="wait .... let's me try" />
+                        <option value="origin/dev_bert" />
                       </list>
                     </value>
                   </entry>
@@ -188,8 +192,27 @@
         </entry>
       </map>
     </option>
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list>
+              <RecentGroup>
+                <option name="FILTER_VALUES">
+                  <option value="origin/dev_bert" />
+                </option>
+              </RecentGroup>
+            </list>
+          </value>
+        </entry>
+      </map>
+    </option>
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="fixed img_scale;comment delete" />
+    <option name="LAST_COMMIT_MESSAGE" value="fixed img_scale;comment delete" />
+  </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
     <select />
diff --git a/src/main/resources/bf.properties b/src/main/resources/bf.properties
index 3e63d58..d9d74e8 100644
--- a/src/main/resources/bf.properties
+++ b/src/main/resources/bf.properties
@@ -60,11 +60,11 @@ smtp.mail_id=eusikdang@gmail.com
 smtp.mail_pw=vumbtgvkdpqzrdnn
 
 mysql_driver=net.sf.log4jdbc.DriverSpy
-#mysql_url=jdbc:log4jdbc:mysql://15.164.37.166:3306/babyfeed?serverTimezone=UTC
 #mysql_url=jdbc:log4jdbc:mysql://121.166.66.72:14236/babyfeed
 #mysql_username=root
+#mysql_url=jdbc:log4jdbc:mysql://15.164.37.166:3306/babyfeed?serverTimezone=UTC
 #mysql_username=imcloud
 #mysql_password=imc1234
-mysql_url=jdbc:log4jdbc:mysql://121.41.171.43:3306/babyfeed?serverTimezone=UTC
+mysql_url=jdbc:log4jdbc:mysql://121.41.171.43:3308/babyfeed
 mysql_username=root
 mysql_password=zhang123.