Merge branch 'develop_fix_ignore' into 'develop'

修改忽略

See merge request o2oa/o2oa!28

.gitignore

@@ -53,4 +53,6 @@ hs_err_pid*
 #ignore mvn test directory
 **/src/test/
 command.swap
-**/bin/
+**/bin/
+**/src/main/webapp/describe/
+**/target/

o2server/version.o2

@@ -1 +1 @@
-2020-03-17 17:51:26
+2020-03-17 18:31:13

o2server/x_attendance_assemble_control/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/target/

o2server/x_attendance_assemble_control/src/main/webapp/describe/api.json

@@ -53,20 +53,14 @@
           "method": "PUT",
           "enctype": "application/json"
         },
-        {
-          "name": "audit",
-          "uri": "jaxrs/attendanceappealInfo/audit",
-          "method": "PUT",
-          "enctype": "application/json"
-        },
         {
           "name": "archive",
           "uri": "jaxrs/attendanceappealInfo/archive/{id}",
           "method": "GET"
         },
         {
-          "name": "listNextWithFilter",
-          "uri": "jaxrs/attendanceappealInfo/filter/list/{id}/next/{count}",
+          "name": "audit",
+          "uri": "jaxrs/attendanceappealInfo/audit",
           "method": "PUT",
           "enctype": "application/json"
         },
@@ -75,6 +69,12 @@
           "uri": "jaxrs/attendanceappealInfo/filter/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
+        },
+        {
+          "name": "listNextWithFilter",
+          "uri": "jaxrs/attendanceappealInfo/filter/list/{id}/next/{count}",
+          "method": "PUT",
+          "enctype": "application/json"
         }
       ]
     },
@@ -98,11 +98,6 @@
           "method": "POST",
           "enctype": "application/json"
         },
-        {
-          "name": "checkDetailWithPersonByCycle",
-          "uri": "jaxrs/attendancedetail/checkDetailWithPersonByCycle/{cycleYear}/{cycleMonth}",
-          "method": "GET"
-        },
         {
           "name": "listUnitAttendanceDetail",
           "uri": "jaxrs/attendancedetail/filter/list/unit",
@@ -115,13 +110,8 @@
           "method": "GET"
         },
         {
-          "name": "analyseAttendanceDetail",
-          "uri": "jaxrs/attendancedetail/analyse/id/{id}",
-          "method": "GET"
-        },
-        {
-          "name": "archiveAttendanceDetail",
-          "uri": "jaxrs/attendancedetail/archive/{id}",
+          "name": "listAttendanceDetailByBatchName",
+          "uri": "jaxrs/attendancedetail/list/{file_id}",
           "method": "GET"
         },
         {
@@ -130,6 +120,11 @@
           "method": "PUT",
           "enctype": "application/json"
         },
+        {
+          "name": "archiveAttendanceDetail",
+          "uri": "jaxrs/attendancedetail/archive/{id}",
+          "method": "GET"
+        },
         {
           "name": "listUserAttendanceDetail",
           "uri": "jaxrs/attendancedetail/filter/list/user",
@@ -137,8 +132,13 @@
           "enctype": "application/json"
         },
         {
-          "name": "listAttendanceDetailByBatchName",
-          "uri": "jaxrs/attendancedetail/list/{file_id}",
+          "name": "analyseAttendanceDetail",
+          "uri": "jaxrs/attendancedetail/analyse/id/{id}",
+          "method": "GET"
+        },
+        {
+          "name": "checkDetailWithPersonByCycle",
+          "uri": "jaxrs/attendancedetail/checkDetailWithPersonByCycle/{cycleYear}/{cycleMonth}",
           "method": "GET"
         },
         {
@@ -148,14 +148,14 @@
           "enctype": "application/json"
         },
         {
-          "name": "listNextWithFilter",
-          "uri": "jaxrs/attendancedetail/filter/list/{id}/next/{count}",
+          "name": "listPrevWithFilter",
+          "uri": "jaxrs/attendancedetail/filter/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listPrevWithFilter",
-          "uri": "jaxrs/attendancedetail/filter/list/{id}/prev/{count}",
+          "name": "listNextWithFilter",
+          "uri": "jaxrs/attendancedetail/filter/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         }
@@ -170,13 +170,13 @@
           "method": "GET"
         },
         {
-          "name": "getStatusDetail",
-          "uri": "jaxrs/fileimport/getStatus/{file_id}/detail",
+          "name": "getStatusAll",
+          "uri": "jaxrs/fileimport/getStatus/all",
           "method": "GET"
         },
         {
-          "name": "getStatusAll",
-          "uri": "jaxrs/fileimport/getStatus/all",
+          "name": "getStatusDetail",
+          "uri": "jaxrs/fileimport/getStatus/{file_id}/detail",
           "method": "GET"
         }
       ]
@@ -277,11 +277,6 @@
           "method": "POST",
           "enctype": "application/json"
         },
-        {
-          "name": "listAllAttendanceScheduleSetting",
-          "uri": "jaxrs/attendanceschedulesetting/list/all",
-          "method": "GET"
-        },
         {
           "name": "listAttendanceScheduleSettingByUnit",
           "uri": "jaxrs/attendanceschedulesetting/list/unit/{name}",
@@ -291,6 +286,11 @@
           "name": "listAttendanceScheduleSettingByTopUnit",
           "uri": "jaxrs/attendanceschedulesetting/list/topUnit/{name}",
           "method": "GET"
+        },
+        {
+          "name": "listAllAttendanceScheduleSetting",
+          "uri": "jaxrs/attendanceschedulesetting/list/all",
+          "method": "GET"
         }
       ]
     },
@@ -310,10 +310,9 @@
           "enctype": "application/json"
         },
         {
-          "name": "listNextWithFilter",
-          "uri": "jaxrs/attendanceselfholiday/filter/list/{id}/next/{count}",
-          "method": "PUT",
-          "enctype": "application/json"
+          "name": "listAllAttendanceSelfHoliday",
+          "uri": "jaxrs/attendanceselfholiday/list/all",
+          "method": "GET"
         },
         {
           "name": "listPrevWithFilter",
@@ -322,9 +321,10 @@
           "enctype": "application/json"
         },
         {
-          "name": "listAllAttendanceSelfHoliday",
-          "uri": "jaxrs/attendanceselfholiday/list/all",
-          "method": "GET"
+          "name": "listNextWithFilter",
+          "uri": "jaxrs/attendanceselfholiday/filter/list/{id}/next/{count}",
+          "method": "PUT",
+          "enctype": "application/json"
         }
       ]
     },
@@ -366,13 +366,13 @@
           "enctype": "application/json"
         },
         {
-          "name": "getWithCode",
-          "uri": "jaxrs/attendancesetting/code/{code}",
+          "name": "listAllAttendanceSetting",
+          "uri": "jaxrs/attendancesetting/list/all",
           "method": "GET"
         },
         {
-          "name": "listAllAttendanceSetting",
-          "uri": "jaxrs/attendancesetting/list/all",
+          "name": "getWithCode",
+          "uri": "jaxrs/attendancesetting/code/{code}",
           "method": "GET"
         }
       ]
@@ -417,11 +417,6 @@
     {
       "name": "AttendanceStatisticShowAction",
       "methods": [
-        {
-          "name": "showStmForPerson",
-          "uri": "jaxrs/statisticshow/person/{name}/{year}/{month}",
-          "method": "GET"
-        },
         {
           "name": "showStmForUnit",
           "uri": "jaxrs/statisticshow/unit/{name}/{year}/{month}",
@@ -438,25 +433,35 @@
           "method": "GET"
         },
         {
-          "name": "showStdForTopUnit",
-          "uri": "jaxrs/statisticshow/topUnit/day/{name}/{year}/{month}",
+          "name": "showStmForPerson",
+          "uri": "jaxrs/statisticshow/person/{name}/{year}/{month}",
           "method": "GET"
         },
         {
-          "name": "listStmForPersonNextWithFilter",
-          "uri": "jaxrs/statisticshow/filter/personMonth/list/{id}/next/{count}",
+          "name": "listStmForTopUnitNextWithFilter",
+          "uri": "jaxrs/statisticshow/filter/topUnitMonth/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listStmForTopUnitPrevWithFilter",
-          "uri": "jaxrs/statisticshow/filter/topUnitMonth/list/{id}/prev/{count}",
+          "name": "showStForPersonInUnitSubNested",
+          "uri": "jaxrs/statisticshow/persons/unit/subnested/{name}/{year}/{month}",
+          "method": "GET"
+        },
+        {
+          "name": "showStmForUnitSubnested",
+          "uri": "jaxrs/statisticshow/unit/subnested/{name}/{year}/{month}",
+          "method": "GET"
+        },
+        {
+          "name": "listStmForUnitPrevWithFilter",
+          "uri": "jaxrs/statisticshow/filter/unitMonth/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listStdForUnitNextWithFilter",
-          "uri": "jaxrs/statisticshow/filter/unitDay/list/{id}/next/{count}",
+          "name": "listStmForPersonNextWithFilter",
+          "uri": "jaxrs/statisticshow/filter/personMonth/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
@@ -467,11 +472,21 @@
           "enctype": "application/json"
         },
         {
-          "name": "listStdForTopUnitNextWithFilter",
-          "uri": "jaxrs/statisticshow/filter/topUnitDay/list/{id}/next/{count}",
+          "name": "showStdForTopUnit",
+          "uri": "jaxrs/statisticshow/topUnit/day/{name}/{year}/{month}",
+          "method": "GET"
+        },
+        {
+          "name": "listStmForTopUnitPrevWithFilter",
+          "uri": "jaxrs/statisticshow/filter/topUnitMonth/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
+        {
+          "name": "showStmForTopUnit",
+          "uri": "jaxrs/statisticshow/topUnit/{name}/{year}/{month}",
+          "method": "GET"
+        },
         {
           "name": "listStdForTopUnitPrevWithFilter",
           "uri": "jaxrs/statisticshow/filter/topUnitDay/list/{id}/prev/{count}",
@@ -479,14 +494,15 @@
           "enctype": "application/json"
         },
         {
-          "name": "showStmForUnitSubnested",
-          "uri": "jaxrs/statisticshow/unit/subnested/{name}/{year}/{month}",
+          "name": "showStForPersonInUnit",
+          "uri": "jaxrs/statisticshow/persons/unit/{name}/{year}/{month}",
           "method": "GET"
         },
         {
-          "name": "showStdForUnitInTopUnitWithDate",
-          "uri": "jaxrs/statisticshow/unit/day/topUnit/{name}/{date}",
-          "method": "GET"
+          "name": "listStmForUnitNextWithFilter",
+          "uri": "jaxrs/statisticshow/filter/unitMonth/list/{id}/next/{count}",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
           "name": "listStmForPersonPrevWithFilter",
@@ -495,19 +511,10 @@
           "enctype": "application/json"
         },
         {
-          "name": "showStForPersonInUnit",
-          "uri": "jaxrs/statisticshow/persons/unit/{name}/{year}/{month}",
-          "method": "GET"
-        },
-        {
-          "name": "showStForPersonInUnitSubNested",
-          "uri": "jaxrs/statisticshow/persons/unit/subnested/{name}/{year}/{month}",
-          "method": "GET"
-        },
-        {
-          "name": "showStmForTopUnit",
-          "uri": "jaxrs/statisticshow/topUnit/{name}/{year}/{month}",
-          "method": "GET"
+          "name": "listStdForUnitNextWithFilter",
+          "uri": "jaxrs/statisticshow/filter/unitDay/list/{id}/next/{count}",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
           "name": "showStdForUnitWithDate",
@@ -515,27 +522,20 @@
           "method": "GET"
         },
         {
-          "name": "listStmForUnitPrevWithFilter",
-          "uri": "jaxrs/statisticshow/filter/unitMonth/list/{id}/prev/{count}",
-          "method": "PUT",
-          "enctype": "application/json"
+          "name": "showStForUnitInTopUnit",
+          "uri": "jaxrs/statisticshow/unit/topUnit/{name}/{year}/{month}",
+          "method": "GET"
         },
         {
-          "name": "listStmForUnitNextWithFilter",
-          "uri": "jaxrs/statisticshow/filter/unitMonth/list/{id}/next/{count}",
-          "method": "PUT",
-          "enctype": "application/json"
+          "name": "showStdForUnitInTopUnitWithDate",
+          "uri": "jaxrs/statisticshow/unit/day/topUnit/{name}/{date}",
+          "method": "GET"
         },
         {
-          "name": "listStmForTopUnitNextWithFilter",
-          "uri": "jaxrs/statisticshow/filter/topUnitMonth/list/{id}/next/{count}",
+          "name": "listStdForTopUnitNextWithFilter",
+          "uri": "jaxrs/statisticshow/filter/topUnitDay/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "showStForUnitInTopUnit",
-          "uri": "jaxrs/statisticshow/unit/topUnit/{name}/{year}/{month}",
-          "method": "GET"
         }
       ]
     },
@@ -560,13 +560,13 @@
           "enctype": "application/json"
         },
         {
-          "name": "cycleDetail",
-          "uri": "jaxrs/attendancestatisticalcycle/cycleDetail/{year}/{month}",
+          "name": "listAllAttendanceStatisticalCycle",
+          "uri": "jaxrs/attendancestatisticalcycle/list/all",
           "method": "GET"
         },
         {
-          "name": "listAllAttendanceStatisticalCycle",
-          "uri": "jaxrs/attendancestatisticalcycle/list/all",
+          "name": "cycleDetail",
+          "uri": "jaxrs/attendancestatisticalcycle/cycleDetail/{year}/{month}",
           "method": "GET"
         }
       ]
@@ -591,16 +591,16 @@
           "method": "POST",
           "enctype": "application/json"
         },
+        {
+          "name": "listAllAttendanceWorkDayConfig",
+          "uri": "jaxrs/attendanceworkdayconfig/list/all",
+          "method": "GET"
+        },
         {
           "name": "listWithFilter",
           "uri": "jaxrs/attendanceworkdayconfig/filter",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "listAllAttendanceWorkDayConfig",
-          "uri": "jaxrs/attendanceworkdayconfig/list/all",
-          "method": "GET"
         }
       ]
     },
@@ -634,16 +634,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -672,13 +672,13 @@
           "method": "GET"
         },
         {
-          "name": "selfHolidayExportStream",
-          "uri": "jaxrs/file/export/selfholiday/{startdate}/{enddate}/stream/{stream}",
+          "name": "abnormalDetailsExportStream",
+          "uri": "jaxrs/file/export/abnormaldetails/year/{year}/month/{month}/stream/{stream}",
           "method": "GET"
         },
         {
-          "name": "abnormalDetailsExportStream",
-          "uri": "jaxrs/file/export/abnormaldetails/year/{year}/month/{month}/stream/{stream}",
+          "name": "selfHolidayExportStream",
+          "uri": "jaxrs/file/export/selfholiday/{startdate}/{enddate}/stream/{stream}",
           "method": "GET"
         }
       ]
@@ -712,13 +712,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]

o2server/x_attendance_core_entity/.gitignore

@@ -1 +0,0 @@
-/target/

o2server/x_base_core_project/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/target/

o2server/x_base_core_project/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8

o2server/x_bbs_assemble_control/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/target/

o2server/x_bbs_assemble_control/src/main/webapp/describe/api.json

@@ -16,29 +16,29 @@
           "enctype": "formData"
         },
         {
-          "name": "downloadWithSubject",
-          "uri": "jaxrs/attachment/download/{id}",
+          "name": "getWithId",
+          "uri": "jaxrs/attachment/{id}",
           "method": "GET"
         },
+        {
+          "name": "uploadCallback",
+          "uri": "jaxrs/attachment/upload/subject/{subjectId}/callback/{callback}",
+          "method": "POST",
+          "enctype": "formData"
+        },
         {
           "name": "listWithSubjectId",
           "uri": "jaxrs/attachment/list/subject/{subjectId}",
           "method": "GET"
         },
         {
-          "name": "downloadWithSubjectStream",
-          "uri": "jaxrs/attachment/download/{id}/stream/{stream}",
+          "name": "downloadWithSubject",
+          "uri": "jaxrs/attachment/download/{id}",
           "method": "GET"
         },
         {
-          "name": "uploadCallback",
-          "uri": "jaxrs/attachment/upload/subject/{subjectId}/callback/{callback}",
-          "method": "POST",
-          "enctype": "formData"
-        },
-        {
-          "name": "getWithId",
-          "uri": "jaxrs/attachment/{id}",
+          "name": "downloadWithSubjectStream",
+          "uri": "jaxrs/attachment/download/{id}/stream/{stream}",
           "method": "GET"
         }
       ]
@@ -83,16 +83,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -183,13 +183,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]
@@ -230,23 +230,23 @@
       "name": "PermissionInfoAction",
       "methods": [
         {
-          "name": "getSubjectOperationPermissoin",
-          "uri": "jaxrs/permission/subject/{subjectId}",
+          "name": "replyPublishable",
+          "uri": "jaxrs/permission/replyPublishable/{subjectId}",
           "method": "GET"
         },
         {
-          "name": "subjectPublishable",
-          "uri": "jaxrs/permission/subjectPublishable/{sectionId}",
+          "name": "getSectionOperationPermissoin",
+          "uri": "jaxrs/permission/section/{sectionId}",
           "method": "GET"
         },
         {
-          "name": "getSectionOperationPermissoin",
-          "uri": "jaxrs/permission/section/{sectionId}",
+          "name": "getSubjectOperationPermissoin",
+          "uri": "jaxrs/permission/subject/{subjectId}",
           "method": "GET"
         },
         {
-          "name": "replyPublishable",
-          "uri": "jaxrs/permission/replyPublishable/{subjectId}",
+          "name": "subjectPublishable",
+          "uri": "jaxrs/permission/subjectPublishable/{sectionId}",
           "method": "GET"
         }
       ]
@@ -254,11 +254,6 @@
     {
       "name": "PermissionInfoAdminAction",
       "methods": [
-        {
-          "name": "listPermissionBySection",
-          "uri": "jaxrs/user/permission/section/{sectionId}",
-          "method": "GET"
-        },
         {
           "name": "listPermissionByRoleCode",
           "uri": "jaxrs/user/permission/role/{roleCode}",
@@ -268,6 +263,11 @@
           "name": "listPermissionByForumId",
           "uri": "jaxrs/user/permission/forum/{forumId}",
           "method": "GET"
+        },
+        {
+          "name": "listPermissionBySection",
+          "uri": "jaxrs/user/permission/section/{sectionId}",
+          "method": "GET"
         }
       ]
     },
@@ -275,14 +275,14 @@
       "name": "PictureAction",
       "methods": [
         {
-          "name": "sectionIconUpdate",
-          "uri": "jaxrs/picture/section/{id}/icon",
+          "name": "pictureEncode",
+          "uri": "jaxrs/picture/encode/base64/size/{size}",
           "method": "POST",
           "enctype": "formData"
         },
         {
-          "name": "pictureEncode",
-          "uri": "jaxrs/picture/encode/base64/size/{size}",
+          "name": "sectionIconUpdate",
+          "uri": "jaxrs/picture/section/{id}/icon",
           "method": "POST",
           "enctype": "formData"
         }
@@ -354,49 +354,49 @@
           "enctype": "application/json"
         },
         {
-          "name": "listSelectedRoleByUser",
-          "uri": "jaxrs/user/role/user/selected",
-          "method": "PUT",
-          "enctype": "application/json"
+          "name": "listAll",
+          "uri": "jaxrs/user/role/all",
+          "method": "GET"
         },
         {
-          "name": "listSelectedRoleByUnit",
-          "uri": "jaxrs/user/role/unit/selected",
+          "name": "listByForum",
+          "uri": "jaxrs/user/role/forum/{forumId}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listBindObjectByRoleCode",
-          "uri": "jaxrs/user/role/rolecode/selected",
+          "name": "bindRoleToUser",
+          "uri": "jaxrs/user/role/bind/object",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listAll",
-          "uri": "jaxrs/user/role/all",
-          "method": "GET"
+          "name": "bindUserToRole",
+          "uri": "jaxrs/user/role/bind/role",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
-          "name": "bindRoleToUser",
-          "uri": "jaxrs/user/role/bind/object",
+          "name": "listBySection",
+          "uri": "jaxrs/user/role/section/{sectionId}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listByForum",
-          "uri": "jaxrs/user/role/forum/{forumId}",
+          "name": "listSelectedRoleByUser",
+          "uri": "jaxrs/user/role/user/selected",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "bindUserToRole",
-          "uri": "jaxrs/user/role/bind/role",
+          "name": "listSelectedRoleByUnit",
+          "uri": "jaxrs/user/role/unit/selected",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listBySection",
-          "uri": "jaxrs/user/role/section/{sectionId}",
+          "name": "listBindObjectByRoleCode",
+          "uri": "jaxrs/user/role/rolecode/selected",
           "method": "PUT",
           "enctype": "application/json"
         }
