'commit'

10 months ago · 425b40377f
parent ff90431065
commit 425b40377f
14 changed files with 13 additions and 3 deletions
--- a/dsBase/.idea/compiler.xml
+++ b/dsBase/.idea/compiler.xml
@ -6,6 +6,7 @@
        <sourceOutputDir name="target/generated-sources/annotations" />
        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
        <outputRelativeToContentRoot value="true" />
+        <module name="dsBase" />
        <module name="ds-base" />
      </profile>
    </annotationProcessing>
--- a/dsBase/.idea/dsBase.iml
+++ b/dsBase/.idea/dsBase.iml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$" dumb="true">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resource" type="java-resource" />
+    </content>
+  </component>
+</module>
--- a/dsBase/.idea/encodings.xml
+++ b/dsBase/.idea/encodings.xml
@ -2,6 +2,7 @@
 <project version="4">
  <component name="Encoding" defaultCharsetForPropertiesFiles="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="PROJECT" charset="UTF-8" />
  </component>
 </project>
--- a/dsBase/.idea/modules.xml
+++ b/dsBase/.idea/modules.xml
@ -2,7 +2,7 @@
 <project version="4">
  <component name="ProjectModuleManager">
    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/ds-base.iml" filepath="$PROJECT_DIR$/.idea/ds-base.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/dsBase.iml" filepath="$PROJECT_DIR$/.idea/dsBase.iml" />
    </modules>
  </component>
 </project>
--- a/ds-base/WebRoot/html/static/layui/css/layui.css
+++ b/ds-base/WebRoot/html/static/layui/css/layui.css
--- a/ds-base/WebRoot/html/static/layui/css/layui.css.map
+++ b/ds-base/WebRoot/html/static/layui/css/layui.css.map
--- a/ds-base/WebRoot/html/static/layui/font/iconfont.eot
+++ b/ds-base/WebRoot/html/static/layui/font/iconfont.eot
--- a/ds-base/WebRoot/html/static/layui/font/iconfont.svg
+++ b/ds-base/WebRoot/html/static/layui/font/iconfont.svg
--- a/ds-base/WebRoot/html/static/layui/font/iconfont.ttf
+++ b/ds-base/WebRoot/html/static/layui/font/iconfont.ttf
--- a/ds-base/WebRoot/html/static/layui/font/iconfont.woff
+++ b/ds-base/WebRoot/html/static/layui/font/iconfont.woff
--- a/ds-base/WebRoot/html/static/layui/font/iconfont.woff2
+++ b/ds-base/WebRoot/html/static/layui/font/iconfont.woff2
--- a/ds-base/WebRoot/html/static/layui/layui.js
+++ b/ds-base/WebRoot/html/static/layui/layui.js
--- a/dsBase/src/main/resource/undertow_dev.properties
+++ b/dsBase/src/main/resource/undertow_dev.properties
@ -3,7 +3,7 @@ undertow.devMode=true
 undertow.port=8001
 undertow.host=0.0.0.0
 #undertow.resourcePath =/root/dsBase/WebRoot,classpath:static
-undertow.resourcePath =D:/dsWork/dsProject/ds-base/WebRoot,classpath:static
+undertow.resourcePath =D:/dsWork/dsProject/dsbase/WebRoot,classpath:static

 # 目录名称
 undertow.contextPath=/dsBase
--- a/dsBase/target/classes/undertow_dev.properties
+++ b/dsBase/target/classes/undertow_dev.properties
@ -3,7 +3,7 @@ undertow.devMode=true
 undertow.port=8001
 undertow.host=0.0.0.0
 #undertow.resourcePath =/root/dsBase/WebRoot,classpath:static
-undertow.resourcePath =D:/dsWork/dsProject/ds-base/WebRoot,classpath:static
+undertow.resourcePath =D:/dsWork/dsProject/dsbase/WebRoot,classpath:static

 # 目录名称
 undertow.contextPath=/dsBase