diff --git a/backend/pom.xml b/backend/pom.xml
index 56c47df966..649a9928ca 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -10,6 +10,7 @@
4.0.0
backend
+
UTF-8
@@ -270,11 +271,16 @@
**/*
- false
+ true
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+ 3.1.0
+
org.springframework.boot
spring-boot-maven-plugin
diff --git a/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java b/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java
index 62af1ce003..20bae525ef 100644
--- a/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java
+++ b/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java
@@ -19,6 +19,6 @@ public class LoginDto implements Serializable {
* 1:ldap登录
* 2:单点登录
*/
- @ApiModelProperty(value = "登录方式", required = true, allowableValues = "0, 1, 2")
+ @ApiModelProperty(value = "登录方式{0:普通登录, 1:ldap登录}", required = true, allowableValues = "0, 1")
private int loginType;
}
diff --git a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java
index e696452ad3..ffd47c558f 100644
--- a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java
+++ b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java
@@ -1,9 +1,9 @@
package io.dataease.config;
import com.github.xiaoymin.knife4j.spring.extension.OpenApiExtensionResolver;
-import io.dataease.commons.condition.LicStatusCondition;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.context.annotation.*;
import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
import springfox.documentation.builders.*;
@@ -12,19 +12,17 @@ import springfox.documentation.service.*;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spi.service.contexts.SecurityContext;
import springfox.documentation.spring.web.plugins.Docket;
-
-import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@EnableOpenApi
@Configuration
@Import(BeanValidatorPluginsConfiguration.class)
-public class Knife4jConfiguration {
+public class Knife4jConfiguration implements BeanPostProcessor{
private final OpenApiExtensionResolver openApiExtensionResolver;
- @Value("${app.version}")
+ @Value("${version}")
private String version;
diff --git a/backend/src/main/java/io/dataease/controller/IndexController.java b/backend/src/main/java/io/dataease/controller/IndexController.java
index 075555618e..38a716f0c0 100644
--- a/backend/src/main/java/io/dataease/controller/IndexController.java
+++ b/backend/src/main/java/io/dataease/controller/IndexController.java
@@ -43,8 +43,8 @@ public class IndexController {
return "doc.html";
default:
// DataEaseException.throwException("Invalid License.");
- return "nolic.html";
- // return "doc.html";
+ //return "nolic.html";
+ return "doc.html";
}
// return "index.html";
}
diff --git a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java
index fc8978f56c..ff0706a6c5 100644
--- a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java
+++ b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java
@@ -10,7 +10,6 @@ import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.PageUtils;
import io.dataease.commons.utils.Pager;
import io.dataease.controller.sys.base.BaseGridRequest;
-import io.dataease.controller.sys.request.LdapAddRequest;
import io.dataease.controller.sys.request.SysUserCreateRequest;
import io.dataease.controller.sys.request.SysUserPwdRequest;
import io.dataease.controller.sys.request.SysUserStateRequest;
@@ -130,11 +129,11 @@ public class SysUserController {
}
- @ApiOperation("同步用户")
+ /* @ApiOperation("同步用户")
@PostMapping("/sync")
public void importLdap(@RequestBody LdapAddRequest request) {
sysUserService.saveLdapUsers(request);
- }
+ } */
@ApiOperation("已同步用户")
@PostMapping("/existLdapUsers")
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index d4f4111a23..c9076ac69d 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -34,7 +34,7 @@ knife4j.setting.enableSearch=false
knife4j.setting.enableOpenApi=false
knife4j.setting.enableAfterScript=false
-app.version=@project.version@
+version=@project.version@
logging.file.path=/opt/dataease/logs/${spring.application.name}
diff --git a/pom.xml b/pom.xml
index 1e915295bf..e08a03d403 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,4 +20,13 @@
backend
+
+
+
+ src/main/resources
+ true
+
+
+
+