@@ -411,13 +411,13 @@
           "method": "GET"
         },
         {
-          "name": "listSubSectionByMainSectionId",
-          "uri": "jaxrs/section/viewsub/{sectionId}",
+          "name": "viewWithForum",
+          "uri": "jaxrs/section/viewforum/{forumId}",
           "method": "GET"
         },
         {
-          "name": "viewWithForum",
-          "uri": "jaxrs/section/viewforum/{forumId}",
+          "name": "listSubSectionByMainSectionId",
+          "uri": "jaxrs/section/viewsub/{sectionId}",
           "method": "GET"
         }
       ]
@@ -438,8 +438,8 @@
           "enctype": "application/json"
         },
         {
-          "name": "listAllSubSectionByMainSectionId",
-          "uri": "jaxrs/user/section/sub/{sectionId}",
+          "name": "listAllSection",
+          "uri": "jaxrs/user/section/all",
           "method": "GET"
         },
         {
@@ -447,16 +447,16 @@
           "uri": "jaxrs/user/section/forum/{forumId}",
           "method": "GET"
         },
-        {
-          "name": "listAllSection",
-          "uri": "jaxrs/user/section/all",
-          "method": "GET"
-        },
         {
           "name": "deleteForce",
           "uri": "jaxrs/user/section/force/{id}",
           "method": "DELETE",
           "enctype": "application/json"
+        },
+        {
+          "name": "listAllSubSectionByMainSectionId",
+          "uri": "jaxrs/user/section/sub/{sectionId}",
+          "method": "GET"
         }
       ]
     },
@@ -490,19 +490,24 @@
       "name": "SubjectInfoAction",
       "methods": [
         {
-          "name": "listRecommendedSubjectForBBSIndex",
-          "uri": "jaxrs/subject/recommended/index/{count}",
+          "name": "listTopSubject",
+          "uri": "jaxrs/subject/top/{sectionId}",
           "method": "GET"
         },
         {
-          "name": "listRecommendedSubjectForPage",
-          "uri": "jaxrs/subject/recommended/list/page/{page}/count/{count}",
+          "name": "viewSubject",
+          "uri": "jaxrs/subject/view/{id}",
+          "method": "GET"
+        },
+        {
+          "name": "listCreamedSubjectForPage",
+          "uri": "jaxrs/subject/creamed/list/page/{page}/count/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listSubjectForPage",
-          "uri": "jaxrs/subject/filter/list/page/{page}/count/{count}",
+          "name": "listRecommendedSubjectForPage",
+          "uri": "jaxrs/subject/recommended/list/page/{page}/count/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
@@ -513,25 +518,20 @@
           "enctype": "application/json"
         },
         {
-          "name": "searchSubjectForPage",
-          "uri": "jaxrs/subject/search/list/page/{page}/count/{count}",
+          "name": "listSubjectForPage",
+          "uri": "jaxrs/subject/filter/list/page/{page}/count/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listCreamedSubjectForPage",
-          "uri": "jaxrs/subject/creamed/list/page/{page}/count/{count}",
+          "name": "searchSubjectForPage",
+          "uri": "jaxrs/subject/search/list/page/{page}/count/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listTopSubject",
-          "uri": "jaxrs/subject/top/{sectionId}",
-          "method": "GET"
-        },
-        {
-          "name": "viewSubject",
-          "uri": "jaxrs/subject/view/{id}",
+          "name": "listRecommendedSubjectForBBSIndex",
+          "uri": "jaxrs/subject/recommended/index/{count}",
           "method": "GET"
         }
       ]
@@ -567,13 +567,8 @@
           "method": "GET"
         },
         {
-          "name": "topToMainSection",
-          "uri": "jaxrs/user/subject/topToMainSection/{id}",
-          "method": "GET"
-        },
-        {
-          "name": "topToBBS",
-          "uri": "jaxrs/user/subject/topToBBS/{id}",
+          "name": "complete",
+          "uri": "jaxrs/user/subject/complete/{id}",
           "method": "GET"
         },
         {
@@ -587,46 +582,33 @@
           "method": "GET"
         },
         {
-          "name": "complete",
-          "uri": "jaxrs/user/subject/complete/{id}",
+          "name": "topToMainSection",
+          "uri": "jaxrs/user/subject/topToMainSection/{id}",
           "method": "GET"
         },
         {
-          "name": "setRecommendToBBSIndex",
-          "uri": "jaxrs/user/subject/setRecommendToBBSIndex/{id}",
+          "name": "topToBBS",
+          "uri": "jaxrs/user/subject/topToBBS/{id}",
           "method": "GET"
         },
         {
-          "name": "listVoteRecordForPage",
-          "uri": "jaxrs/user/subject/voterecord/list/page/{page}/count/{count}",
-          "method": "PUT",
-          "enctype": "application/json"
-        },
-        {
-          "name": "nonRecommendToBBSIndex",
-          "uri": "jaxrs/user/subject/nonRecommendToBBSIndex/{id}",
+          "name": "setRecommendToBBSIndex",
+          "uri": "jaxrs/user/subject/setRecommendToBBSIndex/{id}",
           "method": "GET"
         },
         {
-          "name": "listMySubjectForPage",
-          "uri": "jaxrs/user/subject/my/list/page/{page}/count/{count}",
-          "method": "PUT",
-          "enctype": "application/json"
-        },
-        {
-          "name": "nonTopToMainSection",
-          "uri": "jaxrs/user/subject/nonTopToMainSection/{id}",
+          "name": "nonCream",
+          "uri": "jaxrs/user/subject/nonCream/{id}",
           "method": "GET"
         },
         {
-          "name": "voteSubmit",
-          "uri": "jaxrs/user/subject/vote/submit",
-          "method": "PUT",
-          "enctype": "application/json"
+          "name": "setCream",
+          "uri": "jaxrs/user/subject/setCream/{id}",
+          "method": "GET"
         },
         {
-          "name": "unComplete",
-          "uri": "jaxrs/user/subject/uncomplete/{id}",
+          "name": "acceptReply",
+          "uri": "jaxrs/user/subject/acceptreply/{id}/{replyId}",
           "method": "GET"
         },
         {
@@ -635,29 +617,23 @@
           "method": "GET"
         },
         {
-          "name": "setOriginal",
-          "uri": "jaxrs/user/subject/setOriginal/{id}",
+          "name": "nonTopToForum",
+          "uri": "jaxrs/user/subject/nonTopToForum/{id}",
           "method": "GET"
         },
-        {
-          "name": "changeSection",
-          "uri": "jaxrs/user/subject/change/section",
-          "method": "PUT",
-          "enctype": "application/json"
-        },
         {
           "name": "nonOriginal",
           "uri": "jaxrs/user/subject/nonOriginal/{id}",
           "method": "GET"
         },
         {
-          "name": "nonCream",
-          "uri": "jaxrs/user/subject/nonCream/{id}",
+          "name": "setOriginal",
+          "uri": "jaxrs/user/subject/setOriginal/{id}",
           "method": "GET"
         },
         {
-          "name": "acceptReply",
-          "uri": "jaxrs/user/subject/acceptreply/{id}/{replyId}",
+          "name": "unComplete",
+          "uri": "jaxrs/user/subject/uncomplete/{id}",
           "method": "GET"
         },
         {
@@ -666,19 +642,43 @@
           "method": "GET"
         },
         {
-          "name": "setCream",
-          "uri": "jaxrs/user/subject/setCream/{id}",
+          "name": "changeSection",
+          "uri": "jaxrs/user/subject/change/section",
+          "method": "PUT",
+          "enctype": "application/json"
+        },
+        {
+          "name": "unAcceptReply",
+          "uri": "jaxrs/user/subject/unacceptreply/{id}",
           "method": "GET"
         },
         {
-          "name": "nonTopToForum",
-          "uri": "jaxrs/user/subject/nonTopToForum/{id}",
+          "name": "voteSubmit",
+          "uri": "jaxrs/user/subject/vote/submit",
+          "method": "PUT",
+          "enctype": "application/json"
+        },
+        {
+          "name": "nonTopToMainSection",
+          "uri": "jaxrs/user/subject/nonTopToMainSection/{id}",
           "method": "GET"
         },
         {
-          "name": "unAcceptReply",
-          "uri": "jaxrs/user/subject/unacceptreply/{id}",
+          "name": "nonRecommendToBBSIndex",
+          "uri": "jaxrs/user/subject/nonRecommendToBBSIndex/{id}",
           "method": "GET"
+        },
+        {
+          "name": "listVoteRecordForPage",
+          "uri": "jaxrs/user/subject/voterecord/list/page/{page}/count/{count}",
+          "method": "PUT",
+          "enctype": "application/json"
+        },
+        {
+          "name": "listMySubjectForPage",
+          "uri": "jaxrs/user/subject/my/list/page/{page}/count/{count}",
+          "method": "PUT",
+          "enctype": "application/json"
         }
       ]
     },

o2server/x_bbs_core_entity/.gitignore

@@ -1 +0,0 @@
-/target/

o2server/x_calendar_assemble_control/.gitignore

@@ -1 +0,0 @@
-/target/

o2server/x_calendar_assemble_control/src/main/webapp/describe/api.json

@@ -3,16 +3,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -31,45 +31,45 @@
           "enctype": "application/json"
         },
         {
-          "name": "isManager",
-          "uri": "jaxrs/calendar/ismanager",
-          "method": "GET"
+          "name": "listWithFilter",
+          "uri": "jaxrs/calendar/list/filter",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
-          "name": "listPublicCalendar",
-          "uri": "jaxrs/calendar/list/public",
+          "name": "followCalendar",
+          "uri": "jaxrs/calendar/follow/{id}",
           "method": "GET"
         },
         {
-          "name": "followCalendarCancel",
-          "uri": "jaxrs/calendar/follow/{id}/cancel",
+          "name": "listMyCalendar",
+          "uri": "jaxrs/calendar/list/my",
           "method": "GET"
         },
         {
-          "name": "isCalendarManager",
-          "uri": "jaxrs/calendar/ismanager/calendar/{accountId}",
-          "method": "GET"
+          "name": "destory",
+          "uri": "jaxrs/calendar/{id}",
+          "method": "DELETE",
+          "enctype": "application/json"
         },
         {
-          "name": "followCalendar",
-          "uri": "jaxrs/calendar/follow/{id}",
+          "name": "isManager",
+          "uri": "jaxrs/calendar/ismanager",
           "method": "GET"
         },
         {
-          "name": "destory",
-          "uri": "jaxrs/calendar/{id}",
-          "method": "DELETE",
-          "enctype": "application/json"
+          "name": "listPublicCalendar",
+          "uri": "jaxrs/calendar/list/public",
+          "method": "GET"
         },
         {
-          "name": "listWithFilter",
-          "uri": "jaxrs/calendar/list/filter",
-          "method": "PUT",
-          "enctype": "application/json"
+          "name": "followCalendarCancel",
+          "uri": "jaxrs/calendar/follow/{id}/cancel",
+          "method": "GET"
         },
         {
-          "name": "listMyCalendar",
-          "uri": "jaxrs/calendar/list/my",
+          "name": "isCalendarManager",
+          "uri": "jaxrs/calendar/ismanager/calendar/{accountId}",
           "method": "GET"
         }
       ]
@@ -88,6 +88,11 @@
           "method": "POST",
           "enctype": "application/json"
         },
+        {
+          "name": "getWithCode",
+          "uri": "jaxrs/setting/code/{code}",
+          "method": "GET"
+        },
         {
           "name": "isManager",
           "uri": "jaxrs/setting/ismanager",
@@ -97,11 +102,6 @@
           "name": "listAllReportSetting",
           "uri": "jaxrs/setting/list/all",
           "method": "GET"
-        },
-        {
-          "name": "getWithCode",
-          "uri": "jaxrs/setting/code/{code}",
-          "method": "GET"
         }
       ]
     },
@@ -120,33 +120,32 @@
           "enctype": "application/json"
         },
         {
-          "name": "updateSingleEvent",
-          "uri": "jaxrs/event/update/single/{eventId}",
-          "method": "PUT",
-          "enctype": "application/json"
+          "name": "getRFC",
+          "uri": "jaxrs/event/rfc/{id}",
+          "method": "GET"
         },
         {
-          "name": "destoryAfterEvent",
-          "uri": "jaxrs/event/after/{eventId}",
-          "method": "DELETE",
+          "name": "listWithFilter",
+          "uri": "jaxrs/event/list/filter",
+          "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "updateAllEventsWithRepeatMaster",
-          "uri": "jaxrs/event/update/all/{eventId}",
+          "name": "updateAfterEvent",
+          "uri": "jaxrs/event/update/after/{eventId}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "destorySingleEvent",
-          "uri": "jaxrs/event/single/{eventId}",
-          "method": "DELETE",
+          "name": "updateSingleEvent",
+          "uri": "jaxrs/event/update/single/{eventId}",
+          "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listWithFilterSample",
-          "uri": "jaxrs/event/list/filter/sample",
-          "method": "PUT",
+          "name": "destoryAfterEvent",
+          "uri": "jaxrs/event/after/{eventId}",
+          "method": "DELETE",
           "enctype": "application/json"
         },
         {
@@ -156,19 +155,20 @@
           "enctype": "application/json"
         },
         {
-          "name": "getRFC",
-          "uri": "jaxrs/event/rfc/{id}",
-          "method": "GET"
+          "name": "destorySingleEvent",
+          "uri": "jaxrs/event/single/{eventId}",
+          "method": "DELETE",
+          "enctype": "application/json"
         },
         {
-          "name": "listWithFilter",
-          "uri": "jaxrs/event/list/filter",
+          "name": "updateAllEventsWithRepeatMaster",
+          "uri": "jaxrs/event/update/all/{eventId}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "updateAfterEvent",
-          "uri": "jaxrs/event/update/after/{eventId}",
+          "name": "listWithFilterSample",
+          "uri": "jaxrs/event/list/filter/sample",
           "method": "PUT",
           "enctype": "application/json"
         }
@@ -224,13 +224,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]

o2server/x_calendar_core_entity/.gitignore

@@ -1 +0,0 @@
-/target/

o2server/x_cms_core_express/.gitignore

@@ -1 +0,0 @@
-/target/

o2server/x_component_assemble_control/.gitignore

@@ -1 +0,0 @@
-/target/

o2server/x_component_assemble_control/src/main/webapp/describe/api.json

@@ -3,16 +3,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -42,16 +42,16 @@
           "method": "DELETE",
           "enctype": "application/json"
         },
+        {
+          "name": "listAll",
+          "uri": "jaxrs/component/list/all",
+          "method": "GET"
+        },
         {
           "name": "edit",
           "uri": "jaxrs/component/{flag}",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "listAll",
-          "uri": "jaxrs/component/list/all",
-          "method": "GET"
         }
       ]
     },
@@ -94,13 +94,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]

o2server/x_component_core_entity/.gitignore

@@ -1 +0,0 @@
-/target/

o2server/x_console/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8

o2server/x_file_assemble_control/.gitignore

@@ -1,2 +1 @@
-/bin/
 /target/

o2server/x_file_assemble_control/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8

o2server/x_file_assemble_control/src/main/webapp/describe/api.json

@@ -32,14 +32,8 @@
           "method": "GET"
         },
         {
-          "name": "postDownloadStream",
-          "uri": "jaxrs/attachment2/{id}/download/stream",
-          "method": "POST",
-          "enctype": "application/json"
-        },
-        {
-          "name": "getImageWidthHeightBase64",
-          "uri": "jaxrs/attachment2/{id}/image/width/{width}/height/{height}/binary/base64",
+          "name": "downloadImageWidthHeight",
+          "uri": "jaxrs/attachment2/{id}/download/image/width/{width}/height/{height}",
           "method": "GET"
         },
         {
@@ -48,9 +42,10 @@
           "method": "GET"
         },
         {
-          "name": "downloadImageWidthHeight",
-          "uri": "jaxrs/attachment2/{id}/download/image/width/{width}/height/{height}",
-          "method": "GET"
+          "name": "postDownloadStream",
+          "uri": "jaxrs/attachment2/{id}/download/stream",
+          "method": "POST",
+          "enctype": "application/json"
         },
         {
           "name": "listFileTypePaging",
@@ -59,10 +54,9 @@
           "enctype": "application/json"
         },
         {
-          "name": "uploadCallback",
-          "uri": "jaxrs/attachment2/upload/folder/{folderId}/callback/{callback}",
-          "method": "POST",
-          "enctype": "formData"
+          "name": "getImageWidthHeightBase64",
+          "uri": "jaxrs/attachment2/{id}/image/width/{width}/height/{height}/binary/base64",
+          "method": "GET"
         },
         {
           "name": "listWithFilter",
@@ -70,9 +64,10 @@
           "method": "GET"
         },
         {
-          "name": "listTop",
-          "uri": "jaxrs/attachment2/list/top",
-          "method": "GET"
+          "name": "uploadCallback",
+          "uri": "jaxrs/attachment2/upload/folder/{folderId}/callback/{callback}",
+          "method": "POST",
+          "enctype": "formData"
         },
         {
           "name": "listWithShare",
@@ -80,44 +75,49 @@
           "method": "GET"
         },
         {
-          "name": "listWithFolder",
-          "uri": "jaxrs/attachment2/list/folder/{folderId}",
+          "name": "postDownload",
+          "uri": "jaxrs/attachment2/{id}/download",
+          "method": "POST",
+          "enctype": "application/json"
+        },
+        {
+          "name": "listWithEditor",
+          "uri": "jaxrs/attachment2/list/editor/{owner}",
           "method": "GET"
         },
         {
-          "name": "getBase64",
-          "uri": "jaxrs/attachment2/{id}/binary/base64",
+          "name": "downloadStream",
+          "uri": "jaxrs/attachment2/{id}/download/stream",
           "method": "GET"
         },
         {
-          "name": "getUseCapacity",
-          "uri": "jaxrs/attachment2/user/capacity",
+          "name": "listWithFolder",
+          "uri": "jaxrs/attachment2/list/folder/{folderId}",
           "method": "GET"
         },
         {
-          "name": "listWithEditor",
-          "uri": "jaxrs/attachment2/list/editor/{owner}",
+          "name": "officePreview",
+          "uri": "jaxrs/attachment2/{id}/office/preview/type/{type}",
           "method": "GET"
         },
         {
-          "name": "postDownload",
-          "uri": "jaxrs/attachment2/{id}/download",
-          "method": "POST",
-          "enctype": "application/json"
+          "name": "listTop",
+          "uri": "jaxrs/attachment2/list/top",
+          "method": "GET"
         },
         {
-          "name": "checkFileExist",
-          "uri": "jaxrs/attachment2/exist/file/{fileMd5}",
+          "name": "getBase64",
+          "uri": "jaxrs/attachment2/{id}/binary/base64",
           "method": "GET"
         },
         {
-          "name": "officePreview",
-          "uri": "jaxrs/attachment2/{id}/office/preview/type/{type}",
+          "name": "getUseCapacity",
+          "uri": "jaxrs/attachment2/user/capacity",
           "method": "GET"
         },
         {
-          "name": "downloadStream",
-          "uri": "jaxrs/attachment2/{id}/download/stream",
+          "name": "checkFileExist",
+          "uri": "jaxrs/attachment2/exist/file/{fileMd5}",
           "method": "GET"
         }
       ]
@@ -159,17 +159,6 @@
           "method": "PUT",
           "enctype": "formData"
         },
-        {
-          "name": "postDownloadStream",
-          "uri": "jaxrs/attachment/{id}/download/stream",
-          "method": "POST",
-          "enctype": "application/json"
-        },
-        {
-          "name": "getImageWidthHeightBase64",
-          "uri": "jaxrs/attachment/{id}/image/width/{width}/height/{height}/binary/base64",
-          "method": "GET"
-        },
         {
           "name": "getImageScaleBase64",
           "uri": "jaxrs/attachment/{id}/image/scale/{scale}/binary/base64",
@@ -182,45 +171,56 @@
           "enctype": "formData"
         },
         {
-          "name": "uploadCallback",
-          "uri": "jaxrs/attachment/upload/folder/{folderId}/callback/{callback}",
+          "name": "postDownloadStream",
+          "uri": "jaxrs/attachment/{id}/download/stream",
           "method": "POST",
-          "enctype": "formData"
+          "enctype": "application/json"
         },
         {
-          "name": "listTop",
-          "uri": "jaxrs/attachment/list/top",
+          "name": "getImageWidthHeightBase64",
+          "uri": "jaxrs/attachment/{id}/image/width/{width}/height/{height}/binary/base64",
           "method": "GET"
         },
