修改门户配置打包

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -125,8 +125,7 @@ public class MatterServiceImpl extends AbstractCRUDCacheServiceImpl<MatterDao, M
     private void updateOrSave(MatterEntity item, Long siteId, Context context) {
         SiteMatterEntity siteMatterEntity = siteMatterService.selectOne(new SiteMatterQuery().siteId(siteId).matterId(item.getId()));
         if (!ObjectUtils.isEmpty(siteMatterEntity)) {
-            BeanUtils.copyProperties(item, siteMatterEntity, new String[]{"id"});
-
+            BeanUtils.copyProperties(item, siteMatterEntity, new String[]{"id","siteId","matterId"});
             siteMatterEntity.setMatterName(item.getMatterName());
             siteMatterEntity.setUpdateTime(new Date());
             siteMatterService.update(siteMatterEntity, context);

base-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -7,5 +7,9 @@
   },
   "base-test": {
     "baseUrl": "http://192.168.0.98:11078/base"
-  }
+  },
+  "base-test1": {
+    "baseUrl": "http://192.168.0.98:17211/base"
+  },
+
 }
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/site/SiteMatterController.http

@@ -40,6 +40,15 @@ Accept: application/json
 GET {{baseUrl}}/site/matter/delete?id={{SiteMatter_id}}
 Accept: application/json
 
+###站点事项保存
+POST {{baseUrl}}/matter/addMatterToSite
+Content-Type: application/json
+Authorization: {{authToken}}
+
+{
+  "siteId":35,
+  "matterIds":"1"
+}
 
 
 

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -4,8 +4,8 @@ POST {{baseUrl}}/login/login
 Content-Type: application/json
 
 {
-  "loginName":"xiaoyi",
-  "password":"xiaoyi",
+  "loginName":"admin",
+  "password":"admin",
   "securityCode":"8888"
 }
 

base-manager/src/test/java/com/mortals/httpclient/workman/WorkmanController.http

@@ -54,5 +54,10 @@ GET {{baseUrl}}/workman/delete?id={{Workman_id}}
 Accept: application/json
 
 
+###模板导出
+POST {{baseUrl}}/workman/downloadTemplate
+Content-Type: application/json
+Authorization: {{authToken}}
+
 
 

portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserController.java

 package com.mortals.xhx.module.user.web;
 
+import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.base.framework.annotation.Operlog;
-import com.mortals.xhx.module.area.model.AreaQuery;
 import com.mortals.xhx.module.param.service.ParamService;
 import com.mortals.xhx.module.role.model.RoleEntity;
 import com.mortals.xhx.module.role.model.RoleQuery;
@@ -16,40 +16,20 @@ import com.mortals.xhx.module.role.model.RoleUserEntity;
 import com.mortals.xhx.module.role.model.RoleUserQuery;
 import com.mortals.xhx.module.role.service.RoleService;
 import com.mortals.xhx.module.role.service.RoleUserService;
+import com.mortals.xhx.module.user.model.UserEntity;
 import com.mortals.xhx.module.user.model.UserEntityExt;
+import com.mortals.xhx.module.user.service.UserService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
-import com.mortals.framework.model.Context;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.user.model.UserEntity;
-import com.mortals.xhx.module.user.model.UserQuery;
-import com.mortals.xhx.module.user.service.UserService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.alibaba.fastjson.JSONObject;
-
-import java.util.Arrays;
-
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import static com.mortals.framework.ap.SysConstains.*;
+import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
 
 /**
  * 用户信息业务