增加最后更新时间的保存

.idea/xm-backend.iml

@@ -114,6 +114,7 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.3" level="project" />
+    <orderEntry type="library" name="Maven: com.mdp:mdp-swagger-enhance:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-ds:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.4" level="project" />
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />

xm-bootstrap/xm-bootstrap.iml

@@ -127,9 +127,11 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.3" level="project" />
+    <orderEntry type="library" name="Maven: com.mdp:mdp-swagger-enhance:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-ds:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.4" level="project" />
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-oauth2-client:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-qx-api:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty:1.0.2" level="project" />
@@ -269,7 +271,6 @@
     <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
     <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />

xm-core/pom.xml

@@ -70,7 +70,24 @@
 			<artifactId>fastjson</artifactId>
 			<version>1.2.59</version>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger2 -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>2.9.2</version>
+		</dependency>
 
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>2.9.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.javassist</groupId>
+			<artifactId>javassist</artifactId>
+			<version>3.20.0-GA</version>
+		</dependency>
 	</dependencies>
 
 </project>

xm-core/src/main/java/com/xm/core/ctrl/XmAttachmentController.java

@@ -58,7 +58,7 @@ public class XmAttachmentController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmAttachment.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmAttachment.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmAttachment( @RequestParam Map<String,Object> xmAttachment){

xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java

@@ -104,7 +104,7 @@ public class XmBranchStateController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmBranchState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmBranchState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmBranchState( @RequestParam Map<String,Object> xmBranchState){
@@ -122,7 +122,7 @@ public class XmBranchStateController {
 	@ApiOperation( value = "查询机构内所有项目指标汇总信息列表",notes="listXmBranchState,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
 
 	@ApiResponses({
-			@ApiResponse(code = 200,response= XmBranchState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+			@ApiResponse(code = 200,response= XmBranchState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list/portal/allBranchSum",method=RequestMethod.GET)
 	public Map<String,Object> listPortalAllXmBranchSumState( @RequestParam Map<String,Object> xmBranchState){
@@ -140,7 +140,7 @@ public class XmBranchStateController {
 	@ApiOperation( value = "查询前后两周每日任务变化数量",notes="listXmBranchState,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
 
 	@ApiResponses({
-			@ApiResponse(code = 200,response= XmBranchState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+			@ApiResponse(code = 200,response= XmBranchState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list/tasksSumDw",method=RequestMethod.GET)
 	public Map<String,Object> tasksSumDw(){

xm-core/src/main/java/com/xm/core/ctrl/XmBranchTaskTypeStateController.java

@@ -71,7 +71,7 @@ public class XmBranchTaskTypeStateController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmBranchTaskTypeState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmBranchTaskTypeState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmBranchTaskTypeState( @RequestParam Map<String,Object> xmBranchTaskTypeState){

xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java

@@ -73,7 +73,7 @@ public class XmEnvListController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmEnvList.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmEnvList.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmEnvList( @RequestParam Map<String,Object> xmEnvList){

xm-core/src/main/java/com/xm/core/ctrl/XmExchangeController.java

@@ -74,7 +74,7 @@ public class XmExchangeController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response=XmExchange.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response=XmExchange.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmExchange( @RequestParam Map<String,Object> xmExchange){

xm-core/src/main/java/com/xm/core/ctrl/XmFileController.java

@@ -61,7 +61,7 @@ public class XmFileController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmFile.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmFile.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmFile( @RequestParam Map<String,Object> xmFile){

xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java

@@ -184,7 +184,7 @@ public class XmGroupController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmGroup.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmGroup.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProjectGroup( @RequestParam Map<String,Object> xmGroup){

xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java

@@ -85,7 +85,7 @@ public class XmGroupStateController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmGroupState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmGroupState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProjectGroupState( @RequestParam Map<String,Object> xmGroupState){

xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java

@@ -85,7 +85,7 @@ public class XmGroupUserController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmGroupUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmGroupUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProjectGroupUser( @RequestParam Map<String,Object> xmGroupUser){

xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java

@@ -88,7 +88,7 @@ public class XmIterationController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmIteration.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmIteration.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmIteration( @RequestParam Map<String,Object> xmIteration){
@@ -126,7 +126,7 @@ public class XmIterationController {
 	
 	@ApiOperation( value = "查询迭代数据，联通状态数据一起带出",notes="") 
 	@ApiResponses({
-		@ApiResponse(code = 200,response=XmIteration.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response=XmIteration.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/listWithState",method=RequestMethod.GET)
 	public Map<String,Object> listWithState( @RequestParam Map<String,Object> xmIteration){

xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java

@@ -76,7 +76,7 @@ public class XmIterationMenuController {
 			@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
 	})
 	@ApiResponses({
-			@ApiResponse(code = 200,response= Map.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+			@ApiResponse(code = 200,response= Map.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmIterationMenu( @RequestParam Map<String,Object> xmIterationMenu){

xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateController.java

@@ -76,7 +76,7 @@ public class XmIterationStateController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmIterationState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmIterationState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmIterationState( @RequestParam Map<String,Object> xmIterationState){

xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java

@@ -88,7 +88,7 @@ public class XmMenuController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmMenu.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmMenu.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmMenu( @RequestParam Map<String,Object> xmMenu){

xm-core/src/main/java/com/xm/core/ctrl/XmMenuExchangeController.java

@@ -75,7 +75,7 @@ public class XmMenuExchangeController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmMenuExchange.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmMenuExchange.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmMenuExchange( @RequestParam Map<String,Object> xmMenuExchange){

xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java

@@ -98,7 +98,7 @@ public class XmMenuPlanController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response=XmMenuPlan.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response=XmMenuPlan.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmMenuPlan( @RequestParam Map<String,Object> xmMenuPlan){

xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java

@@ -95,7 +95,7 @@ public class XmMenuStateController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmMenuState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmMenuState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmMenuState( @RequestParam Map<String,Object> xmMenuState){

xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java

@@ -61,7 +61,7 @@ public class XmMyFocusController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmMyFocus.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmMyFocus.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmMyFocus( @RequestParam Map<String,Object> xmMyFocus){

xm-core/src/main/java/com/xm/core/ctrl/XmPhaseController.java

@@ -106,7 +106,7 @@ public class XmPhaseController {
 			@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
 	})
 	@ApiResponses({
-			@ApiResponse(code = 200,response= XmPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+			@ApiResponse(code = 200,response= XmPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProductPhase( @RequestParam Map<String,Object> xmProjectPhase){

xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java

@@ -77,7 +77,7 @@ public class XmPhaseMenuController {
 			@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
 	})
 	@ApiResponses({
-			@ApiResponse(code = 200,response= Map.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+			@ApiResponse(code = 200,response= Map.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listWithPhase( @RequestParam Map<String,Object> xmPhaseMenu){

xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java

@@ -72,7 +72,7 @@ public class XmProductController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProduct.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmProduct.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProduct( @RequestParam Map<String,Object> xmProduct){
@@ -128,7 +128,7 @@ public class XmProductController {
 	}
 	@ApiOperation( value = "查询产品表信息列表连同相关状态数据一起带出",notes="") 
 	@ApiResponses({
-		@ApiResponse(code = 200,response=XmProduct.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response=XmProduct.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/listWithState",method=RequestMethod.GET)
 	public Map<String,Object> listWithState( @RequestParam Map<String,Object> xmProduct){

xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java

@@ -88,7 +88,7 @@ public class XmProductStateController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProductState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmProductState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProductState( @RequestParam Map<String,Object> xmProductState){

xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java

@@ -50,7 +50,7 @@ public class XmProjectContractController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProjectContract.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmProjectContract.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProjectContract( @RequestParam Map<String,Object> contractCard){

xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java

@@ -92,7 +92,7 @@ public class XmProjectController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProject.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmProject.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProject( @RequestParam Map<String,Object> xmProject){

xm-core/src/main/java/com/xm/core/ctrl/XmProjectEnvListController.java

@@ -67,7 +67,7 @@ public class XmProjectEnvListController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProjectEnvList.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmProjectEnvList.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProjectEnvList( @RequestParam Map<String,Object> xmProjectEnvList){

xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiController.java

@@ -65,7 +65,7 @@ public class XmProjectKpiController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProjectKpi.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmProjectKpi.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProjectKpi( @RequestParam Map<String,Object> xmProjectKpi){

xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiHisController.java

@@ -68,7 +68,7 @@ public class XmProjectKpiHisController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProjectKpiHis.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmProjectKpiHis.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProjectKpiHis( @RequestParam Map<String,Object> xmProjectKpiHis){

xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostNouserController.java

@@ -70,7 +70,7 @@ public class XmProjectMBudgetCostNouserController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProjectMBudgetCostNouser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmProjectMBudgetCostNouser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProjectMBudgetCostNouser( @RequestParam Map<String,Object> xmProjectMBudgetCostNouser){
@@ -87,7 +87,7 @@ public class XmProjectMBudgetCostNouserController {
 	
  
 	@ApiResponses({
-		@ApiResponse(code = 200,response=XmProjectMBudgetCostNouser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response=XmProjectMBudgetCostNouser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/listSum",method=RequestMethod.GET)
 	public Map<String,Object> listSum( @RequestParam Map<String,Object> xmProjectMBudgetCostNouser){

xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostUserController.java

@@ -61,7 +61,7 @@ public class XmProjectMBudgetCostUserController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProjectMBudgetCostUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmProjectMBudgetCostUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProjectMBudgetCostUser( @RequestParam Map<String,Object> xmProjectMBudgetCostUser){
@@ -77,7 +77,7 @@ public class XmProjectMBudgetCostUserController {
 	}
 	
 	@ApiResponses({
-		@ApiResponse(code = 200,response=XmProjectMBudgetCostUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response=XmProjectMBudgetCostUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/listSum",method=RequestMethod.GET)
 	public Map<String,Object> listSum( @RequestParam Map<String,Object> xmProjectMBudgetCostUser){

xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostNouserController.java

@@ -78,7 +78,7 @@ public class XmProjectMCostNouserController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProjectMCostNouser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmProjectMCostNouser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProjectMCostNouser( @RequestParam Map<String,Object> xmProjectMCostNouser){
@@ -95,7 +95,7 @@ public class XmProjectMCostNouserController {
 	
 	
 	@ApiResponses({
-		@ApiResponse(code = 200,response=XmProjectMCostNouser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response=XmProjectMCostNouser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/listSum",method=RequestMethod.GET)
 	public Map<String,Object> listSum( @RequestParam Map<String,Object> xmProjectMCostNouser){

xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostUserController.java

@@ -80,7 +80,7 @@ public class XmProjectMCostUserController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProjectMCostUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmProjectMCostUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProjectMCostUser( @RequestParam Map<String,Object> xmProjectMCostUser){
@@ -97,7 +97,7 @@ public class XmProjectMCostUserController {
 	
 
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProjectMBudgetCostNouser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmProjectMBudgetCostNouser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/listSum",method=RequestMethod.GET)
 	public Map<String,Object> listSum( @RequestParam Map<String,Object> xmProjectMCostUser){

xm-core/src/main/java/com/xm/core/ctrl/XmProjectOptionsController.java

@@ -55,7 +55,7 @@ public class XmProjectOptionsController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProjectOptions.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmProjectOptions.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProjectOptions( @RequestParam Map<String,Object> xmProjectOptions){

xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java

@@ -109,7 +109,7 @@ public class XmProjectStateController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProjectState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmProjectState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProjectState( @RequestParam Map<String,Object> xmProjectState){
@@ -127,7 +127,7 @@ public class XmProjectStateController {
 	@ApiOperation( value = "查询功能状态表,无需前端维护，所有数据由汇总统计得出信息列表",notes="listXmProductState,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
 
 	@ApiResponses({
-			@ApiResponse(code = 200,response= XmProductState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+			@ApiResponse(code = 200,response= XmProductState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list/portal",method=RequestMethod.GET)
 	public Map<String,Object> listXmProductStateForPortal( @RequestParam Map<String,Object> xmProductState){

xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java

@@ -105,7 +105,7 @@ public class XmProjectStateHisController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProjectStateHis.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmProjectStateHis.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProjectStateHis( @RequestParam Map<String,Object> xmProjectStateHis){

xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java

@@ -71,7 +71,7 @@ public class XmProjectTaskTypeStateController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmProjectTaskTypeState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmProjectTaskTypeState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmProjectTaskTypeState( @RequestParam Map<String,Object> xmProjectTaskTypeState){

xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java

@@ -99,7 +99,7 @@ public class XmQuestionController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmQuestion.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmQuestion.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmQuestion( @RequestParam Map<String,Object> xmQuestion){

xm-core/src/main/java/com/xm/core/ctrl/XmQuestionHandleController.java

@@ -68,7 +68,7 @@ public class XmQuestionHandleController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmQuestionHandle.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmQuestionHandle.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmQuestionHandle( @RequestParam Map<String,Object> xmQuestionHandle){

xm-core/src/main/java/com/xm/core/ctrl/XmQuestionTagController.java

@@ -56,7 +56,7 @@ public class XmQuestionTagController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmQuestionTag.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmQuestionTag.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmQuestionTag( @RequestParam Map<String,Object> xmQuestionTag){

xm-core/src/main/java/com/xm/core/ctrl/XmRecordController.java

@@ -65,7 +65,7 @@ public class XmRecordController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmRecord.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmRecord.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmRecord( @RequestParam Map<String,Object> xmRecord){

xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@@ -14,6 +14,7 @@ import com.mdp.mybatis.PageUtils;
 import com.mdp.qx.HasQx;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
+import com.mdp.swagger.ApiGlobalModel;
 import com.xm.core.PubTool;
 import com.xm.core.entity.*;
 import com.xm.core.queue.XmTaskSumParentsPushService;
@@ -27,6 +28,7 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -81,51 +83,44 @@ public class XmTaskController {
 	XmTaskSumParentsPushService pushService;
 
 	Map<String,Object> fieldsMap = BaseUtils.toMap(new XmTask());
+	Map<String,String> fieldNameMap=new HashMap<>();
+	public void initFieldNameMap(){
+		fieldNameMap.put("name","任务名称");
+		fieldNameMap.put("parentTaskid","父任务编号");
+		fieldNameMap.put("parentTaskname","父任务名称");
+		fieldNameMap.put("projectId","项目编号");
+		fieldNameMap.put("level","任务级别");
+		fieldNameMap.put("sortLevel","排序级别");
+		fieldNameMap.put("executorUserid","任务执行人编号");
+		fieldNameMap.put("executorUsername","任务执行人");
+		fieldNameMap.put("preTaskid","前置任务编号");
+		fieldNameMap.put("preTaskname","前置任务名称");
+		fieldNameMap.put("startTime","任务开始时间");
+		fieldNameMap.put("endTime","任务结束时间");
+		fieldNameMap.put("milestone","里程碑");
+		fieldNameMap.put("description","任务描述");
+		fieldNameMap.put("remarks","备注");
+		fieldNameMap.put("createUserid","任务创建人编号");
+		fieldNameMap.put("createUsername","任务创建人");
+
+		fieldNameMap.put("createTime","创建时间");
+		fieldNameMap.put("remarks","备注");
+		fieldNameMap.put("createUserid","任务创建人编号");
+		fieldNameMap.put("createUsername","任务创建人");
+		fieldNameMap.put("description","任务描述");
+		fieldNameMap.put("remarks","备注");
+		fieldNameMap.put("createUserid","任务创建人编号");
+		fieldNameMap.put("createUsername","任务创建人");
+	}
 
 	@ApiOperation( value = "查询xm_task信息列表",notes="listXmTask,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name="id",value="任务编号,主键",required=false),
-			@ApiImplicitParam(name="name",value="任务名称",required=false),
-			@ApiImplicitParam(name="parentTaskid",value="父任务编号",required=false),
-			@ApiImplicitParam(name="parentTaskname",value="父任务名称",required=false),
-			@ApiImplicitParam(name="projectId",value="项目编号",required=false),
-			@ApiImplicitParam(name="projectName",value="项目名称",required=false),
-			@ApiImplicitParam(name="level",value="任务级别",required=false),
-			@ApiImplicitParam(name="sortLevel",value="排序级别",required=false),
-			@ApiImplicitParam(name="executorUserid",value="任务执行人编号",required=false),
-			@ApiImplicitParam(name="executorUsername",value="任务执行人",required=false),
-			@ApiImplicitParam(name="preTaskid",value="前置任务编号",required=false),
-			@ApiImplicitParam(name="preTaskname",value="前置任务名称",required=false),
-			@ApiImplicitParam(name="startTime",value="任务开始时间",required=false),
-			@ApiImplicitParam(name="endTime",value="任务结束时间",required=false),
-			@ApiImplicitParam(name="milestone",value="里程碑",required=false),
-			@ApiImplicitParam(name="description",value="任务描述",required=false),
-			@ApiImplicitParam(name="remarks",value="备注",required=false),
-			@ApiImplicitParam(name="createUserid",value="任务创建人编号",required=false),
-			@ApiImplicitParam(name="createUsername",value="任务创建人",required=false),
-			@ApiImplicitParam(name="createTime",value="创建时间",required=false),
-			@ApiImplicitParam(name="rate",value="任务进度",required=false),
-			@ApiImplicitParam(name="budgetCost",value="当前任务预算金额（包括所有成本，包括直接下一级）",required=false),
-			@ApiImplicitParam(name="budgetWorkload",value="预算工时（包括直接下级）",required=false),
-			@ApiImplicitParam(name="actCost",value="当前任务实际费用金额（包括所有成本，包括直接下一级）",required=false),
-			@ApiImplicitParam(name="actWorkload",value="实际工时（包括直接下级）",required=false),
-			@ApiImplicitParam(name="taskState",value="任务状态0待领取1已领取执行中2已完工3已结算",required=false),
-			@ApiImplicitParam(name="taskType",value="1可外包0不可外包",required=false),
-			@ApiImplicitParam(name="taskClass",value="1需结算0不需结算",required=false),
-			@ApiImplicitParam(name="toTaskCenter",value="是否发布到任务大厅0否1是",required=false),
-			@ApiImplicitParam(name="actStartTime",value="实际开始时间",required=false),
-			@ApiImplicitParam(name="actEndTime",value="实际结束时间",required=false),
-			@ApiImplicitParam(name="pageSize",value="每页记录数",required=false),
-			@ApiImplicitParam(name="currentPage",value="当前页码,从1开始",required=false),
-			@ApiImplicitParam(name="total",value="总记录数,服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算",required=false),
-			@ApiImplicitParam(name="orderFields",value="排序列 如性别、学生编号排序 ['sex','studentId']",required=false),
-			@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
-	})
+
+	@ApiGlobalModel(component = XmTask.class, value = "id,name")
 	@ApiResponses({
-			@ApiResponse(code = 200,response= XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+			@ApiResponse(code = 200,response= XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/getTask",method=RequestMethod.GET)
-	public Map<String,Object> getTask( @RequestParam Map<String,Object> xmTask){
+	public Map<String,Object> getTask(   @RequestParam Map<String,Object> xmTask){
 		Map<String,Object> m = new HashMap<>();
 		RequestUtils.transformArray(xmTask, "ids");
 		RequestUtils.transformArray(xmTask, "skillIds");
@@ -181,59 +176,32 @@ public class XmTaskController {
 	}
 
 
-	@ApiOperation( value = "查询xm_task信息列表-互联网大厅首页专用、免登录",notes="listXmTask,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
+	@ApiOperation(  value = "查询xm_task信息列表-互联网大厅首页专用、免登录", notes="listXmTask,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
+
 	@ApiImplicitParams({
-			@ApiImplicitParam(name="id",value="任务编号,主键",required=false),
-			@ApiImplicitParam(name="name",value="任务名称",required=false),
-			@ApiImplicitParam(name="parentTaskid",value="父任务编号",required=false),
-			@ApiImplicitParam(name="parentTaskname",value="父任务名称",required=false),
-			@ApiImplicitParam(name="projectId",value="项目编号",required=false),
-			@ApiImplicitParam(name="projectName",value="项目名称",required=false),
-			@ApiImplicitParam(name="level",value="任务级别",required=false),
-			@ApiImplicitParam(name="sortLevel",value="排序级别",required=false),
-			@ApiImplicitParam(name="executorUserid",value="任务执行人编号",required=false),
-			@ApiImplicitParam(name="executorUsername",value="任务执行人",required=false),
-			@ApiImplicitParam(name="preTaskid",value="前置任务编号",required=false),
-			@ApiImplicitParam(name="preTaskname",value="前置任务名称",required=false),
-			@ApiImplicitParam(name="startTime",value="任务开始时间",required=false),
-			@ApiImplicitParam(name="endTime",value="任务结束时间",required=false),
-			@ApiImplicitParam(name="milestone",value="里程碑",required=false),
-			@ApiImplicitParam(name="description",value="任务描述",required=false),
-			@ApiImplicitParam(name="remarks",value="备注",required=false),
-			@ApiImplicitParam(name="createUserid",value="任务创建人编号",required=false),
-			@ApiImplicitParam(name="createUsername",value="任务创建人",required=false),
-			@ApiImplicitParam(name="createTime",value="创建时间",required=false),
-			@ApiImplicitParam(name="rate",value="任务进度",required=false),
-			@ApiImplicitParam(name="budgetCost",value="当前任务预算金额（包括所有成本，包括直接下一级）",required=false),
-			@ApiImplicitParam(name="budgetWorkload",value="预算工时（包括直接下级）",required=false),
-			@ApiImplicitParam(name="actCost",value="当前任务实际费用金额（包括所有成本，包括直接下一级）",required=false),
-			@ApiImplicitParam(name="actWorkload",value="实际工时（包括直接下级）",required=false),
-			@ApiImplicitParam(name="taskState",value="任务状态0待领取1已领取执行中2已完工3已结算",required=false),
-			@ApiImplicitParam(name="taskType",value="1可外包0不可外包",required=false),
-			@ApiImplicitParam(name="taskClass",value="1需结算0不需结算",required=false),
-			@ApiImplicitParam(name="toTaskCenter",value="是否发布到任务大厅0否1是",required=false),
-			@ApiImplicitParam(name="actStartTime",value="实际开始时间",required=false),
-			@ApiImplicitParam(name="actEndTime",value="实际结束时间",required=false),
-			@ApiImplicitParam(name="pageSize",value="每页记录数",required=false),
-			@ApiImplicitParam(name="currentPage",value="当前页码,从1开始",required=false),
-			@ApiImplicitParam(name="total",value="总记录数,服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算",required=false),
-			@ApiImplicitParam(name="orderFields",value="排序列 如性别、学生编号排序 ['sex','studentId']",required=false),
-			@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
-	})
+			@ApiImplicitParam(name="xmTask",value = "业务参数，参考对象xmTask中各字段描述",dataTypeClass = XmTask.class,required=false),
+			@ApiImplicitParam(name="pageSize",value="每页大小，默认20条",dataType = "int" ,required=false),
+			@ApiImplicitParam(name="pageNum",value="当前页码,从1开始",dataType = "int" ,required=false),
+			@ApiImplicitParam(name="total",value="总记录数,服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算",dataType = "int" ,required=false),			@ApiImplicitParam(name="count",value="是否进行总记录数计算，默认是计算，如果需要关闭，请上送count=false",dataType = "int" ,required=false),
+			@ApiImplicitParam(name="orderBy",value="排序列 如性别、学生编号排序 orderBy = sex desc,student desc",dataType = "string" ,required=false),
+ 	})
 	@ApiResponses({
-			@ApiResponse(code = 200,response= XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+			@ApiResponse(code = 200,response= XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/getOutTask",method=RequestMethod.GET)
-	public Map<String,Object> getOutTask( @RequestParam Map<String,Object> xmTask){
+	public Map<String,Object> getOutTask( @RequestParam XmTask xmTask){
 		Map<String,Object> m = new HashMap<>();
 
 		Tips tips=new Tips("查询成功");
+		/**
 		RequestUtils.transformArray(xmTask, "skillIds");
 		PageUtils.startPage(xmTask);
 		xmTask.put("taskOut","1");
 		List<Map<String,Object>> tasks=xmTaskService.getTask(xmTask);
 		PageUtils.responePage(m,tasks);
+
 		m.put("data",tasks);
+		 **/
 		m.put("tips", tips);
 		return m;
 	}
@@ -330,7 +298,10 @@ public class XmTaskController {
 					}else{
 						xmTaskService.editSomeFields(xmTaskMap);
 					}
-					xmRecordService.addXmTaskRecord(xmTask.getProjectId(),xmTask.getId(),"修改项目任务","修改任务"+xmTask.getMenuName(),"", JSON.toJSONString(xmTask));
+				for (XmTask task : can) {
+					xmRecordService.addXmTaskRecord(task.getProjectId(),task.getId(),"项目-任务-批量修改","修改任务"+task.getName(),"", JSON.toJSONString(xmTask));
+				}
+
 
 			}
 			List<String> msgs=new ArrayList<>();
@@ -359,7 +330,7 @@ public class XmTaskController {
 	@ApiOperation( value = "查询任务的信息详情，免登录",notes="taskDetail,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
 
 	@ApiResponses({
-			@ApiResponse(code = 200,response= XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+			@ApiResponse(code = 200,response= XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/shareTaskDetail",method=RequestMethod.GET)
 	public Map<String,Object> taskDetail( @RequestParam Map<String,Object> xmTask){
@@ -494,7 +465,7 @@ public class XmTaskController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response=XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response=XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmTask( @RequestParam Map<String,Object> xmTask){
@@ -704,6 +675,7 @@ public class XmTaskController {
 				}
 			}
 			xmTaskService.updateTime(xmTask,xmTaskDb);
+
 			m.put("data",xmTask);
 		}catch (BizException e) {
 			tips=e.getTips();
@@ -1225,7 +1197,7 @@ public class XmTaskController {
 	}
 
 
-	/***/
+	/**
 	@ApiOperation( value = "批量修改预算",notes="batchSaveBudget,仅需要上传主键字段")
 	@ApiResponses({
 		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
@@ -1376,6 +1348,9 @@ public class XmTaskController {
 		m.put("tips", tips);
 		return m;
 	}
+	 */
+
+
 	/***/
 	@ApiOperation( value = "批量修改任务的上级",notes="batchChangeParentTask,仅需要上传主键字段")
 	@ApiResponses({

xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java

@@ -99,7 +99,7 @@ public class XmTaskExecuserController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmTaskExecuser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmTaskExecuser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmTaskExecuser( @RequestParam Map<String,Object> xmTaskExecuser){
@@ -141,7 +141,7 @@ public class XmTaskExecuserController {
 			@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false)
 	})
 	@ApiResponses({
-			@ApiResponse(code = 200,response= XmTaskExecuser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+			@ApiResponse(code = 200,response= XmTaskExecuser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/listWithTask",method=RequestMethod.GET)
 	public Map<String,Object> listXmTaskExecuserWithTask( @RequestParam Map<String,Object> xmTaskExecuser){

xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java

@@ -55,7 +55,7 @@ public class XmTaskSkillController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmTaskSkill.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmTaskSkill.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmTaskSkill( @RequestParam Map<String,Object> xmTaskSkill){

xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java

@@ -67,7 +67,7 @@ public class XmTestCaseController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmTestCase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmTestCase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmTestCase( @RequestParam Map<String,Object> xmTestCase){

xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseExecController.java

@@ -72,7 +72,7 @@ public class XmTestCaseExecController {
 		@ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) 
 	})
 	@ApiResponses({
-		@ApiResponse(code = 200,response= XmTestCaseExec.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+		@ApiResponse(code = 200,response= XmTestCaseExec.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
 	})
 	@RequestMapping(value="/list",method=RequestMethod.GET)
 	public Map<String,Object> listXmTestCaseExec( @RequestParam Map<String,Object> xmTestCaseExec){

xm-core/src/main/java/com/xm/core/ctrl/ZZZController.java

@@ -0,0 +1,19 @@
+package com.xm.core.ctrl;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 如果系统最后一个加载的接口加了@ApiGlobalModel/@ApiJsonModel/@ApiSimpleModel，这个接口动态生成的参数在swagger文档里将找不到
+ * 出现这种情况就加上这个Controller，保证这个Controller是最后一个Controller => 保证最后一个接口没有使用以上3个注解
+ */
+@RestController
+@RequestMapping("/whatever")
+@Api(tags = "whatever")
+public class ZZZController {
+    @GetMapping("/whatever")
+    public void whatever() {
+    }
+}

xm-core/src/main/java/com/xm/core/service/XmTaskService.java

@@ -237,6 +237,7 @@ public class XmTaskService extends BaseService {
 		if(StringUtils.isEmpty(xmTask.getMilestone())){
 			xmTask.setMilestone("0");
 		}
+		xmTask.setLtime(new Date());
 		this.updateSomeFieldByPk(xmTask);
 		if(StringUtils.hasText(xmTaskDb.getParentTaskid())){
 			pushService.pushXmTask(xmTaskDb);

xm-core/src/main/resources/application-dev.properties

@@ -146,4 +146,6 @@ spring.redis.pool.max-idle=8
 # 连接池中的最小空闲连接
 spring.redis.pool.min-idle=2
 # 连接超时时间（毫秒）
-spring.redis.timeout=100000
+spring.redis.timeout=100000
+
+swagger2.enable=true

xm-core/src/main/resources/application.properties

@@ -23,4 +23,6 @@ spring.thymeleaf.enabled=true
 spring.thymeleaf.encoding=UTF-8
 spring.thymeleaf.content-type=text/html 
 spring.thymeleaf.cache=false
+
+swagger2.enable=true
  

xm-core/src/test/java/com/xm/SwaggerConfig.java

@@ -0,0 +1,92 @@
+package com.xm;
+
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.service.SecurityReference;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.service.Contact;
+import springfox.documentation.service.AuthorizationScope;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * api 文档,
+ * 生产环境需要禁止访问
+ *
+ * 需要将下面路径放到 WebSecurityConfig 中
+ *
+ *                 "/swagger-ui.html",
+ *                 "/webjars/**",
+ *                 "/swagger-ui/**",
+ *                 "/swagger-resources/**",
+ *                 "/v2/*",
+ *                 "/csrf",
+ *                 "/"
+ */
+//@ConditionalOnProperty(havingValue = "dev",name = {"spring.profiles.active"})
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+    @Value(value = "${spring.application.name:}")
+    String applicationName="";
+
+    @Value(value = "${spring.application.name:}")
+    String springProfilesActive="";
+
+    @Value(value = "${server.port:}")
+    String serverPort="";
+
+    @Bean
+    public Docket customDocket() {
+        Docket docket= new Docket(DocumentationType.SWAGGER_2).select().
+                apis(RequestHandlerSelectors.any())
+                .build()
+                .apiInfo(apiInfo()).enable(true);
+
+        /*
+         * 下面的语句是开启对JWT的支持，当用户用Swagger调用受JWT认证保护的方法，
+         * 必须要先提交参数（例如令牌）
+         */
+        //存储用户必须提交的参数
+        List<ApiKey> apikey = new ArrayList();
+        //规定用户需要输入什么参数
+        apikey.add(new ApiKey("token", "token", "token"));
+        docket.securitySchemes(apikey);
+
+        //以下定义如果用户JWT认证通过，则在Swagger中全局有效
+        AuthorizationScope scope = new AuthorizationScope("global", "accessEverything");
+        AuthorizationScope[] scopeArray = {scope};
+        //存储令牌和作用域
+        SecurityReference reference = new SecurityReference("token", scopeArray);
+        List refList = new ArrayList();
+        refList.add(reference);
+        SecurityContext context = SecurityContext.builder().securityReferences(refList).build();
+        List cxtList = new ArrayList();
+        cxtList.add(context);
+        docket.securityContexts(cxtList);
+        return docket;
+    }
+
+
+    private ApiInfo apiInfo() {
+        Contact contact = new Contact("擎勤科技", String.format("http://localhost:%s/swagger-ui.html",serverPort), "cyc58469@163.com");
+        return new ApiInfoBuilder()
+                .title("唛盟项目核心接口")
+                .description("接口文档")
+                .contact(contact)
+                .version("1.0.0")
+                .build();
+    }
+
+
+}

xm-core/src/test/java/com/xm/WebSecurityConfig.java

@@ -40,7 +40,17 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
      */
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-        http.authorizeRequests().antMatchers("/**/xm/core/xmTask/shareTaskDetail").permitAll().anyRequest().authenticated();
+        http.authorizeRequests().antMatchers("/**/xm/core/xmTask/shareTaskDetail",
+
+                "/swagger-ui.html",
+                "/webjars/**",
+                "/swagger-ui/**",
+                "/swagger-resources/**",
+                "/v2/*",
+                "/csrf",
+                "/"
+
+        ).permitAll().anyRequest().authenticated();
         http.oauth2Client().and().logout().disable();
         http.formLogin().usernameParameter("userloginid");
         http.oauth2Login();

xm-core/src/test/java/com/xm/XmApplication.java

@@ -4,6 +4,8 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
 //@ComponentScan(basePackages={"com.mdp","com.xm"})
 @SpringBootApplication
 @EnableRedisHttpSession

xm-core/xm-core.iml

@@ -27,6 +27,7 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.3" level="project" />
+    <orderEntry type="library" name="Maven: com.mdp:mdp-swagger-enhance:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-tpa-client:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.4.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.2" level="project" />
@@ -103,10 +104,25 @@
     <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.11" level="project" />
     <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.59" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-audit-log-client:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-core-api:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.41" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.41" level="project" />
@@ -116,7 +132,6 @@
     <orderEntry type="library" name="Maven: com.mdp:mdp-ext-utils:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.2" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-safe-client:M.1.0.0-RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.mdp:mdp-mq:M.1.0.0-RELEASE" level="project" />
@@ -177,21 +192,6 @@
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: javax.servlet:jstl:1.2" level="project" />