+        {
+          "name": "uploadCallback",
+          "uri": "jaxrs/attachment/upload/folder/{folderId}/callback/{callback}",
+          "method": "POST",
+          "enctype": "formData"
+        },
         {
           "name": "listWithShare",
           "uri": "jaxrs/attachment/list/share/{owner}",
           "method": "GET"
         },
         {
-          "name": "listWithFolder",
-          "uri": "jaxrs/attachment/list/folder/{folderId}",
+          "name": "postDownload",
+          "uri": "jaxrs/attachment/{id}/download",
+          "method": "POST",
+          "enctype": "application/json"
+        },
+        {
+          "name": "listWithEditor",
+          "uri": "jaxrs/attachment/list/editor/{owner}",
           "method": "GET"
         },
         {
-          "name": "getBase64",
-          "uri": "jaxrs/attachment/{id}/binary/base64",
+          "name": "downloadStream",
+          "uri": "jaxrs/attachment/{id}/download/stream",
           "method": "GET"
         },
         {
-          "name": "listWithEditor",
-          "uri": "jaxrs/attachment/list/editor/{owner}",
+          "name": "listWithFolder",
+          "uri": "jaxrs/attachment/list/folder/{folderId}",
           "method": "GET"
         },
         {
-          "name": "postDownload",
-          "uri": "jaxrs/attachment/{id}/download",
-          "method": "POST",
-          "enctype": "application/json"
+          "name": "listTop",
+          "uri": "jaxrs/attachment/list/top",
+          "method": "GET"
         },
         {
-          "name": "downloadStream",
-          "uri": "jaxrs/attachment/{id}/download/stream",
+          "name": "getBase64",
+          "uri": "jaxrs/attachment/{id}/binary/base64",
           "method": "GET"
         }
       ]
@@ -228,16 +228,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -307,10 +307,10 @@
           "method": "GET"
         },
         {
-          "name": "uploadPostOctetStream",
-          "uri": "jaxrs/file/upload/referencetype/{referenceType}/reference/{reference}/scale/{scale}",
+          "name": "postDownloadStream",
+          "uri": "jaxrs/file/{id}/download/stream",
           "method": "POST",
-          "enctype": "application/octet-stream"
+          "enctype": "application/json"
         },
         {
           "name": "listNextWithReferenceType",
@@ -323,20 +323,10 @@
           "method": "GET"
         },
         {
-          "name": "listNext",
-          "uri": "jaxrs/file/list/{id}/next/{count}",
-          "method": "GET"
-        },
-        {
-          "name": "listPrev",
-          "uri": "jaxrs/file/list/{id}/prev/{count}",
-          "method": "GET"
-        },
-        {
-          "name": "postDownloadStream",
-          "uri": "jaxrs/file/{id}/download/stream",
+          "name": "uploadPostOctetStream",
+          "uri": "jaxrs/file/upload/referencetype/{referenceType}/reference/{reference}/scale/{scale}",
           "method": "POST",
-          "enctype": "application/json"
+          "enctype": "application/octet-stream"
         },
         {
           "name": "uploadCallback",
@@ -356,8 +346,13 @@
           "enctype": "application/json"
         },
         {
-          "name": "listNextAll",
-          "uri": "jaxrs/file/list/{id}/next/{count}/all",
+          "name": "downloadStream",
+          "uri": "jaxrs/file/{id}/download/stream",
+          "method": "GET"
+        },
+        {
+          "name": "listReference",
+          "uri": "jaxrs/file/list/referencetype",
           "method": "GET"
         },
         {
@@ -366,13 +361,18 @@
           "method": "GET"
         },
         {
-          "name": "listReference",
-          "uri": "jaxrs/file/list/referencetype",
+          "name": "listNextAll",
+          "uri": "jaxrs/file/list/{id}/next/{count}/all",
           "method": "GET"
         },
         {
-          "name": "downloadStream",
-          "uri": "jaxrs/file/{id}/download/stream",
+          "name": "listNext",
+          "uri": "jaxrs/file/list/{id}/next/{count}",
+          "method": "GET"
+        },
+        {
+          "name": "listPrev",
+          "uri": "jaxrs/file/list/{id}/prev/{count}",
           "method": "GET"
         }
       ]
@@ -419,13 +419,13 @@
           "method": "GET"
         },
         {
-          "name": "listTop",
-          "uri": "jaxrs/folder2/list/top",
+          "name": "listWithFolder",
+          "uri": "jaxrs/folder2/list/{id}",
           "method": "GET"
         },
         {
-          "name": "listWithFolder",
-          "uri": "jaxrs/folder2/list/{id}",
+          "name": "listTop",
+          "uri": "jaxrs/folder2/list/top",
           "method": "GET"
         },
         {
@@ -462,13 +462,13 @@
           "enctype": "application/json"
         },
         {
-          "name": "listTop",
-          "uri": "jaxrs/folder/list/top",
+          "name": "listWithFolder",
+          "uri": "jaxrs/folder/list/{id}",
           "method": "GET"
         },
         {
-          "name": "listWithFolder",
-          "uri": "jaxrs/folder/list/{id}",
+          "name": "listTop",
+          "uri": "jaxrs/folder/list/top",
           "method": "GET"
         }
       ]
@@ -492,13 +492,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]
@@ -561,44 +561,39 @@
           "uri": "jaxrs/share/download/share/{shareId}/file/{fileId}",
           "method": "GET"
         },
-        {
-          "name": "listFolderWithFolder",
-          "uri": "jaxrs/share/list/folder/share/{shareId}/folder/{folderId}/",
-          "method": "GET"
-        },
         {
           "name": "listAttWithFolder",
           "uri": "jaxrs/share/list/att/share/{shareId}/folder/{folderId}/",
           "method": "GET"
         },
         {
-          "name": "listMyShare2",
-          "uri": "jaxrs/share/list/my2/{shareType}/{fileType}",
+          "name": "listFolderWithFolder",
+          "uri": "jaxrs/share/list/folder/share/{shareId}/folder/{folderId}/",
           "method": "GET"
         },
         {
-          "name": "listMyShare",
-          "uri": "jaxrs/share/list/my",
+          "name": "listShareToMe2",
+          "uri": "jaxrs/share/list/to/me2/{fileType}",
           "method": "GET"
         },
         {
-          "name": "listShareToMe",
-          "uri": "jaxrs/share/list/to/me",
+          "name": "shield",
+          "uri": "jaxrs/share/shield/{id}",
           "method": "GET"
         },
         {
-          "name": "listShare",
-          "uri": "jaxrs/share/list",
+          "name": "listShareToMe",
+          "uri": "jaxrs/share/list/to/me",
           "method": "GET"
         },
         {
-          "name": "listShareToMe2",
-          "uri": "jaxrs/share/list/to/me2/{fileType}",
+          "name": "getWithPassword",
+          "uri": "jaxrs/share/{id}/password/{password}",
           "method": "GET"
         },
         {
-          "name": "getWithPassword",
-          "uri": "jaxrs/share/{id}/password/{password}",
+          "name": "listMyShare",
+          "uri": "jaxrs/share/list/my",
           "method": "GET"
         },
         {
@@ -608,8 +603,13 @@
           "enctype": "application/json"
         },
         {
-          "name": "shield",
-          "uri": "jaxrs/share/shield/{id}",
+          "name": "listShare",
+          "uri": "jaxrs/share/list",
+          "method": "GET"
+        },
+        {
+          "name": "listMyShare2",
+          "uri": "jaxrs/share/list/my2/{shareType}/{fileType}",
           "method": "GET"
         }
       ]

o2server/x_file_core_entity/.gitignore

@@ -1 +0,0 @@
-/target/

o2server/x_file_core_entity/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8

o2server/x_general_assemble_control/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/target/

o2server/x_general_assemble_control/src/main/webapp/describe/api.json

@@ -4,23 +4,23 @@
       "name": "AreaAction",
       "methods": [
         {
-          "name": "listStreet",
-          "uri": "jaxrs/area/list/province/{province}/city/{city}/district/{district}",
+          "name": "listDistrict",
+          "uri": "jaxrs/area/list/province/{province}/city/{city}",
           "method": "GET"
         },
         {
-          "name": "listCity",
-          "uri": "jaxrs/area/list/province/{province}",
+          "name": "listProvince",
+          "uri": "jaxrs/area/list",
           "method": "GET"
         },
         {
-          "name": "listDistrict",
-          "uri": "jaxrs/area/list/province/{province}/city/{city}",
+          "name": "listCity",
+          "uri": "jaxrs/area/list/province/{province}",
           "method": "GET"
         },
         {
-          "name": "listProvince",
-          "uri": "jaxrs/area/list",
+          "name": "listStreet",
+          "uri": "jaxrs/area/list/province/{province}/city/{city}/district/{district}",
           "method": "GET"
         }
       ]
@@ -28,16 +28,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -91,13 +91,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]
@@ -111,16 +111,16 @@
           "method": "POST",
           "enctype": "formData"
         },
-        {
-          "name": "htmlToWordResult",
-          "uri": "jaxrs/office/html/to/word/result/{flag}",
-          "method": "GET"
-        },
         {
           "name": "htmlToWord",
           "uri": "jaxrs/office/html/to/word",
           "method": "POST",
           "enctype": "application/json"
+        },
+        {
+          "name": "htmlToWordResult",
+          "uri": "jaxrs/office/html/to/word/result/{flag}",
+          "method": "GET"
         }
       ]
     },

o2server/x_general_core_entity/.gitignore

@@ -1 +0,0 @@
-/target/

o2server/x_hotpic_assemble_control/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/target/

o2server/x_hotpic_assemble_control/src/main/webapp/describe/api.json

@@ -3,16 +3,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -63,10 +63,9 @@
           "enctype": "application/json"
         },
         {
-          "name": "changeTitle",
-          "uri": "jaxrs/user/hotpic/changeTitle",
-          "method": "POST",
-          "enctype": "application/json"
+          "name": "listByApplicationAndInfoId",
+          "uri": "jaxrs/user/hotpic/{application}/{infoId}",
+          "method": "GET"
         },
         {
           "name": "existsCheck",
@@ -80,9 +79,10 @@
           "enctype": "application/json"
         },
         {
-          "name": "listByApplicationAndInfoId",
-          "uri": "jaxrs/user/hotpic/{application}/{infoId}",
-          "method": "GET"
+          "name": "changeTitle",
+          "uri": "jaxrs/user/hotpic/changeTitle",
+          "method": "POST",
+          "enctype": "application/json"
         }
       ]
     },
@@ -121,13 +121,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]

o2server/x_hotpic_core_entity/.gitignore

@@ -1 +0,0 @@
-/target/

o2server/x_jpush_assemble_control/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/target/

o2server/x_jpush_assemble_control/src/main/webapp/describe/api.json

@@ -3,16 +3,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -82,13 +82,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]

o2server/x_jpush_core_entity/.gitignore

@@ -1 +0,0 @@
-/target/

o2server/x_meeting_assemble_control/.gitignore

@@ -1,2 +1 @@
-/bin/
 /target/

o2server/x_meeting_assemble_control/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8

o2server/x_meeting_assemble_control/src/main/webapp/describe/api.json

@@ -31,6 +31,12 @@
           "uri": "jaxrs/attachment/{id}/download/{stream}",
           "method": "GET"
         },
+        {
+          "name": "uploadCallback",
+          "uri": "jaxrs/attachment/meeting/{meetingId}/upload/{summary}/callback/{callback}",
+          "method": "POST",
+          "enctype": "formData"
+        },
         {
           "name": "listNext",
           "uri": "jaxrs/attachment/list/{id}/next/{count}",
@@ -42,10 +48,10 @@
           "method": "GET"
         },
         {
-          "name": "uploadCallback",
-          "uri": "jaxrs/attachment/meeting/{meetingId}/upload/{summary}/callback/{callback}",
+          "name": "createFormProcessPlatform",
+          "uri": "jaxrs/attachment/create/from/processplatform",
           "method": "POST",
-          "enctype": "formData"
+          "enctype": "application/json"
         },
         {
           "name": "updateCallback",
@@ -57,12 +63,6 @@
           "name": "listWithMeeting",
           "uri": "jaxrs/attachment/list/meeting/{meetingId}",
           "method": "GET"
-        },
-        {
-          "name": "createFormProcessPlatform",
-          "uri": "jaxrs/attachment/create/from/processplatform",
-          "method": "POST",
-          "enctype": "application/json"
         }
       ]
     },
@@ -108,13 +108,13 @@
           "method": "GET"
         },
         {
-          "name": "listLike",
-          "uri": "jaxrs/building/list/like/{key}",
+          "name": "listLikePinyin",
+          "uri": "jaxrs/building//list/like/pinyin/{key}",
           "method": "GET"
         },
         {
-          "name": "listLikePinyin",
-          "uri": "jaxrs/building//list/like/pinyin/{key}",
+          "name": "listLike",
+          "uri": "jaxrs/building/list/like/{key}",
           "method": "GET"
         }
       ]
@@ -122,16 +122,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -174,13 +174,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]
@@ -211,13 +211,8 @@
           "enctype": "application/json"
         },
         {
-          "name": "listAppliedProcessing",
-          "uri": "jaxrs/meeting/list/applied/processing",
-          "method": "GET"
-        },
-        {
-          "name": "listAppliedCompleted",
-          "uri": "jaxrs/meeting/list/applied/completed",
+          "name": "manualCompleted",
+          "uri": "jaxrs/meeting/{id}/manual/completed",
           "method": "GET"
         },
         {
@@ -230,11 +225,6 @@
           "uri": "jaxrs/meeting/list/{id}/prev/{count}",
           "method": "GET"
         },
-        {
-          "name": "manualCompleted",
-          "uri": "jaxrs/meeting/{id}/manual/completed",
-          "method": "GET"
-        },
         {
           "name": "edit",
           "uri": "jaxrs/meeting/{id}",
@@ -242,89 +232,88 @@
           "enctype": "application/json"
         },
         {
-          "name": "lisInvitedCompleted",
-          "uri": "jaxrs/meeting/list/invited/completed",
+          "name": "listForwardMonthAll",
+          "uri": "jaxrs/meeting/list/forward/monthcount/{monthCount}/all",
           "method": "GET"
         },
         {
-          "name": "lisInvitedProcessing",
-          "uri": "jaxrs/meeting/list/invited/processing",
+          "name": "lisInvitedRejected",
+          "uri": "jaxrs/meeting/list/invited/rejected",
           "method": "GET"
         },
         {
-          "name": "listForwardMonthAll",
-          "uri": "jaxrs/meeting/list/forward/monthcount/{monthCount}/all",
+          "name": "listAppliedCompleted",
+          "uri": "jaxrs/meeting/list/applied/completed",
           "method": "GET"
         },
         {
-          "name": "accpet",
-          "uri": "jaxrs/meeting/{id}/accept",
+          "name": "lisInvitedProcessing",
+          "uri": "jaxrs/meeting/list/invited/processing",
           "method": "GET"
         },
         {
-          "name": "listWaitAccept",
-          "uri": "jaxrs/meeting/list/wait/accept",
+          "name": "listAppliedProcessing",
+          "uri": "jaxrs/meeting/list/applied/processing",
           "method": "GET"
         },
         {
-          "name": "listForwardMonth",
-          "uri": "jaxrs/meeting/list/forward/monthcount/{monthCount}",
+          "name": "lisInvitedCompleted",
+          "uri": "jaxrs/meeting/list/invited/completed",
           "method": "GET"
         },
         {
-          "name": "listAppliedWait",
-          "uri": "jaxrs/meeting/list/applied/wait",
+          "name": "confirmDeny",
+          "uri": "jaxrs/meeting/{id}/confirm/deny",
           "method": "GET"
         },
         {
-          "name": "listOnMonthAll",
-          "uri": "jaxrs/meeting/list/year/{year}/month/{month}/all",
+          "name": "checkInBindCode",
+          "uri": "jaxrs/meeting/{id}/checkin/code",
           "method": "GET"
         },
         {
-          "name": "addInvite",
-          "uri": "jaxrs/meeting/{id}/add/invite",
-          "method": "PUT",
-          "enctype": "application/json"
+          "name": "listComingDay",
+          "uri": "jaxrs/meeting/list/coming/day/{count}",
+          "method": "GET"
         },
         {
-          "name": "listOnDay",
-          "uri": "jaxrs/meeting/list/year/{year}/month/{month}/day/{day}",
+          "name": "listOnMonth",
+          "uri": "jaxrs/meeting/list/year/{year}/month/{month}",
           "method": "GET"
         },
         {
-          "name": "confirmAllow",
-          "uri": "jaxrs/meeting/{id}/confirm/allow",
+          "name": "listForwardMonth",
+          "uri": "jaxrs/meeting/list/forward/monthcount/{monthCount}",
           "method": "GET"
         },
         {
-          "name": "checkin",
-          "uri": "jaxrs/meeting/{id}/checkin",
+          "name": "listWaitAccept",
+          "uri": "jaxrs/meeting/list/wait/accept",
           "method": "GET"
         },
         {
-          "name": "listComingDay",
-          "uri": "jaxrs/meeting/list/coming/day/{count}",
+          "name": "listOnDayAll",
+          "uri": "jaxrs/meeting/list/year/{year}/month/{month}/day/{day}/all",
           "method": "GET"
         },
         {
-          "name": "listComingMonth",
-          "uri": "jaxrs/meeting/list/coming/month/{count}",
+          "name": "listOnDay",
+          "uri": "jaxrs/meeting/list/year/{year}/month/{month}/day/{day}",
           "method": "GET"
         },
         {
-          "name": "checkInBindCode",
-          "uri": "jaxrs/meeting/{id}/checkin/code",
+          "name": "checkin",
+          "uri": "jaxrs/meeting/{id}/checkin",
           "method": "GET"
         },
         {
-          "name": "listOnDayAll",
-          "uri": "jaxrs/meeting/list/year/{year}/month/{month}/day/{day}/all",
+          "name": "lisInvitedWait",
+          "uri": "jaxrs/meeting/list/invited/wait",
           "method": "GET"
         },
         {
-          "name": "listOnMonth",
-          "uri": "jaxrs/meeting/list/year/{year}/month/{month}",
+          "name": "listOnMonthAll",
+          "uri": "jaxrs/meeting/list/year/{year}/month/{month}/all",
           "method": "GET"
         },
         {
@@ -333,18 +322,29 @@
           "method": "GET"
         },
         {
-          "name": "lisInvitedWait",
-          "uri": "jaxrs/meeting/list/invited/wait",
+          "name": "accpet",
+          "uri": "jaxrs/meeting/{id}/accept",
           "method": "GET"
         },
         {
-          "name": "confirmDeny",
-          "uri": "jaxrs/meeting/{id}/confirm/deny",
+          "name": "addInvite",
+          "uri": "jaxrs/meeting/{id}/add/invite",
+          "method": "PUT",
+          "enctype": "application/json"
+        },
+        {
+          "name": "listAppliedWait",
+          "uri": "jaxrs/meeting/list/applied/wait",
           "method": "GET"
         },
         {
-          "name": "lisInvitedRejected",
-          "uri": "jaxrs/meeting/list/invited/rejected",
+          "name": "listComingMonth",
+          "uri": "jaxrs/meeting/list/coming/month/{count}",
+          "method": "GET"
+        },
+        {
+          "name": "confirmAllow",
+          "uri": "jaxrs/meeting/{id}/confirm/allow",
           "method": "GET"
         }
       ]
@@ -392,13 +392,13 @@
           "method": "GET"
         },
         {
-          "name": "listLike",
-          "uri": "jaxrs/room/list/like/{key}",
+          "name": "listLikePinyin",
+          "uri": "jaxrs/room/list/like/pinyin/{key}",
           "method": "GET"
         },
         {
-          "name": "listLikePinyin",
-          "uri": "jaxrs/room/list/like/pinyin/{key}",
+          "name": "listLike",
+          "uri": "jaxrs/room/list/like/{key}",
           "method": "GET"
         }
       ]

o2server/x_meeting_core_entity/.gitignore

@@ -1 +0,0 @@
-/target/

o2server/x_message_assemble_communicate/.gitignore

@@ -1,2 +1 @@
-/bin/
 /target/

o2server/x_message_assemble_communicate/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8

o2server/x_message_assemble_communicate/src/main/webapp/describe/api.json

@@ -3,16 +3,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -41,6 +41,11 @@
           "uri": "jaxrs/consume/list/{consume}/count/{count}",
           "method": "GET"
         },
+        {
+          "name": "listWithCurrentPerson",
+          "uri": "jaxrs/consume/list/{consume}/currentperson/count/{count}",
+          "method": "GET"
+        },
         {
           "name": "listWithPerson",
           "uri": "jaxrs/consume/list/{consume}/person/{person}/count/{count}",
@@ -50,11 +55,6 @@
           "name": "updateSingle",
           "uri": "jaxrs/consume/{id}/type/{type}",
           "method": "GET"
-        },
-        {
-          "name": "listWithCurrentPerson",
-          "uri": "jaxrs/consume/list/{consume}/currentperson/count/{count}",
-          "method": "GET"
         }
       ]
     },
