Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
njgzx
dataease
Commits
72b9c620
Unverified
提交
72b9c620
authored
10月 14, 2021
作者:
fit2cloud-chenyw
提交者:
GitHub
10月 14, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #938 from dataease/pr@dev@fix_1.3_leftover
fix: api文档优化
上级
2d60cade
238ce0f2
隐藏空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
45 行增加
和
22 行删除
+45
-22
pom.xml
backend/pom.xml
+7
-1
LoginDto.java
backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java
+1
-1
ExcelReaderUtil.java
.../main/java/io/dataease/commons/utils/ExcelReaderUtil.java
+2
-5
Knife4jConfiguration.java
...rc/main/java/io/dataease/config/Knife4jConfiguration.java
+3
-5
IndexController.java
...src/main/java/io/dataease/controller/IndexController.java
+2
-2
SysUserController.java
...in/java/io/dataease/controller/sys/SysUserController.java
+2
-3
application.properties
backend/src/main/resources/application.properties
+1
-1
UserView.vue
frontend/src/components/canvas/custom-component/UserView.vue
+4
-1
DeSelect.vue
frontend/src/components/widget/DeWidget/DeSelect.vue
+13
-2
DeTabs.vue
frontend/src/components/widget/DeWidget/DeTabs.vue
+1
-1
pom.xml
pom.xml
+9
-0
没有找到文件。
backend/pom.xml
浏览文件 @
72b9c620
...
...
@@ -10,6 +10,7 @@
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
backend
</artifactId>
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
...
...
@@ -270,11 +271,16 @@
<includes>
<include>
**/*
</include>
</includes>
<filtering>
fals
e
</filtering>
<filtering>
tru
e
</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-resources-plugin
</artifactId>
<version>
3.1.0
</version>
</plugin>
<plugin>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
...
...
backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java
浏览文件 @
72b9c620
...
...
@@ -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
;
}
backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java
浏览文件 @
72b9c620
package
io
.
dataease
.
commons
.
utils
;
import
com.google.gson.Gson
;
import
io.dataease.datasource.dto.TableFiled
;
import
org.apache.poi.hssf.usermodel.HSSFCell
;
import
java.io.FileInputStream
;
import
java.io.InputStream
;
import
java.util.List
;
...
...
@@ -70,10 +67,10 @@ public class ExcelReaderUtil {
}
}
public
static
void
main
(
String
[]
args
)
throws
Exception
{
/*
public static void main(String[] args) throws Exception {
String file ="各省市GDP-表格_加内容.xlsx";
ExcelReaderUtil.readExcel(file, new FileInputStream("/Users/taojinlong/Desktop/" + file));
}
}
*/
}
backend/src/main/java/io/dataease/config/Knife4jConfiguration.java
浏览文件 @
72b9c620
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
;
...
...
backend/src/main/java/io/dataease/controller/IndexController.java
浏览文件 @
72b9c620
...
...
@@ -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";
}
...
...
backend/src/main/java/io/dataease/controller/sys/SysUserController.java
浏览文件 @
72b9c620
...
...
@@ -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"
)
...
...
backend/src/main/resources/application.properties
浏览文件 @
72b9c620
...
...
@@ -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}
...
...
frontend/src/components/canvas/custom-component/UserView.vue
浏览文件 @
72b9c620
...
...
@@ -211,7 +211,10 @@ export default {
created
()
{
this
.
refId
=
uuid
.
v1
// this.filter.filter = this.$store.getters.conditions
this
.
getData
(
this
.
element
.
propValue
.
viewId
)
if
(
this
.
element
&&
this
.
element
.
propValue
&&
this
.
element
.
propValue
.
viewId
)
{
this
.
getData
(
this
.
element
.
propValue
.
viewId
)
}
// this.initAreas()
},
mounted
()
{
...
...
frontend/src/components/widget/DeWidget/DeSelect.vue
浏览文件 @
72b9c620
...
...
@@ -10,13 +10,17 @@
:placeholder=
"$t(options.attrs.placeholder)"
:popper-append-to-body=
"inScreen"
@
change=
"changeValue"
@
focus=
"setOptionWidth"
>
<el-option
v-for=
"item in options.attrs.datas"
:key=
"item[options.attrs.key]"
:style=
"
{width:selectOptionWidth}"
:label="item[options.attrs.label]"
:value="item[options.attrs.value]"
/>
>
<span
:title=
"item[options.attrs.label]"
style=
"display:inline-block;width:100%;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;"
>
{{
item
[
options
.
attrs
.
label
]
}}
</span>
</el-option>
</el-select>
</
template
>
...
...
@@ -43,7 +47,8 @@ export default {
data
()
{
return
{
options
:
null
,
showNumber
:
false
showNumber
:
false
,
selectOptionWidth
:
0
}
},
computed
:
{
...
...
@@ -119,6 +124,12 @@ export default {
text
:
item
}
})
},
setOptionWidth
(
event
)
{
// 下拉框弹出时,设置弹框的宽度
this
.
$nextTick
(()
=>
{
this
.
selectOptionWidth
=
event
.
srcElement
.
offsetWidth
+
'px'
})
}
}
...
...
frontend/src/components/widget/DeWidget/DeTabs.vue
浏览文件 @
72b9c620
...
...
@@ -35,7 +35,7 @@
</span>
<div
v-if=
"activeTabName === item.name"
class=
"de-tab-content"
>
<user-view
v-if=
"item.content"
:ref=
"item.name"
:element=
"item.content"
:out-style=
"outStyle"
/>
<user-view
v-if=
"item.content
&& item.content.propValue && item.content.propValue.viewId
"
:ref=
"item.name"
:element=
"item.content"
:out-style=
"outStyle"
/>
</div>
</el-tab-pane>
...
...
pom.xml
浏览文件 @
72b9c620
...
...
@@ -20,4 +20,13 @@
<module>
backend
</module>
</modules>
<build>
<resources>
<resource>
<directory>
src/main/resources
</directory>
<filtering>
true
</filtering>
</resource>
</resources>
</build>
</project>
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论