diff --git a/assembly/assembly.xml b/bin/assembly.xml
similarity index 93%
rename from assembly/assembly.xml
rename to bin/assembly.xml
index 1c39a811..c246e2a4 100644
--- a/assembly/assembly.xml
+++ b/bin/assembly.xml
@@ -39,13 +39,12 @@
src/main/webapp/WEB-INF
- ./lib/WEB-INF
+ ./WEB-INF
./bin
*.sh
- *.cmd
*.bat
./
diff --git a/bin/start.sh b/bin/start.sh
new file mode 100644
index 00000000..e9ff40e7
--- /dev/null
+++ b/bin/start.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+java -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=128m -Xms1024m -Xmx1024m -Xmn256m -Xss256k -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC \
+-Dloader.path=lib,config \
+-jar -Dfile.encoding=utf-8 -Duser.timezone=GMT+08 -Duser.language=zh -Duser.region=CN ./ms-mcms.jar
+:: > boot.log 2>&1
diff --git a/bin/stop.sh b/bin/stop.sh
new file mode 100644
index 00000000..c0074859
--- /dev/null
+++ b/bin/stop.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+killall -9 java
diff --git a/pom-bin.xml b/pom-bin.xml
new file mode 100644
index 00000000..a7380ba7
--- /dev/null
+++ b/pom-bin.xml
@@ -0,0 +1,131 @@
+
+
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.2.2.RELEASE
+
+ 4.0.0
+ net.mingsoft
+ ms-mcms
+ 5.1-SNAPSHOT
+ ms-mcms
+
+ 1.8
+
+
+
+
+ net.mingsoft
+ ms-mpeople
+ 1.0.25
+
+
+
+ net.mingsoft
+ store-client
+ 3.0
+
+
+
+ ms-mcms
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.1
+
+ ${java.version}
+ ${java.version}
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ repackage
+
+
+
+
+
+ ZIP
+
+
+ non-exists
+ non-exists
+
+
+ true
+
+
+
+
+
+ maven-dependency-plugin
+
+
+ copy-dependencies
+ package
+
+ copy-dependencies
+
+
+ ${project.build.directory}/lib
+ false
+ false
+ runtime
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+ 3.1.0
+
+
+ ./bin/assembly.xml
+
+
+
+
+ make-assembly
+ package
+
+ single
+
+
+
+
+
+
+
+
+ src/main/java
+
+
+ *.java
+
+
+
+ src/main/webapp
+
+
+ static/**
+ html/**
+ upload/**
+ templets/**
+ WEB-INF/**
+
+
+
+ compile
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4d67d0f3..b38bdcad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,75 +51,17 @@
-
-
-
- src/main/webapp
-
- static/**
- html/**
- upload/**
- templets/**
-
-
-
+ src/main/java
- src/main/java
-
- **/*.java
-
+ src/main/resources
+
+
+ src/main/webapp
compile
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eb3e8155..3ea61939 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 8080
servlet.session.timeout: P0DT60M0S #D天H小时M分钟S秒，字符T是紧跟在时分秒之前的，每个单位都必须由数字开始,且时分秒顺序不能乱
# ssl: #https证书配置 配置了之后只能通过https访问应用
# key-store: ms.pfx 证书文件
@@ -13,11 +13,14 @@ logging:
path: log #会在项目的根目录下生成log目录，里面会生成对应的日期目录，日期目录下面生成日志压缩包备份文件,默认按每10M分割一个日志文件，例如：log/2020-01/app-2020-01-03-18.1.log.gz（表示2020年1月3号下午六点的第一个备份），也可以根据实际情况写绝对路径，例如：d:/log
ms:
+ mstore:
+ http: http://store.new.mingsoft.net
+ host: store.new.mingsoft.net
# scheme: https #解决使用代理服务器代理应用时标签解析域名依旧为http的问题
swagger:
enable: true #启用swagger文档，生产的时候务必关掉
manager:
- path: /ms #后台访问的路径，如:http://项目/ms/login.do，生成的时候建议修改
+ path: /ms #后台访问的路径，如:http://项目/ms/login.do，生产的时候建议修改
view-path: /WEB-INF/manager #后台视图层路径配置
chcek-code: true #默认开启验证码验证，false验证码不验证
@@ -66,8 +69,7 @@ spring:
expose-session-attributes: true
expose-spring-macro-helpers: true
prefer-file-system-access: false
- template-loader-path: classpath:/WEB-INF/manager,classpath:/WEB-INF
- #template-loader-path: file:WEB-INF/,file:WEB-INF/manager,classpath:/,classpath:/WEB-INF/manager,classpath:/WEB-INF 管理页面WEB-INF/manger单独配置在jar外面，修改部分ftl避免重新jar打包
+ template-loader-path: file:WEB-INF/,file:WEB-INF/manager,classpath:/,classpath:/WEB-INF/manager,classpath:/WEB-INF
settings:
template_update_delay: 1
default_encoding: UTF-8
diff --git a/src/main/webapp/WEB-INF/manager/main.ftl b/src/main/webapp/WEB-INF/manager/main.ftl
index f458d1f7..24ec15a0 100644
--- a/src/main/webapp/WEB-INF/manager/main.ftl
+++ b/src/main/webapp/WEB-INF/manager/main.ftl
@@ -487,7 +487,6 @@
cursor: pointer;
outline-offset: -1px;
max-width:100%;
- height: 69px;
flex-direction: column;
display: flex;
animation-duration: 1s;