@@ -88,11 +88,22 @@
           "enctype": "application/json"
         },
         {
-          "name": "conversationRead",
-          "uri": "jaxrs/im/conversation/{id}/read",
+          "name": "conversationSetTop",
+          "uri": "jaxrs/im/conversation/{id}/top/set",
           "method": "PUT",
           "enctype": "application/json"
         },
+        {
+          "name": "conversationCancelTop",
+          "uri": "jaxrs/im/conversation/{id}/top/cancel",
+          "method": "PUT",
+          "enctype": "application/json"
+        },
+        {
+          "name": "myConversationList",
+          "uri": "jaxrs/im/conversation/list/my",
+          "method": "GET"
+        },
         {
           "name": "conversation",
           "uri": "jaxrs/im/conversation/{id}",
@@ -105,27 +116,16 @@
           "enctype": "application/json"
         },
         {
-          "name": "msgListByPaging",
-          "uri": "jaxrs/im/msg/list/{page}/size/{size}",
-          "method": "POST",
-          "enctype": "application/json"
-        },
-        {
-          "name": "conversationSetTop",
-          "uri": "jaxrs/im/conversation/{id}/top/set",
+          "name": "conversationRead",
+          "uri": "jaxrs/im/conversation/{id}/read",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "conversationCancelTop",
-          "uri": "jaxrs/im/conversation/{id}/top/cancel",
-          "method": "PUT",
+          "name": "msgListByPaging",
+          "uri": "jaxrs/im/msg/list/{page}/size/{size}",
+          "method": "POST",
           "enctype": "application/json"
-        },
-        {
-          "name": "myConversationList",
-          "uri": "jaxrs/im/conversation/list/my",
-          "method": "GET"
         }
       ]
     },
@@ -133,14 +133,10 @@
       "name": "InstantAction",
       "methods": [
         {
-          "name": "listNext",
-          "uri": "jaxrs/instant/list/{id}/next/{count}",
-          "method": "GET"
-        },
-        {
-          "name": "listPrev",
-          "uri": "jaxrs/instant/list/{id}/prev/{count}",
-          "method": "GET"
+          "name": "currentPersonConsumed",
+          "uri": "jaxrs/instant/currentperson/consumed",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
           "name": "listWithCurrentPersonConsumedAsc",
@@ -162,25 +158,29 @@
           "uri": "jaxrs/instant/list/currentperson/count/{count}/desc",
           "method": "GET"
         },
-        {
-          "name": "currentPersonConsumed",
-          "uri": "jaxrs/instant/currentperson/consumed",
-          "method": "PUT",
-          "enctype": "application/json"
-        },
         {
           "name": "listWithCurrentNotConsumedPersonDesc",
           "uri": "jaxrs/instant/list/currentperson/not/consumed/count/{count}/desc",
           "method": "GET"
         },
+        {
+          "name": "listWithCurrentPersonNotConsumedAsc",
+          "uri": "jaxrs/instant/list/currentperson/not/consumed/count/{count}/asc",
+          "method": "GET"
+        },
         {
           "name": "listWithCurrentConsumedPersonDesc",
           "uri": "jaxrs/instant/list/currentperson/consumed/count/{count}/desc",
           "method": "GET"
         },
         {
-          "name": "listWithCurrentPersonNotConsumedAsc",
-          "uri": "jaxrs/instant/list/currentperson/not/consumed/count/{count}/asc",
+          "name": "listNext",
+          "uri": "jaxrs/instant/list/{id}/next/{count}",
+          "method": "GET"
+        },
+        {
+          "name": "listPrev",
+          "uri": "jaxrs/instant/list/{id}/prev/{count}",
           "method": "GET"
         }
       ]
@@ -204,13 +204,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]

o2server/x_message_core_entity/.gitignore

@@ -1 +0,0 @@
-/target/

o2server/x_mind_assemble_control/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/target/

o2server/x_mind_assemble_control/src/main/webapp/describe/api.json

@@ -3,16 +3,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -55,13 +55,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]
@@ -69,12 +69,6 @@
     {
       "name": "MindFolderInfoAction",
       "methods": [
-        {
-          "name": "moveMindAndFolder",
-          "uri": "jaxrs/folder/move/{folderId}",
-          "method": "PUT",
-          "enctype": "application/json"
-        },
         {
           "name": "folderDeleteForce",
           "uri": "jaxrs/folder/{id}/force",
@@ -82,9 +76,15 @@
           "enctype": "application/json"
         },
         {
-          "name": "folderDelete",
-          "uri": "jaxrs/folder/{id}",
-          "method": "DELETE",
+          "name": "moveMindAndFolder",
+          "uri": "jaxrs/folder/move/{folderId}",
+          "method": "PUT",
+          "enctype": "application/json"
+        },
+        {
+          "name": "saveFolder",
+          "uri": "jaxrs/folder/save",
+          "method": "POST",
           "enctype": "application/json"
         },
         {
@@ -93,9 +93,9 @@
           "method": "GET"
         },
         {
-          "name": "saveFolder",
-          "uri": "jaxrs/folder/save",
-          "method": "POST",
+          "name": "folderDelete",
+          "uri": "jaxrs/folder/{id}",
+          "method": "DELETE",
           "enctype": "application/json"
         }
       ]
@@ -115,9 +115,16 @@
           "method": "GET"
         },
         {
-          "name": "getMindIconWithId",
-          "uri": "jaxrs/mind/{id}/icon",
-          "method": "GET"
+          "name": "listMyRecivedMindNextWithFilter",
+          "uri": "jaxrs/mind/filter/recived/{id}/next/{count}",
+          "method": "PUT",
+          "enctype": "application/json"
+        },
+        {
+          "name": "listMyRecycleNextWithFilter",
+          "uri": "jaxrs/mind/filter/recycle/{id}/next/{count}",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
           "name": "listVersionsWithMindId",
@@ -125,16 +132,10 @@
           "method": "GET"
         },
         {
-          "name": "listShareRecordsWithMindId",
-          "uri": "jaxrs/mind/list/{id}/shareRecords",
+          "name": "restoreMindWithId",
+          "uri": "jaxrs/mind/restore/{id}",
           "method": "GET"
         },
-        {
-          "name": "listMyRecivedMindNextWithFilter",
-          "uri": "jaxrs/mind/filter/recived/{id}/next/{count}",
-          "method": "PUT",
-          "enctype": "application/json"
-        },
         {
           "name": "shareCancelWithId",
           "uri": "jaxrs/mind/share/{shareId}/cancel",
@@ -142,19 +143,24 @@
           "enctype": "application/json"
         },
         {
-          "name": "recycleMindWithId",
-          "uri": "jaxrs/mind/recycle/{id}",
-          "method": "DELETE",
-          "enctype": "application/json"
+          "name": "getMindIconWithId",
+          "uri": "jaxrs/mind/{id}/icon",
+          "method": "GET"
         },
         {
-          "name": "viewMindVersionWithId",
-          "uri": "jaxrs/mind/version/{id}",
+          "name": "listShareRecordsWithMindId",
+          "uri": "jaxrs/mind/list/{id}/shareRecords",
           "method": "GET"
         },
         {
-          "name": "restoreMindWithId",
-          "uri": "jaxrs/mind/restore/{id}",
+          "name": "listMySharedMindNextWithFilter",
+          "uri": "jaxrs/mind/filter/shared/{id}/next/{count}",
+          "method": "PUT",
+          "enctype": "application/json"
+        },
+        {
+          "name": "viewMindVersionWithId",
+          "uri": "jaxrs/mind/version/{id}",
           "method": "GET"
         },
         {
@@ -163,12 +169,6 @@
           "method": "DELETE",
           "enctype": "application/json"
         },
-        {
-          "name": "listMySharedMindNextWithFilter",
-          "uri": "jaxrs/mind/filter/shared/{id}/next/{count}",
-          "method": "PUT",
-          "enctype": "application/json"
-        },
         {
           "name": "destoryFromNormal",
           "uri": "jaxrs/mind/{id}/destorymind",
@@ -176,9 +176,9 @@
           "enctype": "application/json"
         },
         {
-          "name": "listMyRecycleNextWithFilter",
-          "uri": "jaxrs/mind/filter/recycle/{id}/next/{count}",
-          "method": "PUT",
+          "name": "recycleMindWithId",
+          "uri": "jaxrs/mind/recycle/{id}",
+          "method": "DELETE",
           "enctype": "application/json"
         },
         {
@@ -186,12 +186,6 @@
           "uri": "jaxrs/mind/view/{id}",
           "method": "GET"
         },
-        {
-          "name": "changeMindIcon",
-          "uri": "jaxrs/mind/{mindId}/icon/size/{size}",
-          "method": "POST",
-          "enctype": "formData"
-        },
         {
           "name": "saveMind",
           "uri": "jaxrs/mind/save",
@@ -203,6 +197,12 @@
           "uri": "jaxrs/mind/share/{id}",
           "method": "PUT",
           "enctype": "application/json"
+        },
+        {
+          "name": "changeMindIcon",
+          "uri": "jaxrs/mind/{mindId}/icon/size/{size}",
+          "method": "POST",
+          "enctype": "formData"
         }
       ]
     },

o2server/x_mind_core_entity/.gitignore

@@ -1 +0,0 @@
-/target/

o2server/x_okr_assemble_control/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/target/

o2server/x_okr_assemble_control/src/main/webapp/describe/api.json

@@ -3,16 +3,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -55,13 +55,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]
@@ -84,11 +84,6 @@
           "uri": "jaxrs/okrattachmentfileinfo/{id}",
           "method": "GET"
         },
-        {
-          "name": "listByWorkReportId",
-          "uri": "jaxrs/okrattachmentfileinfo/list/report/{id}",
-          "method": "GET"
-        },
         {
           "name": "deleteCenterAttachment",
           "uri": "jaxrs/okrattachmentfileinfo/center/attachment/{id}",
@@ -96,10 +91,19 @@
           "enctype": "application/json"
         },
         {
-          "name": "deleteWorkAttachment",
-          "uri": "jaxrs/okrattachmentfileinfo/work/attachment/{id}",
-          "method": "DELETE",
-          "enctype": "application/json"
+          "name": "workAttachmentDownLoad",
+          "uri": "jaxrs/okrattachmentfileinfo/download/work/{id}",
+          "method": "GET"
+        },
+        {
+          "name": "workAttachmentDownloadStream",
+          "uri": "jaxrs/okrattachmentfileinfo/download/work/{id}/stream/{stream}",
+          "method": "GET"
+        },
+        {
+          "name": "listByWorkReportId",
+          "uri": "jaxrs/okrattachmentfileinfo/list/report/{id}",
+          "method": "GET"
         },
         {
           "name": "deleteReportAttachment",
@@ -108,11 +112,21 @@
           "enctype": "application/json"
         },
         {
-          "name": "reportAttachmentUpload",
-          "uri": "jaxrs/okrattachmentfileinfo/upload/report/{id}/site/{site}",
+          "name": "workAttachmentUpload",
+          "uri": "jaxrs/okrattachmentfileinfo/upload/work/{id}/site/{site}",
           "method": "POST",
           "enctype": "formData"
         },
+        {
+          "name": "centerAttachmentDownLoad",
+          "uri": "jaxrs/okrattachmentfileinfo/download/center/{id}",
+          "method": "GET"
+        },
+        {
+          "name": "centerAttachmentDownloadStream",
+          "uri": "jaxrs/okrattachmentfileinfo/download/center/{id}/stream/{stream}",
+          "method": "GET"
+        },
         {
           "name": "centerAttachmentUpload",
           "uri": "jaxrs/okrattachmentfileinfo/upload/center/{id}/site/{site}",
@@ -124,46 +138,32 @@
           "uri": "jaxrs/okrattachmentfileinfo/download/report/{id}",
           "method": "GET"
         },
-        {
-          "name": "workAttachmentDownloadStream",
-          "uri": "jaxrs/okrattachmentfileinfo/download/work/{id}/stream/{stream}",
-          "method": "GET"
-        },
-        {
-          "name": "centerAttachmentDownLoad",
-          "uri": "jaxrs/okrattachmentfileinfo/download/center/{id}",
-          "method": "GET"
-        },
         {
           "name": "reportAttachmentDownloadStream",
           "uri": "jaxrs/okrattachmentfileinfo/download/report/{id}/stream/{stream}",
           "method": "GET"
         },
         {
-          "name": "workAttachmentUpload",
-          "uri": "jaxrs/okrattachmentfileinfo/upload/work/{id}/site/{site}",
-          "method": "POST",
-          "enctype": "formData"
+          "name": "deleteWorkAttachment",
+          "uri": "jaxrs/okrattachmentfileinfo/work/attachment/{id}",
+          "method": "DELETE",
+          "enctype": "application/json"
         },
         {
-          "name": "centerAttachmentDownloadStream",
-          "uri": "jaxrs/okrattachmentfileinfo/download/center/{id}/stream/{stream}",
-          "method": "GET"
+          "name": "reportAttachmentUpload",
+          "uri": "jaxrs/okrattachmentfileinfo/upload/report/{id}/site/{site}",
+          "method": "POST",
+          "enctype": "formData"
         },
         {
-          "name": "workAttachmentDownLoad",
-          "uri": "jaxrs/okrattachmentfileinfo/download/work/{id}",
+          "name": "listByCenterId",
+          "uri": "jaxrs/okrattachmentfileinfo/list/center/{id}",
           "method": "GET"
         },
         {
           "name": "listByWorkId",
           "uri": "jaxrs/okrattachmentfileinfo/list/work/{id}",
           "method": "GET"
-        },
-        {
-          "name": "listByCenterId",
-          "uri": "jaxrs/okrattachmentfileinfo/list/center/{id}",
-          "method": "GET"
         }
       ]
     },
@@ -198,32 +198,32 @@
           "method": "GET"
         },
         {
-          "name": "listNextWithFilter",
-          "uri": "jaxrs/okrcenterworkinfo/filter/list/{id}/next/{count}",
+          "name": "listDraftNextWithFilter",
+          "uri": "jaxrs/okrcenterworkinfo/draft/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listPrevWithFilter",
-          "uri": "jaxrs/okrcenterworkinfo/filter/list/{id}/prev/{count}",
+          "name": "listDraftPrevWithFilter",
+          "uri": "jaxrs/okrcenterworkinfo/draft/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listDraftNextWithFilter",
-          "uri": "jaxrs/okrcenterworkinfo/draft/list/{id}/next/{count}",
+          "name": "listMyDeployedNextWithFilter",
+          "uri": "jaxrs/okrcenterworkinfo/deployed/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listDraftPrevWithFilter",
-          "uri": "jaxrs/okrcenterworkinfo/draft/list/{id}/prev/{count}",
+          "name": "listMyDeployedPrevWithFilter",
+          "uri": "jaxrs/okrcenterworkinfo/deployed/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listMyReadPrevWithFilter",
-          "uri": "jaxrs/okrcenterworkinfo/read/list/{id}/prev/{count}",
+          "name": "listMyArchiveNextWithFilter",
+          "uri": "jaxrs/okrcenterworkinfo/archive/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
@@ -234,26 +234,26 @@
           "enctype": "application/json"
         },
         {
-          "name": "listMyDeployedNextWithFilter",
-          "uri": "jaxrs/okrcenterworkinfo/deployed/list/{id}/next/{count}",
+          "name": "listMyReadNextWithFilter",
+          "uri": "jaxrs/okrcenterworkinfo/read/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listMyReadNextWithFilter",
-          "uri": "jaxrs/okrcenterworkinfo/read/list/{id}/next/{count}",
+          "name": "listMyReadPrevWithFilter",
+          "uri": "jaxrs/okrcenterworkinfo/read/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listMyDeployedPrevWithFilter",
-          "uri": "jaxrs/okrcenterworkinfo/deployed/list/{id}/prev/{count}",
+          "name": "listPrevWithFilter",
+          "uri": "jaxrs/okrcenterworkinfo/filter/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listMyArchiveNextWithFilter",
-          "uri": "jaxrs/okrcenterworkinfo/archive/list/{id}/next/{count}",
+          "name": "listNextWithFilter",
+          "uri": "jaxrs/okrcenterworkinfo/filter/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
@@ -313,14 +313,14 @@
           "enctype": "application/json"
         },
         {
-          "name": "listNextWithFilter",
-          "uri": "jaxrs/okrconfigsecretary/filter/list/{id}/next/{count}",
+          "name": "listPrevWithFilter",
+          "uri": "jaxrs/okrconfigsecretary/filter/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listPrevWithFilter",
-          "uri": "jaxrs/okrconfigsecretary/filter/list/{id}/prev/{count}",
+          "name": "listNextWithFilter",
+          "uri": "jaxrs/okrconfigsecretary/filter/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
@@ -356,16 +356,16 @@
           "method": "POST",
           "enctype": "application/json"
         },
+        {
+          "name": "allowedDeployWork",
+          "uri": "jaxrs/okrconfigsystem/allowed/deploy",
+          "method": "GET"
+        },
         {
           "name": "getByCode",
           "uri": "jaxrs/okrconfigsystem/code",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "allowedDeployWork",
-          "uri": "jaxrs/okrconfigsystem/allowed/deploy",
-          "method": "GET"
         }
       ]
     },
@@ -480,19 +480,14 @@
           "enctype": "application/json"
         },
         {
-          "name": "excute",
-          "uri": "jaxrs/streportcontent/excute",
-          "method": "GET"
-        },
-        {
-          "name": "listByCondition",
-          "uri": "jaxrs/streportcontent/filter/list",
+          "name": "listReportContentByCondition",
+          "uri": "jaxrs/streportcontent/filter/sub/{parentId}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "treeByCondition",
-          "uri": "jaxrs/streportcontent/filter/tree",
+          "name": "listDateByCondition",
+          "uri": "jaxrs/streportcontent/date/list",
           "method": "PUT",
           "enctype": "application/json"
         },
@@ -502,14 +497,19 @@
           "method": "GET"
         },
         {
-          "name": "listReportContentByCondition",
-          "uri": "jaxrs/streportcontent/filter/sub/{parentId}",
+          "name": "excute",
+          "uri": "jaxrs/streportcontent/excute",
+          "method": "GET"
+        },
+        {
+          "name": "listByCondition",
+          "uri": "jaxrs/streportcontent/filter/list",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listDateByCondition",
-          "uri": "jaxrs/streportcontent/date/list",
+          "name": "treeByCondition",
+          "uri": "jaxrs/streportcontent/filter/tree",
           "method": "PUT",
           "enctype": "application/json"
         }
@@ -525,9 +525,10 @@
           "enctype": "application/json"
         },
         {
-          "name": "excute",
-          "uri": "jaxrs/streportstatus/excute",
-          "method": "GET"
+          "name": "listReportStatusByCondition",
+          "uri": "jaxrs/streportstatus/filter/list",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
           "name": "excuteAll",
@@ -535,10 +536,9 @@
           "method": "GET"
         },
         {
-          "name": "listReportStatusByCondition",
-          "uri": "jaxrs/streportstatus/filter/list",
-          "method": "PUT",
-          "enctype": "application/json"
+          "name": "excute",
+          "uri": "jaxrs/streportstatus/excute",
+          "method": "GET"
         }
       ]
     },
@@ -551,14 +551,14 @@
           "method": "GET"
         },
         {
-          "name": "errorInfoFilterListNextWithFilter",
-          "uri": "jaxrs/error/identity/filter/list/{id}/next/{count}",
+          "name": "getOkrErrorIdentityRecords",
+          "uri": "jaxrs/error/identity/errorrecords/filter/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "getOkrErrorIdentityRecords",
-          "uri": "jaxrs/error/identity/errorrecords/filter/list/{id}/next/{count}",
+          "name": "errorInfoFilterListNextWithFilter",
+          "uri": "jaxrs/error/identity/filter/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
@@ -589,6 +589,16 @@
           "uri": "jaxrs/okrtask/{id}",
           "method": "GET"
         },
+        {
+          "name": "showTaskCollect",
+          "uri": "jaxrs/okrtask/unit/reportTaskCollect/{id}",
+          "method": "GET"
+        },
+        {
+          "name": "processRead",
+          "uri": "jaxrs/okrtask/process/read/{id}",
+          "method": "GET"
+        },
         {
           "name": "listMyTaskNext",
           "uri": "jaxrs/okrtask/filter/my/{id}/next/{count}",
@@ -600,16 +610,6 @@
           "uri": "jaxrs/okrtask/sms/send/{workId}",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "showTaskCollect",
-          "uri": "jaxrs/okrtask/unit/reportTaskCollect/{id}",
-          "method": "GET"
-        },
-        {
-          "name": "processRead",
-          "uri": "jaxrs/okrtask/process/read/{id}",
-          "method": "GET"
         }
       ]
     },
