Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-control
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
xzxt-control
Commits
a863e569
Commit
a863e569
authored
Oct 25, 2018
by
chang_chao@founder.com.cn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改项目部署配置
parent
bd96430d
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
11 deletions
+44
-11
pom.xml
+27
-2
src/main/java/com/cc/ServletInitializer.java
+2
-1
src/main/resources/application.properties
+1
-1
src/main/resources/application.yml
+7
-7
src/main/resources/version.txt
+7
-0
No files found.
pom.xml
View file @
a863e569
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<groupId>
com.cc
</groupId>
<groupId>
com.cc
</groupId>
<artifactId>
xzxt-control
</artifactId>
<artifactId>
xzxt-control
</artifactId>
<version>
0.0.1-SNAPSHOT
</version>
<version>
1.ty.1.1-SNAPSHOT_${maven.build.timestamp}
</version>
<packaging>
war
</packaging>
<packaging>
war
</packaging>
<name>
xzxt-control
</name>
<name>
xzxt-control
</name>
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
<parent>
<parent>
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-parent
</artifactId>
<artifactId>
spring-boot-starter-parent
</artifactId>
<version>
1.5.15
.RELEASE
</version>
<version>
2.0.4
.RELEASE
</version>
<relativePath/>
<!-- lookup parent from repository -->
<relativePath/>
<!-- lookup parent from repository -->
</parent>
</parent>
...
@@ -91,6 +91,13 @@
...
@@ -91,6 +91,13 @@
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
<version>
1.16.10
</version>
<version>
1.16.10
</version>
</dependency>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-log4j
</artifactId>
<version>
1.3.8.RELEASE
</version>
</dependency>
<dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-test
</artifactId>
<artifactId>
spring-boot-starter-test
</artifactId>
...
@@ -100,6 +107,24 @@
...
@@ -100,6 +107,24 @@
<build>
<build>
<finalName>
xzxt-control
</finalName>
<finalName>
xzxt-control
</finalName>
<resources>
<resource>
<directory>
${project.basedir}/src/main/resources
</directory>
<filtering>
true
</filtering>
<excludes>
<exclude>
static/**
</exclude>
<exclude>
resources/**
</exclude>
</excludes>
</resource>
<resource>
<directory>
${project.basedir}/src/main/resources
</directory>
<filtering>
false
</filtering>
<includes>
<include>
static/**
</include>
<include>
resources/**
</include>
</includes>
</resource>
</resources>
<plugins>
<plugins>
<plugin>
<plugin>
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
...
...
src/main/java/com/cc/ServletInitializer.java
View file @
a863e569
package
com
.
cc
;
package
com
.
cc
;
import
org.springframework.boot.builder.SpringApplicationBuilder
;
import
org.springframework.boot.builder.SpringApplicationBuilder
;
import
org.springframework.boot.web.support.SpringBootServletInitializer
;
import
org.springframework.boot.web.servlet.support.SpringBootServletInitializer
;
public
class
ServletInitializer
extends
SpringBootServletInitializer
{
public
class
ServletInitializer
extends
SpringBootServletInitializer
{
...
...
src/main/resources/application.properties
View file @
a863e569
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
spring.servlet.multipart.max-request-size
=
10MB
spring.servlet.multipart.max-request-size
=
10MB
# \u5355\u4E2A\u6587\u4EF6\u7684\u6700\u5927\u503C
# \u5355\u4E2A\u6587\u4EF6\u7684\u6700\u5927\u503C
spring.servlet.multipart.max-file-size
=
10MB
spring.servlet.multipart.max-file-size
=
10MB
version
=
@project.version@
# \u5B58\u50A8\u90E8\u7F72\u6587\u6863\u8DEF\u5F84
# \u5B58\u50A8\u90E8\u7F72\u6587\u6863\u8DEF\u5F84
#DocumentPath: D://word//
#DocumentPath: D://word//
DocumentPath
:
/usr/local/word
DocumentPath
:
/usr/local/word
...
...
src/main/resources/application.yml
View file @
a863e569
...
@@ -2,9 +2,9 @@ spring:
...
@@ -2,9 +2,9 @@ spring:
datasource
:
datasource
:
# 数据源基本配置
# 数据源基本配置
username
:
root
username
:
root
password
:
123
456
password
:
123
driver-class-name
:
com.mysql.jdbc.Driver
driver-class-name
:
com.mysql.jdbc.Driver
url
:
jdbc:mysql://1
0.94.61.158
:3306/mybatis
url
:
jdbc:mysql://1
27.0.0.1
:3306/mybatis
type
:
com.alibaba.druid.pool.DruidDataSource
type
:
com.alibaba.druid.pool.DruidDataSource
# 数据源其他配置
# 数据源其他配置
initialSize
:
5
initialSize
:
5
...
@@ -34,12 +34,12 @@ mybatis:
...
@@ -34,12 +34,12 @@ mybatis:
# - classpath:sql/employee.sql
# - classpath:sql/employee.sql
# 调用运行监控微服务url
# 调用运行监控微服务url
service-rest
:
service-rest
:
startRest
:
"
http://1
0.94.61.158
:8084/service-rest/start"
startRest
:
"
http://1
27.0.0.1
:8084/service-rest/start"
stopRest
:
"
http://1
0.94.61.158
:8084/service-rest/stop"
stopRest
:
"
http://1
27.0.0.1
:8084/service-rest/stop"
reportRest
:
"
http://1
0.94.61.158
:8084/service-rest/report"
reportRest
:
"
http://1
27.0.0.1
:8084/service-rest/report"
LogsRest
:
"
http://1
0.94.61.158
:8084/service-rest/logs"
LogsRest
:
"
http://1
27.0.0.1
:8084/service-rest/logs"
# 调用运行监控微服务shell脚本位置(注意:不建议修改)
# 调用运行监控微服务shell脚本位置(注意:不建议修改)
shellPaht
:
"
/usr/local/
shell/
"
shellPaht
:
"
/usr/local/"
# 调用运行监控微服务shell脚本
# 调用运行监控微服务shell脚本
startTomcatName
:
"
startTomcat.sh"
startTomcatName
:
"
startTomcat.sh"
stopTomcatName
:
"
shutTomcat.sh"
stopTomcatName
:
"
shutTomcat.sh"
...
...
src/main/resources/version.txt
0 → 100644
View file @
a863e569
version=@project.version@
describe=
1.修改页面;
2.新增查询功能;
3.本次打包更新以上1.2功能;
4.新增消息功能
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment