java
/
bf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_bert' into dev_bert

Browse Source
dev_bert
zhangjinli 2 years ago
parent e8f6273228 5902df507b
commit 0c32fe8cad
7 changed files with 118 additions and 136 deletions
Show Stats Download Patch File Download Diff File

2
.idea/misc.xml
Unescape View File

@ -11,5 +11,5 @@
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK" /> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project> </project>

211
.idea/workspace.xml
Unescape View File

@ -9,8 +9,14 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="d38a1a39-11ab-49f3-ba5c-d4ebbf69bdaf" name="Changes" comment=""> <list default="true" id="0225a0e2-2a97-4880-9f19-3a2b4b9c3157" name="默认变更列表" comment="">
<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$/.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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -25,6 +31,31 @@
</option> </option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </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>
<component name="LogFilters"> <component name="LogFilters">
<option name="FILTER_ERRORS" value="false" /> <option name="FILTER_ERRORS" value="false" />
<option name="FILTER_WARNINGS" value="false" /> <option name="FILTER_WARNINGS" value="false" />
@ -35,42 +66,22 @@
<component name="MarkdownSettingsMigration"> <component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" /> <option name="stateVersion" value="1" />
</component> </component>
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
<option name="useMavenConfig" value="true" />
</MavenGeneralSettings>
</option>
<option name="importingSettings">
<MavenImportingSettings>
<option name="workspaceImportEnabled" value="true" />
</MavenImportingSettings>
</option>
</component>
<component name="ProjectId" id="2JUJvq4bKAD6X1env3wHQqS45ed" /> <component name="ProjectId" id="2JUJvq4bKAD6X1env3wHQqS45ed" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState"> <component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">
"keyToString": { <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
"RunOnceActivity.OpenProjectViewOnStart": "true", <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
"RunOnceActivity.ShowReadmeOnStart": "true", <property name="last_opened_file_path" value="$PROJECT_DIR$" />
"WebServerToolWindowFactoryState": "false", <property name="project.structure.last.edited" value="项目" />
"last_opened_file_path": "E:/jason-project-bt/bf-dev_jason/bf-dev_jason", <property name="project.structure.proportion" value="0.17" />
"node.js.detected.package.eslint": "true", <property name="project.structure.side.proportion" value="0.50605655" />
"node.js.detected.package.tslint": "true", <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
"node.js.selected.package.eslint": "(autodetect)", </component>
"node.js.selected.package.tslint": "(autodetect)", <component name="RunManager" selected="Smart Tomcat.tomcat8(2)">
"nodejs_package_manager_path": "npm",
"project.structure.last.edited": "Artifacts",
"project.structure.proportion": "0.0",
"project.structure.side.proportion": "0.2",
"spring.configuration.checksum": "c9f9d7dd806cf4122041837a80f47c64",
"vue.rearranger.settings.migration": "true"
}
}]]></component>
<component name="RunManager">
<configuration default="true" type="JetRunConfigurationType"> <configuration default="true" type="JetRunConfigurationType">
<module name="bf-git" /> <module name="bf-git" />
<method v="2"> <method v="2">
@ -84,99 +95,62 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="Tomcat 8.5.73" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.73" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="corretto-1.8" nameIsGenerated="true"> <configuration name="tomcat8" type="com.poratu.idea.plugins.tomcat" factoryName="SMART_TOMCAT_FACTORY">
<option name="UPDATING_POLICY" value="redeploy-artifacts" /> <option name="adminPort" value="8005" />
<deployment> <option name="contextPath" value="/bf" />
<artifact name="bf:war exploded"> <option name="docBase" value="$PROJECT_DIR$/src/main/webapp" />
<settings> <option name="envOptions">
<option name="CONTEXT_PATH" value="/bf" /> <map />
</settings> </option>
</artifact> <option name="passParentEnvironmentVariables" value="true" />
</deployment> <option name="port" value="8080" />
<server-settings> <option name="tomcatInfo">
<option name="BASE_DIRECTORY_NAME" value="e68db40c-5c25-42c8-b2e2-dc834ac86141" /> <TomcatInfo>
<option name="HTTP_PORT" value="14288" /> <option name="name" value="Apache Tomcat/8.5.85" />
</server-settings> <option name="number" value="0" />
<predefined_log_file enabled="true" id="Tomcat" /> <option name="path" value="$PROJECT_DIR$/../tomcat-8.5.85" />
<predefined_log_file enabled="true" id="Tomcat Catalina" /> <option name="version" value="8.5.85.0" />
<predefined_log_file id="Tomcat Manager" /> </TomcatInfo>
<predefined_log_file id="Tomcat Host Manager" /> </option>
<predefined_log_file id="Tomcat Localhost Access" /> <option name="vmOptions" value="-Dfile.encoding=UTF-8" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="56684" />
</RunnerSettings>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Profile">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<method v="2"> <method v="2">
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
<option name="BuildArtifacts" enabled="true"> </method>
<artifact name="bf:war exploded" /> </configuration>
<configuration name="tomcat8(2)" 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="passParentEnvironmentVariables" value="true" />
<option name="port" value="8080" />
<option name="tomcatInfo">
<TomcatInfo>
<option name="name" value="Apache Tomcat/8.5.34" />
<option name="number" value="0" />
<option name="path" value="$PROJECT_DIR$/../tomcat-8.5.34" />
<option name="version" value="8.5.34.0" />
</TomcatInfo>
</option> </option>
<option name="vmOptions" value="" />
<method v="2">
<option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<list>
<item itemvalue="Smart Tomcat.tomcat8" />
<item itemvalue="Smart Tomcat.tomcat8(2)" />
</list>
</component> </component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" /> <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="SvnConfiguration">
<configuration>$USER_HOME$/.subversion</configuration>
</component>
<component name="TaskManager"> <component name="TaskManager">
<task active="true" id="Default" summary="Default task"> <task active="true" id="Default" summary="Default task">
<changelist id="d38a1a39-11ab-49f3-ba5c-d4ebbf69bdaf" name="Changes" comment="" /> <changelist id="0225a0e2-2a97-4880-9f19-3a2b4b9c3157" name="默认变更列表" comment="" />
<created>1672126962178</created> <created>1672126962178</created>
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
@ -214,5 +188,10 @@
</entry> </entry>
</map> </map>
</option> </option>
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="XSLT-Support.FileAssociations.UIState">
<expand />
<select />
</component> </component>
</project> </project>

