松原党建中间件

src/main/java/com/zjj/config/URLConfig.java

@@ -10,7 +10,7 @@ package com.zjj.config;
  */
 public class URLConfig {
 
-    public static final String url = "http://192.168.31.66:8089/leader/a";
+    public static final String url = "http://192.168.31.200:8882/a";
 
     public static String LOGINMOBILE = url + "/loginMobile";//集安党建系统登录接口
     public static String REGISTER = url + "/sys/register/register";//集安党建系统注册接口

src/main/java/com/zjj/controller/AppInterfaceController.java

@@ -13,7 +13,7 @@ import java.util.Map;
 public class AppInterfaceController {
 
     /*******************************************集安党建系统leader开始**************************************************/
-    @PostMapping("/loginMobile")
+    @PostMapping(value="/loginMobile",produces = "application/json;charset=utf-8")
     public String loginMobile(String username,String password){
         Map param = new HashMap<>();
         param.put("username",username);
@@ -21,117 +21,118 @@ public class AppInterfaceController {
         return HttpUtil.sendPostForm(URLConfig.LOGINMOBILE,new HashMap<>(),param);
     }
 
-    @PostMapping("/sys/register/register")
+    @PostMapping(value="/sys/register/register",produces = "application/json;charset=utf-8")
     public String register(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.REGISTER,param,new HashMap<>());
     }
 
-    @PostMapping("/sys/register/getCode")
+    @PostMapping(value="/sys/register/getCode",produces = "application/json;charset=utf-8")
     public String getCode(String tel){
         Map param = new HashMap<>();
         param.put("tel",tel);
         return HttpUtil.sendPostForm(URLConfig.GETCODE,new HashMap<>(),param);
     }
 
-    @PostMapping("/sys/office/getFirst")
+    @PostMapping(value="/sys/office/getFirst",produces = "application/json;charset=utf-8")
     public String getFirst(){
         return HttpUtil.sendPostForm(URLConfig.GETFIRST,new HashMap<>(),new HashMap<>());
     }
 
-    @PostMapping("/sys/office/getByParent")
+    @PostMapping(value="/sys/office/getByParent",produces = "application/json;charset=utf-8")
     public String getByParent(String parentId){
         Map param = new HashMap<>();
         param.put("parentId",parentId);
         return HttpUtil.sendPostForm(URLConfig.GETBYPARENT,new HashMap<>(),param);
     }
 
-    @PostMapping("/app/type/appConsultationType/newsType")
+    @PostMapping(value="/app/type/appConsultationType/newsType",produces = "application/json;charset=utf-8")
     public String newsType(){
         return HttpUtil.sendPostForm(URLConfig.NEWSTYPE,new HashMap<>(),new HashMap<>());
     }
 
-    @PostMapping("/app/news/appConsultation/display")
+    @PostMapping(value="/app/news/appConsultation/display",produces = "application/json;charset=utf-8")
     public String display(){
         return HttpUtil.sendPostForm(URLConfig.display,new HashMap<>(),new HashMap<>());
     }
 
-    @PostMapping("/app/news/appConsultation/data")
+    @PostMapping(value="/app/news/appConsultation/data",produces = "application/json;charset=utf-8")
     public String appConsultationData(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.appConsultationData,param, new HashMap<>());
     }
 
-    @PostMapping("/app/url/appConsultationLink/url")
+    @PostMapping(value="/app/url/appConsultationLink/url",produces = "application/json;charset=utf-8")
     public String appConsultationLinkUrl(){
         return HttpUtil.sendPostForm(URLConfig.appConsultationLinkUrl,new HashMap<>(),new HashMap<>());
     }
 
-    @PostMapping("/leader/org/leaderOrgNo/getChildOrg")
+    @PostMapping(value="/leader/org/leaderOrgNo/getChildOrg",produces = "application/json;charset=utf-8")
     public String getChildOrg(String parentId,String name,String type){
         Map param = new HashMap<>();
         param.put("parentId",parentId);
         param.put("name",name);
         param.put("type",type);
+        System.out.println(type);
         return HttpUtil.sendPostForm(URLConfig.getChildOrg,new HashMap<>(),param);
     }
 
-    @PostMapping("/leader/org/leaderOrgNo/getFirstOrg")
+    @PostMapping(value="/leader/org/leaderOrgNo/getFirstOrg",produces = "application/json;charset=utf-8")
     public String getFirstOrg(){
         return HttpUtil.sendPostForm(URLConfig.getFirstOrg,new HashMap<>(),new HashMap<>());
     }
 
-    @PostMapping("/leader/org/leaderOrgNo/getService")
+    @PostMapping(value="/leader/org/leaderOrgNo/getService",produces = "application/json;charset=utf-8")
     public String getService(String name){
         Map param = new HashMap<>();
         param.put("name",name);
         return HttpUtil.sendPostForm(URLConfig.getService,new HashMap<>(),param);
     }
 
-    @PostMapping("/leader/org/leaderOrgNo/getOrg")
+    @PostMapping(value="/leader/org/leaderOrgNo/getOrg",produces = "application/json;charset=utf-8")
     public String getOrg(String value){
         Map param = new HashMap<>();
         param.put("value",value);
         return HttpUtil.sendPostForm(URLConfig.getOrg,new HashMap<>(),param);
     }
 
-    @PostMapping("/app/base/appBaseNews/dataList")
+    @PostMapping(value="/app/base/appBaseNews/dataList",produces = "application/json;charset=utf-8")
     public String dataList(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.dataList,param, new HashMap<>());
     }
 
-    @PostMapping("/app/base/appBaseNews/getNav")
+    @PostMapping(value="/app/base/appBaseNews/getNav",produces = "application/json;charset=utf-8")
     public String getNav(String deptId){
         Map param = new HashMap<>();
         param.put("deptId",deptId);
         return HttpUtil.sendPostForm(URLConfig.getNav,new HashMap<>(),param);
     }
 
-    @PostMapping("/leader/org/leaderOrgNo/getAllOrg")
+    @PostMapping(value="/leader/org/leaderOrgNo/getAllOrg",produces = "application/json;charset=utf-8")
     public String getAllOrg(){
         return HttpUtil.sendPostForm(URLConfig.getAllOrg,new HashMap<>(),new HashMap<>());
     }
 
-    @PostMapping("/app/complaint/appComplaintInfo/save")
+    @PostMapping(value="/app/complaint/appComplaintInfo/save",produces = "application/json;charset=utf-8")
     public String save(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.save,param,new HashMap<>());
     }
-    @PostMapping("/app/info/appInfo/getByType")
+    @PostMapping(value="/app/info/appInfo/getByType",produces = "application/json;charset=utf-8")
     public String getByType(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.getByType,param,new HashMap<>());
     }
 
-    @PostMapping("/leader/activity/leaderActivity/threeSessions")
+    @PostMapping(value="/leader/activity/leaderActivity/threeSessions",produces = "application/json;charset=utf-8")
     public String threeSessions(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.threeSessions,param,new HashMap<>());
     }
 
-    @PostMapping("/app/record/appActivityRecord/activityList")
+    @PostMapping(value="/app/record/appActivityRecord/activityList",produces = "application/json;charset=utf-8")
     public String activityList(String userId){
         Map param = new HashMap<>();
         param.put("userId",userId);
         return HttpUtil.sendPostForm(URLConfig.activityList,new HashMap<>(),param);
     }
 
-    @PostMapping("/app/record/appActivityRecord/data")
+    @PostMapping(value="/app/record/appActivityRecord/data",produces = "application/json;charset=utf-8")
     public String appActivityRecordData(String userId,String tab){
         Map param = new HashMap<>();
         param.put("userId",userId);
@@ -139,12 +140,12 @@ public class AppInterfaceController {
         return HttpUtil.sendPostForm(URLConfig.appActivityRecordData,new HashMap<>(),param);
     }
 
-    @PostMapping("/app/record/appActivityRecord/save")
+    @PostMapping(value="/app/record/appActivityRecord/save",produces = "application/json;charset=utf-8")
     public String appActivityRecordSave(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.appActivityRecordSave,param,new HashMap<>());
     }
 
-    @PostMapping("/leader/activity/leaderActivity/partyDay")
+    @PostMapping(value="/leader/activity/leaderActivity/partyDay",produces = "application/json;charset=utf-8")
     public String partyDay(String types,String userId){
         Map param = new HashMap<>();
         param.put("types",types);
@@ -152,12 +153,12 @@ public class AppInterfaceController {
         return HttpUtil.sendPostForm(URLConfig.partyDay,new HashMap<>(),param);
     }
 
-    @PostMapping("/leader/logs/leaderLogs/uploadLogs")
+    @PostMapping(value="/leader/logs/leaderLogs/uploadLogs",produces = "application/json;charset=utf-8")
     public String uploadLogs(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.uploadLogs,param,new HashMap<>());
     }
 
-    @PostMapping("/app/leave/appLeave/data")
+    @PostMapping(value="/app/leave/appLeave/data",produces = "application/json;charset=utf-8")
     public String appLeaveData(String userId,String tab){
         Map param = new HashMap<>();
         param.put("tab",tab);
@@ -165,49 +166,49 @@ public class AppInterfaceController {
         return HttpUtil.sendPostForm(URLConfig.appLeaveData,new HashMap<>(),param);
     }
 
-    @PostMapping("/app/leave/appLeave/save")
+    @PostMapping(value="/app/leave/appLeave/save",produces = "application/json;charset=utf-8")
     public String appLeaveSave(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.appLeaveSave,param,new HashMap<>());
     }
 
-    @PostMapping("/app/leave/appLeave/approval")
+    @PostMapping(value="/app/leave/appLeave/approval",produces = "application/json;charset=utf-8")
     public String approval(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.approval,param,new HashMap<>());
     }
 
-    @PostMapping("/leader/sign/leaderVillageSign/save")
+    @PostMapping(value="/leader/sign/leaderVillageSign/save",produces = "application/json;charset=utf-8")
     public String leaderVillageSignSave(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.leaderVillageSignSave,param,new HashMap<>());
     }
 
-    @PostMapping("/leader/logs/leaderLogsPosition/uploadLogs")
+    @PostMapping(value="/leader/logs/leaderLogsPosition/uploadLogs",produces = "application/json;charset=utf-8")
     public String leaderLogsPositionUploadLogs(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.leaderLogsPositionUploadLogs,param,new HashMap<>());
     }
 
-    @PostMapping("/leader/logs/leaderLogsPosition/getLogs")
+    @PostMapping(value="/leader/logs/leaderLogsPosition/getLogs",produces = "application/json;charset=utf-8")
     public String getLogs(String orgId){
         Map param = new HashMap<>();
         param.put("orgId",orgId);
         return HttpUtil.sendPostForm(URLConfig.getLogs,new HashMap<>(),param);
     }
 
-    @PostMapping("/app/resources/appResources/data")
+    @PostMapping(value="/app/resources/appResources/data",produces = "application/json;charset=utf-8")
     public String appResourcesData(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.appResourcesData,param,new HashMap<>());
     }
 
-    @PostMapping("/app/resources/appResources/save")
+    @PostMapping(value="/app/resources/appResources/save",produces = "application/json;charset=utf-8")
     public String appResourceSave(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.appResourceSave,param,new HashMap<>());
     }
 
-    @PostMapping("/app/resources/appResourcesApproval/save")
+    @PostMapping(value="/app/resources/appResourcesApproval/save",produces = "application/json;charset=utf-8")
     public String AppResourcesApprovalSave(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.AppResourcesApprovalSave,param,new HashMap<>());
     }
 
-    @PostMapping("/app/resources/appResourcesApproval/data")
+    @PostMapping(value="/app/resources/appResourcesApproval/data",produces = "application/json;charset=utf-8")
     public String appResourcesApprovalData(String applyId,String tab){
         Map param = new HashMap<>();
         param.put("applyId",applyId);
@@ -215,66 +216,66 @@ public class AppInterfaceController {
         return HttpUtil.sendPostForm(URLConfig.appResourcesApprovalData,new HashMap<>(),param);
     }
 
-    @PostMapping("/app/resources/appResourcesApproval/approval")
+    @PostMapping(value="/app/resources/appResourcesApproval/approval",produces = "application/json;charset=utf-8")
     public String appResourcesApprovalApproval(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.appResourcesApprovalApproval,param,new HashMap<>());
     }
 
-    @PostMapping("/app/report/appReport/save")
+    @PostMapping(value="/app/report/appReport/save",produces = "application/json;charset=utf-8")
     public String appReportSave(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.appReportSave,param,new HashMap<>());
     }
 
-    @PostMapping("/app/phonebook/appPhoneBook/data")
+    @PostMapping(value="/app/phonebook/appPhoneBook/data",produces = "application/json;charset=utf-8")
     public String appPhoneBookData(String userId){
         Map param = new HashMap<>();
         param.put("applyId",userId);
         return HttpUtil.sendPostForm(URLConfig.appPhoneBookData,new HashMap<>(),param);
     }
 
-    @PostMapping("/app/phonebook/appPhoneBook/save")
+    @PostMapping(value="/app/phonebook/appPhoneBook/save",produces = "application/json;charset=utf-8")
     public String appPhoneBookSave(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.appPhoneBookSave,param,new HashMap<>());
     }
 
-    @PostMapping("/app/phonebook/appPhoneBook/delete")
+    @PostMapping(value="/app/phonebook/appPhoneBook/delete",produces = "application/json;charset=utf-8")
     public String appPhoneBookDelete(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.appPhoneBookDelete,param,new HashMap<>());
     }
 
-    @PostMapping("/app/memo/appMemo/data")
+    @PostMapping(value="/app/memo/appMemo/data",produces = "application/json;charset=utf-8")
     public String appMemoData(String userId){
         Map param = new HashMap<>();
         param.put("applyId",userId);
         return HttpUtil.sendPostForm(URLConfig.appMemoData,new HashMap<>(),param);
     }
 
-    @PostMapping("/app/memo/appMemo/delete")
+    @PostMapping(value="/app/memo/appMemo/delete",produces = "application/json;charset=utf-8")
     public String appMemoDelete(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.appMemoDelete,param,new HashMap<>());
     }
 
-    @PostMapping("/app/memo/appMemo/save")
+    @PostMapping(value="/app/memo/appMemo/save",produces = "application/json;charset=utf-8")
     public String appMemoSave(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.appMemoSave,param,new HashMap<>());
     }
 
-    @PostMapping("/app/collection/appCollection/data")
+    @PostMapping(value="/app/collection/appCollection/data",produces = "application/json;charset=utf-8")
     public String appCollectionData(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.appCollectionData,param,new HashMap<>());
     }
 
-    @PostMapping("/app/collection/appCollection/delete")
+    @PostMapping(value="/app/collection/appCollection/delete",produces = "application/json;charset=utf-8")
     public String appCollectionDelete(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.appCollectionDelete,param,new HashMap<>());
     }
 
-    @PostMapping("/app/collection/appCollection/save")
+    @PostMapping(value="/app/collection/appCollection/save",produces = "application/json;charset=utf-8")
     public String appCollectionSave(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.appCollectionSave,param,new HashMap<>());
     }
 
-    @PostMapping("/app/suggestion/appSuggestion/save")
+    @PostMapping(value="/app/suggestion/appSuggestion/save",produces = "application/json;charset=utf-8")
     public String appSuggestionSave(@RequestParam Map param){
         return HttpUtil.sendPostForm(URLConfig.appSuggestionSave,param,new HashMap<>());
     }

src/main/java/com/zjj/controller/FileController.java

@@ -8,11 +8,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
 
 
 /**

src/main/resources/application.yml

@@ -4,4 +4,22 @@ server:
   tomcat:
     uri-encoding: UTF-8
   servlet:
-    context-path: /
+    context-path: /leader
+
+# Spring配置
+spring:
+  # 模板引擎
+  thymeleaf:
+    mode: HTML
+    encoding: utf-8
+    # 禁用缓存
+    cache: false
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: static/i18n/messages
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  profiles:
+    active: druid