Skip to content

Commit

Permalink
Merge pull request #147 from erupts/develop
Browse files Browse the repository at this point in the history
1.11.3
  • Loading branch information
erupts authored Mar 17, 2023
2 parents 7de8ad5 + 8150547 commit 2b19350
Show file tree
Hide file tree
Showing 63 changed files with 99 additions and 41 deletions.
2 changes: 1 addition & 1 deletion erupt-annotation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ default String beforeFetch(List<Condition> conditions) {
default void afterFetch(@Comment("查询结果") Collection<Map<String, Object>> list) {
}


@Comment("数据新增行为,可对数据做初始化等操作")
default void addBehavior(MODEL model) {
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package xyz.erupt.annotation.sub_field.sub_edit;

import xyz.erupt.annotation.config.Comment;

/**
* @author YuePeng
* date 2020-05-21
*/
public @interface DependBy {

@Comment("依赖字段名")
String dependField();

@Comment("显示条件表达式,支持变量:value 该值表示依赖字段的值")
String expr();

@Comment("依赖类型")
Type type() default Type.SHOW;


enum Type {
SHOW,
SHOW_NOTNULL,
READONLY,
NOTNULL
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
@Comment("富文本编辑器类型")
Type value();

@Comment("定义独享存储空间,便于文件查找")
String path() default "";

enum Type {
CKEDITOR, UEDITOR
}
Expand Down
2 changes: 1 addition & 1 deletion erupt-cloud/erupt-cloud-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion erupt-cloud/erupt-cloud-node-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion erupt-cloud/erupt-cloud-node/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.cloud.node.EruptCloudNodeAutoConfiguration
2 changes: 1 addition & 1 deletion erupt-cloud/erupt-cloud-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.cloud.server.EruptCloudServerAutoConfiguration
2 changes: 1 addition & 1 deletion erupt-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import xyz.erupt.annotation.fun.AttachmentProxy;
import xyz.erupt.annotation.sub_field.Edit;
import xyz.erupt.annotation.sub_field.sub_edit.AttachmentType;
import xyz.erupt.annotation.sub_field.sub_edit.HtmlEditorType;
import xyz.erupt.core.annotation.EruptRouter;
import xyz.erupt.core.constant.EruptRestPath;
import xyz.erupt.core.exception.EruptWebApiRuntimeException;
Expand Down Expand Up @@ -113,6 +114,10 @@ public EruptApiModel upload(@PathVariable("erupt") String eruptName, @PathVariab
}
break;
case HTML_EDITOR:
HtmlEditorType htmlEditorType = edit.htmlEditorType();
if (!"".equals(htmlEditorType.path())) {
path = htmlEditorType.path() + path;
}
break;
default:
return EruptApiModel.errorApi("上传失败,非法类型!");
Expand Down Expand Up @@ -177,7 +182,7 @@ public Map<String, Object> uploadHtmlEditorImage(@PathVariable("erupt") String e
}


@GetMapping("/upload-ueditor/{erupt}/{field}")
@RequestMapping("/upload-ueditor/{erupt}/{field}")
@EruptRouter(authIndex = 2, verifyMethod = EruptRouter.VerifyMethod.PARAM, verifyType = EruptRouter.VerifyType.ERUPT)
public void uploadUEditorImage(@PathVariable("erupt") String eruptName,
@PathVariable("field") String fieldName,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.core.EruptCoreAutoConfiguration
2 changes: 1 addition & 1 deletion erupt-data/erupt-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.jpa.EruptJpaAutoConfiguration
2 changes: 1 addition & 1 deletion erupt-data/erupt-mongodb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.mongodb.EruptMongodbAutoConfiguration
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.es.EruptMybatisAutoConfiguration
2 changes: 1 addition & 1 deletion erupt-excel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.excel.EruptExcelAutoConfiguration
2 changes: 1 addition & 1 deletion erupt-extra/erupt-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.generator.EruptGeneratorAutoConfiguration
2 changes: 1 addition & 1 deletion erupt-extra/erupt-job/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public void beforeDelete(EruptJob eruptJob) {
@Override
public String exec(List<EruptJob> eruptJob, Void param, String[] operationParam) {
try {
eruptJobService.triggerJob(eruptJob.get(0));
for (EruptJob job : eruptJob) eruptJobService.triggerJob(job);
return null;
} catch (Exception e) {
throw new EruptWebApiRuntimeException(e.getMessage());
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.job.EruptJobAutoConfiguration
2 changes: 1 addition & 1 deletion erupt-extra/erupt-magic-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.magicapi.EruptMagicApiAutoConfiguration
2 changes: 1 addition & 1 deletion erupt-extra/erupt-monitor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.monitor.EruptMonitorAutoConfiguration
2 changes: 1 addition & 1 deletion erupt-i18n/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.i18n.EruptI18nAutoConfiguration
2 changes: 1 addition & 1 deletion erupt-security/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.security.EruptSecurityAutoConfiguration
2 changes: 1 addition & 1 deletion erupt-toolkit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.toolkit.EruptToolkitAutoConfiguration
2 changes: 1 addition & 1 deletion erupt-tpl-ui/amis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
2 changes: 1 addition & 1 deletion erupt-tpl-ui/ant-design/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
2 changes: 1 addition & 1 deletion erupt-tpl-ui/element-plus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
2 changes: 1 addition & 1 deletion erupt-tpl-ui/element-ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
</project>
2 changes: 1 addition & 1 deletion erupt-tpl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.tpl.EruptTplAutoConfiguration
2 changes: 1 addition & 1 deletion erupt-upms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ public ModuleInfo info() {
@Override
public List<MetaMenu> initMenus() {
List<MetaMenu> menus = new ArrayList<>();
menus.add(MetaMenu.createSimpleMenu("$home", "首页", "/", null,
0, "fa fa-home", MenuTypeEnum.ROUTER.getCode(), MenuStatus.OPEN));
menus.add(MetaMenu.createRootMenu("$manager", "系统管理", "fa fa-cogs", 1));
menus.add(MetaMenu.createEruptClassMenu(EruptMenu.class, menus.get(0), 0, MenuTypeEnum.TREE));
menus.add(MetaMenu.createEruptClassMenu(EruptRole.class, menus.get(0), 10));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,17 @@ public EruptApiModel changePwd(@RequestParam("pwd") String pwd, @RequestParam("n
/**
* 生成验证码
*
* @param mark 生成验证码标记值
* @param mark 生成验证码标记值
* @param height 验证码高度
*/
@GetMapping("/code-img")
public void createCode(HttpServletResponse response, @RequestParam String mark) throws Exception {
public void createCode(HttpServletResponse response, @RequestParam long mark,
@RequestParam(required = false, defaultValue = "38") Integer height) throws Exception {
response.setContentType("image/jpeg"); // 设置响应的类型格式为图片格式
response.setDateHeader("Expires", 0);
response.setHeader("Pragma", "no-cache"); // 禁止图像缓存
response.setHeader("Cache-Control", "no-cache");
Captcha captcha = new SpecCaptcha(150, 38, 4);
Captcha captcha = new SpecCaptcha(150, height, 4);
sessionService.put(SessionKey.VERIFY_CODE + mark, captcha.text(), 60, TimeUnit.SECONDS);
captcha.out(response.getOutputStream());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public class EruptLoginLog extends BaseModel {
private String ip;

@EruptField(
views = @View(title = "IP来源", desc = "格式:国家 | 大区 | 省份 | 城市 | 运营商", template = "value&&value.replace(/\\|/g,' | ')"),
views = @View(title = "IP来源", desc = "格式:国家 | 大区 | 省份 | 城市 | 运营商", width = "250px", template = "value&&value.replace(/\\|/g,' | ')"),
edit = @Edit(title = "IP来源", search = @Search(vague = true))
)
private String region;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.upms.EruptUpmsAutoConfiguration
2 changes: 1 addition & 1 deletion erupt-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>xyz.erupt</groupId>
<artifactId>erupt</artifactId>
<version>1.11.2</version>
<version>1.11.3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xyz.erupt.web.EruptWebConfig

This file was deleted.

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Binary file modified erupt-web/src/main/resources/public/favicon.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion erupt-web/src/main/resources/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -125,5 +125,5 @@
页面长时间处于加载状态,可使用 ctrl + shift + r 清空缓存重新加载
</div>
</div>
<script src="runtime-es2015.622c9b7ac38aaa975f38.js" type="module"></script><script src="runtime-es5.622c9b7ac38aaa975f38.js" nomodule defer></script><script src="polyfills-es5.928ec65dd9118268c862.js" nomodule defer></script><script src="polyfills-es2015.f5b66455e95546901881.js" type="module"></script><script src="scripts.b993e8b98ac7c2ea2917.js" defer></script><script src="main-es2015.6fdac8fb6b1dfd337895.js" type="module"></script><script src="main-es5.6fdac8fb6b1dfd337895.js" nomodule defer></script></body>
<script src="runtime-es2015.8684d86efe8f65637650.js" type="module"></script><script src="runtime-es5.8684d86efe8f65637650.js" nomodule defer></script><script src="polyfills-es5.928ec65dd9118268c862.js" nomodule defer></script><script src="polyfills-es2015.f5b66455e95546901881.js" type="module"></script><script src="scripts.b993e8b98ac7c2ea2917.js" defer></script><script src="main-es2015.63eddaece56e8ceeda60.js" type="module"></script><script src="main-es5.63eddaece56e8ceeda60.js" nomodule defer></script></body>
</html>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2b19350

Please sign in to comment.