@@ -628,14 +628,14 @@
           "enctype": "application/json"
         },
         {
-          "name": "filterListTaskPrev",
-          "uri": "jaxrs/admin/okrtask/filter/{id}/prev/{count}",
+          "name": "filterListTaskNext",
+          "uri": "jaxrs/admin/okrtask/filter/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "filterListTaskNext",
-          "uri": "jaxrs/admin/okrtask/filter/{id}/next/{count}",
+          "name": "filterListTaskPrev",
+          "uri": "jaxrs/admin/okrtask/filter/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         }
@@ -666,14 +666,14 @@
       "name": "OkrWorkAuthorizeAction",
       "methods": [
         {
-          "name": "takeback",
-          "uri": "jaxrs/okrauthorize/takeback",
+          "name": "workAuthorize",
+          "uri": "jaxrs/okrauthorize/work",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "workAuthorize",
-          "uri": "jaxrs/okrauthorize/work",
+          "name": "takeback",
+          "uri": "jaxrs/okrauthorize/takeback",
           "method": "PUT",
           "enctype": "application/json"
         }
@@ -725,27 +725,15 @@
           "uri": "jaxrs/okrworkbaseinfo/archive/{id}",
           "method": "GET"
         },
-        {
-          "name": "getOperation",
-          "uri": "jaxrs/okrworkbaseinfo/getOperation/{id}",
-          "method": "GET"
-        },
         {
           "name": "recycle",
           "uri": "jaxrs/okrworkbaseinfo/recycle/{id}",
           "method": "GET"
         },
         {
-          "name": "listMyResponsibilityNextWithFilter",
-          "uri": "jaxrs/okrworkbaseinfo/responsibility/list/{id}/next/{count}",
-          "method": "PUT",
-          "enctype": "application/json"
-        },
-        {
-          "name": "listMyResponsibilityPrevWithFilter",
-          "uri": "jaxrs/okrworkbaseinfo/responsibility/list/{id}/prev/{count}",
-          "method": "PUT",
-          "enctype": "application/json"
+          "name": "getOperation",
+          "uri": "jaxrs/okrworkbaseinfo/getOperation/{id}",
+          "method": "GET"
         },
         {
           "name": "listDraftNextWithFilter",
@@ -760,105 +748,122 @@
           "enctype": "application/json"
         },
         {
-          "name": "listMyWorkNextWithFilter",
-          "uri": "jaxrs/okrworkbaseinfo/filter/list/{id}/next/{count}",
+          "name": "listMyDeployedNextWithFilter",
+          "uri": "jaxrs/okrworkbaseinfo/deployed/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listMyWorkPrevWithFilter",
-          "uri": "jaxrs/okrworkbaseinfo/filter/list/{id}/prev/{count}",
+          "name": "listMyDeployedPrevWithFilter",
+          "uri": "jaxrs/okrworkbaseinfo/deployed/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listMyCooperatePrevWithFilter",
-          "uri": "jaxrs/okrworkbaseinfo/cooperate/list/{id}/prev/{count}",
+          "name": "listMyArchiveNextWithFilter",
+          "uri": "jaxrs/okrworkbaseinfo/archive/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listMyReadPrevWithFilter",
-          "uri": "jaxrs/okrworkbaseinfo/read/list/{id}/prev/{count}",
+          "name": "listMyDelegateNextWithFilter",
+          "uri": "jaxrs/okrworkbaseinfo/delegate/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listMyProcessWorkInCenterForForm",
-          "uri": "jaxrs/okrworkbaseinfo/process/form/center/{id}",
+          "name": "listWorkByCenterId",
+          "uri": "jaxrs/okrworkbaseinfo/center/{id}",
           "method": "GET"
         },
         {
-          "name": "listMyArchivePrevWithFilter",
-          "uri": "jaxrs/okrworkbaseinfo/archive/list/{id}/prev/{count}",
+          "name": "listMyCooperateNextWithFilter",
+          "uri": "jaxrs/okrworkbaseinfo/cooperate/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listMyDeployedNextWithFilter",
-          "uri": "jaxrs/okrworkbaseinfo/deployed/list/{id}/next/{count}",
+          "name": "listMyArchivePrevWithFilter",
+          "uri": "jaxrs/okrworkbaseinfo/archive/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listWorkByCenterId",
-          "uri": "jaxrs/okrworkbaseinfo/center/{id}",
+          "name": "canDismantlingWork",
+          "uri": "jaxrs/okrworkbaseinfo/canDismantlingWork/{id}",
           "method": "GET"
         },
         {
-          "name": "listMyDelegatePrevWithFilter",
-          "uri": "jaxrs/okrworkbaseinfo/delegate/list/{id}/prev/{count}",
+          "name": "listMyReadNextWithFilter",
+          "uri": "jaxrs/okrworkbaseinfo/read/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listMyReadNextWithFilter",
-          "uri": "jaxrs/okrworkbaseinfo/read/list/{id}/next/{count}",
+          "name": "listMyWorkPrevWithFilter",
+          "uri": "jaxrs/okrworkbaseinfo/filter/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listMyDeployedPrevWithFilter",
-          "uri": "jaxrs/okrworkbaseinfo/deployed/list/{id}/prev/{count}",
+          "name": "listMyCooperatePrevWithFilter",
+          "uri": "jaxrs/okrworkbaseinfo/cooperate/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listMyDelegateNextWithFilter",
-          "uri": "jaxrs/okrworkbaseinfo/delegate/list/{id}/next/{count}",
+          "name": "listMyDeployWorkInCenterForForm",
+          "uri": "jaxrs/okrworkbaseinfo/deploy/form/center/{id}",
+          "method": "GET"
+        },
+        {
+          "name": "listMyProcessWorkInCenterForForm",
+          "uri": "jaxrs/okrworkbaseinfo/process/form/center/{id}",
+          "method": "GET"
+        },
+        {
+          "name": "listMyDelegatePrevWithFilter",
+          "uri": "jaxrs/okrworkbaseinfo/delegate/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listMyCooperateNextWithFilter",
-          "uri": "jaxrs/okrworkbaseinfo/cooperate/list/{id}/next/{count}",
+          "name": "listMyReadPrevWithFilter",
+          "uri": "jaxrs/okrworkbaseinfo/read/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listMyDeployWorkInCenterForForm",
-          "uri": "jaxrs/okrworkbaseinfo/deploy/form/center/{id}",
-          "method": "GET"
+          "name": "listMyWorkNextWithFilter",
+          "uri": "jaxrs/okrworkbaseinfo/filter/list/{id}/next/{count}",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
-          "name": "canDismantlingWork",
-          "uri": "jaxrs/okrworkbaseinfo/canDismantlingWork/{id}",
-          "method": "GET"
+          "name": "listMyResponsibilityNextWithFilter",
+          "uri": "jaxrs/okrworkbaseinfo/responsibility/list/{id}/next/{count}",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
-          "name": "listMyArchiveNextWithFilter",
-          "uri": "jaxrs/okrworkbaseinfo/archive/list/{id}/next/{count}",
+          "name": "listMyResponsibilityPrevWithFilter",
+          "uri": "jaxrs/okrworkbaseinfo/responsibility/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
+        {
+          "name": "progressAdjust",
+          "uri": "jaxrs/okrworkbaseinfo/progress/{id}/{percent}",
+          "method": "GET"
+        },
         {
           "name": "appraise",
           "uri": "jaxrs/okrworkbaseinfo/appraise/{id}/wf_workid/{wid}",
           "method": "GET"
         },
         {
-          "name": "listSubWork",
-          "uri": "jaxrs/okrworkbaseinfo/list/sub/{id}",
+          "name": "getMyStatistic",
+          "uri": "jaxrs/okrworkbaseinfo/statistic/my",
           "method": "GET"
         },
         {
@@ -867,13 +872,8 @@
           "method": "GET"
         },
         {
-          "name": "progressAdjust",
-          "uri": "jaxrs/okrworkbaseinfo/progress/{id}/{percent}",
-          "method": "GET"
-        },
-        {
-          "name": "getMyStatistic",
-          "uri": "jaxrs/okrworkbaseinfo/statistic/my",
+          "name": "listSubWork",
+          "uri": "jaxrs/okrworkbaseinfo/list/sub/{id}",
           "method": "GET"
         }
       ]
@@ -892,11 +892,6 @@
           "method": "DELETE",
           "enctype": "application/json"
         },
-        {
-          "name": "listWorkInCenter",
-          "uri": "jaxrs/admin/okrworkbaseinfo/center/{id}",
-          "method": "GET"
-        },
         {
           "name": "filterListNextWithFilter",
           "uri": "jaxrs/admin/okrworkbaseinfo/filter/list/{id}/next/{count}",
@@ -908,6 +903,11 @@
           "uri": "jaxrs/admin/okrworkbaseinfo/filter/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
+        },
+        {
+          "name": "listWorkInCenter",
+          "uri": "jaxrs/admin/okrworkbaseinfo/center/{id}",
+          "method": "GET"
         }
       ]
     },
@@ -932,14 +932,14 @@
           "enctype": "application/json"
         },
         {
-          "name": "listNextWithFilter",
-          "uri": "jaxrs/okrworkchat/filter/list/{id}/next/{count}",
+          "name": "listPrevWithFilter",
+          "uri": "jaxrs/okrworkchat/filter/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listPrevWithFilter",
-          "uri": "jaxrs/okrworkchat/filter/list/{id}/prev/{count}",
+          "name": "listNextWithFilter",
+          "uri": "jaxrs/okrworkchat/filter/list/{id}/next/{count}",
           "method": "PUT",
           "enctype": "application/json"
         }
@@ -1047,12 +1047,6 @@
           "uri": "jaxrs/okrworkreportbaseinfo/draft/{workId}",
           "method": "GET"
         },
-        {
-          "name": "listMyArchivePrevWithFilter",
-          "uri": "jaxrs/okrworkreportbaseinfo/archive/list/{id}/prev/{count}",
-          "method": "PUT",
-          "enctype": "application/json"
-        },
         {
           "name": "listMyArchiveNextWithFilter",
           "uri": "jaxrs/okrworkreportbaseinfo/archive/list/{id}/next/{count}",
@@ -1060,24 +1054,8 @@
           "enctype": "application/json"
         },
         {
-          "name": "listByWork",
-          "uri": "jaxrs/okrworkreportbaseinfo/list/work/{workId}",
-          "method": "GET"
-        },
-        {
-          "name": "dispatchOver",
-          "uri": "jaxrs/okrworkreportbaseinfo/dispatch/{id}/over",
-          "method": "GET"
-        },
-        {
-          "name": "listMyTaskNextWithFilter",
-          "uri": "jaxrs/okrworkreportbaseinfo/task/list/{id}/next/{count}",
-          "method": "PUT",
-          "enctype": "application/json"
-        },
-        {
-          "name": "listMyProcessNextWithFilter",
-          "uri": "jaxrs/okrworkreportbaseinfo/process/list/{id}/next/{count}",
+          "name": "listMyArchivePrevWithFilter",
+          "uri": "jaxrs/okrworkreportbaseinfo/archive/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
         },
@@ -1099,11 +1077,33 @@
           "method": "PUT",
           "enctype": "application/json"
         },
+        {
+          "name": "listMyProcessNextWithFilter",
+          "uri": "jaxrs/okrworkreportbaseinfo/process/list/{id}/next/{count}",
+          "method": "PUT",
+          "enctype": "application/json"
+        },
+        {
+          "name": "listMyTaskNextWithFilter",
+          "uri": "jaxrs/okrworkreportbaseinfo/task/list/{id}/next/{count}",
+          "method": "PUT",
+          "enctype": "application/json"
+        },
         {
           "name": "listMyDraftPrevWithFilter",
           "uri": "jaxrs/okrworkreportbaseinfo/draft/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
+        },
+        {
+          "name": "dispatchOver",
+          "uri": "jaxrs/okrworkreportbaseinfo/dispatch/{id}/over",
+          "method": "GET"
+        },
+        {
+          "name": "listByWork",
+          "uri": "jaxrs/okrworkreportbaseinfo/list/work/{workId}",
+          "method": "GET"
         }
       ]
     },
@@ -1121,11 +1121,6 @@
           "method": "DELETE",
           "enctype": "application/json"
         },
-        {
-          "name": "reportAutoCreate",
-          "uri": "jaxrs/admin/okrworkreportbaseinfo/create",
-          "method": "GET"
-        },
         {
           "name": "filterListNextWithFilter",
           "uri": "jaxrs/admin/okrworkreportbaseinfo/filter/list/{id}/next/{count}",
@@ -1137,6 +1132,11 @@
           "uri": "jaxrs/admin/okrworkreportbaseinfo/filter/list/{id}/prev/{count}",
           "method": "PUT",
           "enctype": "application/json"
+        },
+        {
+          "name": "reportAutoCreate",
+          "uri": "jaxrs/admin/okrworkreportbaseinfo/create",
+          "method": "GET"
         }
       ]
     },

o2server/x_okr_core_entity/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/target/

o2server/x_organization_assemble_authentication/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/target/

o2server/x_organization_assemble_authentication/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8

o2server/x_organization_assemble_authentication/src/main/webapp/describe/api.json

@@ -4,13 +4,13 @@
       "name": "AuthenticationAction",
       "methods": [
         {
-          "name": "mode",
-          "uri": "jaxrs/authentication/mode",
+          "name": "bind",
+          "uri": "jaxrs/authentication/bind",
           "method": "GET"
         },
         {
-          "name": "bind",
-          "uri": "jaxrs/authentication/bind",
+          "name": "mode",
+          "uri": "jaxrs/authentication/mode",
           "method": "GET"
         },
         {
@@ -19,9 +19,10 @@
           "method": "GET"
         },
         {
-          "name": "who",
+          "name": "login",
           "uri": "jaxrs/authentication",
-          "method": "GET"
+          "method": "POST",
+          "enctype": "application/json"
         },
         {
           "name": "logout",
@@ -30,27 +31,15 @@
           "enctype": "application/json"
         },
         {
-          "name": "login",
+          "name": "who",
           "uri": "jaxrs/authentication",
-          "method": "POST",
-          "enctype": "application/json"
-        },
-        {
-          "name": "oauthLogin",
-          "uri": "jaxrs/authentication/oauth/login/name/{name}/code/{code}/redirecturi/{redirectUri}",
           "method": "GET"
         },
         {
-          "name": "oauthBind",
-          "uri": "jaxrs/authentication/oauth/bind/name/{name}/code/{code}/redirecturi/{redirectUri}",
+          "name": "checkCredential",
+          "uri": "jaxrs/authentication/check/credential/{credential}",
           "method": "GET"
         },
-        {
-          "name": "switchUser",
-          "uri": "jaxrs/authentication/switchuser",
-          "method": "PUT",
-          "enctype": "application/json"
-        },
         {
           "name": "captchaLogin",
           "uri": "jaxrs/authentication/captcha",
@@ -58,31 +47,36 @@
           "enctype": "application/json"
         },
         {
-          "name": "bindMeta",
-          "uri": "jaxrs/authentication/bind/meta/{meta}",
+          "name": "oauth",
+          "uri": "jaxrs/authentication/oauth/name/{name}",
+          "method": "GET"
+        },
+        {
+          "name": "codeLogin",
+          "uri": "jaxrs/authentication/code",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "captcha",
-          "uri": "jaxrs/authentication/captcha/width/{width}/height/{height}",
+          "name": "oauthList",
+          "uri": "jaxrs/authentication/oauth/list",
           "method": "GET"
         },
         {
-          "name": "checkCredential",
-          "uri": "jaxrs/authentication/check/credential/{credential}",
+          "name": "oauthLogin",
+          "uri": "jaxrs/authentication/oauth/login/name/{name}/code/{code}/redirecturi/{redirectUri}",
           "method": "GET"
         },
         {
-          "name": "codeLogin",
-          "uri": "jaxrs/authentication/code",
-          "method": "POST",
-          "enctype": "application/json"
+          "name": "oauthLoginQywx",
+          "uri": "jaxrs/authentication/oauth/login/qywx/code/{code}",
+          "method": "GET"
         },
         {
-          "name": "oauth",
-          "uri": "jaxrs/authentication/oauth/name/{name}",
-          "method": "GET"
+          "name": "switchUser",
+          "uri": "jaxrs/authentication/switchuser",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
           "name": "bindLogin",
@@ -90,18 +84,24 @@
           "method": "GET"
         },
         {
-          "name": "oauthLoginQywx",
-          "uri": "jaxrs/authentication/oauth/login/qywx/code/{code}",
+          "name": "oauthBind",
+          "uri": "jaxrs/authentication/oauth/bind/name/{name}/code/{code}/redirecturi/{redirectUri}",
           "method": "GET"
         },
         {
-          "name": "oauthList",
-          "uri": "jaxrs/authentication/oauth/list",
+          "name": "captcha",
+          "uri": "jaxrs/authentication/captcha/width/{width}/height/{height}",
           "method": "GET"
         },
         {
-          "name": "qiyeweixinOauthConfig",
-          "uri": "jaxrs/authentication/oauth/qywx/config",
+          "name": "bindMeta",
+          "uri": "jaxrs/authentication/bind/meta/{meta}",
+          "method": "POST",
+          "enctype": "application/json"
+        },
+        {
+          "name": "oauthLoginDingding",
+          "uri": "jaxrs/authentication/oauth/login/dingding/code/{code}",
           "method": "GET"
         },
         {
@@ -110,8 +110,8 @@
           "method": "GET"
         },
         {
-          "name": "oauthLoginDingding",
-          "uri": "jaxrs/authentication/oauth/login/dingding/code/{code}",
+          "name": "qiyeweixinOauthConfig",
+          "uri": "jaxrs/authentication/oauth/qywx/config",
           "method": "GET"
         }
       ]
@@ -129,16 +129,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -197,13 +197,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]
@@ -254,14 +254,19 @@
       "name": "SsoAction",
       "methods": [
         {
-          "name": "postEncrypt",
-          "uri": "jaxrs/sso/encrypt",
+          "name": "postLogin",
+          "uri": "jaxrs/sso",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "postLogin",
-          "uri": "jaxrs/sso",
+          "name": "getLogin",
+          "uri": "jaxrs/sso/client/{client}/token/{token}",
+          "method": "GET"
+        },
+        {
+          "name": "postEncrypt",
+          "uri": "jaxrs/sso/encrypt",
           "method": "POST",
           "enctype": "application/json"
         },
@@ -269,11 +274,6 @@
           "name": "getEncrypt",
           "uri": "jaxrs/sso/encrypt/client/{client}/key/{key}/credential/{credential}",
           "method": "GET"
-        },
-        {
-          "name": "getLogin",
-          "uri": "jaxrs/sso/client/{client}/token/{token}",
-          "method": "GET"
         }
       ]
     },

o2server/x_organization_assemble_control/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/target/

o2server/x_organization_assemble_control/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8

o2server/x_organization_assemble_control/src/main/webapp/describe/api.json

@@ -3,16 +3,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -71,6 +71,16 @@
           "method": "POST",
           "enctype": "application/json"
         },
+        {
+          "name": "listSubNested",
+          "uri": "jaxrs/group/list/{flag}/sub/nested",
+          "method": "GET"
+        },
+        {
+          "name": "listSubDirect",
+          "uri": "jaxrs/group/list/{flag}/sub/direct",
+          "method": "GET"
+        },
         {
           "name": "listNext",
           "uri": "jaxrs/group/list/{flag}/next/{count}",
@@ -88,20 +98,13 @@
           "enctype": "application/json"
         },
         {
-          "name": "listPinyinInitial",
-          "uri": "jaxrs/group/list/pinyininitial",
-          "method": "PUT",
-          "enctype": "application/json"
-        },
-        {
-          "name": "listLike",
-          "uri": "jaxrs/group/list/like",
-          "method": "PUT",
-          "enctype": "application/json"
+          "name": "listWithRole",
+          "uri": "jaxrs/group/list/role/{roleFlag}",
+          "method": "GET"
         },
         {
-          "name": "listLikePinyin",
-          "uri": "jaxrs/group/list/like/pinyin",
+          "name": "addMember",
+          "uri": "jaxrs/group/{flag}/add/member",
           "method": "PUT",
           "enctype": "application/json"
         },
@@ -110,6 +113,11 @@
           "uri": "jaxrs/group/list/{flag}/sup/direct",
           "method": "GET"
         },
+        {
+          "name": "listSupNested",
+          "uri": "jaxrs/group/list/{flag}/sup/nested",
+          "method": "GET"
+        },
         {
           "name": "deleteMember",
           "uri": "jaxrs/group/{flag}/delete/member",
@@ -117,30 +125,22 @@
           "enctype": "application/json"
         },
         {
-          "name": "addMember",
-          "uri": "jaxrs/group/{flag}/add/member",
+          "name": "listPinyinInitial",
+          "uri": "jaxrs/group/list/pinyininitial",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listWithRole",
-          "uri": "jaxrs/group/list/role/{roleFlag}",
-          "method": "GET"
-        },
-        {
-          "name": "listSupNested",
-          "uri": "jaxrs/group/list/{flag}/sup/nested",
-          "method": "GET"
-        },
-        {
-          "name": "listSubNested",
-          "uri": "jaxrs/group/list/{flag}/sub/nested",
-          "method": "GET"
+          "name": "listLikePinyin",
+          "uri": "jaxrs/group/list/like/pinyin",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
-          "name": "listSubDirect",
-          "uri": "jaxrs/group/list/{flag}/sub/direct",
-          "method": "GET"
+          "name": "listLike",
+          "uri": "jaxrs/group/list/like",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
           "name": "listSupNestedWithPerson",
@@ -200,6 +200,11 @@
           "uri": "jaxrs/identity/list/person/{personFlag}",
           "method": "GET"
         },
+        {
+          "name": "listWithUnit",
+          "uri": "jaxrs/identity/list/unit/{unitFlag}",
+          "method": "GET"
+        },
         {
           "name": "listPinyinInitial",
           "uri": "jaxrs/identity/list/pinyininitial",
@@ -207,31 +212,26 @@
           "enctype": "application/json"
         },
         {
-          "name": "listLike",
-          "uri": "jaxrs/identity/list/like",
+          "name": "listLikePinyin",
+          "uri": "jaxrs/identity/list/like/pinyin",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listLikePinyin",
-          "uri": "jaxrs/identity/list/like/pinyin",
+          "name": "listLike",
+          "uri": "jaxrs/identity/list/like",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnit",
-          "uri": "jaxrs/identity/list/unit/{unitFlag}",
+          "name": "listWithUnitWithUnitDutyName",
+          "uri": "jaxrs/identity/list/{flag}/unitduty/name/{unitDutyName}",
           "method": "GET"
         },
         {
           "name": "listWithUnitDutyName",
           "uri": "jaxrs/identity/list/unitduty/name/{unitDutyName}",
           "method": "GET"
-        },
-        {
-          "name": "listWithUnitWithUnitDutyName",
-          "uri": "jaxrs/identity/list/{flag}/unitduty/name/{unitDutyName}",
-          "method": "GET"
         }
       ]
     },
@@ -275,13 +275,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]
@@ -328,6 +328,16 @@
           "method": "PUT",
           "enctype": "formData"
         },
+        {
+          "name": "listSubNestedWithGroup",
+          "uri": "jaxrs/person/list/group/{groupFlag}/sub/nested",
+          "method": "GET"
+        },
+        {
+          "name": "listSubDirectWithGroup",
+          "uri": "jaxrs/person/list/group/{groupFlag}/sub/direct",
+          "method": "GET"
+        },
         {
           "name": "listNext",
           "uri": "jaxrs/person/list/{flag}/next/{count}",
@@ -345,22 +355,14 @@
           "enctype": "application/json"
         },
         {
-          "name": "listPinyinInitial",
-          "uri": "jaxrs/person/list/pinyininitial",
-          "method": "PUT",
-          "enctype": "application/json"
-        },
-        {
-          "name": "listLike",
-          "uri": "jaxrs/person/list/like",
-          "method": "PUT",
-          "enctype": "application/json"
+          "name": "getIconWithPerson",
+          "uri": "jaxrs/person/{flag}/icon",
+          "method": "GET"
         },
         {
-          "name": "listLikePinyin",
-          "uri": "jaxrs/person/list/like/pinyin",
-          "method": "PUT",
-          "enctype": "application/json"
+          "name": "listWithRole",
+          "uri": "jaxrs/person/list/role/{roleFlag}",
+          "method": "GET"
         },
         {
           "name": "checkPassword",
@@ -373,24 +375,22 @@
           "method": "GET"
         },
         {
-          "name": "listWithRole",
-          "uri": "jaxrs/person/list/role/{roleFlag}",
-          "method": "GET"
-        },
-        {
-          "name": "listSubDirectWithGroup",
-          "uri": "jaxrs/person/list/group/{groupFlag}/sub/direct",
-          "method": "GET"
+          "name": "listPinyinInitial",
+          "uri": "jaxrs/person/list/pinyininitial",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
-          "name": "listSubNestedWithGroup",
-          "uri": "jaxrs/person/list/group/{groupFlag}/sub/nested",
-          "method": "GET"
+          "name": "listLikePinyin",
+          "uri": "jaxrs/person/list/like/pinyin",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
-          "name": "getIconWithPerson",
-          "uri": "jaxrs/person/{flag}/icon",
-          "method": "GET"
+          "name": "listLike",
+          "uri": "jaxrs/person/list/like",
+          "method": "PUT",
+          "enctype": "application/json"
         }
       ]
     },
@@ -414,6 +414,11 @@
           "method": "POST",
           "enctype": "application/json"
         },
+        {
+          "name": "standardListPrev",
+          "uri": "jaxrs/personattribute/list/{flag}/prev/{count}",
+          "method": "GET"
+        },
         {
           "name": "listNext",
           "uri": "jaxrs/personattribute/list/{flag}/next/{count}",
@@ -429,11 +434,6 @@
           "name": "listWithPerson",
           "uri": "jaxrs/personattribute/list/person/{personFlag}",
           "method": "GET"
-        },
-        {
-          "name": "standardListPrev",
-          "uri": "jaxrs/personattribute/list/{flag}/prev/{count}",
-          "method": "GET"
         }
       ]
     },
@@ -478,11 +478,6 @@
           "uri": "jaxrs/role/list/person/{personFlag}",
           "method": "GET"
         },
-        {
-          "name": "listWithGroup",
-          "uri": "jaxrs/role/list/group/{groupFlag}",
-          "method": "GET"
-        },
         {
           "name": "listPinyinInitial",
           "uri": "jaxrs/role/list/pinyininitial",
@@ -490,16 +485,21 @@
           "enctype": "application/json"
         },
         {
-          "name": "listLike",
-          "uri": "jaxrs/role/list/like",
+          "name": "listLikePinyin",
+          "uri": "jaxrs/role/list/like/pinyin",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listLikePinyin",
-          "uri": "jaxrs/role/list/like/pinyin",
+          "name": "listLike",
+          "uri": "jaxrs/role/list/like",
           "method": "PUT",
           "enctype": "application/json"
+        },
+        {
+          "name": "listWithGroup",
+          "uri": "jaxrs/role/list/group/{groupFlag}",
+          "method": "GET"
         }
       ]
     },
@@ -549,42 +549,39 @@
           "method": "GET"
         },
         {
-          "name": "listNext",
-          "uri": "jaxrs/unit/list/{flag}/next/{count}",
+          "name": "listSubNested",
+          "uri": "jaxrs/unit/list/{flag}/sub/nested",
           "method": "GET"
         },
         {
-          "name": "listPrev",
-          "uri": "jaxrs/unit/list/{flag}/prev/{count}",
+          "name": "listSubDirect",
+          "uri": "jaxrs/unit/list/{flag}/sub/direct",
           "method": "GET"
         },
         {
-          "name": "edit",
-          "uri": "jaxrs/unit/{flag}",
-          "method": "PUT",
-          "enctype": "application/json"
+          "name": "listTop",
+          "uri": "jaxrs/unit/list/top",
+          "method": "GET"
         },
         {
-          "name": "listPinyinInitial",
-          "uri": "jaxrs/unit/list/pinyininitial",
-          "method": "PUT",
-          "enctype": "application/json"
+          "name": "listNext",
+          "uri": "jaxrs/unit/list/{flag}/next/{count}",
+          "method": "GET"
         },
         {
-          "name": "listLike",
-          "uri": "jaxrs/unit/list/like",
-          "method": "PUT",
-          "enctype": "application/json"
+          "name": "listPrev",
+          "uri": "jaxrs/unit/list/{flag}/prev/{count}",
+          "method": "GET"
         },
         {
-          "name": "listLikePinyin",
-          "uri": "jaxrs/unit/list/like/pinyin",
+          "name": "edit",
+          "uri": "jaxrs/unit/{flag}",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "listSupNested",
-          "uri": "jaxrs/unit/list/{flag}/sup/nested",
+          "name": "listTopWithType",
+          "uri": "jaxrs/unit/list/top/type/{type}",
           "method": "GET"
         },
         {
@@ -593,33 +590,36 @@
           "method": "GET"
         },
         {
-          "name": "listTopWithType",
-          "uri": "jaxrs/unit/list/top/type/{type}",
+          "name": "listSupNested",
+          "uri": "jaxrs/unit/list/{flag}/sup/nested",
           "method": "GET"
         },
         {
-          "name": "listTop",
-          "uri": "jaxrs/unit/list/top",
-          "method": "GET"
+          "name": "listPinyinInitial",
+          "uri": "jaxrs/unit/list/pinyininitial",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
-          "name": "listSubNested",
-          "uri": "jaxrs/unit/list/{flag}/sub/nested",
-          "method": "GET"
+          "name": "listLikePinyin",
+          "uri": "jaxrs/unit/list/like/pinyin",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
-          "name": "listSubDirect",
-          "uri": "jaxrs/unit/list/{flag}/sub/direct",
-          "method": "GET"
+          "name": "listLike",
+          "uri": "jaxrs/unit/list/like",
+          "method": "PUT",
+          "enctype": "application/json"
         },
         {
-          "name": "getWithIdentityWithType",
-          "uri": "jaxrs/unit/identity/{identityFlag}/type/{type}",
+          "name": "getWithIdentityWithLevel",
+          "uri": "jaxrs/unit/identity/{identityFlag}/level/{level}",
           "method": "GET"
         },
         {
-          "name": "listSubDirectWithType",
-          "uri": "jaxrs/unit/list/{flag}/sub/direct/type/{type}",
+          "name": "listSupNestedWithType",
+          "uri": "jaxrs/unit/list/{flag}/sup/nested/type/{type}",
           "method": "GET"
         },
         {
@@ -629,13 +629,13 @@
           "enctype": "application/json"
         },
         {
-          "name": "getWithIdentityWithLevel",
-          "uri": "jaxrs/unit/identity/{identityFlag}/level/{level}",
+          "name": "getWithIdentityWithType",
+          "uri": "jaxrs/unit/identity/{identityFlag}/type/{type}",
           "method": "GET"
         },
         {
-          "name": "listSupNestedWithType",
-          "uri": "jaxrs/unit/list/{flag}/sup/nested/type/{type}",
+          "name": "listSubDirectWithType",
+          "uri": "jaxrs/unit/list/{flag}/sub/direct/type/{type}",
           "method": "GET"
         }
       ]
@@ -703,6 +703,11 @@
           "method": "POST",
           "enctype": "application/json"
         },
+        {
+          "name": "listWithName",
+          "uri": "jaxrs/unitduty/list/name/{name}",
+          "method": "GET"
+        },
         {
           "name": "listNext",
           "uri": "jaxrs/unitduty/list/{flag}/next/{count}",
@@ -720,18 +725,13 @@
           "enctype": "application/json"
         },
         {
-          "name": "listWithIdentity",
-          "uri": "jaxrs/unitduty/list/identity/{identityFlag}",
-          "method": "GET"
-        },
-        {
-          "name": "listWithName",
-          "uri": "jaxrs/unitduty/list/name/{name}",
+          "name": "listWithUnit",
+          "uri": "jaxrs/unitduty/list/unit/{unitFlag}",
           "method": "GET"
         },
         {
-          "name": "listWithUnit",
-          "uri": "jaxrs/unitduty/list/unit/{unitFlag}",
+          "name": "distinctNameLike",
+          "uri": "jaxrs/unitduty/distinct/name/like/{key}",
           "method": "GET"
         },
         {
@@ -740,8 +740,8 @@
           "method": "GET"
         },
         {
-          "name": "distinctNameLike",
-          "uri": "jaxrs/unitduty/distinct/name/like/{key}",
+          "name": "listWithIdentity",
+          "uri": "jaxrs/unitduty/list/identity/{identityFlag}",
           "method": "GET"
         }
       ]

o2server/x_organization_assemble_express/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/target/

o2server/x_organization_assemble_express/src/main/webapp/describe/api.json

@@ -3,16 +3,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -67,6 +67,12 @@
           "method": "POST",
           "enctype": "application/json"
         },
+        {
+          "name": "hasRole",
+          "uri": "jaxrs/group/has/role",
+          "method": "POST",
+          "enctype": "application/json"
+        },
         {
           "name": "listWithPerson",
           "uri": "jaxrs/group/list/person",
@@ -80,38 +86,38 @@
           "enctype": "application/json"
         },
         {
-          "name": "hasRole",
-          "uri": "jaxrs/group/has/role",
+          "name": "listWithGroupSubDirect",
+          "uri": "jaxrs/group/list/group/sub/direct",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithGroupSupDirectObject",
-          "uri": "jaxrs/group/list/group/sup/direct/object",
+          "name": "listWithGroupSupNestedObject",
+          "uri": "jaxrs/group/list/group/sup/nested/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithGroupSupDirect",
-          "uri": "jaxrs/group/list/group/sup/direct",
+          "name": "listWithPersonObject",
+          "uri": "jaxrs/group/list/person/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithGroupSubDirect",
-          "uri": "jaxrs/group/list/group/sub/direct",
+          "name": "listWithGroupSubNestedObject",
+          "uri": "jaxrs/group/list/group/sub/nested/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithGroupSupNestedObject",
-          "uri": "jaxrs/group/list/group/sup/nested/object",
+          "name": "listWithGroupSupDirect",
+          "uri": "jaxrs/group/list/group/sup/direct",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithGroupSupNested",
-          "uri": "jaxrs/group/list/group/sup/nested",
+          "name": "listWithGroupSubNested",
+          "uri": "jaxrs/group/list/group/sub/nested",
           "method": "POST",
           "enctype": "application/json"
         },
@@ -122,20 +128,14 @@
           "enctype": "application/json"
         },
         {
-          "name": "listWithGroupSubNested",
-          "uri": "jaxrs/group/list/group/sub/nested",
-          "method": "POST",
-          "enctype": "application/json"
-        },
-        {
-          "name": "listWithGroupSubNestedObject",
-          "uri": "jaxrs/group/list/group/sub/nested/object",
+          "name": "listWithGroupSupDirectObject",
+          "uri": "jaxrs/group/list/group/sup/direct/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithPersonObject",
-          "uri": "jaxrs/group/list/person/object",
+          "name": "listWithGroupSupNested",
+          "uri": "jaxrs/group/list/group/sup/nested",
           "method": "POST",
           "enctype": "application/json"
         }
@@ -163,8 +163,8 @@
           "enctype": "application/json"
         },
         {
-          "name": "listObject",
-          "uri": "jaxrs/identity/list/object",
+          "name": "listWithUnitSubDirect",
+          "uri": "jaxrs/identity/list/unit/sub/direct",
           "method": "POST",
           "enctype": "application/json"
         },
@@ -175,14 +175,14 @@
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitSubDirect",
-          "uri": "jaxrs/identity/list/unit/sub/direct",
+          "name": "listObject",
+          "uri": "jaxrs/identity/list/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitSubDirectObject",
-          "uri": "jaxrs/identity/list/unit/sub/direct/object",
+          "name": "listWithPersonObject",
+          "uri": "jaxrs/identity/list/person/object",
           "method": "POST",
           "enctype": "application/json"
         },
@@ -193,20 +193,20 @@
           "enctype": "application/json"
         },
         {
-          "name": "listMajorWithPersonObject",
-          "uri": "jaxrs/identity/list/major/person/object",
+          "name": "listWithUnitSubNestedObject",
+          "uri": "jaxrs/identity/list/unit/sub/nested/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitSubNestedObject",
-          "uri": "jaxrs/identity/list/unit/sub/nested/object",
+          "name": "listWithUnitPerson",
+          "uri": "jaxrs/identity/list/unit/person",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithGroupObject",
-          "uri": "jaxrs/identity/list/group/object",
+          "name": "listWithUnitSubDirectObject",
+          "uri": "jaxrs/identity/list/unit/sub/direct/object",
           "method": "POST",
           "enctype": "application/json"
         },
@@ -217,14 +217,14 @@
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitPerson",
-          "uri": "jaxrs/identity/list/unit/person",
+          "name": "listMajorWithPersonObject",
+          "uri": "jaxrs/identity/list/major/person/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithPersonObject",
-          "uri": "jaxrs/identity/list/person/object",
+          "name": "listWithGroupObject",
+          "uri": "jaxrs/identity/list/group/object",
           "method": "POST",
           "enctype": "application/json"
         }
@@ -249,13 +249,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]
@@ -275,18 +275,6 @@
           "method": "POST",
           "enctype": "application/json"
         },
-        {
-          "name": "listObject",
-          "uri": "jaxrs/person/list/object",
-          "method": "POST",
-          "enctype": "application/json"
-        },
-        {
-          "name": "listWithGroup",
-          "uri": "jaxrs/person/list/group",
-          "method": "POST",
-          "enctype": "application/json"
-        },
         {
           "name": "listAll",
           "uri": "jaxrs/person/list/all",
@@ -299,8 +287,8 @@
           "enctype": "application/json"
         },
         {
-          "name": "listWithIdentity",
-          "uri": "jaxrs/person/list/identity",
+          "name": "listWithRole",
+          "uri": "jaxrs/person/list/role",
           "method": "POST",
           "enctype": "application/json"
         },
@@ -311,11 +299,16 @@
           "enctype": "application/json"
         },
         {
-          "name": "listWithRole",
-          "uri": "jaxrs/person/list/role",
+          "name": "listWithIdentity",
+          "uri": "jaxrs/person/list/identity",
           "method": "POST",
           "enctype": "application/json"
         },
+        {
+          "name": "listAllObject",
+          "uri": "jaxrs/person/list/all/object",
+          "method": "GET"
+        },
         {
           "name": "listLoginRecent",
           "uri": "jaxrs/person/list/login/recent",
@@ -329,49 +322,44 @@
           "enctype": "application/json"
         },
         {
-          "name": "listAllObject",
-          "uri": "jaxrs/person/list/all/object",
-          "method": "GET"
-        },
-        {
-          "name": "listWithPersonSupDirectObject",
-          "uri": "jaxrs/person/list/person/sup/direct/object",
+          "name": "listWithGroup",
+          "uri": "jaxrs/person/list/group",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitSubDirectObject",
-          "uri": "jaxrs/person/list/unit/sub/direct/object",
+          "name": "listObject",
+          "uri": "jaxrs/person/list/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithPersonAttribute",
-          "uri": "jaxrs/person/list/personattribute",
+          "name": "listLoginAfterObject",
+          "uri": "jaxrs/person/list/login/after/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithPersonSubNestedObject",
-          "uri": "jaxrs/person/list/person/sub/nested/object",
+          "name": "listLoginRecentObject",
+          "uri": "jaxrs/person/list/login/recent/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithPersonSupNested",
-          "uri": "jaxrs/person/list/person/sup/nested",
+          "name": "listWithPersonAttribute",
+          "uri": "jaxrs/person/list/personattribute",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitSubDirectLikeObject",
-          "uri": "jaxrs/person/list/unit/sub/direct/like/object",
+          "name": "listWithPersonAttributeObject",
+          "uri": "jaxrs/person/list/personattribute/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitSubNestedLike",
-          "uri": "jaxrs/person/list/unit/sub/nested/like",
+          "name": "listWithUnitSubNestedObject",
+          "uri": "jaxrs/person/list/unit/sub/nested/object",
           "method": "POST",
           "enctype": "application/json"
         },
@@ -382,50 +370,44 @@
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitSubNestedLikeObject",
-          "uri": "jaxrs/person/list/unit/sub/nested/like/object",
-          "method": "POST",
-          "enctype": "application/json"
-        },
-        {
-          "name": "listWithRoleObject",
-          "uri": "jaxrs/person/list/role/object",
+          "name": "listWithPersonSubDirect",
+          "uri": "jaxrs/person/list/person/sub/direct",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitSubNestedObject",
-          "uri": "jaxrs/person/list/unit/sub/nested/object",
+          "name": "listWithUnitSubDirectObject",
+          "uri": "jaxrs/person/list/unit/sub/direct/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithPersonAttributeObject",
-          "uri": "jaxrs/person/list/personattribute/object",
+          "name": "listWithGroupObject",
+          "uri": "jaxrs/person/list/group/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listLoginAfterObject",
-          "uri": "jaxrs/person/list/login/after/object",
+          "name": "listWithUnitSubNestedLikeObject",
+          "uri": "jaxrs/person/list/unit/sub/nested/like/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithGroupObject",
-          "uri": "jaxrs/person/list/group/object",
+          "name": "listWithPersonSupNestedObject",
+          "uri": "jaxrs/person/list/person/sup/nested/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithPersonSubNested",
-          "uri": "jaxrs/person/list/person/sub/nested",
+          "name": "listWithUnitSubNestedLike",
+          "uri": "jaxrs/person/list/unit/sub/nested/like",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithPersonSupNestedObject",
-          "uri": "jaxrs/person/list/person/sup/nested/object",
+          "name": "listWithPersonSupDirectObject",
+          "uri": "jaxrs/person/list/person/sup/direct/object",
           "method": "POST",
           "enctype": "application/json"
         },
@@ -442,14 +424,14 @@
           "enctype": "application/json"
         },
         {
-          "name": "listLoginRecentObject",
-          "uri": "jaxrs/person/list/login/recent/object",
+          "name": "listWithRoleObject",
+          "uri": "jaxrs/person/list/role/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithPersonSubDirect",
-          "uri": "jaxrs/person/list/person/sub/direct",
+          "name": "listWithUnitSubDirectLikeObject",
+          "uri": "jaxrs/person/list/unit/sub/direct/like/object",
           "method": "POST",
           "enctype": "application/json"
         },
@@ -458,6 +440,24 @@
           "uri": "jaxrs/person/list/person/sup/direct",
           "method": "POST",
           "enctype": "application/json"
+        },
+        {
+          "name": "listWithPersonSubNested",
+          "uri": "jaxrs/person/list/person/sub/nested",
+          "method": "POST",
+          "enctype": "application/json"
+        },
+        {
+          "name": "listWithPersonSubNestedObject",
+          "uri": "jaxrs/person/list/person/sub/nested/object",
+          "method": "POST",
+          "enctype": "application/json"
+        },
+        {
+          "name": "listWithPersonSupNested",
+          "uri": "jaxrs/person/list/person/sup/nested",
+          "method": "POST",
+          "enctype": "application/json"
         }
       ]
     },
@@ -483,14 +483,14 @@
           "enctype": "application/json"
         },
         {
-          "name": "appendWithPersonWithName",
-          "uri": "jaxrs/personattribute/append/person/name",
+          "name": "listNameWithPerson",
+          "uri": "jaxrs/personattribute/list/name/person",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listNameWithPerson",
-          "uri": "jaxrs/personattribute/list/name/person",
+          "name": "appendWithPersonWithName",
+          "uri": "jaxrs/personattribute/append/person/name",
           "method": "POST",
           "enctype": "application/json"
         }
@@ -550,12 +550,6 @@
           "method": "POST",
           "enctype": "application/json"
         },
-        {
-          "name": "listWithIdentitySupNested",
-          "uri": "jaxrs/unit/list/identity/sup/nested",
-          "method": "POST",
-          "enctype": "application/json"
-        },
         {
           "name": "listWithUnitSubNested",
           "uri": "jaxrs/unit/list/unit/sub/nested",
@@ -563,14 +557,8 @@
           "enctype": "application/json"
         },
         {
-          "name": "listWithPerson",
-          "uri": "jaxrs/unit/list/person",
-          "method": "POST",
-          "enctype": "application/json"
-        },
-        {
-          "name": "listObject",
-          "uri": "jaxrs/unit/list/object",
+          "name": "listWithIdentitySupNested",
+          "uri": "jaxrs/unit/list/identity/sup/nested",
           "method": "POST",
           "enctype": "application/json"
         },
@@ -580,8 +568,8 @@
           "method": "GET"
         },
         {
-          "name": "listWithIdentity",
-          "uri": "jaxrs/unit/list/identity",
+          "name": "listWithPerson",
+          "uri": "jaxrs/unit/list/person",
           "method": "POST",
           "enctype": "application/json"
         },
@@ -592,8 +580,14 @@
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitDutyObject",
-          "uri": "jaxrs/unit/list/unitduty/object",
+          "name": "listWithIdentity",
+          "uri": "jaxrs/unit/list/identity",
+          "method": "POST",
+          "enctype": "application/json"
+        },
+        {
+          "name": "listWithLevel",
+          "uri": "jaxrs/unit/list/level",
           "method": "POST",
           "enctype": "application/json"
         },
@@ -609,32 +603,32 @@
           "method": "GET"
         },
         {
-          "name": "listWithLevel",
-          "uri": "jaxrs/unit/list/level",
+          "name": "listObject",
+          "uri": "jaxrs/unit/list/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "getWithIdentityWithType",
-          "uri": "jaxrs/unit/identity/type",
+          "name": "getWithIdentityWithLevel",
+          "uri": "jaxrs/unit/identity/level",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "getWithIdentityWithLevel",
-          "uri": "jaxrs/unit/identity/level",
+          "name": "getWithIdentityWithType",
+          "uri": "jaxrs/unit/identity/type",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitSubDirectObject",
-          "uri": "jaxrs/unit/list/unit/sub/direct/object",
+          "name": "listWithPersonObject",
+          "uri": "jaxrs/unit/list/person/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithPersonSupNested",
-          "uri": "jaxrs/unit/list/person/sup/nested",
+          "name": "listWithUnitSubNestedObject",
+          "uri": "jaxrs/unit/list/unit/sub/nested/object",
           "method": "POST",
           "enctype": "application/json"
         },
@@ -645,44 +639,44 @@
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitSubNestedObject",
-          "uri": "jaxrs/unit/list/unit/sub/nested/object",
+          "name": "listWithUnitSubDirectObject",
+          "uri": "jaxrs/unit/list/unit/sub/direct/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithPersonSupNestedObject",
-          "uri": "jaxrs/unit/list/person/sup/nested/object",
+          "name": "getWithIdentityWithTypeObject",
+          "uri": "jaxrs/unit/identity/type/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithPersonObject",
-          "uri": "jaxrs/unit/list/person/object",
+          "name": "listWithUnitAttribute",
+          "uri": "jaxrs/unit/list/unitattribute",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitAttribute",
-          "uri": "jaxrs/unit/list/unitattribute",
+          "name": "listWithPersonSupNestedObject",
+          "uri": "jaxrs/unit/list/person/sup/nested/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithLevelObject",
-          "uri": "jaxrs/unit/list/level/object",
+          "name": "listWithUnitAttributeObject",
+          "uri": "jaxrs/unit/list/unitattribute/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "getWithIdentityWithLevelObject",
-          "uri": "jaxrs/unit/identity/level/object",
+          "name": "listWithUnitSupDirect",
+          "uri": "jaxrs/unit/list/unit/sup/direct",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "getWithIdentityWithTypeObject",
-          "uri": "jaxrs/unit/identity/type/object",
+          "name": "listWithLevelObject",
+          "uri": "jaxrs/unit/list/level/object",
           "method": "POST",
           "enctype": "application/json"
         },
@@ -693,8 +687,8 @@
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitAttributeObject",
-          "uri": "jaxrs/unit/list/unitattribute/object",
+          "name": "listWithUnitSupDirectObject",
+          "uri": "jaxrs/unit/list/unit/sup/direct/object",
           "method": "POST",
           "enctype": "application/json"
         },
@@ -705,20 +699,26 @@
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitSupNested",
-          "uri": "jaxrs/unit/list/unit/sup/nested",
+          "name": "getWithIdentityWithLevelObject",
+          "uri": "jaxrs/unit/identity/level/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitSupDirectObject",
-          "uri": "jaxrs/unit/list/unit/sup/direct/object",
+          "name": "listWithUnitDutyObject",
+          "uri": "jaxrs/unit/list/unitduty/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitSupDirect",
-          "uri": "jaxrs/unit/list/unit/sup/direct",
+          "name": "listWithUnitSupNested",
+          "uri": "jaxrs/unit/list/unit/sup/nested",
+          "method": "POST",
+          "enctype": "application/json"
+        },
+        {
+          "name": "listWithPersonSupNested",
+          "uri": "jaxrs/unit/list/person/sup/nested",
           "method": "POST",
           "enctype": "application/json"
         }
@@ -734,20 +734,20 @@
           "enctype": "application/json"
         },
         {
-          "name": "listAttributeWithUnitWithName",
-          "uri": "jaxrs/unitattribute/list/attribute/unit/name",
+          "name": "appendWithUnitWithName",
+          "uri": "jaxrs/unitattribute/append/unit/name",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "setWithUnitWithName",
-          "uri": "jaxrs/unitattribute/set/unit/name",
+          "name": "listAttributeWithUnitWithName",
+          "uri": "jaxrs/unitattribute/list/attribute/unit/name",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "appendWithUnitWithName",
-          "uri": "jaxrs/unitattribute/append/unit/name",
+          "name": "setWithUnitWithName",
+          "uri": "jaxrs/unitattribute/set/unit/name",
           "method": "POST",
           "enctype": "application/json"
         },
@@ -781,20 +781,20 @@
           "enctype": "application/json"
         },
         {
-          "name": "listIdentityWithUnitWithName",
-          "uri": "jaxrs/unitduty/list/identity/unit/name",
+          "name": "listWithUnitObject",
+          "uri": "jaxrs/unitduty/list/unit/object",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listNameWithIdentity",
-          "uri": "jaxrs/unitduty/list/name/identity",
+          "name": "listIdentityWithUnitWithName",
+          "uri": "jaxrs/unitduty/list/identity/unit/name",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithUnitObject",
-          "uri": "jaxrs/unitduty/list/unit/object",
+          "name": "listNameWithIdentity",
+          "uri": "jaxrs/unitduty/list/name/identity",
           "method": "POST",
           "enctype": "application/json"
         }

o2server/x_organization_assemble_personal/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/target/

o2server/x_organization_assemble_personal/src/main/webapp/describe/api.json

@@ -3,16 +3,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -106,6 +106,11 @@
           "method": "POST",
           "enctype": "application/json"
         },
+        {
+          "name": "listWithCurrentPerson",
+          "uri": "jaxrs/empower/list/currentperson",
+          "method": "GET"
+        },
         {
           "name": "listNext",
           "uri": "jaxrs/empower/list/{id}/next/{count}",
@@ -128,14 +133,15 @@
           "method": "GET"
         },
         {
-          "name": "listWithCurrentPerson",
-          "uri": "jaxrs/empower/list/currentperson",
+          "name": "listWithCurrentPersonEnable",
+          "uri": "jaxrs/empower/list/currentperson/enable",
           "method": "GET"
         },
         {
-          "name": "listToEnable",
-          "uri": "jaxrs/empower/list/to/enable",
-          "method": "GET"
+          "name": "managerlistPaging",
+          "uri": "jaxrs/empower/manager/list/paging/{page}/size/{size}",
+          "method": "POST",
+          "enctype": "application/json"
         },
         {
           "name": "listTo",
@@ -143,15 +149,9 @@
           "method": "GET"
         },
         {
-          "name": "listWithCurrentPersonEnable",
-          "uri": "jaxrs/empower/list/currentperson/enable",
+          "name": "listToEnable",
+          "uri": "jaxrs/empower/list/to/enable",
           "method": "GET"
-        },
-        {
-          "name": "managerlistPaging",
-          "uri": "jaxrs/empower/manager/list/paging/{page}/size/{size}",
-          "method": "POST",
-          "enctype": "application/json"
         }
       ]
     },
@@ -175,20 +175,20 @@
           "method": "GET"
         },
         {
-          "name": "managerlistPaging",
-          "uri": "jaxrs/empowerlog/manager/list/paging/{page}/size/{size}",
+          "name": "listToCurrentPersonPaging",
+          "uri": "jaxrs/empowerlog/list/to/currentperson/paging/{page}/size/{size}",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listWithCurrentPersonPaging",
-          "uri": "jaxrs/empowerlog/list/currentperson/paging/{page}/size/{size}",
+          "name": "managerlistPaging",
+          "uri": "jaxrs/empowerlog/manager/list/paging/{page}/size/{size}",
           "method": "POST",
           "enctype": "application/json"
         },
         {
-          "name": "listToCurrentPersonPaging",
-          "uri": "jaxrs/empowerlog/list/to/currentperson/paging/{page}/size/{size}",
+          "name": "listWithCurrentPersonPaging",
+          "uri": "jaxrs/empowerlog/list/currentperson/paging/{page}/size/{size}",
           "method": "POST",
           "enctype": "application/json"
         }
@@ -218,13 +218,13 @@
           "method": "GET"
         },
         {
-          "name": "listTitlePassive",
-          "uri": "jaxrs/exmail/list/title/passive",
+          "name": "newCountPassive",
+          "uri": "jaxrs/exmail/new/count/passive",
           "method": "GET"
         },
         {
-          "name": "newCountPassive",
-          "uri": "jaxrs/exmail/new/count/passive",
+          "name": "listTitlePassive",
+          "uri": "jaxrs/exmail/list/title/passive",
           "method": "GET"
         }
       ]
@@ -268,13 +268,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]
@@ -354,13 +354,13 @@
           "method": "GET"
         },
         {
-          "name": "captcha",
-          "uri": "jaxrs/regist/captcha/width/{width}/height/{height}",
+          "name": "checkPassword",
+          "uri": "jaxrs/regist/check/password/{password}",
           "method": "GET"
         },
         {
-          "name": "checkPassword",
-          "uri": "jaxrs/regist/check/password/{password}",
+          "name": "captcha",
+          "uri": "jaxrs/regist/captcha/width/{width}/height/{height}",
           "method": "GET"
         },
         {

o2server/x_organization_core_entity/.gitignore

@@ -1 +0,0 @@
-/target/

o2server/x_organization_core_entity/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8

o2server/x_organization_core_express/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/target/

o2server/x_portal_assemble_designer/.gitignore

@@ -1,2 +1 @@
-/bin/
 /target/

o2server/x_portal_assemble_designer/src/main/webapp/describe/api.json

@@ -3,16 +3,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -122,14 +122,14 @@
           "enctype": "application/json"
         },
         {
-          "name": "prepareCreate",
-          "uri": "jaxrs/input/prepare/create",
+          "name": "prepareCover",
+          "uri": "jaxrs/input/prepare/cover",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "prepareCover",
-          "uri": "jaxrs/input/prepare/cover",
+          "name": "prepareCreate",
+          "uri": "jaxrs/input/prepare/create",
           "method": "PUT",
           "enctype": "application/json"
         }
@@ -154,13 +154,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]
@@ -358,15 +358,15 @@
           "method": "GET"
         },
         {
-          "name": "listWithCategory",
+          "name": "listCategory",
           "uri": "jaxrs/templatepage/list/category",
-          "method": "PUT",
-          "enctype": "application/json"
+          "method": "GET"
         },
         {
-          "name": "listCategory",
+          "name": "listWithCategory",
           "uri": "jaxrs/templatepage/list/category",
-          "method": "GET"
+          "method": "PUT",
+          "enctype": "application/json"
         }
       ]
     },

o2server/x_portal_assemble_surface/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/target/

o2server/x_portal_assemble_surface/src/main/webapp/describe/api.json

@@ -3,16 +3,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -75,13 +75,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]

o2server/x_portal_assemble_surface/src/main/webapp/describe/describe.json

@@ -268,12 +268,6 @@
               "isCollection": false,
               "description": "最后的编辑时间."
             },
-            {
-              "name": "data",
-              "type": "String",
-              "isCollection": false,
-              "description": "编码后文本内容."
-            },
             {
               "name": "fileName",
               "type": "String",
@@ -286,12 +280,6 @@
               "isCollection": false,
               "description": "文件大小."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -303,12 +291,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         }
@@ -527,30 +509,12 @@
               "isCollection": false,
               "description": "所属的Portal."
             },
-            {
-              "name": "data",
-              "type": "String",
-              "isCollection": false,
-              "description": "文本内容."
-            },
-            {
-              "name": "mobileData",
-              "type": "String",
-              "isCollection": false,
-              "description": "移动端文本内容."
-            },
             {
               "name": "hasMobile",
               "type": "Boolean",
               "isCollection": false,
               "description": "是否有移动端内容."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -562,12 +526,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         },
@@ -622,30 +580,12 @@
               "isCollection": false,
               "description": "所属的Portal."
             },
-            {
-              "name": "data",
-              "type": "String",
-              "isCollection": false,
-              "description": "文本内容."
-            },
-            {
-              "name": "mobileData",
-              "type": "String",
-              "isCollection": false,
-              "description": "移动端文本内容."
-            },
             {
               "name": "hasMobile",
               "type": "Boolean",
               "isCollection": false,
               "description": "是否有移动端内容."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -657,12 +597,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         },
@@ -722,30 +656,12 @@
               "isCollection": false,
               "description": "所属的Portal."
             },
-            {
-              "name": "data",
-              "type": "String",
-              "isCollection": false,
-              "description": "文本内容."
-            },
-            {
-              "name": "mobileData",
-              "type": "String",
-              "isCollection": false,
-              "description": "移动端文本内容."
-            },
             {
               "name": "hasMobile",
               "type": "Boolean",
               "isCollection": false,
               "description": "是否有移动端内容."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -757,12 +673,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         },
@@ -822,30 +732,12 @@
               "isCollection": false,
               "description": "所属的Portal."
             },
-            {
-              "name": "data",
-              "type": "String",
-              "isCollection": false,
-              "description": "文本内容."
-            },
-            {
-              "name": "mobileData",
-              "type": "String",
-              "isCollection": false,
-              "description": "移动端文本内容."
-            },
             {
               "name": "hasMobile",
               "type": "Boolean",
               "isCollection": false,
               "description": "是否有移动端内容."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -857,12 +749,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         },
@@ -917,30 +803,12 @@
               "isCollection": false,
               "description": "所属的Portal."
             },
-            {
-              "name": "data",
-              "type": "String",
-              "isCollection": false,
-              "description": "文本内容."
-            },
-            {
-              "name": "mobileData",
-              "type": "String",
-              "isCollection": false,
-              "description": "移动端文本内容."
-            },
             {
               "name": "hasMobile",
               "type": "Boolean",
               "isCollection": false,
               "description": "是否有移动端内容."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -952,12 +820,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         }
@@ -1079,12 +941,6 @@
               "isCollection": false,
               "description": "是否在移动设备显示."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -1096,12 +952,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         },
@@ -1213,18 +1063,6 @@
               "isCollection": false,
               "description": "描述."
             },
-            {
-              "name": "availableIdentityList",
-              "type": "List\u003cString\u003e",
-              "isCollection": true,
-              "description": "在指定启动时候,允许新建的用户."
-            },
-            {
-              "name": "availableUnitList",
-              "type": "List\u003cString\u003e",
-              "isCollection": true,
-              "description": "在指定启动时候,允许新建的组织."
-            },
             {
               "name": "portalCategory",
               "type": "String",
@@ -1243,12 +1081,6 @@
               "isCollection": false,
               "description": "默认首页."
             },
-            {
-              "name": "controllerList",
-              "type": "List\u003cString\u003e",
-              "isCollection": true,
-              "description": "应用管理者。"
-            },
             {
               "name": "creatorPerson",
               "type": "String",
@@ -1279,12 +1111,6 @@
               "isCollection": false,
               "description": "是否在移动设备显示."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -1296,12 +1122,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         }
@@ -1412,12 +1232,6 @@
               "isCollection": false,
               "description": "最后的编辑时间."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -1429,12 +1243,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         },
@@ -1525,12 +1333,6 @@
               "isCollection": false,
               "description": "最后的编辑时间."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -1542,12 +1344,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         },
@@ -1643,12 +1439,6 @@
               "isCollection": false,
               "description": "最后的编辑时间."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -1660,12 +1450,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         },
@@ -1726,18 +1510,6 @@
               "isCollection": false,
               "description": "脚本所属应用."
             },
-            {
-              "name": "text",
-              "type": "String",
-              "isCollection": false,
-              "description": "脚本内容."
-            },
-            {
-              "name": "dependScriptList",
-              "type": "List\u003cString\u003e",
-              "isCollection": true,
-              "description": "依赖的函数列表."
-            },
             {
               "name": "creatorPerson",
               "type": "String",
@@ -1756,12 +1528,6 @@
               "isCollection": false,
               "description": "最后的编辑时间."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -1773,12 +1539,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         }
@@ -1914,30 +1674,12 @@
               "isCollection": false,
               "description": "所属的Portal."
             },
-            {
-              "name": "data",
-              "type": "String",
-              "isCollection": false,
-              "description": "文本内容."
-            },
-            {
-              "name": "mobileData",
-              "type": "String",
-              "isCollection": false,
-              "description": "移动端文本内容."
-            },
             {
               "name": "hasMobile",
               "type": "Boolean",
               "isCollection": false,
               "description": "是否有移动端内容."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -1949,12 +1691,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         },
@@ -2009,30 +1745,12 @@
               "isCollection": false,
               "description": "所属的Portal."
             },
-            {
-              "name": "data",
-              "type": "String",
-              "isCollection": false,
-              "description": "文本内容."
-            },
-            {
-              "name": "mobileData",
-              "type": "String",
-              "isCollection": false,
-              "description": "移动端文本内容."
-            },
             {
               "name": "hasMobile",
               "type": "Boolean",
               "isCollection": false,
               "description": "是否有移动端内容."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -2044,12 +1762,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         },
@@ -2109,30 +1821,12 @@
               "isCollection": false,
               "description": "所属的Portal."
             },
