qizu
/
2112-cloud-market
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

cy
86173 2024-08-23 11:05:32 +08:00
parent e276c30b82 e4f26c8fa0
commit 4142283e4c
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/encodings.xml
View File

@ -1,17 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="Encoding"> <component name="Encoding">
<file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/java" charset="UTF-8" />
<file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-market-client/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/cloud-market-client/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-market-client/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-market-common/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/cloud-market-common/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-market-common/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-market-remote/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/cloud-market-remote/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-market-remote/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-market-server/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/cloud-market-server/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-market-server/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/cloud-market-server/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component> </component>
</project> </project>

2
cloud-market-server/src/main/resources/bootstrap.yml
View File

@ -15,7 +15,7 @@ spring:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
application: application:
# 应用名称 # 应用名称
name: cloud-master name: cloud-market
profiles: profiles:
# 环境配置 # 环境配置
active: dev active: dev