修改依赖包名

hsweb-web-controller/src/main/java/org/hsweb/web/controller/config/ConfigController.java

@@ -1,21 +1,19 @@
 package org.hsweb.web.controller.config;
 
 import com.alibaba.fastjson.JSON;
-import org.hsweb.web.logger.annotation.AccessLogger;
-import org.hsweb.web.authorize.annotation.Authorize;
+import org.hsweb.web.core.logger.annotation.AccessLogger;
+import org.hsweb.web.core.authorize.annotation.Authorize;
 import org.hsweb.web.bean.po.config.Config;
 import org.hsweb.web.controller.GenericController;
-import org.hsweb.web.message.ResponseMessage;
+import org.hsweb.web.core.message.ResponseMessage;
 import org.hsweb.web.service.config.ConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 /**
  * 系统配置控制器，继承自GenericController,使用rest+json。

hsweb-web-controller/src/main/java/org/hsweb/web/controller/file/FileController.java

@@ -1,10 +1,10 @@
 package org.hsweb.web.controller.file;
 
-import org.hsweb.web.exception.NotFoundException;
-import org.hsweb.web.logger.annotation.AccessLogger;
-import org.hsweb.web.authorize.annotation.Authorize;
+import org.hsweb.web.core.exception.NotFoundException;
+import org.hsweb.web.core.logger.annotation.AccessLogger;
+import org.hsweb.web.core.authorize.annotation.Authorize;
 import org.hsweb.web.bean.po.resource.Resources;
-import org.hsweb.web.message.ResponseMessage;
+import org.hsweb.web.core.message.ResponseMessage;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;

hsweb-web-controller/src/main/java/org/hsweb/web/controller/form/DynamicFormController.java

@@ -1,11 +1,11 @@
 package org.hsweb.web.controller.form;
 
-import org.hsweb.web.authorize.annotation.Authorize;
+import org.hsweb.web.core.authorize.annotation.Authorize;
 import org.hsweb.web.bean.common.InsertMapParam;
 import org.hsweb.web.bean.common.QueryParam;
 import org.hsweb.web.bean.common.UpdateMapParam;
-import org.hsweb.web.logger.annotation.AccessLogger;
-import org.hsweb.web.message.ResponseMessage;
+import org.hsweb.web.core.logger.annotation.AccessLogger;
+import org.hsweb.web.core.message.ResponseMessage;
 import org.hsweb.web.service.form.DynamicFormService;
 import org.springframework.web.bind.annotation.*;
 

hsweb-web-controller/src/main/java/org/hsweb/web/controller/form/FormController.java

@@ -1,13 +1,13 @@
 package org.hsweb.web.controller.form;
 
-import org.hsweb.web.authorize.annotation.Authorize;
+import org.hsweb.web.core.authorize.annotation.Authorize;
 import org.hsweb.web.bean.common.PagerResult;
 import org.hsweb.web.bean.common.QueryParam;
 import org.hsweb.web.bean.po.form.Form;
 import org.hsweb.web.controller.GenericController;
-import org.hsweb.web.exception.BusinessException;
-import org.hsweb.web.logger.annotation.AccessLogger;
-import org.hsweb.web.message.ResponseMessage;
+import org.hsweb.web.core.exception.BusinessException;
+import org.hsweb.web.core.logger.annotation.AccessLogger;
+import org.hsweb.web.core.message.ResponseMessage;
 import org.hsweb.web.service.form.FormService;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;

hsweb-web-controller/src/main/java/org/hsweb/web/controller/login/AuthorizeController.java

@@ -1,13 +1,13 @@
 package org.hsweb.web.controller.login;
 
 import org.hsweb.web.bean.po.user.User;
-import org.hsweb.web.exception.AuthorizeException;
-import org.hsweb.web.exception.NotFoundException;
-import org.hsweb.web.logger.annotation.AccessLogger;
-import org.hsweb.web.message.ResponseMessage;
+import org.hsweb.web.core.exception.AuthorizeException;
+import org.hsweb.web.core.exception.NotFoundException;
+import org.hsweb.web.core.logger.annotation.AccessLogger;
+import org.hsweb.web.core.message.ResponseMessage;
+import org.hsweb.web.core.utils.WebUtil;
 import org.hsweb.web.service.config.ConfigService;
 import org.hsweb.web.service.user.UserService;
-import org.hsweb.web.utils.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;

hsweb-web-controller/src/main/java/org/hsweb/web/controller/login/UserModuleController.java

@@ -0,0 +1,58 @@
+package org.hsweb.web.controller.login;
+
+import org.hsweb.web.core.authorize.annotation.Authorize;
+import org.hsweb.web.bean.common.QueryParam;
+import org.hsweb.web.bean.po.module.Module;
+import org.hsweb.web.bean.po.user.User;
+import org.hsweb.web.core.message.ResponseMessage;
+import org.hsweb.web.service.module.ModuleService;
+import org.hsweb.web.core.utils.WebUtil;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.webbuilder.utils.common.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Created by zhouhao on 16-4-13.
+ */
+@RestController
+@RequestMapping("/userModule")
+@Authorize
+public class UserModuleController {
+    @Resource
+    public ModuleService moduleService;
+
+    @RequestMapping
+    public ResponseMessage userModule() throws Exception {
+        String[] includes = {
+                "name", "u_id", "p_id", "icon", "uri", "m_option"
+        };
+        User user = WebUtil.getLoginUser();
+        List<Module> modules;
+        if (user == null) {
+            modules = moduleService.select(new QueryParam().includes(includes).orderBy("sort_index"));
+            modules = modules.stream()
+                    .filter(module -> {
+                        Object obj = module.getM_optionMap().get("M");
+                        if (obj instanceof Map)
+                            return StringUtils.isTrue(((Map) obj).get("checked"));
+                        return false;
+                    })
+                    .collect(Collectors.toCollection(() -> new LinkedList<>()));
+        } else {
+            modules = user.getModules().stream()
+                    .filter(module -> user.hasAccessModuleAction(module.getU_id(), "M"))
+                    .collect(Collectors.toCollection(() -> new LinkedList<>()));
+        }
+
+        return ResponseMessage.ok(modules)
+                .include(Module.class, includes)
+                .exclude(Module.class, "m_option")
+                .onlyData();
+    }
+}

hsweb-web-controller/src/main/java/org/hsweb/web/controller/module/ModuleController.java

@@ -1,11 +1,10 @@
 package org.hsweb.web.controller.module;
 
-import org.hsweb.web.logger.annotation.AccessLogger;
-import org.hsweb.web.authorize.annotation.Authorize;
+import org.hsweb.web.core.logger.annotation.AccessLogger;
+import org.hsweb.web.core.authorize.annotation.Authorize;
 import org.hsweb.web.bean.po.module.Module;
 import org.hsweb.web.controller.GenericController;
 import org.hsweb.web.service.module.ModuleService;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

hsweb-web-controller/src/main/java/org/hsweb/web/controller/resource/ResourcesController.java

@@ -1,16 +1,14 @@
 package org.hsweb.web.controller.resource;
 
-import org.hsweb.web.exception.BusinessException;
-import org.hsweb.web.exception.NotFoundException;
-import org.hsweb.web.logger.annotation.AccessLogger;
-import org.hsweb.web.authorize.annotation.Authorize;
+import org.hsweb.web.core.exception.NotFoundException;
+import org.hsweb.web.core.logger.annotation.AccessLogger;
+import org.hsweb.web.core.authorize.annotation.Authorize;
 import org.hsweb.web.bean.po.resource.Resources;
 import org.hsweb.web.bean.po.role.Role;
 import org.hsweb.web.controller.GenericController;
-import org.hsweb.web.message.ResponseMessage;
+import org.hsweb.web.core.message.ResponseMessage;
 import org.hsweb.web.service.resource.ResourcesService;
 
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

hsweb-web-controller/src/main/java/org/hsweb/web/controller/role/RoleController.java

@@ -1,11 +1,11 @@
 package org.hsweb.web.controller.role;
 
-import org.hsweb.web.logger.annotation.AccessLogger;
-import org.hsweb.web.authorize.annotation.Authorize;
+import org.hsweb.web.core.logger.annotation.AccessLogger;
+import org.hsweb.web.core.authorize.annotation.Authorize;
 import org.hsweb.web.bean.common.QueryParam;
 import org.hsweb.web.bean.po.role.Role;
 import org.hsweb.web.controller.GenericController;
-import org.hsweb.web.message.ResponseMessage;
+import org.hsweb.web.core.message.ResponseMessage;
 import org.springframework.web.bind.annotation.RestController;
 import org.hsweb.web.service.role.RoleService;
 

hsweb-web-controller/src/main/java/org/hsweb/web/controller/script/DynamicScriptController.java

@@ -1,11 +1,11 @@
 package org.hsweb.web.controller.script;
 
-import org.hsweb.web.logger.annotation.AccessLogger;
-import org.hsweb.web.authorize.annotation.Authorize;
+import org.hsweb.web.core.logger.annotation.AccessLogger;
+import org.hsweb.web.core.authorize.annotation.Authorize;
 import org.hsweb.web.bean.po.role.Role;
 import org.hsweb.web.bean.po.script.DynamicScript;
 import org.hsweb.web.controller.GenericController;
-import org.hsweb.web.message.ResponseMessage;
+import org.hsweb.web.core.message.ResponseMessage;
 import org.hsweb.web.service.script.DynamicScriptService;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;

hsweb-web-controller/src/main/java/org/hsweb/web/controller/user/UserController.java

@@ -1,16 +1,17 @@
 package org.hsweb.web.controller.user;
 
-import org.hsweb.web.authorize.annotation.Authorize;
+import org.hsweb.web.bean.common.UpdateParam;
+import org.hsweb.web.core.authorize.annotation.Authorize;
 import org.hsweb.web.bean.common.QueryParam;
 import org.hsweb.web.bean.po.user.User;
 import org.hsweb.web.controller.GenericController;
-import org.hsweb.web.exception.NotFoundException;
-import org.hsweb.web.logger.annotation.AccessLogger;
-import org.hsweb.web.message.ResponseMessage;
+import org.hsweb.web.core.exception.NotFoundException;
+import org.hsweb.web.core.logger.annotation.AccessLogger;
+import org.hsweb.web.core.message.ResponseMessage;
 import org.hsweb.web.service.user.UserService;
-import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -49,15 +50,18 @@ public class UserController extends GenericController<User, String> {
         return super.info(id).exclude(User.class, "password", "modules");
     }
 
-    @Override
     @AccessLogger("禁用")
-    public ResponseMessage delete(@PathVariable("id") String id) throws Exception {
-        User user = getService().selectByPk(id);
-        if (user == null) throw new NotFoundException("用户不存在!");
-        user.setStatus(-1);
-        getService().update(user);
-        return ResponseMessage.ok( "禁用成功");
+    @RequestMapping(value = "/{id}/disable", method = RequestMethod.PUT)
+    public ResponseMessage disable(@PathVariable("id") String id) throws Exception {
+        getService().disableUser(id);
+        return ResponseMessage.ok();
     }
 
+    @AccessLogger("启用")
+    @RequestMapping(value = "/{id}/enable", method = RequestMethod.PUT)
+    public ResponseMessage enable(@PathVariable("id") String id) throws Exception {
+        getService().enableUser(id);
+        return ResponseMessage.ok();
+    }
 
 }