修复依赖关系错误

hsweb-system/hsweb-system-authorization/hsweb-system-authorization-entity/src/main/java/org/hswebframework/web/entity/authorization/ActionEntity.java

@@ -1,8 +1,10 @@
 package org.hswebframework.web.entity.authorization;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.experimental.Wither;
 import org.hswebframework.web.commons.entity.CloneableEntity;
 
 import java.util.Arrays;
@@ -12,6 +14,7 @@ import java.util.stream.Collectors;
 @Getter
 @Setter
 @NoArgsConstructor
+@AllArgsConstructor
 public class ActionEntity implements CloneableEntity {
 
     private static final long serialVersionUID = -5756333786703175612L;
@@ -48,4 +51,5 @@ public class ActionEntity implements CloneableEntity {
     public boolean equals(Object obj) {
         return obj instanceof ActionEntity && obj.hashCode() == hashCode();
     }
+
 }

hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/src/main/java/org/hswebframework/web/controller/dictionary/DictionaryController.java

@@ -18,15 +18,23 @@
 package org.hswebframework.web.controller.dictionary;
 
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.hswebframework.web.authorization.annotation.Authorize;
 import org.hswebframework.web.commons.entity.param.QueryParamEntity;
 import org.hswebframework.web.controller.SimpleGenericEntityController;
+import org.hswebframework.web.controller.message.ResponseMessage;
+import org.hswebframework.web.dict.DictDefine;
+import org.hswebframework.web.dict.DictDefineRepository;
 import org.hswebframework.web.dictionary.api.DictionaryService;
 import org.hswebframework.web.dictionary.api.entity.DictionaryEntity;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import static org.hswebframework.web.controller.message.ResponseMessage.*;
+
 /**
  * 数据字典
  *
@@ -38,15 +46,23 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(value = "数据字典", tags = "数据字典-字典配置")
 public class DictionaryController implements SimpleGenericEntityController<DictionaryEntity, String, QueryParamEntity> {
 
+    @Autowired
     private DictionaryService dictionaryService;
 
     @Autowired
-    public void setDictionaryService(DictionaryService dictionaryService) {
-        this.dictionaryService = dictionaryService;
-    }
+    private DictDefineRepository repository;
 
     @Override
     public DictionaryService getService() {
         return dictionaryService;
     }
+
+
+    @GetMapping("/define/{id:.+}")
+    @Authorize(merge = false)
+    @ApiOperation("获取数据字典定义信息")
+    public ResponseMessage<DictDefine> getDefineById(@PathVariable String id) {
+        return ok(repository.getDefine(id));
+    }
+
 }

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-service/hsweb-system-dynamic-form-service-simple/pom.xml

@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-dictionary-service-api</artifactId>
+            <artifactId>hsweb-system-dictionary-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

hsweb-system/hsweb-system-template/hsweb-system-template-controller/src/main/java/org/hswebframework/web/controller/template/TemplateController.java

@@ -1,5 +1,6 @@
 package org.hswebframework.web.controller.template;
 
+import io.swagger.annotations.Api;
 import org.hswebframework.web.authorization.annotation.Authorize;
 import org.hswebframework.web.commons.entity.param.QueryParamEntity;
 import org.hswebframework.web.controller.SimpleGenericEntityController;
@@ -18,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("${hsweb.web.mappings.template:template}")
 @Authorize(permission = "template")
-@AccessLogger("模板")
+@Api(tags = "模版管理",value = "模版管理")
 public class TemplateController implements SimpleGenericEntityController<TemplateEntity, String, QueryParamEntity> {
 
     private TemplateService templateService;