-            {
-              "name": "data",
-              "type": "String",
-              "isCollection": false,
-              "description": "文本内容."
-            },
-            {
-              "name": "mobileData",
-              "type": "String",
-              "isCollection": false,
-              "description": "移动端文本内容."
-            },
             {
               "name": "hasMobile",
               "type": "Boolean",
               "isCollection": false,
               "description": "是否有移动端内容."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -2144,12 +1838,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         },
@@ -2209,30 +1897,12 @@
               "isCollection": false,
               "description": "所属的Portal."
             },
-            {
-              "name": "data",
-              "type": "String",
-              "isCollection": false,
-              "description": "文本内容."
-            },
-            {
-              "name": "mobileData",
-              "type": "String",
-              "isCollection": false,
-              "description": "移动端文本内容."
-            },
             {
               "name": "hasMobile",
               "type": "Boolean",
               "isCollection": false,
               "description": "是否有移动端内容."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -2244,12 +1914,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         },
@@ -2304,30 +1968,12 @@
               "isCollection": false,
               "description": "所属的Portal."
             },
-            {
-              "name": "data",
-              "type": "String",
-              "isCollection": false,
-              "description": "文本内容."
-            },
-            {
-              "name": "mobileData",
-              "type": "String",
-              "isCollection": false,
-              "description": "移动端文本内容."
-            },
             {
               "name": "hasMobile",
               "type": "Boolean",
               "isCollection": false,
               "description": "是否有移动端内容."
             },
-            {
-              "name": "distributeFactor",
-              "type": "Integer",
-              "isCollection": false,
-              "description": "分布式存储标识位."
-            },
             {
               "name": "createTime",
               "type": "Date",
@@ -2339,12 +1985,6 @@
               "type": "Date",
               "isCollection": false,
               "description": "修改时间,自动生成,索引创建在约束中."
-            },
-            {
-              "name": "sequence",
-              "type": "String",
-              "isCollection": false,
-              "description": "列表序号,由创建时间以及ID组成.在保存时自动生成,索引创建在约束中."
             }
           ]
         }

o2server/x_portal_assemble_surface/src/main/webapp/describe/sources/com/x/portal/assemble/surface/jaxrs/portal/PortalAction.java

@@ -19,7 +19,6 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
 import org.apache.commons.codec.binary.Base64;
-import org.junit.Test;
 
 import com.x.base.core.project.annotation.JaxrsDescribe;
 import com.x.base.core.project.annotation.JaxrsMethodDescribe;
@@ -108,7 +107,6 @@ public class PortalAction extends StandardJaxrsAction {
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}
 
-	@Test
 	public void test() throws Exception {
 		try (FileInputStream in = new FileInputStream(new File("d:/a.png"));
 				ByteArrayOutputStream baos = new ByteArrayOutputStream()) {

o2server/x_processplatform_assemble_bam/.gitignore

@@ -1,2 +0,0 @@
-/bin/
-/target/

o2server/x_processplatform_assemble_bam/src/main/webapp/describe/api.json

@@ -3,16 +3,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -55,13 +55,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]
@@ -70,48 +70,48 @@
       "name": "PeriodAction",
       "methods": [
         {
-          "name": "listCountCompletedWorkByApplication",
-          "uri": "jaxrs/period/list/count/completed/work/unit/{unit}/person/{person}/by/application",
+          "name": "listCompletedWorkApplicationStubs",
+          "uri": "jaxrs/period/list/completed/work/applicationstubs",
           "method": "GET"
         },
         {
-          "name": "listCountCompletedTaskByApplication",
-          "uri": "jaxrs/period/list/count/completed/task/unit/{unit}/person/{person}/by/application",
+          "name": "listCountExpiredTaskByApplication",
+          "uri": "jaxrs/period/list/count/expired/task/unit/{unit}/person/{person}/by/application",
           "method": "GET"
         },
         {
-          "name": "listCountExpiredWorkByApplication",
-          "uri": "jaxrs/period/list/count/expired/work/unit/{unit}/person/{person}/by/application",
+          "name": "listCountCompletedWorkByApplication",
+          "uri": "jaxrs/period/list/count/completed/work/unit/{unit}/person/{person}/by/application",
           "method": "GET"
         },
         {
-          "name": "listCompletedWorkApplicationStubs",
-          "uri": "jaxrs/period/list/completed/work/applicationstubs",
+          "name": "listCountExpiredWorkByApplication",
+          "uri": "jaxrs/period/list/count/expired/work/unit/{unit}/person/{person}/by/application",
           "method": "GET"
         },
         {
-          "name": "listCountExpiredTaskByApplication",
-          "uri": "jaxrs/period/list/count/expired/task/unit/{unit}/person/{person}/by/application",
+          "name": "listCompletedTaskApplicationStubs",
+          "uri": "jaxrs/period/list/completed/task/applicationstubs",
           "method": "GET"
         },
         {
-          "name": "listCompletedTaskApplicationStubs",
-          "uri": "jaxrs/period/list/completed/task/applicationstubs",
+          "name": "listCountCompletedTaskByApplication",
+          "uri": "jaxrs/period/list/count/completed/task/unit/{unit}/person/{person}/by/application",
           "method": "GET"
         },
         {
-          "name": "listExpiredTaskApplicationStubs",
-          "uri": "jaxrs/period/list/expired/task/applicationstubs",
+          "name": "listStartTaskApplicationStubs",
+          "uri": "jaxrs/period/list/start/task/applicationstubs",
           "method": "GET"
         },
         {
-          "name": "listCountStartWorkByApplication",
-          "uri": "jaxrs/period/list/count/start/work/unit/{unit}/person/{person}/by/application",
+          "name": "listStartTaskCompanyStubs",
+          "uri": "jaxrs/period/list/start/task/unitstubs",
           "method": "GET"
         },
         {
-          "name": "listCountCompletedWorkByProcess",
-          "uri": "jaxrs/period/list/count/completed/work/application/{applicationId}/unit/{unit}/person/{person}/by/process",
+          "name": "listCountStartTask",
+          "uri": "jaxrs/period/list/count/start/task/application/{applicationId}/process/{processId}/activity/{activityId}/unit/{unit}/person/{person}",
           "method": "GET"
         },
         {
@@ -120,148 +120,148 @@
           "method": "GET"
         },
         {
-          "name": "listCompletedWorkCompanyStubs",
-          "uri": "jaxrs/period/list/completed/work/unitstubs",
+          "name": "listCountStartTaskByActivity",
+          "uri": "jaxrs/period/list/count/start/task/application/{applicationId}/process/{processId}/unit/{unit}/person/{person}/by/activity",
           "method": "GET"
         },
         {
-          "name": "listCountExpiredWork",
-          "uri": "jaxrs/period/list/count/expired/work/application/{applicationId}/process/{processId}/unit/{unit}/person/{person}",
+          "name": "listCountStartTaskByUnit",
+          "uri": "jaxrs/period/list/count/start/task/application/{applicationId}/process/{processId}/activity/{activityId}/by/unit",
           "method": "GET"
         },
         {
-          "name": "listCountCompletedTaskByProcess",
-          "uri": "jaxrs/period/list/count/completed/task/application/{applicationId}/unit/{unit}/person/{person}/by/process",
+          "name": "listCountStartTaskByApplication",
+          "uri": "jaxrs/period/list/count/start/task/unit/{unit}/person/{person}/by/application",
           "method": "GET"
         },
         {
-          "name": "listCountExpiredTaskByUnit",
-          "uri": "jaxrs/period/list/count/expired/task/application/{applicationId}/process/{processId}/activity/{activityId}/by/unit",
+          "name": "listCompletedTaskCompanyStubs",
+          "uri": "jaxrs/period/list/completed/task/unitstubs",
           "method": "GET"
         },
         {
-          "name": "listCountExpiredTaskByProcess",
-          "uri": "jaxrs/period/list/count/expired/task/application/{applicationId}/unit/{unit}/person/{person}/by/process",
+          "name": "listCountCompletedTask",
+          "uri": "jaxrs/period/list/count/completed/task/application/{applicationId}/process/{processId}/activity/{activityId}/unit/{unit}/person/{person}",
           "method": "GET"
         },
         {
-          "name": "listStartWorkUnitStubs",
-          "uri": "jaxrs/period/list/start/work/unitstubs",
+          "name": "listCountCompletedTaskByProcess",
+          "uri": "jaxrs/period/list/count/completed/task/application/{applicationId}/unit/{unit}/person/{person}/by/process",
           "method": "GET"
         },
         {
-          "name": "listCountStartWorkByProcess",
-          "uri": "jaxrs/period/list/count/start/work/application/{applicationId}/unit/{unit}/person/{person}/by/process",
+          "name": "listCountCompletedTaskByActivity",
+          "uri": "jaxrs/period/list/count/completed/task/application/{applicationId}/process/{processId}/unit/{unit}/person/{person}/by/activity",
           "method": "GET"
         },
         {
-          "name": "listCountExpiredWorkByCompany",
-          "uri": "jaxrs/period/list/count/expired/work/application/{applicationId}/process/{processId}/by/unit",
+          "name": "listCountCompletedTaskByUnit",
+          "uri": "jaxrs/period/list/count/completed/task/application/{applicationId}/process/{processId}/activity/{activityId}/by/unit",
           "method": "GET"
         },
         {
-          "name": "listCountStartTaskByApplication",
-          "uri": "jaxrs/period/list/count/start/task/unit/{unit}/person/{person}/by/application",
+          "name": "listStartWorkApplicationStubs",
+          "uri": "jaxrs/period/list/start/work/applicationstubs",
           "method": "GET"
         },
         {
-          "name": "listCountCompletedTaskByActivity",
-          "uri": "jaxrs/period/list/count/completed/task/application/{applicationId}/process/{processId}/unit/{unit}/person/{person}/by/activity",
+          "name": "listCountStartWorkByCompany",
+          "uri": "jaxrs/period/list/count/start/work/application/{applicationId}/process/{processId}/by/unit",
           "method": "GET"
         },
         {
-          "name": "listCountExpiredTaskByActivity",
-          "uri": "jaxrs/period/list/count/expired/task/application/{applicationId}/process/{processId}/unit/{unit}/person/{person}/by/activity",
+          "name": "listCountExpiredWork",
+          "uri": "jaxrs/period/list/count/expired/work/application/{applicationId}/process/{processId}/unit/{unit}/person/{person}",
           "method": "GET"
         },
         {
-          "name": "listCompletedTaskCompanyStubs",
-          "uri": "jaxrs/period/list/completed/task/unitstubs",
+          "name": "listCountCompletedWorkByProcess",
+          "uri": "jaxrs/period/list/count/completed/work/application/{applicationId}/unit/{unit}/person/{person}/by/process",
           "method": "GET"
         },
         {
-          "name": "listCountStartTaskByActivity",
-          "uri": "jaxrs/period/list/count/start/task/application/{applicationId}/process/{processId}/unit/{unit}/person/{person}/by/activity",
+          "name": "listExpiredWorkCompanyStubs",
+          "uri": "jaxrs/period/list/expired/work/unitstubs",
           "method": "GET"
         },
         {
-          "name": "listCountStartWorkByCompany",
-          "uri": "jaxrs/period/list/count/start/work/application/{applicationId}/process/{processId}/by/unit",
+          "name": "listCountStartWork",
+          "uri": "jaxrs/period/list/count/start/work/application/{applicationId}/process/{processId}/unit/{unit}/person/{person}",
           "method": "GET"
         },
         {
-          "name": "listCountExpiredTask",
-          "uri": "jaxrs/period/list/count/expired/task/application/{applicationId}/process/{processId}/activity/{activityId}/unit/{unit}/person/{person}",
+          "name": "listCountStartWorkByProcess",
+          "uri": "jaxrs/period/list/count/start/work/application/{applicationId}/unit/{unit}/person/{person}/by/process",
           "method": "GET"
         },
         {
-          "name": "listCountCompletedWorkByCompany",
-          "uri": "jaxrs/period/list/count/completed/work/application/{applicationId}/process/{processId}/by/unit",
+          "name": "listCountCompletedWork",
+          "uri": "jaxrs/period/list/count/completed/work/application/{applicationId}/process/{processId}/unit/{unit}/person/{person}",
           "method": "GET"
         },
         {
-          "name": "listCountExpiredWorkByProcess",
-          "uri": "jaxrs/period/list/count/expired/work/application/{applicationId}/unit/{unit}/person/{person}/by/process",
+          "name": "listCountExpiredTaskByUnit",
+          "uri": "jaxrs/period/list/count/expired/task/application/{applicationId}/process/{processId}/activity/{activityId}/by/unit",
           "method": "GET"
         },
         {
-          "name": "listCountCompletedWork",
-          "uri": "jaxrs/period/list/count/completed/work/application/{applicationId}/process/{processId}/unit/{unit}/person/{person}",
+          "name": "listCountExpiredTaskByProcess",
+          "uri": "jaxrs/period/list/count/expired/task/application/{applicationId}/unit/{unit}/person/{person}/by/process",
           "method": "GET"
         },
         {
-          "name": "listCountStartWork",
-          "uri": "jaxrs/period/list/count/start/work/application/{applicationId}/process/{processId}/unit/{unit}/person/{person}",
+          "name": "listCountStartWorkByApplication",
+          "uri": "jaxrs/period/list/count/start/work/unit/{unit}/person/{person}/by/application",
           "method": "GET"
         },
         {
-          "name": "listCountCompletedTask",
-          "uri": "jaxrs/period/list/count/completed/task/application/{applicationId}/process/{processId}/activity/{activityId}/unit/{unit}/person/{person}",
+          "name": "listCompletedWorkCompanyStubs",
+          "uri": "jaxrs/period/list/completed/work/unitstubs",
           "method": "GET"
         },
         {
-          "name": "listExpiredWorkApplicationStubs",
-          "uri": "jaxrs/period/list/expired/work/applicationstubs",
+          "name": "listStartWorkUnitStubs",
+          "uri": "jaxrs/period/list/start/work/unitstubs",
           "method": "GET"
         },
         {
-          "name": "listStartWorkApplicationStubs",
-          "uri": "jaxrs/period/list/start/work/applicationstubs",
+          "name": "listCountExpiredTask",
+          "uri": "jaxrs/period/list/count/expired/task/application/{applicationId}/process/{processId}/activity/{activityId}/unit/{unit}/person/{person}",
           "method": "GET"
         },
         {
-          "name": "listExpiredTaskCompanyStubs",
-          "uri": "jaxrs/period/list/expired/task/unitstubs",
+          "name": "listExpiredTaskApplicationStubs",
+          "uri": "jaxrs/period/list/expired/task/applicationstubs",
           "method": "GET"
         },
         {
-          "name": "listExpiredWorkCompanyStubs",
-          "uri": "jaxrs/period/list/expired/work/unitstubs",
+          "name": "listCountExpiredWorkByCompany",
+          "uri": "jaxrs/period/list/count/expired/work/application/{applicationId}/process/{processId}/by/unit",
           "method": "GET"
         },
         {
-          "name": "listCountCompletedTaskByUnit",
-          "uri": "jaxrs/period/list/count/completed/task/application/{applicationId}/process/{processId}/activity/{activityId}/by/unit",
+          "name": "listCountCompletedWorkByCompany",
+          "uri": "jaxrs/period/list/count/completed/work/application/{applicationId}/process/{processId}/by/unit",
           "method": "GET"
         },
         {
-          "name": "listStartTaskCompanyStubs",
-          "uri": "jaxrs/period/list/start/task/unitstubs",
+          "name": "listCountExpiredWorkByProcess",
+          "uri": "jaxrs/period/list/count/expired/work/application/{applicationId}/unit/{unit}/person/{person}/by/process",
           "method": "GET"
         },
         {
-          "name": "listStartTaskApplicationStubs",
-          "uri": "jaxrs/period/list/start/task/applicationstubs",
+          "name": "listCountExpiredTaskByActivity",
+          "uri": "jaxrs/period/list/count/expired/task/application/{applicationId}/process/{processId}/unit/{unit}/person/{person}/by/activity",
           "method": "GET"
         },
         {
-          "name": "listCountStartTask",
-          "uri": "jaxrs/period/list/count/start/task/application/{applicationId}/process/{processId}/activity/{activityId}/unit/{unit}/person/{person}",
+          "name": "listExpiredTaskCompanyStubs",
+          "uri": "jaxrs/period/list/expired/task/unitstubs",
           "method": "GET"
         },
         {
-          "name": "listCountStartTaskByUnit",
-          "uri": "jaxrs/period/list/count/start/task/application/{applicationId}/process/{processId}/activity/{activityId}/by/unit",
+          "name": "listExpiredWorkApplicationStubs",
+          "uri": "jaxrs/period/list/expired/work/applicationstubs",
           "method": "GET"
         }
       ]

o2server/x_processplatform_assemble_designer/.gitignore

@@ -1,2 +1 @@
-/bin/
 /target/

o2server/x_processplatform_assemble_designer/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8

o2server/x_processplatform_assemble_designer/src/main/webapp/describe/api.json

@@ -100,16 +100,16 @@
     {
       "name": "CacheAction",
       "methods": [
+        {
+          "name": "configFlush",
+          "uri": "jaxrs/cache/config/flush",
+          "method": "GET"
+        },
         {
           "name": "receive",
           "uri": "jaxrs/cache",
           "method": "PUT",
           "enctype": "application/json"
-        },
-        {
-          "name": "configFlush",
-          "uri": "jaxrs/cache/config/flush",
-          "method": "GET"
         }
       ]
     },
@@ -127,8 +127,8 @@
       "name": "ElementToolAction",
       "methods": [
         {
-          "name": "applicationDictOrphan",
-          "uri": "jaxrs/elementtool/applicationdict/orphan",
+          "name": "formOrphan",
+          "uri": "jaxrs/elementtool/form/orphan",
           "method": "GET"
         },
         {
@@ -137,13 +137,13 @@
           "method": "GET"
         },
         {
-          "name": "formOrphan",
-          "uri": "jaxrs/elementtool/form/orphan",
+          "name": "scriptOrphan",
+          "uri": "jaxrs/elementtool/script/orphan",
           "method": "GET"
         },
         {
-          "name": "scriptOrphan",
-          "uri": "jaxrs/elementtool/script/orphan",
+          "name": "applicationDictOrphan",
+          "uri": "jaxrs/elementtool/applicationdict/orphan",
           "method": "GET"
         }
       ]
@@ -322,14 +322,14 @@
           "enctype": "application/json"
         },
         {
-          "name": "prepareCreate",
-          "uri": "jaxrs/input/prepare/create",
+          "name": "prepareCover",
+          "uri": "jaxrs/input/prepare/cover",
           "method": "PUT",
           "enctype": "application/json"
         },
         {
-          "name": "prepareCover",
-          "uri": "jaxrs/input/prepare/cover",
+          "name": "prepareCreate",
+          "uri": "jaxrs/input/prepare/create",
           "method": "PUT",
           "enctype": "application/json"
         }
@@ -354,13 +354,13 @@
           "method": "GET"
         },
         {
-          "name": "info",
-          "uri": "jaxrs/logger/info",
+          "name": "warn",
+          "uri": "jaxrs/logger/warn",
           "method": "GET"
         },
         {
-          "name": "warn",
-          "uri": "jaxrs/logger/warn",
+          "name": "info",
+          "uri": "jaxrs/logger/info",
           "method": "GET"
         }
       ]
@@ -460,16 +460,16 @@
           "uri": "jaxrs/process/application/{applicationId}",
           "method": "GET"
         },
+        {
+          "name": "leadOut",
+          "uri": "jaxrs/process/{id}/lead/out",
+          "method": "GET"
+        },
         {
           "name": "executeProjection",
           "uri": "jaxrs/process/{id}/execute/projection",
           "method": "POST",
           "enctype": "application/json"
-        },
-        {
-          "name": "leadOut",
-          "uri": "jaxrs/process/{id}/lead/out",
-          "method": "GET"
         }
       ]
     },
@@ -593,15 +593,15 @@
           "method": "GET"
         },
         {
-          "name": "listWithCategory",
+          "name": "listCategory",
           "uri": "jaxrs/templateform/list/category",
-          "method": "PUT",
-          "enctype": "application/json"
+          "method": "GET"
         },
         {
-          "name": "listCategory",
+          "name": "listWithCategory",
           "uri": "jaxrs/templateform/list/category",
-          "method": "GET"
+          "method": "PUT",
+          "enctype": "application/json"
         }
       ]
     },

o2server/x_processplatform_assemble_surface/.gitignore

@@ -1,2 +1 @@
-/bin/
 /target/

o2server/x_processplatform_assemble_surface/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8

o2server/x_processplatform_core_entity/.gitignore

@@ -1,2 +1 @@
-/bin/
 /target/

o2server/x_processplatform_core_entity/.settings/org.eclipse.core.resources.prefs

@@ -1,6 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8

o2server/x_processplatform_core_express/.gitignore

@@ -1 +0,0 @@
-/target/