Merge remote-tracking branch 'origin/master'
This commit is contained in:
lyf
commit
177b966237
|
|
@ -82,7 +82,6 @@
|
|||
<element id="library" level="project" name="Maven: com.github.virtuald:curvesapi:1.06" />
|
||||
<element id="library" level="project" name="Maven: cn.jpush.api:jpush-client:3.5.5" />
|
||||
<element id="library" level="project" name="Maven: io.netty:netty-all:4.1.29.Final" />
|
||||
<element id="library" level="project" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" />
|
||||
<element id="library" level="project" name="Maven: cn.jpush.api:jiguang-common:1.1.12" />
|
||||
<element id="library" level="project" name="Maven: com.mob.push.sdk:mobpush-websdkv3-java:1.0.4" />
|
||||
<element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.1.0.RELEASE" />
|
||||
|
|
@ -96,17 +95,6 @@
|
|||
<element id="library" level="project" name="Maven: javax.servlet:javax.servlet-api:4.0.1" />
|
||||
<element id="library" level="project" name="Maven: com.jhlabs:filters:2.0.235-1" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:dysmsapi20170525:2.0.21" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-util:0.2.14" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:endpoint-util:0.0.7" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea:1.2.0" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-openapi:0.2.6" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:credentials-java:0.2.4" />
|
||||
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" />
|
||||
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-xml:0.1.5" />
|
||||
<element id="library" level="project" name="Maven: org.dom4j:dom4j:2.0.3" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:openapiutil:0.1.14" />
|
||||
<element id="library" level="project" name="Maven: cn.hutool:hutool-all:5.8.4" />
|
||||
<element id="library" level="project" name="Maven: xml-security:xmlsec:1.3.0" />
|
||||
<element id="library" level="project" name="Maven: commons-fileupload:commons-fileupload:1.3.2" />
|
||||
|
|
@ -114,8 +102,6 @@
|
|||
<element id="library" level="project" name="Maven: org.apache.httpcomponents:httpmime:4.5.6" />
|
||||
<element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.8.1" />
|
||||
<element id="library" level="project" name="Maven: org.projectlombok:lombok:1.18.20" />
|
||||
<element id="library" level="project" name="Maven: com.squareup.okhttp3:okhttp:3.12.0" />
|
||||
<element id="library" level="project" name="Maven: com.squareup.okio:okio:1.15.0" />
|
||||
<element id="library" level="project" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.23" />
|
||||
<element id="library" level="project" name="Maven: com.alibaba:druid:1.1.23" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.9.1" />
|
||||
|
|
@ -191,6 +177,25 @@
|
|||
<element id="library" level="project" name="Maven: org.springframework.retry:spring-retry:1.2.2.RELEASE" />
|
||||
<element id="library" level="project" name="Maven: org.springframework:spring-core:5.1.2.RELEASE" />
|
||||
<element id="library" level="project" name="Maven: org.springframework:spring-jcl:5.1.2.RELEASE" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:cloudauth20200618:2.0.3" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:oss-client:3.0.2" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:credentials-java:0.2.5" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-xml:0.1.1" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:openplatform20191219:3.0.2" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-rpc-util:0.1.2" />
|
||||
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" />
|
||||
<element id="library" level="project" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-rpc:0.1.2" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:oss-util:1.0.0" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-util:0.2.11" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-fileform:0.0.3" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:endpoint-util:0.0.6" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea:1.2.3" />
|
||||
<element id="library" level="project" name="Maven: com.squareup.okhttp3:okhttp:3.12.13" />
|
||||
<element id="library" level="project" name="Maven: com.squareup.okio:okio:1.15.0" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:tea-openapi:0.0.16" />
|
||||
<element id="library" level="project" name="Maven: com.aliyun:openapiutil:0.1.6" />
|
||||
<element id="library" level="project" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" />
|
||||
<element id="library" level="project" name="Maven: javax.annotation:javax.annotation-api:1.3.2" />
|
||||
<element id="library" level="project" name="Maven: javax.servlet:jstl:1.2" />
|
||||
<element id="library" level="project" name="Maven: org.apache.taglibs:taglibs-standard-impl:1.2.5" />
|
||||
|
|
|
|||
|
|
@ -16,5 +16,10 @@
|
|||
<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="http://maven.aliyun.com/nexus/content/groups/public" />
|
||||
</remote-repository>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -1,250 +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="a8a68d09-bb62-4c54-a8c8-4495b550f9ca" name="默认变更列表" comment="wap部分配置">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-common-bundle/src/main/resources/config/application-common.yml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-common-bundle/src/main/resources/config/application-common.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-common-bundle/target/classes/config/application-common.yml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-common-bundle/target/classes/config/application-common.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class" 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="MavenImportPreferences">
|
||||
<option name="generalSettings">
|
||||
<MavenGeneralSettings>
|
||||
<option name="localRepository" value="D:\java\maven\maven-repo" />
|
||||
<option name="userSettingsFile" value="D:\java\maven\conf\settings.xml" />
|
||||
</MavenGeneralSettings>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectId" id="2JRKsoH7USttjLLgTdufP7isMIQ" />
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
||||
<property name="ExpandSpringBootJavaOptionsPanel" value="true" />
|
||||
<property name="RequestMappingsPanelOrder0" value="0" />
|
||||
<property name="RequestMappingsPanelOrder1" value="1" />
|
||||
<property name="RequestMappingsPanelWidth0" value="75" />
|
||||
<property name="RequestMappingsPanelWidth1" value="75" />
|
||||
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
||||
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
||||
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="aspect.path.notification.shown" value="true" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
||||
<property name="node.js.detected.package.eslint" value="true" />
|
||||
<property name="node.js.detected.package.tslint" value="true" />
|
||||
<property name="node.js.selected.package.eslint" value="(autodetect)" />
|
||||
<property name="node.js.selected.package.tslint" value="(autodetect)" />
|
||||
<property name="nodejs_package_manager_path" value="npm" />
|
||||
<property name="project.structure.last.edited" value="模块" />
|
||||
<property name="project.structure.proportion" value="0.15" />
|
||||
<property name="project.structure.side.proportion" value="0.2" />
|
||||
<property name="settings.editor.selected.configurable" value="MavenSettings" />
|
||||
</component>
|
||||
<component name="RunDashboard">
|
||||
<option name="configurationTypes">
|
||||
<set>
|
||||
<option value="SpringBootApplicationConfigurationType" />
|
||||
</set>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="Spring Boot.WapApplication">
|
||||
<configuration name="Base64Util" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="cn.pluss.platform.util.Base64Util" />
|
||||
<module name="pluss-common-bundle" />
|
||||
<extension name="coverage">
|
||||
<pattern>
|
||||
<option name="PATTERN" value="cn.pluss.platform.util.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
</pattern>
|
||||
</extension>
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
|
||||
<option name="arquillianRunConfiguration">
|
||||
<value>
|
||||
<option name="containerStateName" value="" />
|
||||
</value>
|
||||
</option>
|
||||
<option name="TEST_OBJECT" value="class" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="ApiApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
||||
<module name="pluss-api-page" />
|
||||
<option name="SPRING_BOOT_MAIN_CLASS" value="cn.pluss.platform.ApiApplication" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="ManageApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
||||
<module name="pluss-manage-page" />
|
||||
<option name="SPRING_BOOT_MAIN_CLASS" value="cn.pluss.platform.ManageApplication" />
|
||||
<option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
|
||||
<option name="ALTERNATIVE_JRE_PATH" />
|
||||
<option name="SHORTEN_COMMAND_LINE" value="NONE" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="WapApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
||||
<module name="pluss-wap-page" />
|
||||
<option name="SPRING_BOOT_MAIN_CLASS" value="cn.pluss.platform.WapApplication" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<list>
|
||||
<item itemvalue="Spring Boot.ApiApplication" />
|
||||
<item itemvalue="Spring Boot.ManageApplication" />
|
||||
<item itemvalue="Spring Boot.WapApplication" />
|
||||
<item itemvalue="应用程序.Base64Util" />
|
||||
</list>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="应用程序.Base64Util" />
|
||||
</list>
|
||||
</recent_temporary>
|
||||
</component>
|
||||
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="默认任务">
|
||||
<changelist id="a8a68d09-bb62-4c54-a8c8-4495b550f9ca" name="默认变更列表" comment="" />
|
||||
<created>1672035665897</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1672035665897</updated>
|
||||
<workItem from="1672035668891" duration="14242000" />
|
||||
<workItem from="1672710504604" duration="3600000" />
|
||||
<workItem from="1672794561883" duration="14930000" />
|
||||
<workItem from="1672880913444" duration="22544000" />
|
||||
<workItem from="1672967071131" duration="28253000" />
|
||||
<workItem from="1673053725300" duration="14019000" />
|
||||
<workItem from="1673226451285" duration="22191000" />
|
||||
<workItem from="1673312865230" duration="27697000" />
|
||||
<workItem from="1673400058089" duration="30123000" />
|
||||
<workItem from="1673486519964" duration="33762000" />
|
||||
<workItem from="1673571894423" duration="19662000" />
|
||||
<workItem from="1673831400192" duration="17300000" />
|
||||
<workItem from="1673917492868" duration="27221000" />
|
||||
<workItem from="1674003718074" duration="22135000" />
|
||||
<workItem from="1674867825532" duration="12546000" />
|
||||
<workItem from="1674889612655" duration="4695000" />
|
||||
<workItem from="1674894362598" duration="8405000" />
|
||||
<workItem from="1674954816004" duration="25774000" />
|
||||
<workItem from="1675040599799" duration="1553000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="更改配置">
|
||||
<created>1674892648184</created>
|
||||
<option name="number" value="00001" />
|
||||
<option name="presentableId" value="LOCAL-00001" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1674892648184</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00002" summary="更改发送短信，">
|
||||
<created>1674897664824</created>
|
||||
<option name="number" value="00002" />
|
||||
<option name="presentableId" value="LOCAL-00002" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1674897664824</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00003" summary="更改部分配置（百度文字识别）">
|
||||
<created>1674956689324</created>
|
||||
<option name="number" value="00003" />
|
||||
<option name="presentableId" value="LOCAL-00003" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1674956689324</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00004" summary="wap部分配置">
|
||||
<created>1674959790671</created>
|
||||
<option name="number" value="00004" />
|
||||
<option name="presentableId" value="LOCAL-00004" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1674959790671</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="5" />
|
||||
<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>
|
||||
<option name="FILTERS">
|
||||
<map>
|
||||
<entry key="branch">
|
||||
<value>
|
||||
<list>
|
||||
<option value="origin/master" />
|
||||
</list>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
</State>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
<option name="oldMeFiltersMigrated" value="true" />
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="更改配置" />
|
||||
<MESSAGE value="更改发送短信，" />
|
||||
<MESSAGE value="更改部分配置（百度文字识别）" />
|
||||
<MESSAGE value="wap部分配置" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="wap部分配置" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
<breakpoints>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java</url>
|
||||
<line>336</line>
|
||||
<option name="timeStamp" value="4" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java</url>
|
||||
<line>2565</line>
|
||||
<option name="timeStamp" value="17" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java</url>
|
||||
<line>1478</line>
|
||||
<option name="timeStamp" value="19" />
|
||||
</line-breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
<pin-to-top-manager>
|
||||
<pinned-members>
|
||||
<PinnedItemInfo parentTag="com.aliyun.oss.OSSClient" memberName="uploadOperation" />
|
||||
</pinned-members>
|
||||
</pin-to-top-manager>
|
||||
</component>
|
||||
<component name="XSLT-Support.FileAssociations.UIState">
|
||||
<expand />
|
||||
<select />
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -35,6 +35,8 @@
|
|||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
|
|
|
|||
|
|
@ -35,6 +35,8 @@
|
|||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
|
|
@ -124,8 +126,6 @@
|
|||
<orderEntry type="library" name="Maven: com.aliyun:tea:1.2.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" />
|
||||
|
|
@ -214,6 +214,15 @@
|
|||
<orderEntry type="library" name="Maven: io.opentracing:opentracing-util:0.33.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.opentracing:opentracing-noop:0.33.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:cloudauth20200618:2.0.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:oss-client:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:openplatform20191219:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-rpc-util:0.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-rpc:0.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:oss-util:1.0.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.aliyun:tea-fileform:0.0.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.tencentyun:tls-sig-api:1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.json:json:20180130" level="project" />
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
spring:
|
||||
datasource:
|
||||
url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: CZGmysqlroot@123
|
||||
driver-class-name: com.mysql.jdbc.Driver
|
||||
parameter:
|
||||
### 这个根据自己的情况配置
|
||||
domain:
|
||||
|
||||
swagger:
|
||||
### 生产环境不允许访问swagger
|
||||
production: false
|
||||
|
||||
logging:
|
||||
config: classpath:log4j2-dev.xml
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
spring:
|
||||
datasource:
|
||||
url:
|
||||
username:
|
||||
password:
|
||||
driver-class-name: com.mysql.jdbc.Driver
|
||||
|
||||
rabbitmq:
|
||||
enabled: true
|
||||
|
||||
swagger:
|
||||
### 生产环境不允许访问swagger
|
||||
production: true
|
||||
|
||||
logging:
|
||||
config: classpath:log4j2-prod.xml
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
# 测试服务器上的数据库连接
|
||||
spring:
|
||||
datasource:
|
||||
url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: CZGmysqlroot@123
|
||||
driver-class-name: com.mysql.jdbc.Driver
|
||||
|
||||
parameter:
|
||||
domain:
|
||||
|
||||
swagger:
|
||||
### 生产环境不允许访问swagger
|
||||
production: true
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
spring:
|
||||
output:
|
||||
ansi:
|
||||
enabled: always
|
||||
profiles:
|
||||
### 将一些固定的配置放到下级文件夹下的yml文件中
|
||||
include: common, ryx, ys
|
||||
active: dev
|
||||
mvc:
|
||||
view:
|
||||
prefix: /WEB-INF/jsp/
|
||||
suffix: .jsp
|
||||
resources:
|
||||
static-locations: classpath:/static
|
||||
datasource:
|
||||
druid:
|
||||
break-after-acquire-failure: true
|
||||
connection-error-retry-attempts: 1
|
||||
task:
|
||||
execution:
|
||||
pool:
|
||||
max-size: 20
|
||||
|
||||
server:
|
||||
servlet:
|
||||
context-path: /api
|
||||
port: 7004
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue