Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthUserInterceptor.java

@@ -61,11 +61,9 @@ public class AuthUserInterceptor extends BaseInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
             throws Exception {
-        //response.setContentType("application/json");
         String referer = request.getHeader("Referer");
         RedisTemplate<String, String> redisTemplate = cacheService.selectDbRedisTemplate(portalDb);
         String trustedReferer =redisTemplate.opsForValue().get(RedisKey.KEY_REFERERS_CACHE);
-       // String referer = cacheService.get(RedisKey.KEY_REFERERS_CACHE);
         if (!ObjectUtils.isEmpty(referer)) {
             //校验host即可
             URI host = URLUtil.getHost(new URL(referer));
@@ -79,20 +77,6 @@ public class AuthUserInterceptor extends BaseInterceptor {
                 }
             }
         }
-
-        HttpServletResponse httpResponse = response;
-        Cookie[] cookies = request.getCookies();
-        if (cookies != null) {
-            for (Cookie cookie : cookies) {
-                cookie.setHttpOnly(true);
-                cookie.setSecure(true);
-                cookie.setPath("/");
-                cookie.setMaxAge(3600);
-                httpResponse.addCookie(cookie);
-            }
-        }
-
-
         if (handler instanceof HandlerMethod) {
             HandlerMethod handlerMethod = (HandlerMethod) handler;
             Method method = handlerMethod.getMethod();

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java

@@ -58,14 +58,8 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
     @Autowired
     private ICacheService cacheService;
     @Autowired
-    private MatterService matterService;
-    @Autowired
-    private DeptService deptService;
-    @Autowired
     private SiteService siteService;
     @Autowired
-    private SiteMatterService siteMatterService;
-    @Autowired
     private AreaService areaService;
 
     public SiteController() {
@@ -536,4 +530,41 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
         return jsonObject.toJSONString();
     }
 
+
+    /**
+     * 外部站点添加
+     */
+    @PostMapping(value = "api/add")
+    @UnAuth
+    public String apiAdd(@RequestBody SiteEntity siteEntity) {
+        JSONObject jsonObject = new JSONObject();
+        String busiDesc = "外部站点添加" + this.getModuleDesc();
+        try {
+            if (ObjectUtils.isEmpty(siteEntity.getAreaCode())) {
+                throw new AppException("区域编码不能为空！");
+            }
+
+            SiteEntity one = this.service.selectOne(new SiteQuery().areaCode(siteEntity.getAreaCode()).siteName(siteEntity.getSiteName()), getContext());
+            if(!ObjectUtils.isEmpty(one)) throw new AppException("当前区域下站点名称已存在！");
+
+            AreaEntity areaEntity = areaService.selectOne(new AreaQuery().areaCode(siteEntity.getAreaCode()), getContext());
+            if (!ObjectUtils.isEmpty(areaEntity)) {
+                siteEntity.setAreaID(areaEntity.getIid());
+                siteEntity.setAreaName(areaEntity.getName());
+                siteEntity.setAreaLevel(areaEntity.getAreaLevel());
+            }
+
+            SiteEntity save = this.service.save(siteEntity, getContext());
+            recordSysLog(request, busiDesc + " 【成功】");
+            jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+            jsonObject.put(KEY_RESULT_DATA, save);
+            jsonObject.put(KEY_RESULT_MSG, "外部站点添加成功！");
+        } catch (Exception e) {
+            log.error("外部站点添加", e);
+            jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
+        }
+        return jsonObject.toJSONString();
+    }
+
 }
\ No newline at end of file

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

@@ -217,7 +217,7 @@ Content-Type: application/json
 
 {
   "page":1,
-  "secondOrganize": "hongqi"
+  "name": "%domain%"
 
 }
 

portal-manager/src/main/java/com/mortals/xhx/module/user/dao/UserDao.java

@@ -17,4 +17,5 @@ import java.util.List;
 public interface  UserDao extends ICRUDDao<UserEntity,Long>{
     List<Long> getAuthListById(Long id);
     Result<UserEntityExt> getListExt(UserEntity params, PageInfo pageInfo);
+    int initUser(UserEntity userEntity);
 }

portal-manager/src/main/java/com/mortals/xhx/module/user/dao/ibatis/UserDaoImpl.java

 package com.mortals.xhx.module.user.dao.ibatis;
 
 
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.ParamDto;
 import com.mortals.framework.model.Result;
+import com.mortals.xhx.module.user.dao.UserDao;
+import com.mortals.xhx.module.user.model.UserEntity;
 import com.mortals.xhx.module.user.model.UserEntityExt;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.stereotype.Repository;
-import com.mortals.xhx.module.user.dao.UserDao;
-import com.mortals.xhx.module.user.model.UserEntity;
 
 import java.util.ArrayList;
-import java.util.Date;
-
-import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
-
 import java.util.List;
 
 /**
@@ -69,4 +66,9 @@ public class UserDaoImpl extends BaseCRUDDaoMybatis<UserEntity, Long> implements
         return result;
     }
 
+    @Override
+    public int initUser(UserEntity userEntity) {
+        return getSqlSession().update(this.getSqlId("initUser"),userEntity);
+    }
+
 }

portal-manager/src/main/java/com/mortals/xhx/module/user/service/UserService.java

@@ -5,7 +5,6 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.service.ICRUDCacheService;
-import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.user.model.UserEntity;
 import com.mortals.xhx.module.user.model.UserEntityExt;
 
@@ -80,4 +79,11 @@ public interface UserService extends ICRUDCacheService<UserEntity,Long> {
      */
     boolean resetUserPwd(String loginName, String newPwd , Context context) throws AppException;
 
+    /***
+     * 初始化用户数据
+     * @param userEntity
+     * @throws AppException
+     */
+    int initUser(UserEntity userEntity) throws AppException;
+
 }
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/service/impl/UserServiceImpl.java

@@ -32,6 +32,7 @@ import com.mortals.xhx.module.user.service.UserService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -61,6 +62,10 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
     @Autowired
     private UserPwdRecordDao userPwdRecordDao;
 
+    // 当日密码错误次数（默认60分钟）
+    @Value("${login.errorCount:5}")
+    private int ErrorCount;
+
     /**
      * @param data
      * @return
@@ -208,14 +213,16 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
         if (sysUser.getLoginLock() == null) {
             sysUser.setLoginLock(0);
         }
-        //取消账户锁定功能
-/*        if (sysUser.getLoginLock() == 1 && sysUser.getLockTime() != null) {
+        //账户锁定功能
+        if (sysUser.getLoginLock() == 1 && sysUser.getLockTime() != null) {
             String nowStr = DateUtils.getCurrStrDate();
             String loginDateStr = DateUtils.getDateTime(sysUser.getLockTime(), "yyyy-MM-dd");
             if (nowStr.equals(loginDateStr)) {
-                throw new AppException("此账号当天密码错误次数已达上限，已被锁定");
+                throw new AppException("此账号当天密码错误次数已达上限"+ErrorCount+"次，已被锁定");
+            }else {
+                sysUser.setLoginLock(0);
             }
-        }*/
+        }
 
         try {
             if (StringUtils.isNotEmpty(sysUser.getSaltKey())) {
@@ -225,7 +232,7 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
                 UserEntity update = new UserEntity();
                 update.setId(sysUser.getId());
                 update.setErrorCount(sysUser.getErrorCount() + 1);
-                if (update.getErrorCount() == 5) {
+                if (update.getErrorCount() == ErrorCount) {
                     update.setLoginLock(1);
                     update.setLockTime(new Date());
                 }
@@ -561,4 +568,8 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
 
     }
 
+    @Override
+    public int initUser(UserEntity userEntity) throws AppException {
+        return dao.initUser(userEntity);
+    }
 }
\ No newline at end of file

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

@@ -31,8 +31,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
-
 /**
  * 用户信息业务
  *
@@ -325,4 +323,22 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
     public String importData(MultipartFile file, boolean updateSupport) {
         return super.importData(file, updateSupport);
     }
+
+
+    /**
+     * 初始化用户数据
+     * @return
+     */
+    @PostMapping(value = "initData")
+    @UnAuth
+    public Rest<String> initData(UserEntity user) {
+
+        try {
+            this.service.initUser(user);
+            return Rest.ok("初始化用户数据成功！");
+        } catch (Exception e) {
+            log.error("初始化用户数据错误", e);
+            return Rest.fail("初始化用户数据异常!");
+        }
+    }
 }
\ No newline at end of file

portal-manager/src/main/resources/sqlmap/module/user/userExt.xml

@@ -163,4 +163,9 @@
 			</where>
 		</trim>
 	</select>
+
+	<!-- 初始化用户登录密码admin -->
+	<update id="initUser" parameterType="UserEntity">
+		update mortals_xhx_user set loginPwd='43442676c74ae59f219c2d87fd6bad52',errorCount=0,lockTime=NULL,loginLock=0,saltKey=NULL,status=1,siteIds=#{siteIds},areaCodes=#{areaCodes},areaNames=#{areaNames}
+	</update>
 </mapper>
\ No newline at end of file