Commit 86e7d6a4 authored by 徐俊's avatar 徐俊

xujun

parent 6857289b
<?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://$PROJECT_DIR$/../../maven325/mavendata/repository/com/yiboshi/arch/1.0.10-SNAPSHOT/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/../../maven325/mavendata/repository/com/yiboshi/arch/1.0.10-SNAPSHOT/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/science-admin/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/science-admin/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/science-admin/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/science-base/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/science-base/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" 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" /> <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/../../maven325/mavendata/repository/com/yiboshi/arch/1.0.10-SNAPSHOT/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/../../maven325/mavendata/repository/com/yiboshi/arch/1.0.10-SNAPSHOT/src/main/resources" charset="UTF-8" />
</component> </component>
</project> </project>
\ No newline at end of file
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>true</filtering> <filtering>false</filtering>
</resource> </resource>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
......
...@@ -8,7 +8,7 @@ spring: ...@@ -8,7 +8,7 @@ spring:
application: application:
name: science-admin name: science-admin
profiles: profiles:
active: @profileActive@ active: 'prod'
http: http:
encoding: encoding:
force: true force: true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment