Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-rest
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-rest
Commits
735b42bb
Commit
735b42bb
authored
Oct 31, 2018
by
chang_chao@founder.com.cn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加版本控制功能
parent
b1c3839e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
132 additions
and
2 deletions
+132
-2
.gitignore
+85
-0
pom.xml
+5
-1
src/main/java/com/cc/common/pojo/XzxtRestResult.java
+2
-1
src/main/resources/version.txt
+23
-0
src/main/resources/versionlogs.txt
+17
-0
No files found.
.gitignore
0 → 100644
View file @
735b42bb
# Created by .ignore support plugin (hsz.mobi)
### Java template
# Compiled class file
*.class
# Log file
*.log
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.ear
*.zip
*.tar.gz
*.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
### Eclipse template
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath
.recommenders
# Eclipse Core
.project
# External tool builders
.externalToolBuilders/
# Locally stored "Eclipse launch configurations"
*.launch
# PyDev specific (Python IDE for Eclipse)
*.pydevproject
# CDT-specific (C/C++ Development Tooling)
.cproject
# JDT-specific (Eclipse Java Development Tools)
.classpath
# Java annotation processor (APT)
.factorypath
# PDT-specific (PHP Development Tools)
.buildpath
# sbteclipse plugin
.target
# Tern plugin
.tern-project
# TeXlipse plugin
.texlipse
# STS (Spring Tool Suite)
.springBeans
# Code Recommenders
.recommenders/
# Scala IDE specific (Scala & Java development for Eclipse)
.cache-main
.scala_dependencies
.worksheet
/target
.idea
*.iml
pom.xml
View file @
735b42bb
...
...
@@ -4,7 +4,7 @@
<groupId>
com.cc
</groupId>
<artifactId>
xzxt-rest
</artifactId>
<packaging>
war
</packaging>
<version>
1.
0-SNAPSHOT
</version>
<version>
1.
ty.1.0-SNAPSHOT_${maven.build.timestamp}
</version>
<name>
xzxt-rest Maven Webapp
</name>
<url>
http://maven.apache.org
</url>
<properties>
...
...
@@ -306,6 +306,10 @@
</includes>
<filtering>
false
</filtering>
</resource>
<resource>
<directory>
${project.basedir}/src/main/resources
</directory>
<filtering>
true
</filtering>
</resource>
</resources>
</build>
</project>
src/main/java/com/cc/common/pojo/XzxtRestResult.java
View file @
735b42bb
...
...
@@ -103,7 +103,8 @@ public class XzxtRestResult {
}
return
build
(
jsonNode
.
get
(
"status"
).
intValue
(),
jsonNode
.
get
(
"msg"
).
asText
(),
obj
);
}
catch
(
Exception
e
)
{
return
null
;
System
.
out
.
println
(
e
.
getStackTrace
());
return
new
XzxtRestResult
();
}
}
...
...
src/main/resources/version.txt
0 → 100644
View file @
735b42bb
version=@project.version@
————————————————————版本描述规范-——————————————————————————
规范:
1、序号:用“#”+阿拉伯数字
2、名称:迭代信息描述,记录本次开发、修改功能描述
3、类别:01:新增功能、02:修改bug、03、修改配置文件
4、描述:新增功能:填写简要需求说明
修改bug:填写对应禅道问题
修改配置文件:填写简要说明
示例:
#1.名称:新增solr更新功能;类别:01;描述:解决solr数据同步问题。
#2.名称:修改指令查询功能;类别:02;描述:解决查询中分页数据不回显问题。
#3.名称:修改jdbc文件; 类别:03;描述:修改数据库连接池大小。
————————————————————版本描述规范-——————————————————————————
————————————————————@project.version@-——————————————————————————
————————————————————@project.version@-——————————————————————————
\ No newline at end of file
src/main/resources/versionlogs.txt
0 → 100644
View file @
735b42bb
#1.记录迭代次数,如果在version.txt中清除了版本描述信息,在此复制备份;
————————————————————1.ty.1.1-SNAPSHOT_20181026-1022-——————————————————————————
#1.修改页面;
#2.新增查询功能;
#3.本次打包更新以上1.2功能;
————————————————————1.ty.1.1-SNAPSHOT_20181026-1022-——————————————————————————
————————————————————1.ty.2.1-SNAPSHOT_20181026-1022-——————————————————————————
#1.修改页面;
#2.新增查询功能;
#3.本次打包更新以上1.2功能;
————————————————————1.ty.2.1-SNAPSHOT_20181026-1022-——————————————————————————
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