25
src/main/resources/bf.properties
Unescape View File

@ -1,12 +1,12 @@
?########## ?? Environment ########## ?########## ?? Environment ##########
#URL_BASE=http://15.164.37.166:80 URL_BASE=http://15.164.37.166:80
URL_BASE=http://121.166.66.72:14280 #URL_BASE=http://121.166.66.72:14280
SERVER_TP_KOR=?? SERVER_TP_KOR=??
SERVER_TP=DEV SERVER_TP=DEV
#system.domain=http://15.164.37.166:80 system.domain=http://15.164.37.166:80
system.domain=http://121.166.66.72:14280 #system.domain=http://121.166.66.72:14280
#system.weburl=http://15.164.37.166:14288 system.weburl=http://15.164.37.166:14288
system.weburl=http://121.166.66.72:14288 #system.weburl=http://121.166.66.72:14288
SERVER_NAME=bf SERVER_NAME=bf
PLATFORM_VERSION = 1.0 PLATFORM_VERSION = 1.0
PLATFORM_NAME = ???? PLATFORM_NAME = ????
@ -54,14 +54,17 @@ sms.api_id=gaonn0509
sms.api_key=040ec316ad13c59031b5c4c30cdec923 sms.api_key=040ec316ad13c59031b5c4c30cdec923
sms.api_sendnum=02-363-5123 sms.api_sendnum=02-363-5123
file.music_path=c:/bf/music/ file.music_path=/Users/apple/Documents/music
smtp.mail_id=eusikdang@gmail.com smtp.mail_id=eusikdang@gmail.com
smtp.mail_pw=vumbtgvkdpqzrdnn smtp.mail_pw=vumbtgvkdpqzrdnn
mysql_driver=net.sf.log4jdbc.DriverSpy mysql_driver=net.sf.log4jdbc.DriverSpy
#mysql_url=jdbc:log4jdbc:mysql://15.164.37.166:3306/babyfeed #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_url=jdbc:log4jdbc:mysql://121.166.66.72:14236/babyfeed
#mysql_username=root #mysql_username=root
mysql_username=imcloud #mysql_username=imcloud
mysql_password=imc1234 #mysql_password=imc1234
mysql_url=jdbc:log4jdbc:mysql://121.41.171.43:3306/babyfeed?serverTimezone=UTC
mysql_username=root
mysql_password=zhang123.

2
src/main/resources/bf_dev.properties
Unescape View File

@ -51,7 +51,7 @@ sms.api_id=gaonn0509
sms.api_key=040ec316ad13c59031b5c4c30cdec923 sms.api_key=040ec316ad13c59031b5c4c30cdec923
sms.api_sendnum=02-363-5123 sms.api_sendnum=02-363-5123
file.music_path=/home/imcloud/Music file.music_path=/Users/apple/Documents/music
smtp.mail_id=eusikdang@gmail.com smtp.mail_id=eusikdang@gmail.com
smtp.mail_pw=vumbtgvkdpqzrdnn smtp.mail_pw=vumbtgvkdpqzrdnn

2
src/main/resources/bf_local.properties
Unescape View File

@ -51,7 +51,7 @@ sms.api_id=gaonn0509
sms.api_key=040ec316ad13c59031b5c4c30cdec923 sms.api_key=040ec316ad13c59031b5c4c30cdec923
sms.api_sendnum=02-363-5123 sms.api_sendnum=02-363-5123
file.music_path=c:/bf/music/ file.music_path=/Users/apple/Documents/music
smtp.mail_id=eusikdang@gmail.com smtp.mail_id=eusikdang@gmail.com
smtp.mail_pw=gaonn&0509 smtp.mail_pw=gaonn&0509

2
src/main/resources/bf_real.properties
Unescape View File

@ -51,7 +51,7 @@ sms.api_id=gaonn0509
sms.api_key=040ec316ad13c59031b5c4c30cdec923 sms.api_key=040ec316ad13c59031b5c4c30cdec923
sms.api_sendnum=02-363-5123 sms.api_sendnum=02-363-5123
file.music_path=/home/imcloud/Music file.music_path=/Users/apple/Documents/music
smtp.mail_id=eusikdang@gmail.com smtp.mail_id=eusikdang@gmail.com
smtp.mail_pw=gaonn&0509 smtp.mail_pw=gaonn&0509

2
src/main/webapp/META-INF/context.xml
Unescape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Context path="/bf"> <Context path="/bf">
<Resources> <Resources>
<PostResources base="/home/imcloud/Music" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/upload"/> <PostResources base="/Users/apple/Documents/music" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/upload"/>
<!-- <PostResources base="/home/imcloud/Music" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/upload"/>--> <!-- <PostResources base="/home/imcloud/Music" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/upload"/>-->
</Resources> </Resources>
</Context> </Context>

Write Preview
Loading…
Cancel
Save