diff --git a/.codebeatignore b/.codebeatignore deleted file mode 100644 index 5fae8584f..000000000 --- a/.codebeatignore +++ /dev/null @@ -1,2 +0,0 @@ -/src/test/** -/src/main/webapp/assets/lib/** diff --git a/.codecov.yml b/.codecov.yml index 168510d95..377a9ed46 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -16,3 +16,4 @@ ignore: - "src/test/.*" - "src/main/webapp/.*" - "src/main/java/com/rebuild/web/.*" + - ".*/.*Exception.java" diff --git a/.eslintrc.json b/.eslintrc.json index 14079c468..d547f67f4 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,3 +1,4 @@ +// Use ESLint in locally : `npm install eslint babel-eslint eslint-plugin-react --save-dev` { "env": { "browser": true, @@ -21,6 +22,7 @@ }, "settings": { "react": { + "pragma": "React", "version": "16.10.2" } }, @@ -93,6 +95,7 @@ }, "rules": { "strict": 0, + "no-redeclare": 0, "indent": [2, 2], "linebreak-style": [0, "unix"], "quotes": [2, "single"], diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..ae5554d84 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @getrebuild @devezhao \ No newline at end of file diff --git a/.gitignore b/.gitignore index f96389c70..bc61075a5 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ rebuild.iml .DS_Store +node_modules +package-lock.json diff --git a/.setup/db-init.sql b/.setup/db-init.sql deleted file mode 100644 index 2edf6ada6..000000000 --- a/.setup/db-init.sql +++ /dev/null @@ -1 +0,0 @@ --- The file has been moved to `src/main/resources/scripts/db-init.sql` \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index f7140c092..69af1139b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,7 +14,9 @@ "editor.fontSize": 12, "editor.tabSize": 2, "editor.formatOnSave": true, - "eslint.autoFixOnSave": true, + "editor.codeActionsOnSave": { + "source.fixAll.eslint": true + }, "eslint.options": { "configFile": "./.eslintrc.json" }, @@ -26,6 +28,4 @@ "prettier.eslintIntegration": true, "workbench.editor.enablePreview": false, "java.configuration.updateBuildConfiguration": "disabled" -} -// node and eslint(-g) -// Plugins: Beautify and ESLint \ No newline at end of file +} \ No newline at end of file diff --git a/README.md b/README.md index 802810b37..dcc0d2d97 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ [![codecov](https://codecov.io/gh/getrebuild/rebuild/branch/master/graph/badge.svg)](https://codecov.io/gh/getrebuild/rebuild) [![Build Status](https://travis-ci.org/getrebuild/rebuild.svg?branch=master)](https://travis-ci.org/getrebuild/rebuild) [![Crowdin](https://badges.crowdin.net/rebuild/localized.svg)](https://crowdin.com/project/rebuild) -[![License GPLv3](https://img.shields.io/github/license/getrebuild/rebuild.svg)](https://raw.githubusercontent.com/getrebuild/rebuild/master/LICENSE) -[![License COMMERCIAL](https://img.shields.io/badge/license-COMMERCIAL-orange.svg)](https://raw.githubusercontent.com/getrebuild/rebuild/master/COMMERCIAL) +[![License GPLv3](https://img.shields.io/github/license/getrebuild/rebuild.svg)](https://getrebuild.com/license/LICENSE.txt) +[![License COMMERCIAL](https://img.shields.io/badge/license-COMMERCIAL-orange.svg)](https://getrebuild.com/license/COMMERCIAL.txt) ## 快速开始 @@ -29,6 +29,6 @@ REBUILD is a true production-grade project that fully considers security, robust ## 注意 NOTICE -REBUILD 使用 [开源 GPL-3.0](https://raw.githubusercontent.com/getrebuild/rebuild/master/LICENSE) 和 [商用](https://raw.githubusercontent.com/getrebuild/rebuild/master/COMMERCIAL) 双重授权许可，您应当认真阅读许可内容。使用 REBUILD 即表示您完全同意许可内容/条款。感谢支持！ +REBUILD 使用 [开源 GPL-3.0](https://getrebuild.com/license/LICENSE.txt) 和 [商用](https://getrebuild.com/license/COMMERCIAL.txt) 双重授权许可，您应当认真阅读许可内容。使用 REBUILD 即表示您完全同意许可内容/条款。感谢支持！ -REBUILD uses the [open source GPL-3.0](https://raw.githubusercontent.com/getrebuild/rebuild/master/LICENSE) and [commercial](https://raw.githubusercontent.com/getrebuild/rebuild/master/COMMERCIAL) dual license agreements, and you should read the contents of the agreement carefully. By using REBUILD, you fully agree to the Licensed Content/Terms. Thanks for the support! \ No newline at end of file +REBUILD uses the [open source GPL-3.0](https://getrebuild.com/license/LICENSE.txt) and [commercial](https://getrebuild.com/license/COMMERCIAL.txt) dual license agreements, and you should read the contents of the agreement carefully. By using REBUILD, you fully agree to the Licensed Content/Terms. Thanks for the support! \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3069f8620..55d0145bb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.rebuild rebuild war - 1.7.2 + 1.8.0 rebuild Building your business-systems free! https://getrebuild.com/ @@ -127,7 +127,7 @@ com.github.devezhao persist4j - 1.3.4 + 1.3.5 junit @@ -290,6 +290,12 @@ com.alibaba easyexcel 2.1.3 + + + ehcache + org.ehcache + + org.jxls @@ -316,5 +322,10 @@ h2 1.4.200 + + com.googlecode.aviator + aviator + 4.2.9 + diff --git a/src/main/java/com/rebuild/api/ApiGateway.java b/src/main/java/com/rebuild/api/ApiGateway.java index 4c5ec3edc..4d22ffa1d 100644 --- a/src/main/java/com/rebuild/api/ApiGateway.java +++ b/src/main/java/com/rebuild/api/ApiGateway.java @@ -21,6 +21,7 @@ import cn.devezhao.commons.CalendarUtils; import cn.devezhao.commons.EncryptUtils; import cn.devezhao.commons.ObjectUtils; +import cn.devezhao.commons.ThreadPool; import cn.devezhao.commons.web.ServletUtils; import cn.devezhao.persist4j.Record; import cn.devezhao.persist4j.engine.ID; @@ -32,6 +33,7 @@ import com.rebuild.server.service.DataSpecificationException; import com.rebuild.server.service.bizz.UserService; import com.rebuild.utils.AppUtils; +import com.rebuild.utils.CommonsUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -81,6 +83,7 @@ public void api(@PathVariable String apiName, JSON ok = formatSuccess(data); ServletUtils.writeJson(response, ok.toJSONString()); logRequestAsync(reuqestTime, remoteIp, apiName, context, ok); + return; } catch (ApiInvokeException ex) { @@ -201,17 +204,19 @@ protected void logRequestAsync(Date requestTime, String remoteIp, String apiName return; } - Record record = EntityHelper.forNew(EntityHelper.RebuildApiRequest, UserService.SYSTEM_USER); - record.setString("appId", context.getAppId()); - record.setString("remoteIp", remoteIp); - record.setString("requestUrl", apiName + " " + context.getParameterMap()); - if (context.getPostData() != null) { - record.setString("requestBody", context.getPostData().toJSONString()); - } - record.setString("responseBody", result.toJSONString()); - record.setDate("requestTime", requestTime); - record.setDate("responseTime", CalendarUtils.now()); - Application.getCommonService().create(record); + ThreadPool.exec(() -> { + Record record = EntityHelper.forNew(EntityHelper.RebuildApiRequest, UserService.SYSTEM_USER); + record.setString("appId", context.getAppId()); + record.setString("remoteIp", remoteIp); + record.setString("requestUrl", CommonsUtils.maxstr(apiName + "?" + context.getParameterMap(),300)); + if (context.getPostData() != null) { + record.setString("requestBody", CommonsUtils.maxstr(context.getPostData().toJSONString(), 10000)); + } + record.setString("responseBody", CommonsUtils.maxstr(result.toJSONString(), 10000)); + record.setDate("requestTime", requestTime); + record.setDate("responseTime", CalendarUtils.now()); + Application.getCommonService().create(record, false); + }); } // -- 注册 API diff --git a/src/main/java/com/rebuild/api/LoginToken.java b/src/main/java/com/rebuild/api/LoginToken.java index fff49651e..a475e5a06 100644 --- a/src/main/java/com/rebuild/api/LoginToken.java +++ b/src/main/java/com/rebuild/api/LoginToken.java @@ -92,7 +92,7 @@ public static ID verifyToken(String loginToken) { * @return */ public static String checkUser(String user, String password) { - if (!Application.getUserStore().exists(user)) { + if (!Application.getUserStore().existsUser(user)) { return Languages.lang("InputWrong", "UsernameOrPassword"); } diff --git a/src/main/java/com/rebuild/server/Application.java b/src/main/java/com/rebuild/server/Application.java index 94ef596f4..1b44d4fe2 100644 --- a/src/main/java/com/rebuild/server/Application.java +++ b/src/main/java/com/rebuild/server/Application.java @@ -71,7 +71,7 @@ public final class Application { /** Rebuild Version */ - public static final String VER = "1.7.2"; + public static final String VER = "1.8.0"; /** Logging for Global */ diff --git a/src/main/java/com/rebuild/server/ServerListener.java b/src/main/java/com/rebuild/server/ServerListener.java index cf332a0ba..976637ebe 100644 --- a/src/main/java/com/rebuild/server/ServerListener.java +++ b/src/main/java/com/rebuild/server/ServerListener.java @@ -21,7 +21,7 @@ import cn.devezhao.commons.CalendarUtils; import com.rebuild.server.helper.ConfigurableItem; import com.rebuild.server.helper.SysConfiguration; -import com.rebuild.server.helper.setup.InstallAfter; +import com.rebuild.server.helper.setup.InstallState; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,7 +38,7 @@ * @author devezhao * @since 10/13/2018 */ -public class ServerListener extends ContextCleanupListener implements InstallAfter { +public class ServerListener extends ContextCleanupListener implements InstallState { private static final Log LOG = LogFactory.getLog(ServerListener.class); diff --git a/src/main/java/com/rebuild/server/ServerStatus.java b/src/main/java/com/rebuild/server/ServerStatus.java index 794e1e4ef..8b8c56714 100644 --- a/src/main/java/com/rebuild/server/ServerStatus.java +++ b/src/main/java/com/rebuild/server/ServerStatus.java @@ -127,7 +127,7 @@ protected static Status checkCreateFile() { if (!test.exists()) { return Status.error(name, "Couldn't create file in temp Directory"); } else { - test.delete(); + FileUtils.deleteQuietly(test); } } catch (Exception ex) { diff --git a/src/main/java/com/rebuild/server/business/approval/ApprovalProcessor.java b/src/main/java/com/rebuild/server/business/approval/ApprovalProcessor.java index abcf21fe3..973f96ad9 100644 --- a/src/main/java/com/rebuild/server/business/approval/ApprovalProcessor.java +++ b/src/main/java/com/rebuild/server/business/approval/ApprovalProcessor.java @@ -124,7 +124,25 @@ public boolean submit(JSONObject selectNextUsers) throws ApprovalException { * @throws ApprovalException */ public void approve(ID approver, ApprovalState state, String remark, JSONObject selectNextUsers) throws ApprovalException { - Integer currentState = (Integer) Application.getQueryFactory().unique(this.record, EntityHelper.ApprovalState)[0]; + approve(approver, state, remark, selectNextUsers, null); + } + + /** + * 审批 + * + * @param approver + * @param state + * @param remark + * @param selectNextUsers + * @param addedData + * @throws ApprovalException + */ + public void approve(ID approver, ApprovalState state, String remark, JSONObject selectNextUsers, Record addedData) throws ApprovalException { + Object[] o = Application.getQueryFactory().unique(this.record, EntityHelper.ApprovalState); + if (o == null) { + throw new NoRecordFoundException("审批记录不存在或你无权查看"); + } + Integer currentState = (Integer) o[0]; if (currentState != ApprovalState.PROCESSING.getState()) { throw new ApprovalException("当前记录已经" + (currentState == ApprovalState.APPROVED.getState() ? "审批完成" : "驳回审批")); } @@ -152,28 +170,28 @@ public void approve(ID approver, ApprovalState state, String remark, JSONObject Set ccs = nextNodes.getCcUsers(this.getUser(), this.record, selectNextUsers); Set nextApprovers = null; String nextNode = null; - if (!nextNodes.isLastStep()) { + + if (state == ApprovalState.APPROVED && !nextNodes.isLastStep()) { nextApprovers = nextNodes.getApproveUsers(this.getUser(), this.record, selectNextUsers); if (nextApprovers.isEmpty()) { throw new ApprovalException("无下一步审批人可用，请联系管理员配置"); } - + FlowNode nextApprovalNode = nextNodes.getApprovalNode(); nextNode = nextApprovalNode != null ? nextApprovalNode.getNodeId() : null; } - + FlowNode currentNode = getFlowParser().getNode((String) stepApprover[2]); Application.getBean(ApprovalStepService.class) - .txApprove(approvedStep, currentNode.getSignMode(), ccs, nextApprovers, nextNode); + .txApprove(approvedStep, currentNode.getSignMode(), ccs, nextApprovers, nextNode, addedData); } /** * 撤销 * - * @param remark * @throws ApprovalException */ - public void cancel(String remark) throws ApprovalException { + public void cancel() throws ApprovalException { Object[] state = Application.getQueryFactory().unique(this.record, EntityHelper.ApprovalState, EntityHelper.ApprovalId); Integer currentState = (Integer) state[0]; if ((Integer) state[0] != ApprovalState.PROCESSING.getState()) { @@ -183,6 +201,13 @@ public void cancel(String remark) throws ApprovalException { Application.getBean(ApprovalStepService.class).txCancel(this.record, (ID) state[1], getCurrentNodeId()); } + /** + * @return + */ + public FlowNode getCurrentNode() { + return getFlowParser().getNode(getCurrentNodeId()); + } + /** * @return * @see #getNextNode(String) diff --git a/src/main/java/com/rebuild/server/business/approval/FlowNode.java b/src/main/java/com/rebuild/server/business/approval/FlowNode.java index 7785ef92f..6e7fd8294 100644 --- a/src/main/java/com/rebuild/server/business/approval/FlowNode.java +++ b/src/main/java/com/rebuild/server/business/approval/FlowNode.java @@ -136,7 +136,7 @@ public Set getSpecUsers(ID operator, ID record) { if (userDefs == null || userDefs.isEmpty()) { return Collections.emptySet(); } - + String userType = userDefs.getString(0); if (USER_SELF.equalsIgnoreCase(userType)) { Set users = new HashSet<>(); @@ -171,7 +171,27 @@ public int hashCode() { @Override public boolean equals(Object obj) { - return obj.hashCode() == this.hashCode(); + if (obj == null) return false; + return obj instanceof FlowNode && obj.hashCode() == this.hashCode(); + } + + /** + * 节点可编辑字段 + * + * @return + */ + public JSONArray getEditableFields() { + JSONArray editableFields = dataMap == null ? null : dataMap.getJSONArray("editableFields"); + if (editableFields == null) { + return null; + } + + editableFields = (JSONArray) JSONUtils.clone(editableFields); + for (Object o : editableFields) { + JSONObject field = (JSONObject) o; + field.put("nullable", !((Boolean) field.remove("notNull"))); + } + return editableFields; } // -- diff --git a/src/main/java/com/rebuild/server/business/approval/FlowNodeGroup.java b/src/main/java/com/rebuild/server/business/approval/FlowNodeGroup.java index 234cf1002..0d9122e5f 100644 --- a/src/main/java/com/rebuild/server/business/approval/FlowNodeGroup.java +++ b/src/main/java/com/rebuild/server/business/approval/FlowNodeGroup.java @@ -21,25 +21,31 @@ import cn.devezhao.persist4j.engine.ID; import com.alibaba.fastjson.JSONObject; import com.rebuild.server.service.bizz.UserHelper; +import org.springframework.util.Assert; import java.util.HashSet; import java.util.Set; /** + * 1个审批节点+N个抄送节点 + * * @author devezhao zhaofang123@gmail.com * @since 2019/07/11 + * @see FlowNode */ public class FlowNodeGroup { private Set nodes = new HashSet<>(); protected FlowNodeGroup() { + super(); } /** * @param node */ public void addNode(FlowNode node) { + Assert.isNull(getApprovalNode(), "Cannot add multiple approved nodes"); nodes.add(node); } @@ -59,12 +65,8 @@ public boolean allowSelfSelectingCc() { * @return */ public boolean allowSelfSelectingApprover() { - for (FlowNode node : nodes) { - if (node.getType().equals(FlowNode.TYPE_APPROVER) && node.allowSelfSelecting()) { - return true; - } - } - return false; + FlowNode node = getApprovalNode(); + return node != null && node.allowSelfSelecting(); } /** @@ -95,12 +97,12 @@ public Set getCcUsers(ID operator, ID recordId, JSONObject selectUsers) { */ public Set getApproveUsers(ID operator, ID recordId, JSONObject selectUsers) { Set users = new HashSet<>(); - for (FlowNode node : nodes) { - if (FlowNode.TYPE_APPROVER.equals(node.getType())) { - users.addAll(node.getSpecUsers(operator, recordId)); - } + + FlowNode node = getApprovalNode(); + if (node != null) { + users.addAll(node.getSpecUsers(operator, recordId)); } - + if (selectUsers != null) { users.addAll(UserHelper.parseUsers(selectUsers.getJSONArray("selectApprovers"), recordId)); } @@ -114,12 +116,7 @@ public Set getApproveUsers(ID operator, ID recordId, JSONObject selectUsers) */ public boolean isLastStep() { // TODO 对审批最后一步加强判断 - for (FlowNode node : nodes) { - if (node.getType().equals(FlowNode.TYPE_APPROVER)) { - return false; - } - } - return true; + return getApprovalNode() == null; } /** @@ -130,6 +127,8 @@ public boolean isValid() { } /** + * 获取审批节点 + * * @return */ public FlowNode getApprovalNode() { diff --git a/src/main/java/com/rebuild/server/business/approval/FormBuilder.java b/src/main/java/com/rebuild/server/business/approval/FormBuilder.java new file mode 100644 index 000000000..07255796d --- /dev/null +++ b/src/main/java/com/rebuild/server/business/approval/FormBuilder.java @@ -0,0 +1,45 @@ +/* +rebuild - Building your business-systems freely. +Copyright (C) 2020 devezhao + +rebuild is dual-licensed under commercial and open source licenses (GPLv3). +For more information, please see +*/ + +package com.rebuild.server.business.approval; + +import cn.devezhao.persist4j.Record; +import cn.devezhao.persist4j.engine.ID; +import com.alibaba.fastjson.JSONArray; +import com.rebuild.server.configuration.portals.FormsBuilder; + +/** + * 审批可修改字段表单 + * + * @author devezhao + * @since 2020/2/5 + */ +public class FormBuilder { + + final private ID record; + final private ID user; + + /** + * @param record + * @param user + */ + public FormBuilder(ID record, ID user) { + this.record = record; + this.user = user; + } + + /** + * @param elements + * @return + */ + public JSONArray build(JSONArray elements) { + Record data = FormsBuilder.instance.findRecord(record, user, elements); + FormsBuilder.instance.buildModelElements(elements, data.getEntity(), data, user); + return elements; + } +} diff --git a/src/main/java/com/rebuild/server/business/charts/TreeBuilder.java b/src/main/java/com/rebuild/server/business/charts/TreeBuilder.java index b561c6bce..433747f15 100644 --- a/src/main/java/com/rebuild/server/business/charts/TreeBuilder.java +++ b/src/main/java/com/rebuild/server/business/charts/TreeBuilder.java @@ -66,6 +66,10 @@ public JSON toJSON() { for (Object[] o : rows) { double value = (double) o[lastIndex]; + // 排除0，因为0在树图中本就不显示 + if (value <= 0d) { + continue; + } String name = (String) o[0]; Item L1 = thereAll.get(name); @@ -85,7 +89,7 @@ public JSON toJSON() { } } - Item L3 = null; + Item L3; if (lastIndex > 2) { name = name + NAME_SPEA + o[2]; L3 = thereAll.get(name); @@ -102,7 +106,8 @@ public JSON toJSON() { } return treeJson; } - + + // 单项 private class Item { private Item parent; private List children = new ArrayList<>(); @@ -123,9 +128,8 @@ private Item(String name, double value, Item parent) { protected String getName() { return name; -// String[] names = name.split(NAME_SPEA); -// return names[names.length - 1]; } + protected double getValue() { if (this.children.isEmpty()) { return value; diff --git a/src/main/java/com/rebuild/server/business/charts/builtin/ApprovalList.java b/src/main/java/com/rebuild/server/business/charts/builtin/ApprovalList.java index 938e75c60..d55f84a68 100644 --- a/src/main/java/com/rebuild/server/business/charts/builtin/ApprovalList.java +++ b/src/main/java/com/rebuild/server/business/charts/builtin/ApprovalList.java @@ -20,6 +20,7 @@ import cn.devezhao.commons.ObjectUtils; import cn.devezhao.momentjava.Moment; +import cn.devezhao.persist4j.Entity; import cn.devezhao.persist4j.engine.ID; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -30,6 +31,7 @@ import com.rebuild.server.configuration.portals.FieldValueWrapper; import com.rebuild.server.helper.cache.NoRecordFoundException; import com.rebuild.server.metadata.MetadataHelper; +import com.rebuild.server.metadata.entity.EasyMeta; import com.rebuild.server.service.bizz.UserHelper; import com.rebuild.utils.JSONUtils; @@ -73,7 +75,8 @@ public JSONObject getChartConfig() { @Override public JSON build() { final int viewState = ObjectUtils.toInt(getExtraParams().get("state"), ApprovalState.DRAFT.getState()); - final String baseWhere = "where isCanceled = 'F' and isWaiting = 'F' and approver = ? and approvalId <> '' and approvalId is not null and "; + final String baseWhere = "where isCanceled = 'F' and isWaiting = 'F' and approver = ?" + + " and approvalId <> '' and recordId <> '' and "; Object[][] array = Application.createQueryNoFilter( "select createdBy,modifiedOn,recordId,approvalId from RobotApprovalStep " + @@ -101,6 +104,7 @@ public JSON build() { continue; } + Entity entity = MetadataHelper.getEntity(recordId.getEntityCode()); ID s = ApprovalHelper.getSubmitter(recordId, (ID) o[3]); rearray.add(new Object[] { s, @@ -109,7 +113,8 @@ public JSON build() { o[2], label, o[3], - MetadataHelper.getEntityLabel(recordId) + EasyMeta.getLabel(entity), + entity.getName() }); } diff --git a/src/main/java/com/rebuild/server/business/dataimport/DataFileParser.java b/src/main/java/com/rebuild/server/business/dataimport/DataFileParser.java index 54116297c..6f029741e 100644 --- a/src/main/java/com/rebuild/server/business/dataimport/DataFileParser.java +++ b/src/main/java/com/rebuild/server/business/dataimport/DataFileParser.java @@ -41,8 +41,7 @@ public class DataFileParser { * @param sourceFile */ public DataFileParser(File sourceFile) { - this.sourceFile = sourceFile; - this.encoding = "GBK"; + this(sourceFile, "utf-8"); } /** diff --git a/src/main/java/com/rebuild/server/business/datareport/ReportGenerator.java b/src/main/java/com/rebuild/server/business/datareport/ReportGenerator.java index 8f0ba2a5a..c4b390e7c 100644 --- a/src/main/java/com/rebuild/server/business/datareport/ReportGenerator.java +++ b/src/main/java/com/rebuild/server/business/datareport/ReportGenerator.java @@ -64,7 +64,8 @@ public class ReportGenerator extends SetUser { * @param record */ public ReportGenerator(ID reportId, ID record) { - this(DataReportManager.instance.getTemplateFile(MetadataHelper.getEntity(record.getEntityCode()), reportId), record); + this(DataReportManager.instance.getTemplateFile(MetadataHelper.getEntity(record.getEntityCode()), + reportId), record); } /** diff --git a/src/main/java/com/rebuild/server/business/datareport/TemplateExtractor.java b/src/main/java/com/rebuild/server/business/datareport/TemplateExtractor.java index 7eed90316..d3d0aa924 100644 --- a/src/main/java/com/rebuild/server/business/datareport/TemplateExtractor.java +++ b/src/main/java/com/rebuild/server/business/datareport/TemplateExtractor.java @@ -63,10 +63,10 @@ public TemplateExtractor(File template) { public Set extractVars(boolean matchsAny) { List rows = CommonsUtils.readExcel(this.template); - String regex = "\\$\\{[0-9a-zA-Z\\.]+\\}"; + String regex = "\\$\\{[0-9a-zA-Z_.]+}"; // 能够匹配中文 if (matchsAny) { - regex = "\\$\\{.+\\}"; + regex = "\\$\\{.+}"; } // jxls 不支持中文变量 @@ -131,7 +131,7 @@ protected String getRealField(Entity entity, String fieldPath) { String[] paths = fieldPath.split("\\."); List realPaths = new ArrayList<>(); - Field lastField = null; + Field lastField; Entity father = entity; for (String field : paths) { if (father == null) { diff --git a/src/main/java/com/rebuild/server/business/feeds/FeedsHelper.java b/src/main/java/com/rebuild/server/business/feeds/FeedsHelper.java index b02d9189f..44cf8a419 100644 --- a/src/main/java/com/rebuild/server/business/feeds/FeedsHelper.java +++ b/src/main/java/com/rebuild/server/business/feeds/FeedsHelper.java @@ -19,17 +19,22 @@ package com.rebuild.server.business.feeds; import cn.devezhao.bizz.security.member.Team; +import cn.devezhao.commons.CodecUtils; import cn.devezhao.commons.ObjectUtils; import cn.devezhao.persist4j.engine.ID; import com.rebuild.server.Application; import com.rebuild.server.metadata.EntityHelper; import com.rebuild.server.service.bizz.UserHelper; +import com.rebuild.server.service.notification.MessageBuilder; +import com.rebuild.utils.AppUtils; import org.apache.commons.lang.StringUtils; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * @author devezhao @@ -163,4 +168,37 @@ public static boolean checkReadable(ID feedsOrComment, ID user) { } return false; } + + /** + * URL 提取 + */ + public static final Pattern URL_PATTERN = Pattern.compile("((www|https?:\\/\\/)[-a-zA-Z0-9+&@#/%?=~_|!:,.;]{5,300})"); + + /** + * 格式化动态内容 + * + * @param content + * @return + */ + public static String formatContent(String content) { + Matcher urlMatcher = URL_PATTERN.matcher(content); + while (urlMatcher.find()) { + String url = urlMatcher.group(); + String safeUrl = AppUtils.getContextPath() + "/commons/url-safe?url=" + CodecUtils.urlEncode(url); + content = content.replace(url, + String.format("%s", safeUrl, url)); + } + + Matcher atMatcher = MessageBuilder.AT_PATTERN.matcher(content); + while (atMatcher.find()) { + String at = atMatcher.group(); + ID user = ID.valueOf(at.substring(1)); + if (user.getEntityCode() == EntityHelper.User && Application.getUserStore().existsUser(user)) { + String fullName = Application.getUserStore().getUser(user).getFullName(); + content = content.replace(at, String.format("@%s", user, fullName)); + } + } + + return content; + } } diff --git a/src/main/java/com/rebuild/server/business/feeds/FeedsType.java b/src/main/java/com/rebuild/server/business/feeds/FeedsType.java index d2141a4d0..54b8da6b3 100644 --- a/src/main/java/com/rebuild/server/business/feeds/FeedsType.java +++ b/src/main/java/com/rebuild/server/business/feeds/FeedsType.java @@ -28,6 +28,7 @@ public enum FeedsType { ACTIVITY(1, "动态"), FOLLOWUP(2, "跟进"), + ANNOUNCEMENT(3, "公告"), ; diff --git a/src/main/java/com/rebuild/server/business/recyclebin/RecycleBinCleanerJob.java b/src/main/java/com/rebuild/server/business/recyclebin/RecycleBinCleanerJob.java index c4a5d3d4e..ec825d9fb 100644 --- a/src/main/java/com/rebuild/server/business/recyclebin/RecycleBinCleanerJob.java +++ b/src/main/java/com/rebuild/server/business/recyclebin/RecycleBinCleanerJob.java @@ -46,8 +46,9 @@ public class RecycleBinCleanerJob extends QuartzJobBean { @Override protected void executeInternal(JobExecutionContext context) throws JobExecutionException { - int keepingDays = SysConfiguration.getInt(ConfigurableItem.RecycleBinKeepingDays); + final int keepingDays = getKeepingDays(); LOG.info("RecycleBinCleanerJob running ... " + keepingDays); + // Keep forever if (keepingDays > 9999) { return; } @@ -61,5 +62,16 @@ protected void executeInternal(JobExecutionContext context) throws JobExecutionE CalendarUtils.getUTCDateFormat().format(before)); int del = Application.getSQLExecutor().execute(delSql, 120); LOG.warn("RecycleBin cleaned : " + del); + + // TODO 相关引用也在此时一并删除，因为记录已经彻底删除了 + } + + /** + * 回收站保留天数。小于等于 0 表示未开启回收站，大于等于 9999 表示永远保留 + * + * @return + */ + public static int getKeepingDays() { + return SysConfiguration.getInt(ConfigurableItem.RecycleBinKeepingDays); } } diff --git a/src/main/java/com/rebuild/server/business/recyclebin/RecycleRestore.java b/src/main/java/com/rebuild/server/business/recyclebin/RecycleRestore.java index 06606d198..e50480ae0 100644 --- a/src/main/java/com/rebuild/server/business/recyclebin/RecycleRestore.java +++ b/src/main/java/com/rebuild/server/business/recyclebin/RecycleRestore.java @@ -27,7 +27,9 @@ import com.alibaba.fastjson.JSONObject; import com.rebuild.server.Application; import com.rebuild.server.RebuildException; +import com.rebuild.server.metadata.EntityHelper; import com.rebuild.server.metadata.MetadataHelper; +import com.rebuild.server.service.OperatingContext; import com.rebuild.server.service.TransactionManual; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -68,7 +70,7 @@ public int restore() { /** * 恢复数据 * - * @param cascade 级联恢复 + * @param cascade 恢复关联删除的数据 * @return */ public int restore(boolean cascade) { @@ -84,9 +86,9 @@ public int restore(boolean cascade) { final List recycleIds = new ArrayList<>(); - final List willRestores = new ArrayList<>(toRecord(JSON.parseObject((String) main[0]), (ID) main[1])); + final List willRestores = new ArrayList<>(conver2Record(JSON.parseObject((String) main[0]), (ID) main[1])); if (willRestores.isEmpty()) { - throw new RebuildException("记录的所属实体不存在"); + throw new RebuildException("记录实体已经不存在"); } recycleIds.add((ID) main[2]); @@ -96,7 +98,7 @@ public int restore(boolean cascade) { .setParameter(1, main[1]) .array(); for (Object[] o : array) { - List records = toRecord(JSON.parseObject((String) o[0]), (ID) o[1]); + List records = conver2Record(JSON.parseObject((String) o[0]), (ID) o[1]); if (!records.isEmpty()) { willRestores.addAll(records); recycleIds.add((ID) o[2]); @@ -114,13 +116,12 @@ public int restore(boolean cascade) { String primaryName = r.getEntity().getPrimaryField().getName(); ID primaryId = (ID) r.removeValue(primaryName); PM.saveInternal(r, primaryId); + restoreAttachment(PM, primaryId); - // 非明细才计数 - if (r.getEntity().getMasterEntity() == null) { - restored++; - } + restored++; } + // 从回收站删除 PM.delete(recycleIds.toArray(new ID[0])); TransactionManual.commit(status); @@ -133,11 +134,13 @@ public int restore(boolean cascade) { } /** + * 转换成 Record 对象，返回多条是可能存在明细 + * * @param content * @param recordId * @return */ - private List toRecord(JSONObject content, ID recordId) { + private List conver2Record(JSONObject content, ID recordId) { if (!MetadataHelper.containsEntity(recordId.getEntityCode())) { return Collections.emptyList(); } @@ -162,4 +165,21 @@ private List toRecord(JSONObject content, ID recordId) { } return records; } + + /** + * @param PM + * @param recordId + * @see com.rebuild.server.service.base.AttachmentAwareObserver#onDelete(OperatingContext) + */ + private void restoreAttachment(PersistManagerImpl PM, ID recordId) { + Object[][] array = Application.createQueryNoFilter( + "select attachmentId from Attachment where relatedRecord = ?") + .setParameter(1, recordId) + .array(); + for (Object[] o : array) { + Record u = EntityHelper.forUpdate((ID) o[0], null, false); + u.setBoolean(EntityHelper.IsDeleted, false); + PM.update(u); + } + } } diff --git a/src/main/java/com/rebuild/server/business/trigger/ActionType.java b/src/main/java/com/rebuild/server/business/trigger/ActionType.java index b90fb0624..7b6f7673e 100644 --- a/src/main/java/com/rebuild/server/business/trigger/ActionType.java +++ b/src/main/java/com/rebuild/server/business/trigger/ActionType.java @@ -21,6 +21,7 @@ import com.rebuild.server.business.trigger.impl.AutoAssign; import com.rebuild.server.business.trigger.impl.AutoShare; import com.rebuild.server.business.trigger.impl.FieldAggregation; +import com.rebuild.server.business.trigger.impl.FieldWriteback; import com.rebuild.server.business.trigger.impl.SendNotification; import org.springframework.cglib.core.ReflectUtils; @@ -35,8 +36,8 @@ public enum ActionType { FIELDAGGREGATION("数据聚合", FieldAggregation.class), - SENDNOTIFICATION("发送通知 (内部消息)", SendNotification.class), - + FIELDWRITEBACK("数据回写", FieldWriteback.class), + SENDNOTIFICATION("发送通知", SendNotification.class), AUTOSHARE("自动共享", AutoShare.class), AUTOASSIGN("自动分派", AutoAssign.class), @@ -70,7 +71,7 @@ public Class getActionClazz() { * @throws NoSuchMethodException */ public TriggerAction newInstance(ActionContext context) throws NoSuchMethodException { - Constructor c = getActionClazz().getConstructor(ActionContext.class); + Constructor c = getActionClazz().getConstructor(ActionContext.class); return (TriggerAction) ReflectUtils.newInstance(c, new Object[] { context }); } } diff --git a/src/main/java/com/rebuild/server/business/trigger/RobotTriggerObserver.java b/src/main/java/com/rebuild/server/business/trigger/RobotTriggerObserver.java index 317ac0297..6e00437cd 100644 --- a/src/main/java/com/rebuild/server/business/trigger/RobotTriggerObserver.java +++ b/src/main/java/com/rebuild/server/business/trigger/RobotTriggerObserver.java @@ -78,6 +78,10 @@ protected void execAction(OperatingContext context, TriggerWhen when) { if (cleanSource) { setTriggerSource(context); } + // 自己触发自己，避免无限执行 + else if (getTriggerSource().getAnyRecord().getPrimary().equals(context.getAnyRecord().getPrimary())) { + return; + } final ID currentUser = Application.getCurrentUser(); try { diff --git a/src/main/java/com/rebuild/server/business/trigger/impl/AggregationEvaluator.java b/src/main/java/com/rebuild/server/business/trigger/impl/AggregationEvaluator.java new file mode 100644 index 000000000..8250a8e9b --- /dev/null +++ b/src/main/java/com/rebuild/server/business/trigger/impl/AggregationEvaluator.java @@ -0,0 +1,162 @@ +/* +rebuild - Building your business-systems freely. +Copyright (C) 2018-2020 devezhao + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +package com.rebuild.server.business.trigger.impl; + +import cn.devezhao.persist4j.Entity; +import cn.devezhao.persist4j.engine.ID; +import com.alibaba.fastjson.JSONObject; +import com.googlecode.aviator.AviatorEvaluator; +import com.googlecode.aviator.AviatorEvaluatorInstance; +import com.googlecode.aviator.Options; +import com.googlecode.aviator.exception.ExpressionSyntaxErrorException; +import com.rebuild.server.Application; +import com.rebuild.server.metadata.MetadataHelper; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * 归集计算 + * + * @author devezhao + * @since 2020/1/16 + */ +public class AggregationEvaluator { + + private static final Log LOG = LogFactory.getLog(FieldAggregation.class); + + private static final Pattern FIELD_PATT = Pattern.compile("\\{(.*?)}"); + + private static AviatorEvaluatorInstance AVIATOR = AviatorEvaluator.newInstance(); + static { + // 强制使用 BigDecimal/BigInteger 运算 + AVIATOR.setOption(Options.ALWAYS_PARSE_FLOATING_POINT_NUMBER_INTO_DECIMAL, true); + } + + final private Entity sourceEntity; + final private JSONObject item; + final private String followSourceField; + final private String filterSql; + + /** + * @param item + * @param sourceEntity + * @param followSourceField + * @param filterSql + */ + protected AggregationEvaluator(JSONObject item, Entity sourceEntity, String followSourceField, String filterSql) { + this.sourceEntity = sourceEntity; + this.item = item; + this.followSourceField = followSourceField; + this.filterSql = filterSql; + } + + /** + * @param triggerRecord + * @return + */ + public Object eval(ID triggerRecord) { + String calcMode = item.getString("calcMode"); + if ("FORMULA".equalsIgnoreCase(calcMode)) { + return evalFormula(triggerRecord); + } + + String sourceField = item.getString("sourceField"); + if (MetadataHelper.getLastJoinField(sourceEntity, sourceField) == null) { + return null; + } + + String funcAndField = String.format("%s(%s)", calcMode, sourceField); + String sql = String.format("select %s from %s where %s = ?", + funcAndField, sourceEntity.getName(), followSourceField); + if (filterSql != null) { + sql += " and " + filterSql; + } + + Object[] o = Application.createQueryNoFilter(sql) + .setParameter(1, triggerRecord) + .unique(); + return o == null || o[0] == null ? 0 : o[0]; + } + + /** + * @param triggerRecord + * @return + */ + private Object evalFormula(ID triggerRecord) { + String formula = item.getString("sourceFormula"); + Matcher m = FIELD_PATT.matcher(formula); + + final List fields = new ArrayList<>(); + while (m.find()) { + String[] fieldAndFunc = m.group(1).split("\\$\\$\\$\\$"); + if (MetadataHelper.getLastJoinField(sourceEntity, fieldAndFunc[0]) != null) { + fields.add(fieldAndFunc); + } + } + if (fields.isEmpty()) { + return null; + } + + StringBuilder sql = new StringBuilder("select "); + for (String[] field : fields) { + if (field.length == 2) { + sql.append(String.format("%s(%s)", field[1], field[0])); + } else { + sql.append(field[0]); + } + sql.append(','); + } + sql.deleteCharAt(sql.length() - 1) + .append(" from ").append(sourceEntity.getName()) + .append(" where ").append(followSourceField).append(" = ?"); + if (filterSql != null) { + sql.append(" and ").append(filterSql); + } + + Object[] o = Application.createQueryNoFilter(sql.toString()) + .setParameter(1, triggerRecord) + .unique(); + if (o == null) { + return null; + } + + String newFormual = formula.toUpperCase() + .replace("×", "*") + .replace("÷", "/"); + for (int i = 0; i < fields.size(); i++) { + String[] field = fields.get(i); + Object v = o[i] == null ? "0" : o[i]; + String replace = "{" + StringUtils.join(field, "$$$$") + "}"; + newFormual = newFormual.replace(replace.toUpperCase(), v.toString()); + } + + try { + return AVIATOR.execute(newFormual); + } catch (ExpressionSyntaxErrorException ex) { + LOG.error("Bad formula : " + formula + " > " + newFormual, ex); + return null; + } + } +} diff --git a/src/main/java/com/rebuild/server/business/trigger/impl/CompatibleValueConversion.java b/src/main/java/com/rebuild/server/business/trigger/impl/CompatibleValueConversion.java new file mode 100644 index 000000000..0c44186e1 --- /dev/null +++ b/src/main/java/com/rebuild/server/business/trigger/impl/CompatibleValueConversion.java @@ -0,0 +1,134 @@ +/* +rebuild - Building your business-systems freely. +Copyright (C) 2020 devezhao + +rebuild is dual-licensed under commercial and open source licenses (GPLv3). +For more information, please see +*/ + +package com.rebuild.server.business.trigger.impl; + +import cn.devezhao.commons.CalendarUtils; +import cn.devezhao.persist4j.Field; +import cn.devezhao.persist4j.engine.ID; +import cn.devezhao.persist4j.engine.NullValue; +import com.rebuild.server.configuration.portals.FieldValueWrapper; +import com.rebuild.server.configuration.portals.PickListManager; +import com.rebuild.server.metadata.entity.DisplayType; +import com.rebuild.server.metadata.entity.EasyMeta; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * 字段值兼容转换 + * + * @author ZHAO + * @since 2020/2/8 + */ +public class CompatibleValueConversion { + + private static final Log LOG = LogFactory.getLog(CompatibleValueConversion.class); + + final private Field source; + final private Field target; + + /** + * @param sourceField + * @param targetField + */ + public CompatibleValueConversion(Field sourceField, Field targetField) { + this.source = sourceField; + this.target = targetField; + } + + /** + * @param sourceValue + * @return + */ + public Object conversion(Object sourceValue) { + return conversion(sourceValue, false); + } + + /** + * @param sourceValue + * @param mixValue + * @return + */ + public Object conversion(Object sourceValue, boolean mixValue) { + if (sourceValue == null || NullValue.is(sourceValue)) { + return null; + } + + final EasyMeta sourceField = EasyMeta.valueOf(source); + final DisplayType sourceType = sourceField.getDisplayType(); + final DisplayType targetType = EasyMeta.getDisplayType(target); + final boolean is2Text = targetType == DisplayType.TEXT || targetType == DisplayType.NTEXT; + + Object compatibleValue = sourceValue; + if (sourceType == DisplayType.ID) { + if (is2Text) { + compatibleValue = sourceValue.toString().toUpperCase(); + } + } + else if (sourceType == DisplayType.REFERENCE) { + if (is2Text) { + compatibleValue = FieldValueWrapper.getLabelNotry((ID) sourceValue); + } else if (mixValue) { + String text = FieldValueWrapper.getLabelNotry((ID) sourceValue); + compatibleValue = FieldValueWrapper.wrapMixValue((ID) sourceValue, text); + } + } + else if (sourceType == DisplayType.CLASSIFICATION) { + if (is2Text) { + compatibleValue = FieldValueWrapper.instance.wrapFieldValue(sourceValue, sourceField, true); + } else if (mixValue) { + compatibleValue = FieldValueWrapper.instance.wrapFieldValue(sourceValue, sourceField, false); + } + } + else if (sourceType == DisplayType.PICKLIST) { + String text = FieldValueWrapper.instance.wrapPickList(sourceValue, sourceField); + if (is2Text) { + compatibleValue = text; + } else { + // 转换 PickList ID + compatibleValue = PickListManager.instance.findItemByLabel(text, target); + if (compatibleValue == null) { + LOG.warn("Cannot find value of PickList : " + text + " << " + target); + } + } + } + else if (sourceType == DisplayType.STATE) { + if (is2Text) { + compatibleValue = FieldValueWrapper.instance.wrapState(sourceValue, sourceField); + } + } + else if (sourceType == DisplayType.DATETIME && targetType == DisplayType.DATE) { + String datetime = FieldValueWrapper.instance.wrapDatetime(sourceValue, sourceField); + compatibleValue = datetime.split(" ")[0]; + if (!(is2Text || mixValue)) { + compatibleValue = CalendarUtils.parse((String) compatibleValue); + } + } + else if (sourceType == DisplayType.DATE && targetType == DisplayType.DATETIME) { + String date = FieldValueWrapper.instance.wrapDate(sourceValue, sourceField); + if (date.length() == 4) { // YYYY + compatibleValue = date + "01-01 00:00:00"; + } else if (date.length() == 7) { // YYYY-MM + compatibleValue = date + "-01 00:00:00"; + } else { + compatibleValue = date + " 00:00:00"; + } + + if (!(is2Text || mixValue)) { + compatibleValue = CalendarUtils.parse((String) compatibleValue); + } + } + else if (is2Text) { + compatibleValue = FieldValueWrapper.instance.wrapFieldValue(sourceValue, sourceField); + } + // 整数/浮点数无需转换，因为持久层框架已有兼容处理 + + return compatibleValue; + } + +} diff --git a/src/main/java/com/rebuild/server/business/trigger/impl/FieldAggregation.java b/src/main/java/com/rebuild/server/business/trigger/impl/FieldAggregation.java index ae3ad0e2f..08c5cda1d 100644 --- a/src/main/java/com/rebuild/server/business/trigger/impl/FieldAggregation.java +++ b/src/main/java/com/rebuild/server/business/trigger/impl/FieldAggregation.java @@ -51,53 +51,69 @@ * @see com.rebuild.server.business.trigger.RobotTriggerObserver */ public class FieldAggregation implements TriggerAction { - - private static final Log LOG = LogFactory.getLog(FieldAggregation.class); - - // 此触发器可能产生连锁反应 - // 如触发器 A 调用 B，而 B 又调用了 C ... 以此类推。此处记录其深度 - private static final ThreadLocal CALL_CHAIN_DEPTH = new ThreadLocal<>(); - // 最大调用深度 - private static final int MAX_DEPTH = 5; - - final private ActionContext context; - - // 允许无权限更新 - private boolean allowNoPermissionUpdate; - - private Entity sourceEntity; - private Entity targetEntity; - - private String followSourceField; - private ID targetRecordId; - - public FieldAggregation(ActionContext context) { - this(context, Boolean.TRUE); - } - public FieldAggregation(ActionContext context, boolean allowNoPermissionUpdate) { - this.context = context; - this.allowNoPermissionUpdate = allowNoPermissionUpdate; + private static final Log LOG = LogFactory.getLog(FieldAggregation.class); + + /** + * 归集到自己 + */ + public static final String SOURCE_SELF = "$PRIMARY$"; + + final protected ActionContext context; + // 允许无权限更新 + final private boolean allowNoPermissionUpdate; + // 最大触发链深度 + final private int maxTriggerDepth; + + // 此触发器可能产生连锁反应 + // 如触发器 A 调用 B，而 B 又调用了 C ... 以此类推。此处记录其深度 + private static final ThreadLocal TRIGGER_CHAIN_DEPTH = new ThreadLocal<>(); + + // 源实体 + protected Entity sourceEntity; + // 目标实体 + protected Entity targetEntity; + // 关联字段 + protected String followSourceField; + // 触发记录 + protected ID targetRecordId; + + /** + * @param context + */ + public FieldAggregation(ActionContext context) { + this(context, Boolean.TRUE, 5); } - + + /** + * @param context + * @param allowNoPermissionUpdate + * @param maxTriggerDepth + */ + protected FieldAggregation(ActionContext context, boolean allowNoPermissionUpdate, int maxTriggerDepth) { + this.context = context; + this.allowNoPermissionUpdate = allowNoPermissionUpdate; + this.maxTriggerDepth = maxTriggerDepth; + } + @Override public ActionType getType() { return ActionType.FIELDAGGREGATION; } - - @Override - public boolean isUsableSourceEntity(int entityCode) { - return true; - } - - @Override + + @Override + public boolean isUsableSourceEntity(int entityCode) { + return true; + } + + @Override public void execute(OperatingContext operatingContext) throws TriggerException { - Integer depth = CALL_CHAIN_DEPTH.get(); + Integer depth = TRIGGER_CHAIN_DEPTH.get(); if (depth == null) { depth = 1; } - if (depth > MAX_DEPTH) { - throw new TriggerException("Too many call-chain with triggers : " + depth); + if (depth > maxTriggerDepth) { + throw new TriggerException("Too many trigger-chain with triggers : " + depth); } this.prepare(operatingContext); @@ -116,56 +132,54 @@ public void execute(OperatingContext operatingContext) throws TriggerException { // 聚合数据过滤 JSONObject dataFilter = ((JSONObject) context.getActionContent()).getJSONObject("dataFilter"); - String dataFilterWhere = null; + String dataFilterSql = null; if (dataFilter != null && !dataFilter.isEmpty()) { - dataFilterWhere = new AdvFilterParser(dataFilter).toSqlWhere(); + dataFilterSql = new AdvFilterParser(dataFilter).toSqlWhere(); } - // 更新目标 - Record targetRecord = EntityHelper.forUpdate(targetRecordId, UserService.SYSTEM_USER, false); - - JSONArray items = ((JSONObject) context.getActionContent()).getJSONArray("items"); - for (Object o : items) { - JSONObject item = (JSONObject) o; - String sourceField = item.getString("sourceField"); - String targetField = item.getString("targetField"); - if (!MetadataHelper.checkAndWarnField(sourceEntity, sourceField) - || !MetadataHelper.checkAndWarnField(targetEntity, targetField)) { - continue; - } - - // 直接利用 SQL 函数计算结果 - String calcMode = item.getString("calcMode"); - String calcField = "COUNT".equalsIgnoreCase(calcMode) ? sourceEntity.getPrimaryField().getName() : sourceField; - - String sql = String.format("select %s(%s) from %s where %s = ?", - calcMode, calcField, sourceEntity.getName(), followSourceField); - if (dataFilterWhere != null) { - sql += " and " + dataFilterWhere; - } + Record targetRecord = EntityHelper.forUpdate(targetRecordId, UserService.SYSTEM_USER, false); + buildTargetRecord(targetRecord, dataFilterSql); - Object[] result = Application.createQueryNoFilter(sql).setParameter(1, targetRecordId).unique(); - double calcValue = result == null || result[0] == null ? 0d : ObjectUtils.toDouble(result[0]); - - DisplayType dt = EasyMeta.getDisplayType(targetEntity.getField(targetField)); - if (dt == DisplayType.NUMBER) { - targetRecord.setInt(targetField, (int) calcValue); - } else if (dt == DisplayType.DECIMAL) { - targetRecord.setDouble(targetField, calcValue); - } - } - - if (targetRecord.getAvailableFieldIterator().hasNext()) { + // 不含 ID + if (targetRecord.getAvailableFields().size() > 1) { if (allowNoPermissionUpdate) { PrivilegesGuardInterceptor.setNoPermissionPassOnce(targetRecordId); } // 会关联触发下一触发器（如有） - CALL_CHAIN_DEPTH.set(depth + 1); + TRIGGER_CHAIN_DEPTH.set(depth + 1); Application.getEntityService(targetEntity.getEntityCode()).update(targetRecord); } } + /** + * @param record + * @param dataFilterSql + */ + protected void buildTargetRecord(Record record, String dataFilterSql) { + JSONArray items = ((JSONObject) context.getActionContent()).getJSONArray("items"); + for (Object o : items) { + JSONObject item = (JSONObject) o; + String targetField = item.getString("targetField"); + if (!MetadataHelper.checkAndWarnField(targetEntity, targetField)) { + continue; + } + + Object evalValue = new AggregationEvaluator(item, sourceEntity, followSourceField, dataFilterSql) + .eval(targetRecordId); + if (evalValue == null) { + continue; + } + + DisplayType dt = EasyMeta.getDisplayType(targetEntity.getField(targetField)); + if (dt == DisplayType.NUMBER) { + record.setLong(targetField, ObjectUtils.toLong(evalValue)); + } else if (dt == DisplayType.DECIMAL) { + record.setDouble(targetField, ObjectUtils.toDouble(evalValue)); + } + } + } + @Override public void prepare(OperatingContext operatingContext) throws TriggerException { if (sourceEntity != null) { // 已经初始化 @@ -180,22 +194,29 @@ public void prepare(OperatingContext operatingContext) throws TriggerException { this.sourceEntity = context.getSourceEntity(); this.targetEntity = MetadataHelper.getEntity(targetFieldEntity[1]); - this.followSourceField = targetFieldEntity[0]; - if (!sourceEntity.containsField(followSourceField)) { - return; - } - // 找到主记录 - Object[] o = Application.getQueryFactory().uniqueNoFilter( - context.getSourceRecord(), followSourceField, followSourceField + "." + EntityHelper.OwningUser); - // o[1] 为空说明记录不存在 - if (o != null && o[0] != null && o[1] != null) { - this.targetRecordId = (ID) o[0]; + // 自己 + if (SOURCE_SELF.equalsIgnoreCase(targetFieldEntity[0])) { + this.followSourceField = sourceEntity.getPrimaryField().getName(); + this.targetRecordId = context.getSourceRecord(); + } else { + this.followSourceField = targetFieldEntity[0]; + if (!sourceEntity.containsField(followSourceField)) { + return; + } + + // 找到主记录 + Object[] o = Application.getQueryFactory().uniqueNoFilter( + context.getSourceRecord(), followSourceField, followSourceField + "." + EntityHelper.OwningUser); + // o[1] 为空说明记录不存在 + if (o != null && o[0] != null && o[1] != null) { + this.targetRecordId = (ID) o[0]; + } } } @Override public void clean() { - CALL_CHAIN_DEPTH.remove(); + TRIGGER_CHAIN_DEPTH.remove(); } } diff --git a/src/main/java/com/rebuild/server/business/trigger/impl/FieldWriteback.java b/src/main/java/com/rebuild/server/business/trigger/impl/FieldWriteback.java new file mode 100644 index 000000000..dd7ef9f0c --- /dev/null +++ b/src/main/java/com/rebuild/server/business/trigger/impl/FieldWriteback.java @@ -0,0 +1,90 @@ +/* +rebuild - Building your business-systems freely. +Copyright (C) 2020 devezhao + +rebuild is dual-licensed under commercial and open source licenses (GPLv3). +For more information, please see +*/ + +package com.rebuild.server.business.trigger.impl; + +import cn.devezhao.persist4j.Field; +import cn.devezhao.persist4j.Record; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.rebuild.server.Application; +import com.rebuild.server.business.trigger.ActionContext; +import com.rebuild.server.business.trigger.ActionType; +import com.rebuild.server.metadata.MetadataHelper; +import org.apache.commons.lang.StringUtils; + +import java.util.HashMap; +import java.util.Map; + +/** + * 数据回填 + * + * @author devezhao + * @since 2020/2/7 + * + * @see com.rebuild.server.configuration.AutoFillinManager + */ +public class FieldWriteback extends FieldAggregation { + + /** + * @param context + */ + public FieldWriteback(ActionContext context) { + super(context, Boolean.TRUE, 5); + } + + @Override + public ActionType getType() { + return ActionType.FIELDWRITEBACK; + } + + @Override + protected void buildTargetRecord(Record record, String dataFilterSql) { + JSONArray items = ((JSONObject) context.getActionContent()).getJSONArray("items"); + Map t2sMap = new HashMap<>(); + for (Object o : items) { + JSONObject item = (JSONObject) o; + String targetField = item.getString("targetField"); + String sourceField = item.getString("sourceField"); + if (!MetadataHelper.checkAndWarnField(targetEntity, targetField) + || MetadataHelper.getLastJoinField(sourceEntity, sourceField) == null) { + continue; + } + t2sMap.put(targetField, sourceField); + } + + if (t2sMap.isEmpty()) { + return; + } + + String sql = String.format("select %s from %s where %s = ?", + StringUtils.join(t2sMap.values(), ","), sourceEntity.getName(), followSourceField); + + final Record o = Application.createQueryNoFilter(sql) + .setParameter(1, targetRecordId) + .record(); + if (o == null) { + return; + } + + for (Map.Entry e : t2sMap.entrySet()) { + Object value = o.getObjectValue(e.getValue()); + // NOTE 忽略空值 + if (value == null) { + continue; + } + + Field sourceField = MetadataHelper.getLastJoinField(sourceEntity, e.getValue()); + Field targetField = targetEntity.getField(e.getKey()); + Object newValue = new CompatibleValueConversion(sourceField, targetField).conversion(value); + if (newValue != null) { + record.setObjectValue(targetField.getName(), newValue); + } + } + } +} diff --git a/src/main/java/com/rebuild/server/business/trigger/impl/SendNotification.java b/src/main/java/com/rebuild/server/business/trigger/impl/SendNotification.java index f46f8767f..7d16cd949 100644 --- a/src/main/java/com/rebuild/server/business/trigger/impl/SendNotification.java +++ b/src/main/java/com/rebuild/server/business/trigger/impl/SendNotification.java @@ -18,6 +18,8 @@ package com.rebuild.server.business.trigger.impl; +import cn.devezhao.persist4j.Entity; +import cn.devezhao.persist4j.Record; import cn.devezhao.persist4j.engine.ID; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -26,14 +28,22 @@ import com.rebuild.server.business.trigger.ActionType; import com.rebuild.server.business.trigger.TriggerAction; import com.rebuild.server.business.trigger.TriggerException; +import com.rebuild.server.configuration.portals.FieldValueWrapper; +import com.rebuild.server.helper.SMSender; +import com.rebuild.server.metadata.MetadataHelper; import com.rebuild.server.service.OperatingContext; import com.rebuild.server.service.bizz.UserHelper; import com.rebuild.server.service.notification.Message; import com.rebuild.server.service.notification.MessageBuilder; +import org.apache.commons.lang.StringUtils; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * @author devezhao zhaofang123@gmail.com @@ -41,6 +51,14 @@ */ public class SendNotification implements TriggerAction { + // 内部消息 + @SuppressWarnings("unused") + private static final int TYPE_NOTIFICATION = 1; + // 邮件 + private static final int TYPE_MAIL = 2; + // 短信 + private static final int TYPE_SMS = 3; + final private ActionContext context; public SendNotification(ActionContext context) { @@ -70,28 +88,84 @@ public void execute(OperatingContext operatingContext) { if (toUsers.isEmpty()) { return; } - + String message = content.getString("content"); message = formatMessage(message, context.getSourceRecord()); + + final int type = content.getIntValue("type"); + final String title = StringUtils.defaultIfBlank(content.getString("title"), "你有一条新通知"); + for (ID user : toUsers) { - Message m = MessageBuilder.createMessage(user, message, context.getSourceRecord()); - Application.getNotifications().send(m); + if (type == TYPE_MAIL) { + if (!SMSender.availableMail()) break; + + String emailAddr = Application.getUserStore().getUser(user).getEmail(); + if (emailAddr != null) { + SMSender.sendMail(emailAddr, title, message); + } + + } else if (type == TYPE_SMS) { + // TODO 发送短信（暂无手机字段） + + } else { + Message m = MessageBuilder.createMessage(user, message, context.getSourceRecord()); + Application.getNotifications().send(m); + } } } @Override public void prepare(OperatingContext operatingContext) throws TriggerException { - // Nothings + // NOOP } + private static final Pattern PATT_FIELD = Pattern.compile("\\{([0-9a-zA-Z._]+)}"); /** * @param message * @param recordId * @return */ - private String formatMessage(String message, ID recordId) { - // TODO 处理变量 -// return message + " @" + recordId; + protected String formatMessage(String message, ID recordId) { + Map vars = null; + if (recordId != null) { + Entity entity = MetadataHelper.getEntity(recordId.getEntityCode()); + vars = new HashMap<>(); + + Matcher m = PATT_FIELD.matcher(message); + while (m.find()) { + String field = m.group(1); + if (MetadataHelper.getLastJoinField(entity, field) == null) { + continue; + } + vars.put(field, null); + } + + if (!vars.isEmpty()) { + String sql = String.format("select %s from %s where %s = ?", + StringUtils.join(vars.keySet(), ","), entity.getName(), entity.getPrimaryField().getName()); + + Record o = Application.createQueryNoFilter(sql) + .setParameter(1, recordId) + .record(); + if (o != null) { + for (String field : vars.keySet()) { + Object value = o.getObjectValue(field); + value = FieldValueWrapper.instance.wrapFieldValue( + value, MetadataHelper.getLastJoinField(entity, field), true); + if (value != null) { + vars.put(field, value.toString()); + } + } + } + } + } + + if (vars != null) { + for (Map.Entry e : vars.entrySet()) { + message = message.replaceAll( + "\\{" + e.getKey() + "}", StringUtils.defaultIfBlank(e.getValue(), StringUtils.EMPTY)); + } + } return message; } diff --git a/src/main/java/com/rebuild/server/configuration/AutoFillinManager.java b/src/main/java/com/rebuild/server/configuration/AutoFillinManager.java index 5822336bf..52a8207a4 100644 --- a/src/main/java/com/rebuild/server/configuration/AutoFillinManager.java +++ b/src/main/java/com/rebuild/server/configuration/AutoFillinManager.java @@ -22,13 +22,13 @@ import cn.devezhao.persist4j.Field; import cn.devezhao.persist4j.Record; import cn.devezhao.persist4j.engine.ID; +import cn.devezhao.persist4j.engine.NullValue; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.rebuild.server.Application; -import com.rebuild.server.configuration.portals.FieldValueWrapper; +import com.rebuild.server.business.trigger.impl.CompatibleValueConversion; import com.rebuild.server.metadata.MetadataHelper; -import com.rebuild.server.metadata.entity.DisplayType; import com.rebuild.server.metadata.entity.EasyMeta; import com.rebuild.utils.JSONUtils; import org.apache.commons.lang.StringUtils; @@ -57,6 +57,11 @@ private AutoFillinManager() { } * @return */ public JSONArray getFillinValue(Field field, ID source) { + // @see field-edit.jsp 内建字段无配置 + if (EasyMeta.valueOf(field).isBuiltin()) { + return JSONUtils.EMPTY_ARRAY; + } + final List config = getConfig(field); if (config.isEmpty()) { return JSONUtils.EMPTY_ARRAY; @@ -101,7 +106,7 @@ public JSONArray getFillinValue(Field field, ID source) { } // NOTE 忽略空值 - if (value == null || StringUtils.isBlank(value.toString())) { + if (value == null || NullValue.is(value) || StringUtils.isBlank(value.toString())) { continue; } @@ -119,40 +124,10 @@ public JSONArray getFillinValue(Field field, ID source) { * @param target * @param value * @return + * @see CompatibleValueConversion */ protected Object conversionCompatibleValue(Field source, Field target, Object value) { - DisplayType sourceType = EasyMeta.getDisplayType(source); - DisplayType targetType = EasyMeta.getDisplayType(target); - boolean is2Text = targetType == DisplayType.TEXT || targetType == DisplayType.NTEXT; - EasyMeta sourceField = EasyMeta.valueOf(source); - - Object compatibleValue = null; - if (sourceType == DisplayType.REFERENCE) { - String idLabel = FieldValueWrapper.getLabelNotry((ID) value); - if (is2Text) { - compatibleValue = idLabel; - } else { - compatibleValue = FieldValueWrapper.wrapMixValue((ID) value, idLabel); - } - } else if (sourceType == DisplayType.CLASSIFICATION) { - compatibleValue = FieldValueWrapper.instance.wrapFieldValue(value, sourceField, is2Text); - } else if (sourceType == DisplayType.PICKLIST || sourceType == DisplayType.STATE) { - if (is2Text) { - compatibleValue = FieldValueWrapper.instance.wrapFieldValue(value, sourceField); - } else { - compatibleValue = value; - } - } else if (sourceType == DisplayType.DATETIME && targetType == DisplayType.DATE) { - String datetime = FieldValueWrapper.instance.wrapDatetime(value, sourceField); - compatibleValue = datetime.split(" ")[0]; - } else if (sourceType == DisplayType.DATE && targetType == DisplayType.DATETIME) { - String date = FieldValueWrapper.instance.wrapDate(value, sourceField); - compatibleValue = date + " 00:00:00"; - } else { - compatibleValue = FieldValueWrapper.instance.wrapFieldValue(value, sourceField); - } - - return compatibleValue; + return new CompatibleValueConversion(source, target).conversion(value, true); } /** diff --git a/src/main/java/com/rebuild/server/configuration/RebuildApiManager.java b/src/main/java/com/rebuild/server/configuration/RebuildApiManager.java index 1dd4ce2d8..50a8f2c48 100644 --- a/src/main/java/com/rebuild/server/configuration/RebuildApiManager.java +++ b/src/main/java/com/rebuild/server/configuration/RebuildApiManager.java @@ -60,8 +60,8 @@ public ConfigEntry getApp(String appid) { } @Override - public void clean(String cacheKey) { - final String cKey = "RebuildApiManager-" + cacheKey; + public void clean(String appid) { + final String cKey = "RebuildApiManager-" + appid; Application.getCommonCache().evict(cKey); } } diff --git a/src/main/java/com/rebuild/server/configuration/RobotTriggerManager.java b/src/main/java/com/rebuild/server/configuration/RobotTriggerManager.java index a7e817cc6..30e573762 100644 --- a/src/main/java/com/rebuild/server/configuration/RobotTriggerManager.java +++ b/src/main/java/com/rebuild/server/configuration/RobotTriggerManager.java @@ -119,7 +119,7 @@ private boolean allowedWhen(ConfigEntry entry, TriggerWhen... when) { * @param record * @return */ - public boolean isFiltered(JSONObject whenFilter, ID record) { + private boolean isFiltered(JSONObject whenFilter, ID record) { if (whenFilter == null || whenFilter.isEmpty()) { return false; } @@ -195,8 +195,9 @@ public Set getAutoReadonlyFields(String entity) { */ private Map> initAutoReadonlyFields() { Object[][] array = Application.createQueryNoFilter( - "select actionContent from RobotTriggerConfig where actionType = ? and isDisabled = 'F'") + "select actionContent from RobotTriggerConfig where (actionType = ? or actionType = ?) and isDisabled = 'F'") .setParameter(1, ActionType.FIELDAGGREGATION.name()) + .setParameter(2, ActionType.FIELDWRITEBACK.name()) .array(); CaseInsensitiveMap> fieldsMap = new CaseInsensitiveMap<>(); diff --git a/src/main/java/com/rebuild/server/configuration/portals/AdvFilterManager.java b/src/main/java/com/rebuild/server/configuration/portals/AdvFilterManager.java index 5d9c83992..a3d9f0795 100644 --- a/src/main/java/com/rebuild/server/configuration/portals/AdvFilterManager.java +++ b/src/main/java/com/rebuild/server/configuration/portals/AdvFilterManager.java @@ -46,8 +46,8 @@ protected String getConfigEntity() { } @Override - protected String getFieldsForConfig() { - return super.getFieldsForConfig() + ",filterName"; + protected String getConfigFields() { + return super.getConfigFields() + ",filterName"; } /** diff --git a/src/main/java/com/rebuild/server/configuration/portals/BaseLayoutManager.java b/src/main/java/com/rebuild/server/configuration/portals/BaseLayoutManager.java index 52d4ba68a..72ff4f70b 100644 --- a/src/main/java/com/rebuild/server/configuration/portals/BaseLayoutManager.java +++ b/src/main/java/com/rebuild/server/configuration/portals/BaseLayoutManager.java @@ -73,11 +73,21 @@ public ConfigEntry getLayoutOfDatalist(ID user, String entity) { } /** + * @param user + * @return + */ + public ConfigEntry getLayoutOfNav(ID user) { + return getLayout(user, null, TYPE_NAV); + } + + /** + * 列表页 SIDE 图表 + * * @param user * @param entity * @return */ - public ConfigEntry getWidgetOfCharts(ID user, String entity) { + public ConfigEntry getWidgetCharts(ID user, String entity) { ConfigEntry e = getLayout(user, entity, TYPE_WCHARTS); if (e == null) { return null; @@ -90,14 +100,6 @@ public ConfigEntry getWidgetOfCharts(ID user, String entity) { .set("shareTo", null); } - /** - * @param user - * @return - */ - public ConfigEntry getLayoutOfNav(ID user) { - return getLayout(user, null, TYPE_NAV); - } - /** * @param user * @param belongEntity @@ -132,19 +134,18 @@ public ConfigEntry getLayoutById(ID cfgid) { } /** - * @param cached + * @param uses * @param cfgid * @return */ - private ConfigEntry findEntry(Object[][] cached, ID cfgid) { - for (Object[] c : cached) { - if (!c[0].equals(cfgid)) { - continue; + protected ConfigEntry findEntry(Object[][] uses, ID cfgid) { + for (Object[] c : uses) { + if (c[0].equals(cfgid)) { + return new ConfigEntry() + .set("id", c[0]) + .set("shareTo", c[1]) + .set("config", JSON.parse((String) c[3])); } - return new ConfigEntry() - .set("id", c[0]) - .set("shareTo", c[1]) - .set("config", JSON.parse((String) c[3])); } return null; } diff --git a/src/main/java/com/rebuild/server/configuration/portals/DashboardManager.java b/src/main/java/com/rebuild/server/configuration/portals/DashboardManager.java index 80cda0b68..88c107d50 100644 --- a/src/main/java/com/rebuild/server/configuration/portals/DashboardManager.java +++ b/src/main/java/com/rebuild/server/configuration/portals/DashboardManager.java @@ -28,6 +28,9 @@ import com.rebuild.server.service.configuration.DashboardConfigService; import com.rebuild.utils.JSONUtils; +import java.util.Arrays; +import java.util.Comparator; + /** * 首页仪表盘 * @@ -45,8 +48,8 @@ protected String getConfigEntity() { } @Override - protected String getFieldsForConfig() { - return super.getFieldsForConfig() + ",title"; + protected String getConfigFields() { + return super.getConfigFields() + ",title"; } /** @@ -75,7 +78,7 @@ public JSON getDashList(ID user) { canUses[i][2] = isSelf(user, (ID) canUses[i][2]); } - sort(canUses, 4); + Arrays.sort(canUses, Comparator.comparing(o -> o[4].toString())); return (JSON) JSON.toJSON(canUses); } diff --git a/src/main/java/com/rebuild/server/configuration/portals/DataListManager.java b/src/main/java/com/rebuild/server/configuration/portals/DataListManager.java index 1aa6d73f9..0dfc7cc47 100644 --- a/src/main/java/com/rebuild/server/configuration/portals/DataListManager.java +++ b/src/main/java/com/rebuild/server/configuration/portals/DataListManager.java @@ -153,4 +153,20 @@ public Map formatField(Field field, Field parent) { new String[] { "field", "label", "type" }, new Object[] { parentField + easyField.getName(), parentLabel + easyField.getLabel(), easyField.getDisplayType(false) }); } + + /** + * 获取可用列显示ID + * + * @param entity + * @param user + * @return + */ + public ID[] getUsesDataListId(String entity, ID user) { + Object[][] uses = getUsesConfig(user, entity, TYPE_DATALIST); + List array = new ArrayList<>(); + for (Object[] c : uses) { + array.add((ID) c[0]); + } + return array.toArray(new ID[0]); + } } diff --git a/src/main/java/com/rebuild/server/configuration/portals/FieldValueWrapper.java b/src/main/java/com/rebuild/server/configuration/portals/FieldValueWrapper.java index fd31c8c0e..e075fb6d7 100644 --- a/src/main/java/com/rebuild/server/configuration/portals/FieldValueWrapper.java +++ b/src/main/java/com/rebuild/server/configuration/portals/FieldValueWrapper.java @@ -86,7 +86,7 @@ public Object wrapFieldValue(Object value, EasyMeta field, boolean unpackMix) { value = wrapFieldValue(value, field); if (unpackMix && value != null) { DisplayType dt = field.getDisplayType(); - if (dt == DisplayType.CLASSIFICATION || dt == DisplayType.REFERENCE) { + if (value instanceof JSON && (dt == DisplayType.CLASSIFICATION || dt == DisplayType.REFERENCE)) { return ((JSONObject) value).getString("text"); } else if (dt == DisplayType.FILE || dt == DisplayType.IMAGE) { return value.toString(); @@ -195,11 +195,14 @@ public String wrapDecimal(Object value, EasyMeta field) { * @see #wrapMixValue(ID, String) */ public JSON wrapReference(Object value, EasyMeta field) { - String text = ((ID) value).getLabel(); + Object text = ((ID) value).getLabelRaw(); if (text == null) { - text = getLabelNotry((ID) value); + text = getLabelNotry((ID) value); + } else { + Field nameField = ((Field) field.getBaseMeta()).getReferenceEntity().getNameField(); + text = instance.wrapFieldValue(text, nameField, true); } - return wrapMixValue((ID) value, text); + return wrapMixValue((ID) value, text == null ? null : text.toString()); } /** @@ -320,9 +323,27 @@ protected Object wrapSpecialField(Object value, EasyMeta field) { * @throws NoRecordFoundException If no record found */ public static String getLabel(ID id, String defaultValue) throws NoRecordFoundException { + if (id == null) { + throw new NoRecordFoundException("[id] must not be null"); + } + Entity entity = MetadataHelper.getEntity(id.getEntityCode()); - Field nameField = MetadataHelper.getNameField(entity); + if (id.getEntityCode() == EntityHelper.ClassificationData) { + String hasValue = ClassificationManager.instance.getFullName(id); + if (hasValue == null) { + throw new NoRecordFoundException("No ClassificationData found by ID : " + id); + } + return hasValue; + } else if (id.getEntityCode() == EntityHelper.PickList) { + String hasValue = PickListManager.instance.getLabel(id); + if (hasValue == null) { + throw new NoRecordFoundException("No PickList found by ID : " + id); + } + return hasValue; + } + + Field nameField = MetadataHelper.getNameField(entity); Object[] nameValue = Application.getQueryFactory().uniqueNoFilter(id, nameField.getName()); if (nameValue == null) { throw new NoRecordFoundException("No record found by ID : " + id); @@ -354,7 +375,7 @@ public static String getLabel(ID id) throws NoRecordFoundException { */ public static String getLabelNotry(ID id) { try { - return FieldValueWrapper.getLabel(id); + return getLabel(id); } catch (MetadataException | NoRecordFoundException ex) { return MISS_REF_PLACE; } diff --git a/src/main/java/com/rebuild/server/configuration/portals/FormsBuilder.java b/src/main/java/com/rebuild/server/configuration/portals/FormsBuilder.java index 461808037..96bf8f65c 100644 --- a/src/main/java/com/rebuild/server/configuration/portals/FormsBuilder.java +++ b/src/main/java/com/rebuild/server/configuration/portals/FormsBuilder.java @@ -114,14 +114,12 @@ public JSON buildView(String entity, ID user, ID record) { * @param viewMode 视图模式 * @return */ - protected JSON buildModel(String entity, ID user, ID record, boolean viewMode) { + private JSON buildModel(String entity, ID user, ID record, boolean viewMode) { Assert.notNull(entity, "[entity] not be null"); Assert.notNull(user, "[user] not be null"); final Entity entityMeta = MetadataHelper.getEntity(entity); - final User currentUser = Application.getUserStore().getUser(user); - final Date now = CalendarUtils.now(); - + // 明细实体 final Entity masterEntity = entityMeta.getMasterEntity(); // 审批流程（状态） @@ -197,39 +195,124 @@ else if (viewMode) { } } - // 自动只读字段 - final Set autoReadonlyByTriggers = RobotTriggerManager.instance.getAutoReadonlyFields(entity); + // 触发器自动只读 + Set roViaTriggers = RobotTriggerManager.instance.getAutoReadonlyFields(entity); + for (Object o : elements) { + JSONObject field = (JSONObject) o; + if (roViaTriggers.contains(field.getString("field"))) { + field.put("readonly", true); + } + } + + buildModelElements(elements, entityMeta, data, user); + + if (elements.isEmpty()) { + return formatModelError("此表单布局尚未配置，请配置后使用"); + } + + // 主/明细实体处理 + if (entityMeta.getMasterEntity() != null) { + model.set("isSlave", true); + } else if (entityMeta.getSlaveEntity() != null) { + model.set("isMaster", true); + model.set("slaveMeta", EasyMeta.getEntityShow(entityMeta.getSlaveEntity())); + } + if (data != null && data.hasValue(EntityHelper.ModifiedOn)) { + model.set("lastModified", data.getDate(EntityHelper.ModifiedOn).getTime()); + } + + if (approvalState != null) { + model.set("hadApproval", approvalState.getState()); + } + + model.set("id", null); // Clean form's ID of config + return model.toJSON(); + } + + /** + * @param error + * @return + */ + private JSONObject formatModelError(String error) { + JSONObject cfg = new JSONObject(); + cfg.put("error", error); + return cfg; + } + + /** + * @param entity + * @param recordId + * @return + * + * @see RobotApprovalManager#hadApproval(Entity, ID) + */ + private ApprovalState getHadApproval(Entity entity, ID recordId) { + Entity masterEntity = entity.getMasterEntity(); + if (masterEntity == null) { + return RobotApprovalManager.instance.hadApproval(entity, recordId); + } + + ID masterRecordId = MASTERID4NEWSLAVE.get(); + if (masterRecordId == null) { + Field stm = MetadataHelper.getSlaveToMasterField(entity); + String sql = String.format("select %s from %s where %s = ?", + Objects.requireNonNull(stm).getName(), entity.getName(), entity.getPrimaryField().getName()); + Object[] o = Application.createQueryNoFilter(sql).setParameter(1, recordId).unique(); + if (o == null) { + return null; + } + masterRecordId = (ID) o[0]; + } + return RobotApprovalManager.instance.hadApproval(masterEntity, masterRecordId); + } + + /** + * 构建表单元素 + * + * @param elements + * @param entity + * @param data + * @param user + */ + public void buildModelElements(JSONArray elements, Entity entity, Record data, ID user) { + final User currentUser = Application.getUserStore().getUser(user); + final Date now = CalendarUtils.now(); + // Check and clean for (Iterator iter = elements.iterator(); iter.hasNext(); ) { JSONObject el = (JSONObject) iter.next(); String fieldName = el.getString("field"); - if (DIVIDER_LINE.equalsIgnoreCase(fieldName)) { - // 分割线表单页暂不支持 - if (!viewMode) { - iter.remove(); - } continue; } // 已删除字段 - if (!MetadataHelper.checkAndWarnField(entityMeta, fieldName)) { + if (!MetadataHelper.checkAndWarnField(entity, fieldName)) { iter.remove(); continue; } - Field fieldMeta = entityMeta.getField(fieldName); + Field fieldMeta = entity.getField(fieldName); EasyMeta easyField = new EasyMeta(fieldMeta); final DisplayType dt = easyField.getDisplayType(); el.put("label", easyField.getLabel()); el.put("type", dt.name()); - el.put("nullable", fieldMeta.isNullable()); - el.put("readonly", false); - boolean triggersReadonly = autoReadonlyByTriggers.contains(fieldName); + // 触发器自动只读 + final boolean roViaTriggers = el.getBooleanValue("readonly"); // 不可更新字段 - if ((data != null && !fieldMeta.isUpdatable()) || triggersReadonly) { + if ((data != null && !fieldMeta.isUpdatable()) || roViaTriggers) { el.put("readonly", true); + } else { + el.put("readonly", false); + } + + // 优先使用指定值 + final Boolean nullable = el.getBoolean("nullable"); + if (nullable != null) { + el.put("nullable", nullable); + } else { + el.put("nullable", fieldMeta.isNullable()); } // 字段扩展配置 FieldExtConfigProps @@ -237,11 +320,11 @@ else if (viewMode) { for (Map.Entry e : fieldExt.entrySet()) { el.put(e.getKey(), e.getValue()); } - + // 不同字段类型的处理 - + int dateLength = -1; - + if (dt == DisplayType.PICKLIST) { JSONArray options = PickListManager.instance.getPickList(fieldMeta); el.put("options", options); @@ -282,36 +365,36 @@ else if (dt == DisplayType.CLASSIFICATION) { else { if (!fieldMeta.isCreatable()) { el.put("readonly", true); - switch (fieldName) { - case EntityHelper.CreatedOn: - case EntityHelper.ModifiedOn: - el.put("value", CalendarUtils.getUTCDateTimeFormat().format(now)); - break; - case EntityHelper.CreatedBy: - case EntityHelper.ModifiedBy: - case EntityHelper.OwningUser: - el.put("value", FieldValueWrapper.wrapMixValue(currentUser.getId(), currentUser.getFullName())); - break; - case EntityHelper.OwningDept: - Department dept = currentUser.getOwningDept(); - Assert.notNull(dept, "Department of user is unset : " + currentUser.getId()); - el.put("value", FieldValueWrapper.wrapMixValue((ID) dept.getIdentity(), dept.getName())); - break; + switch (fieldName) { + case EntityHelper.CreatedOn: + case EntityHelper.ModifiedOn: + el.put("value", CalendarUtils.getUTCDateTimeFormat().format(now)); + break; + case EntityHelper.CreatedBy: + case EntityHelper.ModifiedBy: + case EntityHelper.OwningUser: + el.put("value", FieldValueWrapper.wrapMixValue(currentUser.getId(), currentUser.getFullName())); + break; + case EntityHelper.OwningDept: + Department dept = currentUser.getOwningDept(); + Assert.notNull(dept, "Department of user is unset : " + currentUser.getId()); + el.put("value", FieldValueWrapper.wrapMixValue((ID) dept.getIdentity(), dept.getName())); + break; case EntityHelper.ApprovalId: el.put("value", FieldValueWrapper.wrapMixValue(null,"自动值 (审批流程)")); break; case EntityHelper.ApprovalState: el.put("value", ApprovalState.DRAFT.getState()); break; - } + default: + break; + } } if (dt == DisplayType.SERIES) { el.put("value", "自动值 (自动编号)"); } else if (dt == DisplayType.BOOL) { el.put("value", BoolEditor.FALSE); - } else if (triggersReadonly) { - el.put("value", "自动值 (触发器)"); } else { String defVal = DefaultValueHelper.exprDefaultValueToString(fieldMeta); if (defVal != null) { @@ -321,41 +404,19 @@ else if (dt == DisplayType.CLASSIFICATION) { el.put("value", defVal); } } - } - } - - if (elements.isEmpty()) { - return formatModelError("此表单布局尚未配置，请配置后使用"); - } - - // 主/明细实体处理 - if (entityMeta.getMasterEntity() != null) { - model.set("isSlave", true); - } else if (entityMeta.getSlaveEntity() != null) { - model.set("isMaster", true); - model.set("slaveMeta", EasyMeta.getEntityShow(entityMeta.getSlaveEntity())); - } - - if (data != null && data.hasValue(EntityHelper.ModifiedOn)) { - model.set("lastModified", data.getDate(EntityHelper.ModifiedOn).getTime()); - } - if (approvalState != null) { - model.set("hadApproval", approvalState.getState()); + if (roViaTriggers && el.get("value") == null) { + if (dt == DisplayType.REFERENCE || dt == DisplayType.CLASSIFICATION) { + el.put("value", FieldValueWrapper.wrapMixValue(null,"自动值 (触发器)")); + } else if (dt == DisplayType.TEXT || dt == DisplayType.NTEXT + || dt == DisplayType.EMAIL || dt == DisplayType.URL || dt == DisplayType.PHONE + || dt == DisplayType.NUMBER || dt == DisplayType.DECIMAL + || dt == DisplayType.DATETIME || dt == DisplayType.DATE) { + el.put("value", "自动值 (触发器)"); + } + } + } } - - model.set("id", null); // Clean form's ID of config - return model.toJSON(); - } - - /** - * @param error - * @return - */ - private JSONObject formatModelError(String error) { - JSONObject cfg = new JSONObject(); - cfg.put("error", error); - return cfg; } /** @@ -364,11 +425,11 @@ private JSONObject formatModelError(String error) { * @param elements * @return */ - private Record findRecord(ID id, ID user, JSONArray elements) { + public Record findRecord(ID id, ID user, JSONArray elements) { if (elements.isEmpty()) { return null; } - + Entity entity = MetadataHelper.getEntity(id.getEntityCode()); StringBuilder ajql = new StringBuilder("select "); for (Object element : elements) { @@ -398,30 +459,6 @@ private Record findRecord(ID id, ID user, JSONArray elements) { .append(" = ?"); return Application.getQueryFactory().createQuery(ajql.toString(), user).setParameter(1, id).record(); } - - /** - * @param entity - * @param recordId - * @return - * - * @see RobotApprovalManager#hadApproval(Entity, ID) - */ - private ApprovalState getHadApproval(Entity entity, ID recordId) { - Entity masterEntity = entity.getMasterEntity(); - if (masterEntity == null) { - return RobotApprovalManager.instance.hadApproval(entity, recordId); - } - - ID masterRecordId = MASTERID4NEWSLAVE.get(); - if (masterRecordId == null) { - Field stm = MetadataHelper.getSlaveToMasterField(entity); - String sql = String.format("select %s from %s where %s = ?", - Objects.requireNonNull(stm).getName(), entity.getName(), entity.getPrimaryField().getName()); - Object[] o = Application.createQueryNoFilter(sql).setParameter(1, recordId).unique(); - masterRecordId = (ID) o[0]; - } - return RobotApprovalManager.instance.hadApproval(masterEntity, masterRecordId); - } /** * 封装表单/布局所用的字段值 diff --git a/src/main/java/com/rebuild/server/configuration/portals/NavManager.java b/src/main/java/com/rebuild/server/configuration/portals/NavManager.java index a93090732..56955c081 100644 --- a/src/main/java/com/rebuild/server/configuration/portals/NavManager.java +++ b/src/main/java/com/rebuild/server/configuration/portals/NavManager.java @@ -35,7 +35,9 @@ import org.jsoup.nodes.Element; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.Iterator; +import java.util.List; /** * 导航菜单 @@ -73,6 +75,21 @@ public JSON getNavLayoutById(ID cfgid) { return config == null ? null : config.toJSON(); } + /** + * 获取可用导航ID + * + * @param user + * @return + */ + public ID[] getUsesNavId(ID user) { + Object[][] uses = getUsesConfig(user, null, TYPE_NAV); + List array = new ArrayList<>(); + for (Object[] c : uses) { + array.add((ID) c[0]); + } + return array.toArray(new ID[0]); + } + // ---- /** @@ -182,16 +199,17 @@ public String renderNavItem(JSONObject item, String activeNav) { } StringBuilder navHtml = new StringBuilder() - .append(String.format("
  • %s", + .append(String.format("
  • %s", navName + (subNavs == null ? StringUtils.EMPTY : " parent"), subNavs == null ? navUrl : "###", - isUrlType ? " target='_blank' rel='noopener noreferrer'" : StringUtils.EMPTY, - navIcon, navText)); + isUrlType ? "_blank" : "_self", + navIcon, + navText)); if (subNavs != null) { StringBuilder subHtml = new StringBuilder() - .append("
    • ") + .append("
      • ") .append(navText) - .append("
        • "); + .append("
          • "); for (Object o : subNavs) { JSONObject subNav = (JSONObject) o; diff --git a/src/main/java/com/rebuild/server/configuration/portals/ShareToManager.java b/src/main/java/com/rebuild/server/configuration/portals/ShareToManager.java index 20104456e..a725b203d 100644 --- a/src/main/java/com/rebuild/server/configuration/portals/ShareToManager.java +++ b/src/main/java/com/rebuild/server/configuration/portals/ShareToManager.java @@ -33,7 +33,6 @@ import org.apache.commons.logging.LogFactory; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -64,7 +63,7 @@ public abstract class ShareToManager implements ConfigManager { * Default: configId,shareTo,createdBy,config * @return */ - protected String getFieldsForConfig() { + protected String getConfigFields() { return "configId,shareTo,createdBy,config"; } @@ -91,21 +90,21 @@ protected void cleanWithBelongEntity(ID cfgid, boolean hasApplyType) { * @return */ public ID detectUseConfig(ID user, String belongEntity, String applyType) { - Object[][] cached = getAllConfig(belongEntity, applyType); - if (cached.length == 0) { + final Object[][] alls = getAllConfig(belongEntity, applyType); + if (alls.length == 0) { return null; } // 优先使用自己的 boolean isAdmin = UserHelper.isAdmin(user); - for (Object[] d : cached) { + for (Object[] d : alls) { ID createdBy = (ID) d[2]; if (user.equals(createdBy) || (isAdmin && UserHelper.isAdmin(createdBy))) { return (ID) d[0]; } } // 其次共享的 - for (Object[] d : cached) { + for (Object[] d : alls) { if (isShareTo((String) d[1], user)) { return (ID) d[0]; } @@ -142,8 +141,9 @@ protected Object[][] getUsesConfig(ID user, String belongEntity, String applyTyp * @return */ protected Object[][] getAllConfig(String belongEntity, String applyType) { - String cacheKey = formatCacheKey(belongEntity, applyType); + final String cacheKey = formatCacheKey(belongEntity, applyType); Object[][] cached = (Object[][]) Application.getCommonCache().getx(cacheKey); + if (cached == null) { List sqlWhere = new ArrayList<>(); if (belongEntity != null) { @@ -153,7 +153,7 @@ protected Object[][] getAllConfig(String belongEntity, String applyType) { sqlWhere.add(String.format("applyType = '%s'", applyType)); } - String ql = String.format("select %s from %s where (1=1) order by modifiedOn desc", getFieldsForConfig(), getConfigEntity()); + String ql = String.format("select %s from %s where (1=1) order by modifiedOn desc", getConfigFields(), getConfigEntity()); if (!sqlWhere.isEmpty()) { ql = ql.replace("(1=1)", StringUtils.join(sqlWhere.iterator(), " and ")); } @@ -203,14 +203,6 @@ final protected String formatCacheKey(String belongEntity, String applyType) { StringUtils.defaultIfBlank(applyType, "N")).toUpperCase(); } - /** - * @param array - * @param useIndex - */ - protected void sort(Object[][] array, int useIndex) { - Arrays.sort(array, (foo, bar) -> ObjectUtils.compare((Comparable) foo[useIndex], (Comparable) bar[useIndex])); - } - // -- /** @@ -224,30 +216,26 @@ public static boolean isSelf(ID user, ID configOrUser) { if (configOrUser.getEntityCode() != EntityHelper.User) { configOrUser = getCreatedBy(configOrUser); } - boolean s = user.equals(configOrUser); - if (s) { - return true; - } - return UserHelper.isAdmin(user) && UserHelper.isAdmin(configOrUser); + return user.equals(configOrUser) || (UserHelper.isAdmin(user) && UserHelper.isAdmin(configOrUser)); } private static final Map CREATEDBYs = new HashMap<>(); /** - * @param configId + * @param cfgid * @return */ - static ID getCreatedBy(ID configId) { - if (CREATEDBYs.containsKey(configId)) { - return CREATEDBYs.get(configId); + private static ID getCreatedBy(ID cfgid) { + if (CREATEDBYs.containsKey(cfgid)) { + return CREATEDBYs.get(cfgid); } - Entity e = MetadataHelper.getEntity(configId.getEntityCode()); + Entity e = MetadataHelper.getEntity(cfgid.getEntityCode()); String ql = String.format("select createdBy from %s where %s = ?", e.getName(), e.getPrimaryField().getName()); - Object[] c = Application.createQueryNoFilter(ql).setParameter(1, configId).unique(); + Object[] c = Application.createQueryNoFilter(ql).setParameter(1, cfgid).unique(); if (c == null) { - throw new RebuildException("No config found : " + configId); + throw new RebuildException("No config found : " + cfgid); } - CREATEDBYs.put(configId, (ID) c[0]); + CREATEDBYs.put(cfgid, (ID) c[0]); return (ID) c[0]; } } diff --git a/src/main/java/com/rebuild/server/helper/AesPreferencesConfigurer.java b/src/main/java/com/rebuild/server/helper/AesPreferencesConfigurer.java index 550f63ef0..9132ce203 100644 --- a/src/main/java/com/rebuild/server/helper/AesPreferencesConfigurer.java +++ b/src/main/java/com/rebuild/server/helper/AesPreferencesConfigurer.java @@ -19,28 +19,41 @@ package com.rebuild.server.helper; import com.rebuild.server.Application; +import com.rebuild.server.helper.setup.InstallState; +import com.rebuild.server.helper.setup.SetupException; import com.rebuild.utils.AES; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.config.PreferencesPlaceholderConfigurer; +import org.springframework.core.io.FileSystemResource; +import org.springframework.core.io.support.PropertiesLoaderUtils; +import java.io.File; import java.io.IOException; import java.util.Properties; /** + * 系统参数加载/处理 + * * @author Zhao Fangfang * @since 1.0, 2013-7-7 */ -public class AesPreferencesConfigurer extends PreferencesPlaceholderConfigurer { +public class AesPreferencesConfigurer extends PreferencesPlaceholderConfigurer implements InstallState { + + private Properties propsHold = null; @Override protected void loadProperties(Properties props) throws IOException { super.loadProperties(props); this.afterLoad(props); + setNullValue(StringUtils.EMPTY); } - - private Properties propsHold = null; - + + /** + * @param props + */ private void afterLoad(Properties props) { + props.putAll(fromInstallFile()); + final Object[] keys = props.keySet().toArray(new Object[0]); for (Object key : keys) { String cleanKey = key.toString(); @@ -55,9 +68,9 @@ private void afterLoad(Properties props) { } // Overrides by command-line - String valInCL = System.getProperty(cleanKey); - if (StringUtils.isNotBlank(valInCL)) { - props.put(cleanKey, valInCL); + String viaCL = System.getProperty(cleanKey); + if (StringUtils.isNotBlank(viaCL)) { + props.put(cleanKey, viaCL); } } @@ -68,14 +81,50 @@ private void afterLoad(Properties props) { dbUrl = dbUrl.replace("3306", "4653"); props.put("db.url", dbUrl); } - + + // MUST NOT BE NULL + setIfEmpty(props, ConfigurableItem.CacheHost, "127.0.0.1"); + setIfEmpty(props, ConfigurableItem.CachePort, "16379"); + propsHold = (Properties) props.clone(); - + + if (propsHold.getProperty("db.url").contains("jdbc:h2:")) { + Application.LOG.warn("Using QuickMode with H2 database!"); + } if (Application.devMode()) { Application.LOG.info("System properties : " + propsHold); } } - + + /** + * 从安装文件加载配置 + * + * @return + * @see #INSTALL_FILE + */ + private Properties fromInstallFile() { + File file = SysConfiguration.getFileOfData(INSTALL_FILE); + if (file.exists()) { + try { + return PropertiesLoaderUtils.loadProperties(new FileSystemResource(file)); + } catch (IOException e) { + throw new SetupException(e); + } + } + return new Properties(); + } + + /** + * @param props + * @param item + * @param defaultValue + */ + private void setIfEmpty(Properties props, ConfigurableItem item, String defaultValue) { + if (StringUtils.isBlank(props.getProperty(item.name()))) { + props.put(item.name(), defaultValue); + } + } + /** * 获取配置项 * diff --git a/src/main/java/com/rebuild/server/helper/ConfigurableItem.java b/src/main/java/com/rebuild/server/helper/ConfigurableItem.java index dbaf76932..5aa651293 100644 --- a/src/main/java/com/rebuild/server/helper/ConfigurableItem.java +++ b/src/main/java/com/rebuild/server/helper/ConfigurableItem.java @@ -77,7 +77,12 @@ SmsUser, SmsPassword, SmsSign(AppName), /** * 默认语言 */ - DefaultLanguage("zh-CN") + DefaultLanguage("zh-CN"), + + // 数据库备份 + DBBackupsEnable(true), + // 数据备份保留时间 + DBBackupsKeepingDays(30) ; diff --git a/src/main/java/com/rebuild/server/helper/FormDataBuilder.java b/src/main/java/com/rebuild/server/helper/FormDataBuilder.java new file mode 100644 index 000000000..9ea0c0f7e --- /dev/null +++ b/src/main/java/com/rebuild/server/helper/FormDataBuilder.java @@ -0,0 +1,108 @@ +/* +rebuild - Building your business-systems freely. +Copyright (C) 2018-2020 devezhao + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +package com.rebuild.server.helper; + +import cn.devezhao.persist4j.Entity; +import cn.devezhao.persist4j.Record; +import cn.devezhao.persist4j.engine.ID; +import com.alibaba.fastjson.JSONObject; +import com.rebuild.server.metadata.ExtRecordCreator; +import com.rebuild.server.metadata.MetadataHelper; + +/** + * 表单数据构建 + * + * @author devezhao + * @since 2020/1/17 + */ +public class FormDataBuilder { + + /** + * @param entity + * @return + */ + public static FormDataBuilder builder(Entity entity) { + return new FormDataBuilder(entity, null); + } + + /** + * @param entityCode + * @return + */ + public static FormDataBuilder builder(int entityCode) { + return new FormDataBuilder(MetadataHelper.getEntity(entityCode), null); + } + + /** + * @param record + * @return + */ + public static FormDataBuilder builder(ID record) { + return new FormDataBuilder(MetadataHelper.getEntity(record.getEntityCode()), record); + } + + // -- + + final private Entity entity; + + final private JSONObject data = new JSONObject(); + + /** + * @param entity + * @param record + */ + private FormDataBuilder(Entity entity, ID record) { + this.entity = entity; + + JSONObject metadata = new JSONObject(); + metadata.put("entity", entity.getName()); + if (record != null) { + metadata.put("id", record.toLiteral()); + } + this.data.put(ExtRecordCreator.META_FIELD, metadata); + } + + /** + * 添加数据。注意此方法不做任何数据合适转换，需自行处理 + * + * @param name + * @param value + * @return + */ + public FormDataBuilder add(String name, Object value) { + data.put(name, value); + return this; + } + + /** + * @return + */ + public JSONObject build() { + return data; + } + + /** + * @param editor + * @return + * @see ExtRecordCreator + */ + public Record buildRecord(ID editor) { + return new ExtRecordCreator(this.entity, this.build(), editor).create(); + } +} diff --git a/src/main/java/com/rebuild/server/helper/Lisence.java b/src/main/java/com/rebuild/server/helper/License.java similarity index 72% rename from src/main/java/com/rebuild/server/helper/Lisence.java rename to src/main/java/com/rebuild/server/helper/License.java index bcffbce82..9d404a371 100644 --- a/src/main/java/com/rebuild/server/helper/Lisence.java +++ b/src/main/java/com/rebuild/server/helper/License.java @@ -32,7 +32,7 @@ * @author ZHAO * @since 2019-08-23 */ -public final class Lisence { +public final class License { /** * 授权码/SN @@ -43,7 +43,7 @@ public static String SN() { String SN = SysConfiguration.get(ConfigurableItem.SN, true); if (SN == null) { SN = String.format("ZR%s%s-%s", - "107", + "108", StringUtils.leftPad(Locale.getDefault().getCountry(), 3, "0"), UUID.randomUUID().toString().replace("-", "").substring(0, 15).toUpperCase()); SysConfiguration.set(ConfigurableItem.SN, SN); @@ -57,14 +57,33 @@ public static String SN() { * @return */ public static JSON queryAuthority() { - String queryUrl = "https://getrebuild.com/authority/query?k=IjkMHgq94T7s7WkP&sn=" + SN(); + JSON result = siteApi("authority/query"); + if (result == null) { + result = JSONUtils.toJSONObject( + new String[]{ "sn", "authType" }, + new String[]{ SN(), "开源社区版" }); + } + return result; + } + + /** + * 调用 RB 官方服务 API + * + * @param api + * @return + */ + public static JSON siteApi(String api) { + String apiUrl = "https://getrebuild.com/" + api; + apiUrl += api.contains("\\?") ? "&" : "?"; + apiUrl += "k=IjkMHgq94T7s7WkP&sn=" + SN(); + try { - String result = CommonsUtils.get(queryUrl); + String result = CommonsUtils.get(apiUrl); if (StringUtils.isNotBlank(result) && JSONUtils.wellFormat(result)) { return JSON.parseObject(result); } } catch (Exception ignored) { } - return JSONUtils.toJSONObject(new String[]{"sn", "authType"}, new String[]{SN(), "开源社区版"}); + return null; } } diff --git a/src/main/java/com/rebuild/server/helper/QiniuCloud.java b/src/main/java/com/rebuild/server/helper/QiniuCloud.java index c4bcf5316..8a1332e6a 100644 --- a/src/main/java/com/rebuild/server/helper/QiniuCloud.java +++ b/src/main/java/com/rebuild/server/helper/QiniuCloud.java @@ -30,6 +30,7 @@ import com.qiniu.util.StringMap; import com.rebuild.server.RebuildException; import com.rebuild.utils.CommonsUtils; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -49,8 +50,12 @@ public class QiniuCloud { private static final Log LOG = LogFactory.getLog(QiniuCloud.class); - - private final Configuration CONFIGURATION = new Configuration(Region.autoRegion()); + + /** + * 默认配置 + */ + public static final Configuration CONFIGURATION = new Configuration(Region.autoRegion()); + private final UploadManager UPLOAD_MANAGER = new UploadManager(CONFIGURATION); private Auth auth; @@ -70,7 +75,6 @@ private QiniuCloud() { * @return */ public boolean available() { -// return false; // TEST return this.auth != null; } @@ -111,7 +115,7 @@ public String upload(URL url) throws Exception { try { return upload(tmp); } finally { - tmp.delete(); + FileUtils.deleteQuietly(tmp); } } @@ -156,7 +160,7 @@ public String url(String filePath, int seconds) { protected boolean delete(String key) { Assert.notNull(auth, "云存储账户未配置"); BucketManager bucketManager = new BucketManager(auth, CONFIGURATION); - Response resp = null; + Response resp; try { resp = bucketManager.delete(this.bucketName, key); if (resp.isOK()) { diff --git a/src/main/java/com/rebuild/server/helper/SMSender.java b/src/main/java/com/rebuild/server/helper/SMSender.java index 1b4b11bfc..c08a0ab06 100644 --- a/src/main/java/com/rebuild/server/helper/SMSender.java +++ b/src/main/java/com/rebuild/server/helper/SMSender.java @@ -28,7 +28,6 @@ import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; -import org.springframework.util.Assert; import java.io.File; import java.io.IOException; @@ -45,16 +44,6 @@ public class SMSender { private static final Log LOG = LogFactory.getLog(SMSender.class); - /** - * @param to - * @param subject - * @param content - * @return - */ - public static String sendMail(String to, String subject, String content) { - return sendMail(to, subject, content, true); - } - /** * @param to * @param subject @@ -63,12 +52,22 @@ public static String sendMail(String to, String subject, String content) { public static void sendMailAsync(String to, String subject, String content) { ThreadPool.exec(() -> { try { - sendMail(to, subject, content, true); + sendMail(to, subject, content); } catch (Exception ex) { - LOG.error("Mail send failure: " + to + " < " + subject, ex); + LOG.error("Mail failed to send : " + to + " < " + subject, ex); } }); } + + /** + * @param to + * @param subject + * @param content + * @return + */ + public static String sendMail(String to, String subject, String content) { + return sendMail(to, subject, content, true, SysConfiguration.getMailAccount()); + } /** * @param to @@ -78,23 +77,24 @@ public static void sendMailAsync(String to, String subject, String content) { * @return null if failed or SENDID * @throws ConfigurationException If mail-account unset */ - public static String sendMail(String to, String subject, String content, boolean useTemplate) throws ConfigurationException { - String[] account = SysConfiguration.getMailAccount(); - Assert.notNull(account, "邮箱账户未配置"); - + public static String sendMail(String to, String subject, String content, boolean useTemplate, String[] specAccount) throws ConfigurationException { + if (specAccount == null || specAccount.length < 4) { + throw new ConfigurationException("邮箱账户未配置/无效"); + } + Map params = new HashMap<>(); - params.put("appid", account[0]); - params.put("signature", account[1]); + params.put("appid", specAccount[0]); + params.put("signature", specAccount[1]); params.put("to", to); - params.put("from", account[2]); - params.put("from_name", account[3]); + params.put("from", specAccount[2]); + params.put("from_name", specAccount[3]); params.put("subject", subject); if (useTemplate) { - Element mailbody = null; + Element mailbody; try { mailbody = getMailTemplate(); } catch (IOException e) { - LOG.error("Couldn't load mail template", e); + LOG.error("Couldn't load template of mail", e); return null; } @@ -111,24 +111,24 @@ public static String sendMail(String to, String subject, String content, boolean } params.put("asynchronous", "true"); - JSONObject rJson = null; + JSONObject rJson; try { String r = CommonsUtils.post("https://api.mysubmail.com/mail/send.json", params); rJson = JSON.parseObject(r); } catch (Exception ex) { - LOG.error("Mail failed : " + to + " > " + subject, ex); + LOG.error("Mail failed to send : " + to + " > " + subject, ex); return null; } if ("success".equals(rJson.getString("status"))) { JSONArray returns = rJson.getJSONArray("return"); if (returns.isEmpty()) { - LOG.error("Mail failed : " + to + " > " + subject + "\nError : " + rJson); + LOG.error("Mail failed to send : " + to + " > " + subject + "\nError : " + rJson); return null; } return ((JSONObject) returns.get(0)).getString("send_id"); } else { - LOG.error("Mail failed : " + to + " > " + subject + "\nError : " + rJson); + LOG.error("Mail failed to send : " + to + " > " + subject + "\nError : " + rJson); } return null; } @@ -142,58 +142,70 @@ protected static Element getMailTemplate() throws IOException { Document html = Jsoup.parse(tmp, "utf-8"); return html.body(); } - + /** * @param to * @param content + */ + public static void sendSMSAsync(String to, String content) { + ThreadPool.exec(() -> { + try { + sendSMS(to, content); + } catch (Exception ex) { + LOG.error("SMS failed to send : " + to, ex); + } + }); + } + + /** + * @param to + * @param content + * @return + * @throws ConfigurationException + */ + public static String sendSMS(String to, String content) throws ConfigurationException { + return sendSMS(to, content, SysConfiguration.getSmsAccount()); + } + + /** + * @param to + * @param content + * @param specAccount * @return null if failed or SENDID * @throws ConfigurationException If sms-account unset */ - public static String sendSMS(String to, String content) throws ConfigurationException { - String[] account = SysConfiguration.getSmsAccount(); - Assert.notNull(account, "短信账户未配置"); - + public static String sendSMS(String to, String content, String[] specAccount) throws ConfigurationException { + if (specAccount == null || specAccount.length < 3) { + throw new ConfigurationException("短信账户未配置/无效"); + } + Map params = new HashMap<>(); - params.put("appid", account[0]); - params.put("signature", account[1]); + params.put("appid", specAccount[0]); + params.put("signature", specAccount[1]); params.put("to", to); // Auto appended the SMS-Sign (China only?) if (!content.startsWith("【")) { - content = "【" + account[2] + "】" + content; + content = "【" + specAccount[2] + "】" + content; } params.put("content", content); - JSONObject rJson = null; + JSONObject rJson; try { String r = CommonsUtils.post("https://api.mysubmail.com/message/send.json", params); rJson = JSON.parseObject(r); } catch (Exception ex) { - LOG.error("SMS failed : " + to + " > " + content, ex); + LOG.error("SMS failed to send : " + to + " > " + content, ex); return null; } if ("success".equals(rJson.getString("status"))) { return rJson.getString("send_id"); } else { - LOG.error("SMS failed : " + to + " > " + content + "\nError : " + rJson); + LOG.error("SMS failed to send : " + to + " > " + content + "\nError : " + rJson); } return null; } - /** - * @param to - * @param content - */ - public static void sendSMSAsync(String to, String content) { - ThreadPool.exec(() -> { - try { - sendSMS(to, content); - } catch (Exception ex) { - LOG.error("SMS send failure: " + to, ex); - } - }); - } - /** * 短信服务可用 * diff --git a/src/main/java/com/rebuild/server/helper/SysConfiguration.java b/src/main/java/com/rebuild/server/helper/SysConfiguration.java index eb7f14013..6f3fa7487 100644 --- a/src/main/java/com/rebuild/server/helper/SysConfiguration.java +++ b/src/main/java/com/rebuild/server/helper/SysConfiguration.java @@ -122,17 +122,7 @@ public static String[] getStorageAccount() { return getsNoUnset(false, ConfigurableItem.StorageApiKey, ConfigurableItem.StorageApiSecret, ConfigurableItem.StorageBucket, ConfigurableItem.StorageURL); } - - /** - * 缓存账号 - * - * @return returns [CacheHost, CachePort, CachePassword] - */ - public static String[] getCacheAccount() { - return getsNoUnset(false, - ConfigurableItem.CacheHost, ConfigurableItem.CachePort, ConfigurableItem.CachePassword); - } - + /** * 邮件账号 * @@ -153,23 +143,30 @@ public static String[] getSmsAccount() { ConfigurableItem.SmsUser, ConfigurableItem.SmsPassword, ConfigurableItem.SmsSign); } + /** + * @return + */ + public static String getHomeUrl() { + return getHomeUrl(null); + } + /** * 获取绝对 URL * * @param path 可带有路径，会自动拼接 * @return */ - public static String getHomeUrl(String...path) { + public static String getHomeUrl(String path) { String homeUrl = get(ConfigurableItem.HomeURL); if (!homeUrl.endsWith("/")) { homeUrl += "/"; } - if (path.length > 0) { - if (path[0].startsWith("/")) { - path[0] = path[0].substring(1); + if (path != null) { + if (path.startsWith("/")) { + path = path.substring(1); } - return homeUrl + path[0]; + return homeUrl + path; } return homeUrl; } diff --git a/src/main/java/com/rebuild/server/helper/cache/BaseCacheTemplate.java b/src/main/java/com/rebuild/server/helper/cache/BaseCacheTemplate.java index d4632b0ee..9854fd7e4 100644 --- a/src/main/java/com/rebuild/server/helper/cache/BaseCacheTemplate.java +++ b/src/main/java/com/rebuild/server/helper/cache/BaseCacheTemplate.java @@ -18,6 +18,7 @@ package com.rebuild.server.helper.cache; +import cn.devezhao.commons.ThrowableUtils; import com.rebuild.server.Application; import org.apache.commons.io.IOUtils; import org.springframework.cache.CacheManager; @@ -127,7 +128,8 @@ private boolean testJedisPool(JedisPool jedisPool) { IOUtils.closeQuietly(jedis); return true; } catch (Exception ex) { - Application.LOG.warn("Acquisition J/Redis failed : " + ex.getLocalizedMessage() + " !!! Using backup ehcache for " + getClass()); + Application.LOG.warn("Acquisition J/Redis failed : " + ThrowableUtils.getRootCause(ex).getLocalizedMessage() + + " !!! Using backup ehcache for " + getClass()); } return false; } diff --git a/src/main/java/com/rebuild/server/helper/cache/JedisCacheTemplate.java b/src/main/java/com/rebuild/server/helper/cache/JedisCacheTemplate.java index 038b0f769..00459a629 100644 --- a/src/main/java/com/rebuild/server/helper/cache/JedisCacheTemplate.java +++ b/src/main/java/com/rebuild/server/helper/cache/JedisCacheTemplate.java @@ -44,11 +44,12 @@ protected JedisCacheTemplate(JedisPool jedisPool, String keyPrefix) { @Override public String get(String key) { - String ckey = unityKey(key); Jedis jedis = null; try { jedis = jedisPool.getResource(); - return jedis.get(ckey); + + key = unityKey(key); + return jedis.get(key); } finally { IOUtils.closeQuietly(jedis); } @@ -64,9 +65,11 @@ public void put(String key, String value, int seconds) { Jedis jedis = null; try { jedis = jedisPool.getResource(); - jedis.set(unityKey(key), value); + + key = unityKey(key); + jedis.set(key, value); if (seconds > 0) { - jedis.expire(value, seconds); + jedis.expire(key, seconds); } } finally { IOUtils.closeQuietly(jedis); @@ -76,11 +79,12 @@ public void put(String key, String value, int seconds) { @Override @SuppressWarnings("unchecked") public V getx(String key) { - String ckey = unityKey(key); Jedis jedis = null; try { jedis = jedisPool.getResource(); - byte[] bs = jedis.get(ckey.getBytes()); + + key = unityKey(key); + byte[] bs = jedis.get(key.getBytes()); if (bs == null || bs.length == 0) { return null; } @@ -100,14 +104,14 @@ public void putx(String key, V value) { @Override public void putx(String key, V value, int seconds) { - String ckey = unityKey(key); Jedis jedis = null; try { jedis = jedisPool.getResource(); - byte[] bKey = ckey.getBytes(); - jedis.set(bKey, SerializationUtils.serialize(value)); + + byte[] bkey = unityKey(key).getBytes(); + jedis.set(bkey, SerializationUtils.serialize(value)); if (seconds > 0) { - jedis.expire(bKey, seconds); + jedis.expire(bkey, seconds); } } finally { IOUtils.closeQuietly(jedis); @@ -116,11 +120,12 @@ public void putx(String key, V value, int seconds) { @Override public void evict(String key) { - String ckey = unityKey(key); Jedis jedis = null; try { jedis = jedisPool.getResource(); - jedis.del(ckey); + + key = unityKey(key); + jedis.del(key); } finally { IOUtils.closeQuietly(jedis); } diff --git a/src/main/java/com/rebuild/server/helper/cache/RecentlyUsedCache.java b/src/main/java/com/rebuild/server/helper/cache/RecentlyUsedCache.java index 1e6fa70ac..59eca8195 100644 --- a/src/main/java/com/rebuild/server/helper/cache/RecentlyUsedCache.java +++ b/src/main/java/com/rebuild/server/helper/cache/RecentlyUsedCache.java @@ -23,6 +23,7 @@ import com.rebuild.server.configuration.portals.FieldValueWrapper; import com.rebuild.server.helper.ConfigurableItem; import com.rebuild.server.helper.SysConfiguration; +import com.rebuild.server.metadata.EntityHelper; import com.rebuild.server.metadata.MetadataHelper; import org.apache.commons.lang.StringUtils; @@ -39,6 +40,9 @@ * @since 2019/04/25 */ public class RecentlyUsedCache { + + // 最大缓存数量 + private static final int MAXNUM_PRE_ENTITY = 50; final private CommonCache cacheManager; @@ -78,12 +82,12 @@ public ID[] gets(ID user, String entity, String type, int limit) { if (exists == null) { return ID.EMPTY_ID_ARRAY; } - + Set missed = new HashSet<>(); List data = new ArrayList<>(); for (int i = 0; i < limit && i < exists.size(); i++) { final ID raw = exists.get(i); - if (!Application.getSecurityManager().allowRead(user, raw)) { + if (!(raw.getEntityCode() == EntityHelper.ClassificationData || Application.getSecurityManager().allowRead(user, raw))) { continue; } @@ -126,7 +130,7 @@ public void addOne(ID user, ID id, String type) { exists.remove(id); } - if (exists.size() > 50) { + if (exists.size() > MAXNUM_PRE_ENTITY) { exists.removeLast(); } exists.addFirst(id); @@ -149,11 +153,6 @@ public void clean(ID user, String entity, String type) { cacheManager.evict(key); } - /** - * @param entity - * @param type - * @return - */ private String formatKey(ID user, String entity, String type) { return String.format("RSR.%s-%s-%s", user, entity, StringUtils.defaultIfBlank(type, StringUtils.EMPTY)); } diff --git a/src/main/java/com/rebuild/server/helper/datalist/DataListWrapper.java b/src/main/java/com/rebuild/server/helper/datalist/DataListWrapper.java index 8e51ac8fc..b0527874d 100644 --- a/src/main/java/com/rebuild/server/helper/datalist/DataListWrapper.java +++ b/src/main/java/com/rebuild/server/helper/datalist/DataListWrapper.java @@ -133,7 +133,7 @@ public JSON toJson() { nameValue = StringUtils.EMPTY; } } - ((ID) value).setLabel(nameValue.toString()); + ((ID) value).setLabel(nameValue); } row[colIndex] = wrapFieldValue(value, field); diff --git a/src/main/java/com/rebuild/server/helper/language/LanguageBundle.java b/src/main/java/com/rebuild/server/helper/language/LanguageBundle.java index bc20cb5ee..f93fae37b 100644 --- a/src/main/java/com/rebuild/server/helper/language/LanguageBundle.java +++ b/src/main/java/com/rebuild/server/helper/language/LanguageBundle.java @@ -25,6 +25,7 @@ import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; +import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -77,6 +78,7 @@ private JSONObject merge(JSONObject bundle) { /** * @return + * @see Locale#forLanguageTag(String) */ public String locale() { return locale; diff --git a/src/main/java/com/rebuild/server/helper/setup/DatabaseBackup.java b/src/main/java/com/rebuild/server/helper/setup/DatabaseBackup.java new file mode 100644 index 000000000..a60f46357 --- /dev/null +++ b/src/main/java/com/rebuild/server/helper/setup/DatabaseBackup.java @@ -0,0 +1,146 @@ +/* +rebuild - Building your business-systems freely. +Copyright (C) 2020 devezhao + +rebuild is dual-licensed under commercial and open source licenses (GPLv3). +For more information, please see +*/ + +package com.rebuild.server.helper.setup; + +import cn.devezhao.commons.CalendarUtils; +import com.rebuild.server.Application; +import com.rebuild.server.helper.AesPreferencesConfigurer; +import com.rebuild.server.helper.ConfigurableItem; +import com.rebuild.server.helper.SysConfiguration; +import com.rebuild.utils.CommonsUtils; +import com.rebuild.utils.MaxBackupIndexDailyRollingFileAppender; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.SystemUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.Arrays; + +/** + * 数据库备份 + * + * @author devezhao + * @since 2020/2/4 + */ +public class DatabaseBackup { + + private static final Log LOG = LogFactory.getLog(DatabaseBackup.class); + + /** + * @return + * @throws IOException + */ + public File backup() throws IOException { + String url = Application.getBean(AesPreferencesConfigurer.class).getItem("db.url"); + String user = Application.getBean(AesPreferencesConfigurer.class).getItem("db.user"); + String passwd = Application.getBean(AesPreferencesConfigurer.class).getItem("db.passwd"); + + url = url.split("\\?")[0].split("//")[1]; + String host = url.split(":")[0]; + String port = url.split("/")[0].split(":")[1]; + String dbname = url.split("/")[1]; + + String destName = dbname + "." + CalendarUtils.getPlainDateFormat().format(CalendarUtils.now()); + File backups = SysConfiguration.getFileOfData("backups"); + if (!backups.exists()) { + FileUtils.forceMkdir(backups); + } + File dest = new File(backups, destName); + + String cmd = String.format( + "mysqldump -u%s -p%s -h%s -P%s --default-character-set=utf8 --opt --extended-insert=true --triggers -R --hex-blob -x %s>%s", + user, passwd, host, port, dbname, dest.getAbsolutePath()); + + Process process; + + if (SystemUtils.IS_OS_WINDOWS) { + cmd = cmd.replaceFirst("mysqldump", "cmd /c mysqldump.exe"); + process = Runtime.getRuntime().exec(cmd); + } + // for Linux + else { + process = Runtime.getRuntime().exec(new String[] { "/bin/sh", "-c", cmd }); + } + + BufferedReader readerError = null; + BufferedReader reader = null; + StringBuilder echo = new StringBuilder(); + try { + readerError = new BufferedReader(new InputStreamReader(process.getErrorStream())); + reader = new BufferedReader(new InputStreamReader(process.getInputStream())); + + String line; + while ((line = readerError.readLine()) != null) { + echo.append(line).append("\n"); + } + while ((line = reader.readLine()) != null) { + echo.append(line).append("\n"); + } + + } finally { + IOUtils.closeQuietly(readerError); + IOUtils.closeQuietly(reader); + process.destroy(); + } + + boolean isGotError = echo.toString().contains("Got error"); + try { + int code = process.waitFor(); + if (code != 0 || isGotError) { + LOG.error("Command failed : " + code + " # " + echo.toString()); + return null; + } + } catch (InterruptedException ex) { + LOG.error("Command interrupted"); + return null; + } + + try { + File zip = new File(backups, destName + ".zip"); + CommonsUtils.zip(dest, zip); + + FileUtils.deleteQuietly(dest); + dest = zip; + + } catch (Exception ex) { + LOG.warn(null, ex); + } + LOG.info("Backup succeeded : " + dest + " (" + FileUtils.byteCountToDisplaySize(dest.length()) + ")"); + + deleteOldBackups(backups, SysConfiguration.getInt(ConfigurableItem.DBBackupsKeepingDays)); + + return dest; + } + + /** + * @param backupDir + * @param maxKeep + */ + protected void deleteOldBackups(File backupDir, int maxKeep) { + if (maxKeep <= 0) { + return; + } + + File[] backupFiles = backupDir.listFiles(); + if (backupFiles == null) { + return; + } + + Arrays.sort(backupFiles, new MaxBackupIndexDailyRollingFileAppender.CompratorByLastModified()); + for (int i = maxKeep; i < backupFiles.length; i++) { + File file = backupFiles[i]; + FileUtils.deleteQuietly(file); + } + } +} diff --git a/src/main/java/com/rebuild/server/helper/setup/InstallAfter.java b/src/main/java/com/rebuild/server/helper/setup/InstallAfter.java deleted file mode 100644 index 24e9d2725..000000000 --- a/src/main/java/com/rebuild/server/helper/setup/InstallAfter.java +++ /dev/null @@ -1,76 +0,0 @@ -/* -rebuild - Building your business-systems freely. -Copyright (C) 2018-2019 devezhao - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ -package com.rebuild.server.helper.setup; - -import com.rebuild.server.Application; -import com.rebuild.server.helper.SysConfiguration; -import com.rebuild.utils.AES; -import org.springframework.core.io.FileSystemResource; -import org.springframework.core.io.support.PropertiesLoaderUtils; - -import java.io.File; -import java.io.IOException; -import java.util.Map; -import java.util.Properties; - -/** - * 标记接口。 - * 此接口用于标示系统在未完成安装时子类不能随意调用（直接或间接）Application 中的关于 SPRING 相关的方法，调用前应该判断安装状态。 - * - * @author devezhao - * @since 2019/12/17 - */ -public interface InstallAfter { - - /** - * 状态文件。位置 ～/.rebuild/.rebuild - */ - String INSTALL_FILE = ".rebuild"; - - /** - * 检查安装状态 - * - * @return - */ - default boolean checkInstalled() { - if (Application.devMode()) return true; // for dev - - File file = SysConfiguration.getFileOfData(INSTALL_FILE); - if (file.exists()) { - try { - Properties dbProps = PropertiesLoaderUtils.loadProperties(new FileSystemResource(file)); - String dbPasswd = (String) dbProps.remove("db.passwd.aes"); - if (dbPasswd != null) { - dbProps.put("db.passwd", AES.decrypt(dbPasswd)); - } - - for (Map.Entry e : dbProps.entrySet()) { - System.setProperty((String) e.getKey(), (String) e.getValue()); - if ("db.url".equals(e.getKey()) && ((String) e.getValue()).contains("jdbc:h2:")) { - Application.LOG.warn("Using QuickMode with H2 database!"); - } - } - } catch (IOException e) { - throw new SetupException(e); - } - - return true; - } - return false; - } -} diff --git a/src/main/java/com/rebuild/server/helper/setup/InstallState.java b/src/main/java/com/rebuild/server/helper/setup/InstallState.java new file mode 100644 index 000000000..9c012989f --- /dev/null +++ b/src/main/java/com/rebuild/server/helper/setup/InstallState.java @@ -0,0 +1,49 @@ +/* +rebuild - Building your business-systems freely. +Copyright (C) 2018-2019 devezhao + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +package com.rebuild.server.helper.setup; + +import com.rebuild.server.Application; +import com.rebuild.server.helper.SysConfiguration; + +import java.io.File; + +/** + * 安装状态。 + * 此接口主要用于警示子类在未安装时不能随意调用（直接或间接）Application 中关于 SPRING 的相关方法，调用前应该判断安装状态。 + * + * @author devezhao + * @since 2019/12/17 + */ +public interface InstallState { + + /** + * 状态文件位置 ～/.rebuild/.rebuild + */ + String INSTALL_FILE = ".rebuild"; + + /** + * 检查安装状态 + * + * @return + */ + default boolean checkInstalled() { + if (Application.devMode()) return true; // for dev + File file = SysConfiguration.getFileOfData(INSTALL_FILE); + return file != null && file.exists(); + } +} diff --git a/src/main/java/com/rebuild/server/helper/setup/Installer.java b/src/main/java/com/rebuild/server/helper/setup/Installer.java index b3eb1f69f..999845ecb 100644 --- a/src/main/java/com/rebuild/server/helper/setup/Installer.java +++ b/src/main/java/com/rebuild/server/helper/setup/Installer.java @@ -20,18 +20,15 @@ import cn.devezhao.commons.EncryptUtils; import cn.devezhao.commons.sql.SqlBuilder; -import cn.devezhao.commons.sql.builder.InsertBuilder; import cn.devezhao.commons.sql.builder.UpdateBuilder; -import cn.devezhao.persist4j.engine.ID; import com.alibaba.fastjson.JSONObject; import com.rebuild.server.Application; import com.rebuild.server.ServerListener; import com.rebuild.server.helper.ConfigurableItem; -import com.rebuild.server.helper.Lisence; +import com.rebuild.server.helper.License; import com.rebuild.server.helper.SysConfiguration; import com.rebuild.server.helper.cache.EhcacheTemplate; import com.rebuild.server.helper.cache.JedisCacheTemplate; -import com.rebuild.server.metadata.EntityHelper; import com.rebuild.utils.AES; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; @@ -59,7 +56,7 @@ * @author devezhao * @since 2019/11/25 */ -public class Installer implements InstallAfter { +public class Installer implements InstallState { private static final Log LOG = LogFactory.getLog(Installer.class); @@ -77,20 +74,35 @@ public Installer(JSONObject installProps) { /** * 执行安装 + * + * @throws Exception */ - public void install() { + public void install() throws Exception { this.installDatabase(); - this.installSystem(); this.installAdmin(); - // Save install state + // Save install state (file) File dest = SysConfiguration.getFileOfData(INSTALL_FILE); - Properties dbProps = buildConnectionProps(null); - dbProps.put("db.passwd.aes", AES.encrypt((String) dbProps.remove("db.passwd"))); + Properties installProps = buildConnectionProps(null); + // Redis + JSONObject cacheProps = this.installProps.getJSONObject("cacheProps"); + if (cacheProps != null && !cacheProps.isEmpty()) { + installProps.put(ConfigurableItem.CacheHost.name(), cacheProps.getString(ConfigurableItem.CacheHost.name())); + installProps.put(ConfigurableItem.CachePort.name(), cacheProps.getString(ConfigurableItem.CachePort.name())); + installProps.put(ConfigurableItem.CachePassword.name(), cacheProps.getString(ConfigurableItem.CachePassword.name())); + } + // 加密 + String dbPasswd = (String) installProps.remove("db.passwd"); + installProps.put("db.passwd.aes", + StringUtils.isBlank(dbPasswd) ? StringUtils.EMPTY : AES.encrypt(dbPasswd)); + String cachePasswd = (String) installProps.remove(ConfigurableItem.CachePassword.name()); + installProps.put(ConfigurableItem.CachePassword.name() + ".aes", + StringUtils.isBlank(cachePasswd) ? StringUtils.EMPTY : AES.encrypt(cachePasswd)); + try { FileUtils.deleteQuietly(dest); try (OutputStream os = new FileOutputStream(dest)) { - dbProps.store(os, "INSTALL FILE FOR REBUILD. DON'T DELETE OR MODIFY IT!!!"); + installProps.store(os, "INSTALL FILE FOR REBUILD. DON'T DELETE OR MODIFY IT!!!"); LOG.warn("Stored install file : " + dest); } @@ -98,11 +110,17 @@ public void install() { throw new SetupException(e); } - // init again - new ServerListener().contextInitialized(null); + // initialize + try { + new ServerListener().contextInitialized(null); + } catch (Exception ex) { + // If error + FileUtils.deleteQuietly(dest); + throw ex; + } // Gen SN - Lisence.SN(); + License.SN(); // Clean cached if (Application.getCommonCache().isUseRedis()) { @@ -225,7 +243,8 @@ protected String[] getDbInitScript() throws IOException { String L2 = L.toString().trim(); // NOTE double 字段也不支持 - boolean H2Unsupported = quickMode && L2.startsWith("fulltext"); + boolean H2Unsupported = quickMode + && (L2.startsWith("fulltext ") || L2.startsWith("unique ") || L2.startsWith("index ")); // Ignore comments and line of blank if (StringUtils.isEmpty(L2) || L2.startsWith("--") || H2Unsupported) { @@ -250,20 +269,6 @@ protected String[] getDbInitScript() throws IOException { return SQLS.toArray(new String[0]); } - /** - * 系统参数 - */ - protected void installSystem() { - JSONObject systemProps = installProps.getJSONObject("systemProps"); - if (systemProps == null || systemProps.isEmpty()) { - return; - } - - insertSystemProp(ConfigurableItem.DataDirectory, systemProps.getString("dataDirectory")); - insertSystemProp(ConfigurableItem.AppName, systemProps.getString("appName")); - insertSystemProp(ConfigurableItem.HomeURL, systemProps.getString("homeUrl")); - } - /** * 管理员 */ @@ -291,18 +296,9 @@ protected void installAdmin() { executeSql(ub.toSql()); } - private void insertSystemProp(ConfigurableItem item, String value) { - if (StringUtils.isBlank(value)) { - return; - } - - InsertBuilder ib = SqlBuilder.buildInsert("system_config") - .addColumn("CONFIG_ID", ID.newId(EntityHelper.SystemConfig)) - .addColumn("ITEM", item.name()) - .addColumn("VALUE", value); - executeSql(ib.toSql()); - } - + /** + * @param sql + */ private void executeSql(String sql) { try (Connection conn = getConnection(null)) { try (Statement stmt = conn.createStatement()) { diff --git a/src/main/java/com/rebuild/server/helper/state/StateManager.java b/src/main/java/com/rebuild/server/helper/state/StateManager.java index cf653d993..0fb5b1244 100644 --- a/src/main/java/com/rebuild/server/helper/state/StateManager.java +++ b/src/main/java/com/rebuild/server/helper/state/StateManager.java @@ -19,6 +19,7 @@ package com.rebuild.server.helper.state; import cn.devezhao.persist4j.Field; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.rebuild.server.Application; @@ -65,7 +66,8 @@ public JSONArray getStateOptions(String stateClass) { final String cKey = "STATECLASS-" + stateClass; JSONArray options = (JSONArray) Application.getCommonCache().getx(cKey); if (options != null) { - return options; + // 使用副本 + return JSON.parseArray(options.toJSONString()); } Class state = StateHelper.getSatetClass(stateClass); diff --git a/src/main/java/com/rebuild/server/metadata/EntityHelper.java b/src/main/java/com/rebuild/server/metadata/EntityHelper.java index 3783a3392..397a2ec8d 100644 --- a/src/main/java/com/rebuild/server/metadata/EntityHelper.java +++ b/src/main/java/com/rebuild/server/metadata/EntityHelper.java @@ -56,9 +56,14 @@ public static Record parse(JSONObject data, ID user) { if (metadata == null) { throw new FieldValueException("无效实体数据格式(1): " + data.toJSONString()); } + String entityName = metadata.getString("entity"); if (StringUtils.isBlank(entityName)) { - throw new FieldValueException("无效实体数据格式(2): " + data.toJSONString()); + String id = metadata.getString("id"); + if (!ID.isId(id)) { + throw new FieldValueException("无效实体数据格式(2): " + data.toJSONString()); + } + entityName = MetadataHelper.getEntityName(ID.valueOf(id)); } ExtRecordCreator creator = new ExtRecordCreator(MetadataHelper.getEntity(entityName), data, user); @@ -136,8 +141,6 @@ private static Record forNew(Entity entity, ID user) { public static final String AutoId = "autoId"; public static final String QuickCode = "quickCode"; - @SuppressWarnings("DeprecatedIsStillUsed") - @Deprecated public static final String IsDeleted = "isDeleted"; public static final String ApprovalId = "approvalId"; diff --git a/src/main/java/com/rebuild/server/metadata/ExtRecordCreator.java b/src/main/java/com/rebuild/server/metadata/ExtRecordCreator.java index da8de7da3..d641eeffd 100644 --- a/src/main/java/com/rebuild/server/metadata/ExtRecordCreator.java +++ b/src/main/java/com/rebuild/server/metadata/ExtRecordCreator.java @@ -28,6 +28,7 @@ import cn.devezhao.persist4j.record.JsonRecordCreator; import com.alibaba.fastjson.JSONObject; import com.rebuild.server.Application; +import com.rebuild.server.configuration.RobotTriggerManager; import com.rebuild.server.metadata.entity.DisplayType; import com.rebuild.server.metadata.entity.EasyMeta; import com.rebuild.server.service.DataSpecificationException; @@ -39,6 +40,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Set; /** * 标准 Record 解析 @@ -120,18 +122,22 @@ public void verify(Record record, boolean isNew) { List notAllowed = new ArrayList<>(); // 新建 if (isNew) { + // 自动只读字段可以忽略非空检查 + final Set roFieldsByTrigger = RobotTriggerManager.instance.getAutoReadonlyFields(record.getEntity().getName()); + for (Field field : entity.getFields()) { - if (MetadataHelper.isSystemField(field)) { + if (MetadataHelper.isSystemField(field) || roFieldsByTrigger.contains(field.getName())) { continue; } - EasyMeta easy = EasyMeta.valueOf(field); - if (easy.getDisplayType() == DisplayType.SERIES) { + + final EasyMeta easyField = EasyMeta.valueOf(field); + if (easyField.getDisplayType() == DisplayType.SERIES) { continue; } Object hasVal = record.getObjectValue(field.getName()); if ((hasVal == null || NullValue.is(hasVal)) && !field.isNullable()) { - notAllowed.add(easy.getLabel()); + notAllowed.add(easyField.getLabel()); } } @@ -149,10 +155,10 @@ public void verify(Record record, boolean isNew) { continue; } - EasyMeta easy = EasyMeta.valueOf(field); - if (!easy.isUpdatable()) { + final EasyMeta easyField = EasyMeta.valueOf(field); + if (!easyField.isUpdatable()) { if (strictMode) { - notAllowed.add(easy.getLabel()); + notAllowed.add(easyField.getLabel()); } else { record.removeValue(fieldName); LOG.warn("Remove non-updatable field : " + fieldName); diff --git a/src/main/java/com/rebuild/server/metadata/entity/Entity2Schema.java b/src/main/java/com/rebuild/server/metadata/entity/Entity2Schema.java index 581db9a32..72b4b795a 100644 --- a/src/main/java/com/rebuild/server/metadata/entity/Entity2Schema.java +++ b/src/main/java/com/rebuild/server/metadata/entity/Entity2Schema.java @@ -157,15 +157,15 @@ record = Application.getCommonService().create(record); } catch (Throwable ex) { LOG.error(null, ex); Application.getCommonService().delete(tempMetaId.toArray(new ID[0])); - return null; + throw new ModifiyMetadataException("元数据初始化失败 : " + ex.getLocalizedMessage()); } boolean schemaReady = schema2Database(tempEntity); if (!schemaReady) { Application.getCommonService().delete(tempMetaId.toArray(new ID[0])); - return null; + throw new ModifiyMetadataException("无法创建表到数据库"); } - + Application.getMetadataFactory().refresh(false); return entityName; } diff --git a/src/main/java/com/rebuild/server/service/PerHourJob.java b/src/main/java/com/rebuild/server/service/PerHourJob.java new file mode 100644 index 000000000..121ccbcdb --- /dev/null +++ b/src/main/java/com/rebuild/server/service/PerHourJob.java @@ -0,0 +1,52 @@ +/* +rebuild - Building your business-systems freely. +Copyright (C) 2020 devezhao + +rebuild is dual-licensed under commercial and open source licenses (GPLv3). +For more information, please see +*/ + +package com.rebuild.server.service; + +import com.rebuild.server.helper.ConfigurableItem; +import com.rebuild.server.helper.SysConfiguration; +import com.rebuild.server.helper.setup.DatabaseBackup; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.quartz.DisallowConcurrentExecution; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.quartz.PersistJobDataAfterExecution; +import org.springframework.scheduling.quartz.QuartzJobBean; + +import java.util.Calendar; + +/** + * 每小时执行一次的 Job + * + * @author devezhao + * @since 2020/2/4 + */ +@PersistJobDataAfterExecution +@DisallowConcurrentExecution +public class PerHourJob extends QuartzJobBean { + + private static final Log LOG = LogFactory.getLog(PerHourJob.class); + + @Override + protected void executeInternal(JobExecutionContext context) throws JobExecutionException { + final int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY); + + // 数据库备份 + if (hour == 0 && SysConfiguration.getBool((ConfigurableItem.DBBackupsEnable))) { + try { + new DatabaseBackup().backup(); + } catch (Exception e) { + LOG.error("Executing [DatabaseBackup] failed : " + e); + } + } + + // others here + + } +} diff --git a/src/main/java/com/rebuild/server/service/base/ApprovalStepService.java b/src/main/java/com/rebuild/server/service/base/ApprovalStepService.java index 23ba3d395..a818b28ad 100644 --- a/src/main/java/com/rebuild/server/service/base/ApprovalStepService.java +++ b/src/main/java/com/rebuild/server/service/base/ApprovalStepService.java @@ -98,15 +98,25 @@ public void txSubmit(Record mainRecord, Set cc, Set nextApprovers) { String cKey = "ApprovalSubmitter" + recordId + approvalId; Application.getCommonCache().evict(cKey); } - + /** * @param stepRecord * @param signMode * @param cc - * @param nextApprovers - * @param nextNode + * @param nextApprovers 驳回时无需 + * @param nextNode 驳回时无需 + * @param addedData 驳回时无需 */ - public void txApprove(Record stepRecord, String signMode, Set cc, Set nextApprovers, String nextNode) { + public void txApprove(Record stepRecord, String signMode, Set cc, Set nextApprovers, String nextNode, Record addedData) { + if (addedData != null) { + IN_ADDED.set(true); + try { + Application.getService(addedData.getEntity().getEntityCode()).update(addedData); + } finally { + IN_ADDED.remove(); + } + } + super.update(stepRecord); final ID stepRecordId = stepRecord.getPrimary(); @@ -340,4 +350,16 @@ public ID findSubmitter(ID recordId, ID approvalId) { Application.getCommonCache().putx(cKey, submitter); return submitter; } + + // -- + + private static final ThreadLocal IN_ADDED = new ThreadLocal<>(); + /** + * 可编辑字段模式 + * + * @return + */ + public static boolean inAddedMode() { + return IN_ADDED.get() != null && IN_ADDED.get(); + } } diff --git a/src/main/java/com/rebuild/server/service/base/AttachmentAwareObserver.java b/src/main/java/com/rebuild/server/service/base/AttachmentAwareObserver.java index 3340a43b8..a288155b3 100644 --- a/src/main/java/com/rebuild/server/service/base/AttachmentAwareObserver.java +++ b/src/main/java/com/rebuild/server/service/base/AttachmentAwareObserver.java @@ -25,6 +25,8 @@ import com.alibaba.fastjson.JSONArray; import com.rebuild.server.Application; import com.rebuild.server.business.files.FilesHelper; +import com.rebuild.server.business.recyclebin.RecycleBinCleanerJob; +import com.rebuild.server.metadata.EntityHelper; import com.rebuild.server.metadata.MetadataSorter; import com.rebuild.server.metadata.entity.DisplayType; import com.rebuild.server.service.OperatingContext; @@ -71,7 +73,7 @@ public void onCreate(OperatingContext context) { return; } - Application.getCommonService().createOrUpdate(createWill.toArray(new Record[0])); + Application.getCommonService().createOrUpdate(createWill.toArray(new Record[0]), false); } @Override @@ -100,8 +102,8 @@ public void onUpdate(OperatingContext context) { } } if (LOG.isDebugEnabled()) { - LOG.debug("删除 ... " + beforeFiles); - LOG.debug("增加 ... " + afterFiles); + LOG.debug("Remove ... " + beforeFiles); + LOG.debug("Add ... " + afterFiles); } for (Object o : beforeFiles) { @@ -128,7 +130,7 @@ public void onUpdate(OperatingContext context) { } Application.getCommonService().createOrUpdateAndDelete( - createWill.toArray(new Record[0]), deleteWill.toArray(new ID[0])); + createWill.toArray(new Record[0]), deleteWill.toArray(new ID[0]), false); } @Override @@ -143,17 +145,29 @@ public void onDelete(OperatingContext context) { "select attachmentId from Attachment where relatedRecord = ?") .setParameter(1, record.getPrimary()) .array(); + if (array.length == 0) { + return; + } + + // 回收站开启 + boolean recycleEnable = RecycleBinCleanerJob.getKeepingDays() > 0; + + List updateWill = new ArrayList<>(); List deleteWill = new ArrayList<>(); for (Object[] o : array) { - deleteWill.add((ID) o[0]); - } - if (deleteWill.isEmpty()) { - return; + if (recycleEnable) { + Record u = EntityHelper.forUpdate((ID) o[0], null, false); + u.setBoolean(EntityHelper.IsDeleted, true); + updateWill.add(u); + } else { + deleteWill.add((ID) o[0]); + } } - - Application.getCommonService().delete(deleteWill.toArray(new ID[0])); + + Application.getCommonService().createOrUpdateAndDelete( + updateWill.toArray(new Record[0]), deleteWill.toArray(new ID[0]), false); } - + private JSONArray parseFilesJson(String files) { if (StringUtils.isBlank(files)) { return JSONUtils.EMPTY_ARRAY; diff --git a/src/main/java/com/rebuild/server/service/base/GeneralEntityService.java b/src/main/java/com/rebuild/server/service/base/GeneralEntityService.java index eea1c1a77..259027a20 100644 --- a/src/main/java/com/rebuild/server/service/base/GeneralEntityService.java +++ b/src/main/java/com/rebuild/server/service/base/GeneralEntityService.java @@ -31,11 +31,10 @@ import com.rebuild.server.RebuildException; import com.rebuild.server.business.approval.ApprovalState; import com.rebuild.server.business.dataimport.DataImporter; +import com.rebuild.server.business.recyclebin.RecycleBinCleanerJob; import com.rebuild.server.business.recyclebin.RecycleStore; import com.rebuild.server.business.series.SeriesGeneratorFactory; import com.rebuild.server.business.trigger.RobotTriggerObserver; -import com.rebuild.server.helper.ConfigurableItem; -import com.rebuild.server.helper.SysConfiguration; import com.rebuild.server.helper.cache.NoRecordFoundException; import com.rebuild.server.helper.task.TaskExecutors; import com.rebuild.server.metadata.DefaultValueHelper; @@ -134,7 +133,7 @@ public int delete(ID record, String[] cascades) { final ID currentUser = Application.getCurrentUser(); RecycleStore recycleBin = null; - if (SysConfiguration.getInt(ConfigurableItem.RecycleBinKeepingDays) > 0) { + if (RecycleBinCleanerJob.getKeepingDays() > 0) { recycleBin = new RecycleStore(currentUser); } @@ -421,7 +420,8 @@ protected boolean checkModifications(ID recordId, Permission action) throws Data return false; } - if (state == ApprovalState.APPROVED || state == ApprovalState.PROCESSING) { + if (state == ApprovalState.APPROVED + || (state == ApprovalState.PROCESSING && !ApprovalStepService.inAddedMode())) { String actionType = action == BizzPermission.UPDATE ? "修改" : "删除"; String stateType = state == ApprovalState.APPROVED ? "已完成审批" : "正在审批中"; if (RobotTriggerObserver.getTriggerSource() != null) { diff --git a/src/main/java/com/rebuild/server/service/bizz/UserHelper.java b/src/main/java/com/rebuild/server/service/bizz/UserHelper.java index ce1819d9d..7abb54ca7 100644 --- a/src/main/java/com/rebuild/server/service/bizz/UserHelper.java +++ b/src/main/java/com/rebuild/server/service/bizz/UserHelper.java @@ -186,6 +186,7 @@ public static Member[] getMembers(ID groupId) { if (ms == null || ms.isEmpty()) { return new Member[0]; } + // noinspection SuspiciousToArrayCall return ms.toArray(new Member[0]); } @@ -244,9 +245,10 @@ public static Set parseUsers(Collection userDefs, ID record) { if (bizz.getEntityCode() == EntityHelper.User) { users.add(bizz); } else if (bizz.getEntityCode() == EntityHelper.Department || bizz.getEntityCode() == EntityHelper.Role) { - Member[] ms = UserHelper.getMembers(bizz); + Member[] ms = getMembers(bizz); for (Member m : ms) { - users.add((ID) m.getIdentity()); + if (m.getIdentity().equals(UserService.SYSTEM_USER)) continue; + users.add((ID) m.getIdentity()); } } } @@ -366,7 +368,26 @@ public static User[] sortUsers(boolean isAll) { users = list.toArray(new User[0]); } - Arrays.sort(users, Comparator.comparing(User::getFullName)); + sortMembers(users); return users; } + + /** + * 成员排序 + * + * @param members + * @return + */ + public static Member[] sortMembers(Member[] members) { + if (members == null || members.length == 0) { + return new Member[0]; + } + + if (members[0] instanceof User) { + Arrays.sort(members, Comparator.comparing(o -> ((User) o).getFullName())); + } else { + Arrays.sort(members, Comparator.comparing(Member::getName)); + } + return members; + } } diff --git a/src/main/java/com/rebuild/server/service/bizz/UserService.java b/src/main/java/com/rebuild/server/service/bizz/UserService.java index 5ede1b3f0..cce2a84c4 100644 --- a/src/main/java/com/rebuild/server/service/bizz/UserService.java +++ b/src/main/java/com/rebuild/server/service/bizz/UserService.java @@ -111,7 +111,7 @@ protected void saveBefore(Record record) { record.setString("password", EncryptUtils.toSHA256Hex(password)); } - if (record.hasValue("email") && Application.getUserStore().exists(record.getString("email"))) { + if (record.hasValue("email") && Application.getUserStore().existsUser(record.getString("email"))) { throw new DataSpecificationException(Languages.lang("Repeated", "Email")); } @@ -133,7 +133,7 @@ protected void saveBefore(Record record) { * @throws DataSpecificationException */ private void checkLoginName(String loginName) throws DataSpecificationException { - if (Application.getUserStore().exists(loginName)) { + if (Application.getUserStore().existsUser(loginName)) { throw new DataSpecificationException("登陆名重复"); } if (!CommonsUtils.isPlainText(loginName) || BlackList.isBlack(loginName)) { diff --git a/src/main/java/com/rebuild/server/service/bizz/privileges/UserStore.java b/src/main/java/com/rebuild/server/service/bizz/privileges/UserStore.java index efc7ca989..ba05565da 100644 --- a/src/main/java/com/rebuild/server/service/bizz/privileges/UserStore.java +++ b/src/main/java/com/rebuild/server/service/bizz/privileges/UserStore.java @@ -31,6 +31,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.rebuild.server.Application; +import com.rebuild.server.metadata.EntityHelper; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -89,17 +90,34 @@ public boolean existsEmail(String email) { * @param emailOrName * @return */ - public boolean exists(String emailOrName) { + public boolean existsUser(String emailOrName) { return existsName(emailOrName) || existsEmail(emailOrName); } - + /** * @param userId * @return */ - public boolean exists(ID userId) { + public boolean existsUser(ID userId) { return USERs.containsKey(userId); } + + /** + * @param bizzId + * @return + */ + public boolean existsAny(ID bizzId) { + if (bizzId.getEntityCode() == EntityHelper.User) { + return USERs.containsKey(bizzId); + } else if (bizzId.getEntityCode() == EntityHelper.Role) { + return ROLEs.containsKey(bizzId); + } else if (bizzId.getEntityCode() == EntityHelper.Department) { + return DEPTs.containsKey(bizzId); + } else if (bizzId.getEntityCode() == EntityHelper.Team) { + return TEAMs.containsKey(bizzId); + } + return false; + } /** * @param username @@ -249,7 +267,7 @@ public void refreshUser(ID userId) { final ID deptId = (ID) o[6]; final ID roleId = (ID) o[7]; - final User oldUser = exists(userId) ? getUser(userId) : null; + final User oldUser = existsUser(userId) ? getUser(userId) : null; if (oldUser != null) { Role role = oldUser.getOwningRole(); if (role != null) { diff --git a/src/main/java/com/rebuild/server/service/notification/MessageBuilder.java b/src/main/java/com/rebuild/server/service/notification/MessageBuilder.java index 3fd0d340b..9e7f132fd 100644 --- a/src/main/java/com/rebuild/server/service/notification/MessageBuilder.java +++ b/src/main/java/com/rebuild/server/service/notification/MessageBuilder.java @@ -91,7 +91,7 @@ public static Message createApproval(ID fromUser, ID toUser, String message, ID /** * Matchs @ID */ - public static final Pattern AT_PATTERN = Pattern.compile("(\\@[0-9a-z\\-]{20})"); + public static final Pattern AT_PATTERN = Pattern.compile("(@[0-9a-zA-Z\\-]{20})"); /** * 格式化消息 @@ -139,7 +139,7 @@ protected static String parseAtsId(String atid) { final ID id = ID.valueOf(atid); if (id.getEntityCode() == EntityHelper.User) { - if (Application.getUserStore().exists(id)) { + if (Application.getUserStore().existsUser(id)) { return Application.getUserStore().getUser(id).getFullName(); } else { return "[无效用户]"; diff --git a/src/main/java/com/rebuild/server/service/query/AdvFilterParser.java b/src/main/java/com/rebuild/server/service/query/AdvFilterParser.java index 4cdcf2d18..4eeae4a48 100644 --- a/src/main/java/com/rebuild/server/service/query/AdvFilterParser.java +++ b/src/main/java/com/rebuild/server/service/query/AdvFilterParser.java @@ -104,16 +104,18 @@ public String toSqlWhere() { values = values == null ? JSONUtils.EMPTY_OBJECT : values; Map indexItemSqls = new LinkedHashMap<>(); - int noIndex = 1; - for (Object item : items) { - JSONObject jo = (JSONObject) item; - Integer index = jo.getInteger("index"); + int incrIndex = 1; + for (Object o : items) { + JSONObject item = (JSONObject) o; + Integer index = item.getInteger("index"); if (index == null) { - index = noIndex++; + index = incrIndex++; } - String itemSql = parseItem(jo, values); + + String itemSql = parseItem(item, values); if (itemSql != null) { indexItemSqls.put(index, itemSql.trim()); + this.includeFields.add(item.getString("field")); } } if (indexItemSqls.isEmpty()) { @@ -176,26 +178,38 @@ public Set getIncludeFields() { } /** + * 解析查询项为 SQL + * * @param item * @param values * @return */ private String parseItem(JSONObject item, JSONObject values) { String field = item.getString("field"); - final boolean hasNameFlag = field.startsWith("&"); + boolean hasNameFlag = field.startsWith("&"); if (hasNameFlag) { field = field.substring(1); } - final Field fieldMeta = MetadataHelper.getLastJoinField(rootEntity, field); + Field fieldMeta = MetadataHelper.getLastJoinField(rootEntity, field); if (fieldMeta == null) { LOG.warn("Unknow field '" + field + "' in '" + rootEntity.getName() + "'"); return null; } - final DisplayType dt = EasyMeta.getDisplayType(fieldMeta); - if (dt == DisplayType.CLASSIFICATION || hasNameFlag) { + DisplayType dt = EasyMeta.getDisplayType(fieldMeta); + if (dt == DisplayType.CLASSIFICATION) { field = "&" + field; + } else if (hasNameFlag) { + if (dt != DisplayType.REFERENCE) { + LOG.warn("Non reference-field '" + field + "' in '" + rootEntity.getName() + "'"); + return null; + } + + // 转化为名称字段 + fieldMeta = fieldMeta.getReferenceEntity().getNameField(); + dt = EasyMeta.getDisplayType(fieldMeta); + field += "." + fieldMeta.getName(); } String op = item.getString("op"); @@ -226,8 +240,8 @@ private String parseItem(JSONObject item, JSONObject values) { } } else if (dt == DisplayType.MULTISELECT) { // 多选的包含/不包含要按位计算 - if (op.equalsIgnoreCase(ParserTokens.IN) || op.equalsIgnoreCase(ParserTokens.NIN)) { - op = op.equalsIgnoreCase(ParserTokens.IN) ? ParserTokens.BAND : ParserTokens.NBAND; + if (ParserTokens.IN.equalsIgnoreCase(op) || ParserTokens.NIN.equalsIgnoreCase(op)) { + op = ParserTokens.IN.equalsIgnoreCase(op) ? ParserTokens.BAND : ParserTokens.NBAND; long maskValue = 0; for (String s : value.split("\\|")) { @@ -241,8 +255,7 @@ private String parseItem(JSONObject item, JSONObject values) { .append(' ') .append(ParserTokens.convetOperator(op)); // 无需值 - if (op.equalsIgnoreCase(ParserTokens.NL) || op.equalsIgnoreCase(ParserTokens.NT)) { - includeFields.add(field); + if (ParserTokens.NL.equalsIgnoreCase(op) || ParserTokens.NT.equalsIgnoreCase(op)) { return sb.toString(); } @@ -270,11 +283,11 @@ private String parseItem(JSONObject item, JSONObject values) { Department dept = UserHelper.getDepartment(currentUser); if (dept != null) { value = dept.getIdentity().toString(); - int refe = fieldMeta.getReferenceEntity().getEntityCode(); - if (refe == EntityHelper.User) { + int ref = fieldMeta.getReferenceEntity().getEntityCode(); + if (ref == EntityHelper.User) { sb.insert(sb.indexOf(" "), ".deptId"); - } else if (refe == EntityHelper.Department) { - // Nothings + } else if (ref == EntityHelper.Department) { + // NOOP } else { value = null; } @@ -290,12 +303,12 @@ private String parseItem(JSONObject item, JSONObject values) { } if (StringUtils.isBlank(value)) { - LOG.warn("No search value defined"); + LOG.warn("No search value defined : " + item.toJSONString()); return null; } // 快速搜索的占位符 {1} - if (value.matches("\\{\\d+\\}")) { + if (value.matches("\\{\\d+}")) { if (values == null || values.isEmpty()) { return null; } @@ -337,7 +350,6 @@ private String parseItem(JSONObject item, JSONObject values) { .append(" )"); } - includeFields.add(field); return sb.toString(); } @@ -426,6 +438,8 @@ private boolean isNumberType(Type type) { } /** + * 快速查询 + * * @param qFields * @return */ diff --git a/src/main/java/com/rebuild/utils/AppUtils.java b/src/main/java/com/rebuild/utils/AppUtils.java index 84d012d0f..e4f429d15 100644 --- a/src/main/java/com/rebuild/utils/AppUtils.java +++ b/src/main/java/com/rebuild/utils/AppUtils.java @@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRequest; import java.nio.file.AccessDeniedException; +import java.sql.DataTruncation; /** * 封裝一些有用的工具方法 @@ -119,6 +120,10 @@ public static String formatControllMsg(int errorCode, String errorMsg) { */ public static String getErrorMessage(HttpServletRequest request, Throwable exception) { String errorMsg = (String) request.getAttribute(ServletUtils.ERROR_MESSAGE); + if (exception != null && ThrowableUtils.getRootCause(exception) instanceof DataTruncation) { + errorMsg = "字段长度超出限制"; + } + if (StringUtils.isNotBlank(errorMsg)) { return errorMsg; } @@ -147,7 +152,7 @@ public static String getErrorMessage(HttpServletRequest request, Throwable excep errorMsg = StringUtils.defaultIfBlank( ex.getLocalizedMessage(), Languages.lang("ErrorUnknow")); - return ex.getClass().getSimpleName() + " : " + errorMsg; + return ex.getClass().getSimpleName() + ": " + errorMsg; } /** diff --git a/src/main/java/com/rebuild/utils/CommonsUtils.java b/src/main/java/com/rebuild/utils/CommonsUtils.java index 721180423..f56d16f3f 100644 --- a/src/main/java/com/rebuild/utils/CommonsUtils.java +++ b/src/main/java/com/rebuild/utils/CommonsUtils.java @@ -30,6 +30,7 @@ import org.apache.commons.lang.StringUtils; import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -43,6 +44,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Pattern; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; /** * 通用工具类 @@ -104,6 +107,18 @@ public static boolean isSpecialChar(char ch) { return false; } + /** + * @param text + * @param maxLength + * @return + */ + public static String maxstr(String text, int maxLength) { + if (text.length() > maxLength) { + return text.substring(0, maxLength); + } + return text; + } + private static OkHttpClient okHttpClient = null; /** * @return @@ -210,6 +225,7 @@ public static List readExcel(File excel, int maxRows, boolean hasHead) { try (InputStream is = new FileInputStream(excel)) { try (BufferedInputStream bis = new BufferedInputStream(is)) { + // noinspection rawtypes EasyExcel.read(bis, null, new AnalysisEventListener() { @Override public void invokeHeadMap(Map headMap, AnalysisContext context) { @@ -258,4 +274,24 @@ public static String escapeHtml(String text) { } return text.replaceAll("<", "<").replaceAll(">", ">"); } + + /** + * ZIP 压缩（不支持目录压缩） + * + * @param file + * @param dest + */ + public static void zip(File file, File dest) throws IOException { + try (ZipOutputStream zos = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(dest)))) { + zos.putNextEntry(new ZipEntry(file.getName())); + + try (BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file))) { + byte[] chunk = new byte[1024]; + int count; + while((count = bis.read(chunk)) != -1) { + zos.write(chunk, 0, count); + } + } + } + } } diff --git a/src/main/java/com/rebuild/utils/MarkdownUtils.java b/src/main/java/com/rebuild/utils/MarkdownUtils.java index 1b6471287..99cfebe07 100644 --- a/src/main/java/com/rebuild/utils/MarkdownUtils.java +++ b/src/main/java/com/rebuild/utils/MarkdownUtils.java @@ -27,7 +27,7 @@ import java.util.Collections; /** - * MD 解析工具 + * MD 转换工具 * * @author devezhao-mbp zhaofang123@gmail.com * @since 2019/05/16 @@ -48,7 +48,6 @@ public class MarkdownUtils { */ public static String parse(String md) { Node document = PARSER.parse(md); - String html = RENDERER.render(document); - return html; + return RENDERER.render(document); } } diff --git a/src/main/java/com/rebuild/utils/MaxBackupIndexDailyRollingFileAppender.java b/src/main/java/com/rebuild/utils/MaxBackupIndexDailyRollingFileAppender.java index 5f652946d..e30d17f6e 100644 --- a/src/main/java/com/rebuild/utils/MaxBackupIndexDailyRollingFileAppender.java +++ b/src/main/java/com/rebuild/utils/MaxBackupIndexDailyRollingFileAppender.java @@ -103,7 +103,7 @@ public boolean accept(File file) { /** * Sort max > min */ - static class CompratorByLastModified implements Comparator { + public static class CompratorByLastModified implements Comparator { @Override public int compare(File a, File b) { long d = a.lastModified() - b.lastModified(); diff --git a/src/main/java/com/rebuild/web/OnlineSessionStore.java b/src/main/java/com/rebuild/web/OnlineSessionStore.java index 16f7686c5..1ddfe490a 100644 --- a/src/main/java/com/rebuild/web/OnlineSessionStore.java +++ b/src/main/java/com/rebuild/web/OnlineSessionStore.java @@ -115,6 +115,16 @@ public Set getAllSession() { all.addAll(ONLINE_USERS.values()); return all; } + + /** + * 用户会话 + * + * @param user + * @return + */ + public HttpSession getSession(ID user) { + return ONLINE_USERS.get(user); + } /** * @param request diff --git a/src/main/java/com/rebuild/web/RequestWatchHandler.java b/src/main/java/com/rebuild/web/RequestWatchHandler.java index 0107a0389..860715059 100644 --- a/src/main/java/com/rebuild/web/RequestWatchHandler.java +++ b/src/main/java/com/rebuild/web/RequestWatchHandler.java @@ -24,7 +24,7 @@ import cn.devezhao.persist4j.engine.ID; import com.rebuild.server.Application; import com.rebuild.server.ServerListener; -import com.rebuild.server.helper.setup.InstallAfter; +import com.rebuild.server.helper.setup.InstallState; import com.rebuild.utils.AppUtils; import com.rebuild.web.admin.AdminEntryControll; import org.apache.commons.lang.StringUtils; @@ -42,7 +42,7 @@ * @author Zhao Fangfang * @since 1.0, 2013-6-24 */ -public class RequestWatchHandler extends HandlerInterceptorAdapter implements InstallAfter { +public class RequestWatchHandler extends HandlerInterceptorAdapter implements InstallState { private static final Log LOG = LogFactory.getLog(RequestWatchHandler.class); @@ -80,10 +80,10 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons response.sendRedirect(ServerListener.getContextPath() + "/gw/server-status?s=" + CodecUtils.urlEncode(requestUrl)); return false; } - } else if (!requestUrl.contains("/setup/")) { - response.sendRedirect(ServerListener.getContextPath() + "/setup/install"); - return false; - } + } else if (!(requestUrl.contains("/setup/") || requestUrl.contains("/language/bundle"))) { + response.sendRedirect(ServerListener.getContextPath() + "/setup/install"); + return false; + } } else { // for Language Application.getSessionStore().setLocale(AppUtils.getLocale(request)); @@ -210,7 +210,10 @@ private static boolean inIgnoreRes(String reqUrl) { reqUrl = reqUrl.replaceFirst(ServerListener.getContextPath(), ""); return reqUrl.startsWith("/gw/") || reqUrl.startsWith("/assets/") || reqUrl.startsWith("/error/") || reqUrl.startsWith("/t/") || reqUrl.startsWith("/s/") - || reqUrl.startsWith("/setup/") || reqUrl.startsWith("/language/"); + || reqUrl.startsWith("/setup/") || reqUrl.startsWith("/language/") + || reqUrl.startsWith("/commons/announcements") + || reqUrl.startsWith("/commons/url-safe") + || reqUrl.startsWith("/filex/access/"); } /** diff --git a/src/main/java/com/rebuild/web/admin/AdminEntryControll.java b/src/main/java/com/rebuild/web/admin/AdminEntryControll.java index 4860833ba..bd0478b25 100644 --- a/src/main/java/com/rebuild/web/admin/AdminEntryControll.java +++ b/src/main/java/com/rebuild/web/admin/AdminEntryControll.java @@ -83,6 +83,13 @@ public void adminVerify(HttpServletRequest request, HttpServletResponse response } } + @RequestMapping("/user/admin-cancel") + public void adminCancel(HttpServletRequest request, HttpServletResponse response) + throws IOException { + ServletUtils.setSessionAttribute(request, KEY_VERIFIED, null); + writeSuccess(response); + } + // ---- private static final String KEY_VERIFIED = WebUtils.KEY_PREFIX + "-AdminVerified"; @@ -95,18 +102,12 @@ public static boolean isAdminVerified(HttpServletRequest request) { return verified != null; } - /** - * @param request - */ - public static void cleanAdminVerified(HttpServletRequest request) { - ServletUtils.setSessionAttribute(request, KEY_VERIFIED, null); - } - // ---- CLI - @RequestMapping("/admin/cli/{command}") + @SuppressWarnings("rawtypes") + @RequestMapping("/admin/cli/{command}") public void adminCLI(@PathVariable String command, - HttpServletRequest request, HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { // 清缓存 if ("CLEANCACHE".equals(command)) { if (Application.getCommonCache().isUseRedis()) { diff --git a/src/main/java/com/rebuild/web/admin/SysConfigurationControll.java b/src/main/java/com/rebuild/web/admin/SysConfigurationControll.java index d49f2ea81..673e73790 100644 --- a/src/main/java/com/rebuild/web/admin/SysConfigurationControll.java +++ b/src/main/java/com/rebuild/web/admin/SysConfigurationControll.java @@ -18,19 +18,31 @@ package com.rebuild.web.admin; -import com.rebuild.server.Application; +import cn.devezhao.commons.RegexUtils; +import cn.devezhao.commons.ThrowableUtils; +import cn.devezhao.commons.web.ServletUtils; +import com.alibaba.fastjson.JSONObject; +import com.qiniu.common.QiniuException; +import com.qiniu.storage.BucketManager; +import com.qiniu.util.Auth; import com.rebuild.server.helper.ConfigurableItem; -import com.rebuild.server.helper.Lisence; +import com.rebuild.server.helper.License; import com.rebuild.server.helper.QiniuCloud; +import com.rebuild.server.helper.SMSender; import com.rebuild.server.helper.SysConfiguration; import com.rebuild.utils.CommonsUtils; import com.rebuild.web.BasePageControll; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Map; /** * 系统配置 @@ -51,6 +63,33 @@ public ModelAndView pageSystems() { } return mv; } + + @RequestMapping(value = "systems", method = RequestMethod.POST) + public void postSystems(HttpServletRequest request, HttpServletResponse response) throws IOException { + JSONObject data = (JSONObject) ServletUtils.getRequestJson(request); + + String dHomeURL = defaultIfBlank(data, ConfigurableItem.HomeURL); + if (!RegexUtils.isUrl(dHomeURL)) { + writeFailure(response, "无效主页地址/域名"); + return; + } + String dRecycleBinKeepingDays = defaultIfBlank(data, ConfigurableItem.RecycleBinKeepingDays); + if (!NumberUtils.isNumber(dRecycleBinKeepingDays)) { + data.put(ConfigurableItem.RecycleBinKeepingDays.name(), ConfigurableItem.RecycleBinKeepingDays.getDefaultValue()); + } + String dDBBackupsKeepingDays = defaultIfBlank(data, ConfigurableItem.DBBackupsKeepingDays); + if (!NumberUtils.isNumber(dDBBackupsKeepingDays)) { + data.put(ConfigurableItem.DBBackupsKeepingDays.name(), ConfigurableItem.DBBackupsKeepingDays.getDefaultValue()); + } + + setValues(data); + + // @see ServerListener + request.getServletContext().setAttribute("appName", SysConfiguration.get(ConfigurableItem.AppName)); + request.getServletContext().setAttribute("homeUrl", SysConfiguration.get(ConfigurableItem.HomeURL)); + + writeSuccess(response); + } @RequestMapping("integration/storage") public ModelAndView pageIntegrationStorage() { @@ -60,29 +99,109 @@ public ModelAndView pageIntegrationStorage() { mv.getModel().put("storageStatus", QiniuCloud.instance().available()); return mv; } - - @RequestMapping("integration/cache") - public ModelAndView pageIntegrationCache() { - ModelAndView mv = createModelAndView("/admin/integration/cache-redis.jsp"); - mv.getModel().put("cacheAccount", - starsAccount(SysConfiguration.getCacheAccount(), 2)); - mv.getModel().put("cacheStatus", Application.getCommonCache().isUseRedis()); - return mv; - } + + @RequestMapping(value = "integration/storage", method = RequestMethod.POST) + public void postIntegrationStorage(HttpServletRequest request, HttpServletResponse response) throws IOException { + JSONObject data = (JSONObject) ServletUtils.getRequestJson(request); + + String dStorageURL = defaultIfBlank(data, ConfigurableItem.StorageURL); + String dStorageBucket = defaultIfBlank(data, ConfigurableItem.StorageBucket); + String dStorageApiKey = defaultIfBlank(data, ConfigurableItem.StorageApiKey); + String dStorageApiSecret = defaultIfBlank(data, ConfigurableItem.StorageApiSecret); + + if (dStorageURL.startsWith("//")) { + dStorageURL = "https:" + dStorageURL; + } + if (!RegexUtils.isUrl(dStorageURL)) { + writeFailure(response, "无效访问域名"); + return; + } + + try { + // Test + Auth auth = Auth.create(dStorageApiKey, dStorageApiSecret); + BucketManager bucketManager = new BucketManager(auth, QiniuCloud.CONFIGURATION); + bucketManager.getBucketInfo(dStorageBucket); + + setValues(data); + writeSuccess(response); + + } catch (QiniuException ex) { + writeFailure(response, "无效配置参数 : " + ex.response.error); + } catch (Exception ex) { + writeFailure(response, ThrowableUtils.getRootCause(ex).getLocalizedMessage()); + } + } @RequestMapping("integration/submail") public ModelAndView pageIntegrationSubmail() { ModelAndView mv = createModelAndView("/admin/integration/submail.jsp"); - mv.getModel().put("smsAccount", + mv.getModel().put("smsAccount", starsAccount(SysConfiguration.getSmsAccount(), 1)); mv.getModel().put("mailAccount", starsAccount(SysConfiguration.getMailAccount(), 1)); return mv; } + @RequestMapping(value = "integration/submail", method = RequestMethod.POST) + public void postIntegrationSubmail(HttpServletRequest request, HttpServletResponse response) throws IOException { + JSONObject data = (JSONObject) ServletUtils.getRequestJson(request); + + String dMailAddr = defaultIfBlank(data, ConfigurableItem.MailAddr); + if (!RegexUtils.isEMail(dMailAddr)) { + writeFailure(response, "无效发件人地址"); + return; + } + + setValues(data); + writeSuccess(response); + } + + @RequestMapping(value = "integration/submail/test", method = RequestMethod.POST) + public void testSubmail(HttpServletRequest request, HttpServletResponse response) throws IOException { + JSONObject data = (JSONObject) ServletUtils.getRequestJson(request); + String type = getParameterNotNull(request, "type"); + String receiver = getParameterNotNull(request, "receiver"); + + String sent = null; + if ("SMS".equalsIgnoreCase(type)) { + if (!RegexUtils.isCNMobile(receiver)) { + writeFailure(response, "无效接收手机"); + return; + } + + String[] specAccount = new String[] { + data.getString("SmsUser"), data.getString("SmsPassword"), + data.getString("SmsSign") + }; + if (specAccount[1].contains("**********")) specAccount[1] = SysConfiguration.get(ConfigurableItem.SmsPassword); + + sent = SMSender.sendSMS(receiver, "收到此消息说明你的短信服务配置正确", specAccount); + } else if ("EMAIL".equalsIgnoreCase(type)) { + if (!RegexUtils.isEMail(receiver)) { + writeFailure(response, "无效接收邮箱"); + return; + } + + String[] specAccount = new String[] { + data.getString("MailUser"), data.getString("MailPassword"), + data.getString("MailAddr"), data.getString("MailName") + }; + if (specAccount[1].contains("**********")) specAccount[1] = SysConfiguration.get(ConfigurableItem.MailPassword); + + sent = SMSender.sendMail(receiver, "测试邮件", "收到此消息说明你的邮件服务配置正确", true, specAccount); + } + + if (sent != null) { + writeSuccess(response, sent); + } else { + writeFailure(response, "测试发送失败，请检查你的配置"); + } + } + @RequestMapping("systems/query-authority") public void queryAuthority(HttpServletResponse response) throws IOException { - writeSuccess(response, Lisence.queryAuthority()); + writeSuccess(response, License.queryAuthority()); } private String[] starsAccount(String[] account, int ...index) { @@ -94,4 +213,19 @@ private String[] starsAccount(String[] account, int ...index) { } return account; } + + private String defaultIfBlank(JSONObject data, ConfigurableItem item) { + return StringUtils.defaultIfBlank(data.getString(item.name()), SysConfiguration.get(item)); + } + + private void setValues(JSONObject data) { + for (Map.Entry e : data.entrySet()) { + try { + ConfigurableItem item = ConfigurableItem.valueOf(e.getKey()); + SysConfiguration.set(item, e.getValue()); + } catch (Exception ex) { + LOG.error("Invalid item : " + e.getKey() + " = " + e.getValue()); + } + } + } } diff --git a/src/main/java/com/rebuild/web/admin/bizz/UserControll.java b/src/main/java/com/rebuild/web/admin/bizz/UserControll.java index 3dd320f92..b00e4b22e 100644 --- a/src/main/java/com/rebuild/web/admin/bizz/UserControll.java +++ b/src/main/java/com/rebuild/web/admin/bizz/UserControll.java @@ -21,6 +21,7 @@ import cn.devezhao.bizz.security.member.Role; import cn.devezhao.commons.ObjectUtils; import cn.devezhao.commons.web.ServletUtils; +import cn.devezhao.persist4j.Record; import cn.devezhao.persist4j.engine.ID; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -42,6 +43,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -67,7 +69,7 @@ public ModelAndView pageList(HttpServletRequest request) throws IOException { @RequestMapping("check-user-status") public void checkUserStatus(HttpServletRequest request, HttpServletResponse response) throws IOException { ID id = getIdParameterNotNull(request, "id"); - if (!Application.getUserStore().exists(id)) { + if (!Application.getUserStore().existsUser(id)) { writeFailure(response); return; } @@ -136,28 +138,38 @@ public void enableUser(HttpServletRequest request, HttpServletResponse response) Languages.defaultBundle().lang("YourAccountActive"), content); } } + + // 登录失效 + if (!u.isActive()) { + HttpSession s = Application.getSessionStore().getSession(u.getId()); + if (s != null) { + LOG.warn("Force destroy user session : " + u.getId()); + s.invalidate(); + } + } writeSuccess(response); } @RequestMapping("delete-checks") public void deleteChecks(HttpServletRequest request, HttpServletResponse response) throws IOException { - ID id = getIdParameterNotNull(request, "id"); - + // 用户/部门/角色 + final ID bizz = getIdParameterNotNull(request, "id"); + int hasMember = 0; int hasChild = 0; - if (id.getEntityCode() == EntityHelper.Department) { - Department dept = Application.getUserStore().getDepartment(id); + if (bizz.getEntityCode() == EntityHelper.Department) { + Department dept = Application.getUserStore().getDepartment(bizz); hasMember = dept.getMembers().size(); hasChild = dept.getChildren().size(); - } else if (id.getEntityCode() == EntityHelper.Role) { - Role role = Application.getUserStore().getRole(id); + } else if (bizz.getEntityCode() == EntityHelper.Role) { + Role role = Application.getUserStore().getRole(bizz); hasMember = role.getMembers().size(); - } else if (id.getEntityCode() == EntityHelper.User) { + } else if (bizz.getEntityCode() == EntityHelper.User) { // 仅检查是否登陆过。严谨些还应该检查是否有其他业务数据 Object[] hasLogin = Application.createQueryNoFilter( "select count(logId) from LoginLog where user = ?") - .setParameter(1, id) + .setParameter(1, bizz) .unique(); hasMember = ObjectUtils.toInt(hasLogin[0]); } @@ -174,4 +186,15 @@ public void userDelete(HttpServletRequest request, HttpServletResponse response) Application.getBean(UserService.class).delete(user); writeSuccess(response); } + + @RequestMapping( value = "user-resetpwd", method = RequestMethod.POST) + public void userResetpwd(HttpServletRequest request, HttpServletResponse response) throws IOException { + ID user = getIdParameterNotNull(request, "id"); + String newp = getParameterNotNull(request, "newp"); + + Record record = EntityHelper.forUpdate(user, user); + record.setString("password", newp); + Application.getBean(UserService.class).update(record); + writeSuccess(response); + } } \ No newline at end of file diff --git a/src/main/java/com/rebuild/web/admin/entityhub/DataReportControll.java b/src/main/java/com/rebuild/web/admin/entityhub/DataReportControll.java index 80dfc0859..63b8ba1ce 100644 --- a/src/main/java/com/rebuild/web/admin/entityhub/DataReportControll.java +++ b/src/main/java/com/rebuild/web/admin/entityhub/DataReportControll.java @@ -26,6 +26,7 @@ import com.rebuild.server.business.datareport.ReportGenerator; import com.rebuild.server.business.datareport.TemplateExtractor; import com.rebuild.server.configuration.DataReportManager; +import com.rebuild.server.helper.ConfigurationException; import com.rebuild.server.helper.SysConfiguration; import com.rebuild.server.metadata.MetadataHelper; import com.rebuild.server.metadata.entity.EasyMeta; @@ -114,12 +115,18 @@ public void preview(HttpServletRequest request, HttpServletResponse response) th entity.getPrimaryField().getName(), entity.getName()); Object[] random = Application.createQueryNoFilter(sql).unique(); if (random == null) { - response.sendError(400, "无法预览。未找到可用记录"); + response.sendError(400, "无法预览。未找到可供预览的记录"); return; } - File template = DataReportManager.instance.getTemplateFile(entity, reportId); - File file = new ReportGenerator(template, (ID) random[0]).generate(); + File file; + try { + File template = DataReportManager.instance.getTemplateFile(entity, reportId); + file = new ReportGenerator(template, (ID) random[0]).generate(); + } catch (ConfigurationException ex) { + response.sendError(400, "无法预览。报表模板不存在"); + return; + } FileDownloader.setDownloadHeaders(request, response, file.getName()); FileDownloader.writeLocalFile(file, response); diff --git a/src/main/java/com/rebuild/web/admin/entityhub/MetaEntityControll.java b/src/main/java/com/rebuild/web/admin/entityhub/MetaEntityControll.java index 7f04ff52e..879063c15 100644 --- a/src/main/java/com/rebuild/web/admin/entityhub/MetaEntityControll.java +++ b/src/main/java/com/rebuild/web/admin/entityhub/MetaEntityControll.java @@ -230,11 +230,13 @@ private Entity getEntityById(ID metaId) { } /** + * 设置实体信息 + * * @param mv * @param entity * @return */ - static EasyMeta setEntityBase(ModelAndView mv, String entity) { + protected static EasyMeta setEntityBase(ModelAndView mv, String entity) { EasyMeta entityMeta = EasyMeta.valueOf(entity); mv.getModel().put("entityMetaId", entityMeta.getMetaId()); mv.getModel().put("entityName", entityMeta.getName()); diff --git a/src/main/java/com/rebuild/web/admin/robot/FieldAggregationControll.java b/src/main/java/com/rebuild/web/admin/robot/FieldAggregationControll.java index c45e8aab5..a473ada9d 100644 --- a/src/main/java/com/rebuild/web/admin/robot/FieldAggregationControll.java +++ b/src/main/java/com/rebuild/web/admin/robot/FieldAggregationControll.java @@ -21,7 +21,9 @@ import cn.devezhao.persist4j.Entity; import cn.devezhao.persist4j.Field; import com.alibaba.fastjson.JSON; +import com.rebuild.server.business.trigger.impl.FieldAggregation; import com.rebuild.server.configuration.RobotApprovalManager; +import com.rebuild.server.helper.state.StateHelper; import com.rebuild.server.metadata.MetadataHelper; import com.rebuild.server.metadata.MetadataSorter; import com.rebuild.server.metadata.entity.DisplayType; @@ -36,9 +38,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * @author devezhao zhaofang123@gmail.com @@ -51,9 +51,9 @@ public class FieldAggregationControll extends BaseControll { @RequestMapping("field-aggregation-entities") public void getTargetEntity(HttpServletRequest request, HttpServletResponse response) throws IOException { Entity sourceEntity = MetadataHelper.getEntity(getParameterNotNull(request, "source")); + boolean self = getBoolParameter(request, "self", true); List entities = new ArrayList<>(); - Map hasMany = new HashMap<>(); for (Field refField : MetadataSorter.sortFields(sourceEntity, DisplayType.REFERENCE)) { if (MetadataHelper.isApprovalField(refField.getName())) { continue; @@ -62,27 +62,13 @@ public void getTargetEntity(HttpServletRequest request, HttpServletResponse resp Entity refEntity = refField.getReferenceEntity(); String entityLabel = EasyMeta.getLabel(refEntity) + " (" + EasyMeta.getLabel(refField) + ")"; entities.add(new String[] { refEntity.getName(), entityLabel, refField.getName() }); - - Integer many = hasMany.get(refEntity.getName()); - if (many == null) { - many = 0; - } - hasMany.put(refEntity.getName(), many + 1); } - - // 会出现同实体中多个字段引用同一实体的情况 - // 只有一个引用则不显示字段名称 - for (Map.Entry e : hasMany.entrySet()) { - if (e.getValue() == 1) { - String entityName = e.getKey(); - for (String[] item : entities) { - if (entityName.equals(item[0])) { - item[1] = EasyMeta.getLabel(MetadataHelper.getEntity(entityName)); - } - } - } - } - + + // 可归集到自己（通过主键字段） + if (self) { + entities.add(new String[] { sourceEntity.getName(), EasyMeta.getLabel(sourceEntity), FieldAggregation.SOURCE_SELF}); + } + writeSuccess(response, entities); } @@ -91,20 +77,43 @@ public void getTargetField(HttpServletRequest request, HttpServletResponse respo Entity sourceEntity = MetadataHelper.getEntity(getParameterNotNull(request, "source")); String target = getParameter(request, "target"); Entity targetEntity = StringUtils.isBlank(target) ? null : MetadataHelper.getEntity(target); - + + final DisplayType[] allowTypes = new DisplayType[] { DisplayType.NUMBER, DisplayType.DECIMAL }; + List sourceFields = new ArrayList<>(); List targetFields = new ArrayList<>(); - for (Field field : MetadataSorter.sortFields(sourceEntity.getFields(), DisplayType.NUMBER, DisplayType.DECIMAL)) { - sourceFields.add(new String[] { field.getName(), EasyMeta.getLabel(field) }); + + // 源字段 + + for (Field field : MetadataSorter.sortFields(sourceEntity.getFields(), allowTypes)) { + sourceFields.add(buildField(field, false)); } + // 关联实体 + for (Field fieldRef : MetadataSorter.sortFields(sourceEntity.getFields(), DisplayType.REFERENCE)) { + String fieldRefName = fieldRef.getName() + "."; + String fieldRefLabel = EasyMeta.getLabel(fieldRef) + "."; + for (Field field : MetadataSorter.sortFields(fieldRef.getReferenceEntity(), allowTypes)) { + String[] build = buildField(field, false); + build[0] = fieldRefName + build[0]; + build[1] = fieldRefLabel + build[1]; + sourceFields.add(build); + } + } + + // 目标字段 + if (targetEntity != null) { - for (Field field : MetadataSorter.sortFields(targetEntity.getFields(), DisplayType.NUMBER, DisplayType.DECIMAL)) { - targetFields.add(new String[] { field.getName(), EasyMeta.getLabel(field) }); + for (Field field : MetadataSorter.sortFields(targetEntity.getFields(), allowTypes)) { + if (EasyMeta.valueOf(field).isBuiltin()) { + continue; + } + targetFields.add(buildField(field, false)); } } - boolean hadApproval = RobotApprovalManager.instance.hadApproval(targetEntity, null) != null; - + // 审批流程启用 + boolean hadApproval = targetEntity != null && RobotApprovalManager.instance.hadApproval(targetEntity, null) != null; + JSON data = JSONUtils.toJSONObject( new String[] { "source", "target", "hadApproval" }, new Object[] { @@ -113,4 +122,28 @@ public void getTargetField(HttpServletRequest request, HttpServletResponse respo hadApproval}); writeSuccess(response, data); } + + /** + * @param field + * @return + * @see com.rebuild.web.base.MetadataGetting#buildField(Field) + */ + protected static String[] buildField(Field field, boolean includesType) { + EasyMeta easyField = EasyMeta.valueOf(field); + if (!includesType) { + return new String[] { field.getName(), easyField.getLabel() }; + } + + DisplayType dt = easyField.getDisplayType(); + String typeExt = null; + if (dt == DisplayType.REFERENCE) { + typeExt = field.getReferenceEntity().getName(); + } else if (dt == DisplayType.STATE) { + typeExt = StateHelper.getSatetClass(field).getName(); + } else if (dt == DisplayType.ID) { + dt = DisplayType.REFERENCE; + typeExt = field.getOwnEntity().getName(); + } + return new String[] { field.getName(), easyField.getLabel(), dt.name(), typeExt }; + } } diff --git a/src/main/java/com/rebuild/web/admin/robot/FieldWritebackControll.java b/src/main/java/com/rebuild/web/admin/robot/FieldWritebackControll.java new file mode 100644 index 000000000..8b87e6357 --- /dev/null +++ b/src/main/java/com/rebuild/web/admin/robot/FieldWritebackControll.java @@ -0,0 +1,98 @@ +/* +rebuild - Building your business-systems freely. +Copyright (C) 2020 devezhao + +rebuild is dual-licensed under commercial and open source licenses (GPLv3). +For more information, please see +*/ + +package com.rebuild.web.admin.robot; + +import cn.devezhao.persist4j.Entity; +import cn.devezhao.persist4j.Field; +import com.alibaba.fastjson.JSON; +import com.rebuild.server.configuration.RobotApprovalManager; +import com.rebuild.server.metadata.EntityHelper; +import com.rebuild.server.metadata.MetadataHelper; +import com.rebuild.server.metadata.MetadataSorter; +import com.rebuild.server.metadata.entity.DisplayType; +import com.rebuild.server.metadata.entity.EasyMeta; +import com.rebuild.utils.JSONUtils; +import com.rebuild.web.BaseControll; +import org.apache.commons.lang.StringUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +/** + * @author devezhao + * @since 2020/2/7 + * @see FieldAggregationControll + */ +@Controller +@RequestMapping("/admin/robot/trigger/") +public class FieldWritebackControll extends BaseControll { + + @RequestMapping("field-writeback-fields") + public void getTargetField(HttpServletRequest request, HttpServletResponse response) throws IOException { + Entity sourceEntity = MetadataHelper.getEntity(getParameterNotNull(request, "source")); + String target = getParameter(request, "target"); + Entity targetEntity = StringUtils.isBlank(target) ? null : MetadataHelper.getEntity(target); + + List sourceFields = new ArrayList<>(); + List targetFields = new ArrayList<>(); + + // 源字段 + + sourceFields.add(FieldAggregationControll.buildField(sourceEntity.getPrimaryField(), true)); + for (Field field : MetadataSorter.sortFields(sourceEntity.getFields())) { + sourceFields.add(FieldAggregationControll.buildField(field, true)); + } + // 关联实体 + for (Field fieldRef : MetadataSorter.sortFields(sourceEntity.getFields(), DisplayType.REFERENCE)) { + Entity refEntity = fieldRef.getReferenceEntity(); + if (refEntity.getEntityCode() == EntityHelper.RobotApprovalConfig) { + continue; + } + + String fieldRefName = fieldRef.getName() + "."; + String fieldRefLabel = EasyMeta.getLabel(fieldRef) + "."; + for (Field field : MetadataSorter.sortFields(refEntity)) { + String[] build = FieldAggregationControll.buildField(field, true); + build[0] = fieldRefName + build[0]; + build[1] = fieldRefLabel + build[1]; + sourceFields.add(build); + } + } + + // 目标字段 + + if (targetEntity != null) { + for (Field field : MetadataSorter.sortFields(targetEntity.getFields())) { + EasyMeta easyField = EasyMeta.valueOf(field); + DisplayType dt = easyField.getDisplayType(); + if (dt == DisplayType.SERIES || dt == DisplayType.MULTISELECT || easyField.isBuiltin()) { + continue; + } + targetFields.add(FieldAggregationControll.buildField(field, true)); + } + } + + // 审批流程启用 + @SuppressWarnings("DuplicatedCode") + boolean hadApproval = targetEntity != null && RobotApprovalManager.instance.hadApproval(targetEntity, null) != null; + + JSON data = JSONUtils.toJSONObject( + new String[] { "source", "target", "hadApproval" }, + new Object[] { + sourceFields.toArray(new String[sourceFields.size()][]), + targetFields.toArray(new String[targetFields.size()][]), + hadApproval}); + writeSuccess(response, data); + } +} diff --git a/src/main/java/com/rebuild/web/admin/robot/SendNotificationControll.java b/src/main/java/com/rebuild/web/admin/robot/SendNotificationControll.java index 9ba7cc36c..3f3d2f8e8 100644 --- a/src/main/java/com/rebuild/web/admin/robot/SendNotificationControll.java +++ b/src/main/java/com/rebuild/web/admin/robot/SendNotificationControll.java @@ -18,15 +18,29 @@ package com.rebuild.web.admin.robot; +import com.rebuild.server.helper.SMSender; import com.rebuild.web.BaseControll; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + /** * @author devezhao zhaofang123@gmail.com * @since 2019/05/25 */ @Controller -@RequestMapping("/admin/robot/") +@RequestMapping("/admin/robot/trigger/") public class SendNotificationControll extends BaseControll { + + @RequestMapping("sendnotification-atypes") + public void availableTypes(HttpServletResponse response) throws IOException { + Map ta = new HashMap<>(); + ta.put("serviceMail", SMSender.availableMail()); + ta.put("serviceSms", SMSender.availableSMS()); + writeSuccess(response, ta); + } } diff --git a/src/main/java/com/rebuild/web/base/MetadataGetting.java b/src/main/java/com/rebuild/web/base/MetadataGetting.java index 5876f404e..a2906cfa2 100644 --- a/src/main/java/com/rebuild/web/base/MetadataGetting.java +++ b/src/main/java/com/rebuild/web/base/MetadataGetting.java @@ -81,8 +81,8 @@ public void fields(HttpServletRequest request, HttpServletResponse response) { boolean appendRefFields = "2".equals(getParameter(request, "deep")); String fromType = getParameter(request, "from"); - List> list = new ArrayList<>(); - putFields(list, entityMeta, appendRefFields, fromType); + List> fsList = new ArrayList<>(); + putFields(fsList, entityMeta, appendRefFields, fromType); // 追加二级引用字段 if (appendRefFields) { @@ -92,18 +92,16 @@ public void fields(HttpServletRequest request, HttpServletResponse response) { } int entityCode = field.getReferenceEntity().getEntityCode(); - if (!MetadataHelper.isBizzEntity(entityCode)) { - list.add(buildField(field)); + if (MetadataHelper.isBizzEntity(entityCode) || entityCode == EntityHelper.RobotApprovalConfig) { + continue; + } - // 引用实体字段 - if (entityCode != EntityHelper.RobotApprovalConfig) { - putFields(list, field, false, fromType); - } - } + fsList.add(buildField(field)); + putFields(fsList, field, false, fromType); } } - writeSuccess(response, list); + writeSuccess(response, fsList); } /** @@ -115,7 +113,7 @@ public void fields(HttpServletRequest request, HttpServletResponse response) { private void putFields( List> dest, BaseMeta entityOrField, boolean filterRefField, String fromType) { Field parentField = null; - Entity useEntity = null; + Entity useEntity; if (entityOrField instanceof Field) { parentField = (Field) entityOrField; useEntity = parentField.getReferenceEntity(); @@ -129,13 +127,12 @@ private void putFields( } Map map = buildField(field); + // 引用字段处理 if (EasyMeta.getDisplayType(field) == DisplayType.REFERENCE && filterRefField) { + boolean isApprovalId = field.getName().equalsIgnoreCase(EntityHelper.ApprovalId); boolean isBizz = MetadataHelper.isBizzEntity(field.getReferenceEntity().getEntityCode()); - boolean isApprovalId = field.getName().equalsIgnoreCase(EntityHelper.ApprovalId); - if (isApprovalId) { - continue; - } else if (!isBizz) { + if (!(isApprovalId || isBizz)) { continue; } } diff --git a/src/main/java/com/rebuild/web/base/ReferenceSearch.java b/src/main/java/com/rebuild/web/base/ReferenceSearch.java index 2cb9f6dbf..35555fac5 100644 --- a/src/main/java/com/rebuild/web/base/ReferenceSearch.java +++ b/src/main/java/com/rebuild/web/base/ReferenceSearch.java @@ -29,6 +29,7 @@ import com.rebuild.server.metadata.MetadataHelper; import com.rebuild.server.metadata.MetadataSorter; import com.rebuild.server.metadata.entity.DisplayType; +import com.rebuild.server.metadata.entity.EasyMeta; import com.rebuild.server.service.bizz.UserHelper; import com.rebuild.server.service.bizz.UserService; import com.rebuild.utils.JSONUtils; @@ -98,7 +99,12 @@ public void referenceSearch(HttpServletRequest request, HttpServletResponse resp // 搜索字符 Set searchFields = new HashSet<>(); - searchFields.add(referenceNameField.getName()); + DisplayType referenceNameFieldType = EasyMeta.getDisplayType(referenceNameField); + if (!(referenceNameFieldType == DisplayType.DATETIME || referenceNameFieldType == DisplayType.DATE + || referenceNameFieldType == DisplayType.NUMBER || referenceNameFieldType == DisplayType.DECIMAL + || referenceNameFieldType == DisplayType.ID)) { + searchFields.add(referenceNameField.getName()); + } if (referenceEntity.containsField(EntityHelper.QuickCode) && StringUtils.isAlphanumericSpace(q)) { searchFields.add(EntityHelper.QuickCode); } @@ -106,6 +112,12 @@ public void referenceSearch(HttpServletRequest request, HttpServletResponse resp searchFields.add(seriesField.getName()); } + if (searchFields.isEmpty()) { + LOG.warn("No fields of search found : " + referenceEntity); + writeSuccess(response, JSONUtils.EMPTY_ARRAY); + return; + } + String like = " like '%" + q + "%'"; String searchWhere = StringUtils.join(searchFields.iterator(), like + " or ") + like; @@ -114,7 +126,7 @@ public void referenceSearch(HttpServletRequest request, HttpServletResponse resp if (referenceEntity.containsField(EntityHelper.ModifiedOn)) { sql += " order by modifiedOn desc"; } - + List result = resultSearch(sql, metaEntity, referenceNameField); writeSuccess(response, result); } @@ -236,12 +248,15 @@ public void searchClassification(HttpServletRequest request, HttpServletResponse * 封装查询结果 * * @param sql - * @param entity + * @param entity 不指定则使用无权限查询 * @param nameField * @return */ private List resultSearch(String sql, Entity entity, Field nameField) { - Object[][] array = Application.createQuery(sql).setLimit(10).array(); + Object[][] array = (entity == null ? Application.createQueryNoFilter(sql) : Application.createQuery(sql)) + .setLimit(10) + .array(); + List result = new ArrayList<>(); for (Object[] o : array) { final ID recordId = (ID) o[0]; @@ -262,7 +277,10 @@ private List resultSearch(String sql, Entity entity, Field nameField) { } else { label = (String) FieldValueWrapper.instance.wrapFieldValue(o[1], nameField, true); } - + + if (StringUtils.isBlank(label)) { + label = FieldValueWrapper.NO_LABEL_PREFIX + recordId.toLiteral().toUpperCase(); + } result.add(FieldValueWrapper.wrapMixValue(recordId, label)); } return result; diff --git a/src/main/java/com/rebuild/web/base/UsersGetting.java b/src/main/java/com/rebuild/web/base/UsersGetting.java index 2495be2b7..c3db81e9b 100644 --- a/src/main/java/com/rebuild/web/base/UsersGetting.java +++ b/src/main/java/com/rebuild/web/base/UsersGetting.java @@ -54,8 +54,8 @@ public class UsersGetting extends BaseControll { @RequestMapping("users") public void loadUsers(HttpServletRequest request, HttpServletResponse response) { - String type = getParameter(request, "type", "User"); - String q = getParameter(request, "q"); + final String type = getParameter(request, "type", "User"); + final String query = getParameter(request, "q"); Member[] members; if ("User".equalsIgnoreCase(type)) { @@ -64,35 +64,41 @@ public void loadUsers(HttpServletRequest request, HttpServletResponse response) members = Application.getUserStore().getAllDepartments(); } else if ("Role".equalsIgnoreCase(type)) { members = Application.getUserStore().getAllRoles(); - } else { + } else if ("Team".equalsIgnoreCase(type)) { + members = Application.getUserStore().getAllTeams(); + } else { throw new IllegalParameterException("Unknow type of bizz : " + type); } + // 排序 + members = UserHelper.sortMembers(members); - List filtered = new ArrayList<>(); + List ret = new ArrayList<>(); for (Member m : members) { if (m.isDisabled()) { continue; } String name = m.getName(); + String email = null; if (m instanceof User) { - name = ((User) m).getFullName(); if (!((User) m).isActive()) { continue; } + name = ((User) m).getFullName(); + email = ((User) m).getEmail(); } - - if (StringUtils.isBlank(q) || (StringUtils.isNotBlank(q) && name.contains(q))) { - JSON item = JSONUtils.toJSONObject(new String[] { "id", "text" }, + + if (StringUtils.isBlank(query) + || StringUtils.containsIgnoreCase(name, query) + || (email != null && StringUtils.containsIgnoreCase(email, query))) { + JSON o = JSONUtils.toJSONObject(new String[] { "id", "text" }, new String[] { m.getIdentity().toString(), name }); - filtered.add(item); - if (filtered.size() >= 100) { - break; - } + ret.add(o); + if (ret.size() >= 40) break; } } - writeSuccess(response, filtered); + writeSuccess(response, ret); } /** diff --git a/src/main/java/com/rebuild/web/base/configuration/DataListSettingsControll.java b/src/main/java/com/rebuild/web/base/configuration/DataListSettingsControll.java index 6b4e9aa86..89aea72bb 100644 --- a/src/main/java/com/rebuild/web/base/configuration/DataListSettingsControll.java +++ b/src/main/java/com/rebuild/web/base/configuration/DataListSettingsControll.java @@ -37,11 +37,13 @@ import com.rebuild.server.metadata.entity.DisplayType; import com.rebuild.server.metadata.entity.EasyMeta; import com.rebuild.server.service.bizz.RoleService; +import com.rebuild.server.service.bizz.UserHelper; import com.rebuild.server.service.bizz.privileges.ZeroEntry; import com.rebuild.server.service.configuration.LayoutConfigService; import com.rebuild.utils.JSONUtils; import com.rebuild.web.BaseControll; import com.rebuild.web.PortalsConfiguration; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.PathVariable; @@ -70,14 +72,21 @@ public class DataListSettingsControll extends BaseControll implements PortalsCon @Override public void sets(@PathVariable String entity, HttpServletRequest request, HttpServletResponse response) throws IOException { - ID user = getRequestUser(request); + final ID user = getRequestUser(request); Assert.isTrue(Application.getSecurityManager().allow(user, ZeroEntry.AllowCustomDataList), "没有权限"); - JSON config = ServletUtils.getRequestJson(request); ID cfgid = getIdParameter(request, "id"); + // 普通用户只能有一个 if (cfgid != null && !ShareToManager.isSelf(user, cfgid)) { - cfgid = null; + ID useList = DataListManager.instance.detectUseConfig(user, entity, DataListManager.TYPE_DATALIST); + if (useList != null && ShareToManager.isSelf(user, useList)) { + cfgid = useList; + } else { + cfgid = null; + } } + + JSON config = ServletUtils.getRequestJson(request); Record record; if (cfgid == null) { @@ -99,8 +108,8 @@ record = EntityHelper.forUpdate(cfgid, user); @Override public void gets(@PathVariable String entity, HttpServletRequest request, HttpServletResponse response) { - ID user = getRequestUser(request); - Entity entityMeta = MetadataHelper.getEntity(entity); + final ID user = getRequestUser(request); + final Entity entityMeta = MetadataHelper.getEntity(entity); List> fieldList = new ArrayList<>(); for (Field field : MetadataSorter.sortFields(entityMeta)) { @@ -127,7 +136,7 @@ public void gets(@PathVariable String entity, } } - ConfigEntry raw = null; + ConfigEntry raw; String cfgid = request.getParameter("id"); if ("NEW".equalsIgnoreCase(cfgid)) { raw = new ConfigEntry(); @@ -150,15 +159,25 @@ public void gets(@PathVariable String entity, writeSuccess(response, ret); } + /** + * @see NavSettings#getsList(HttpServletRequest, HttpServletResponse) + */ @RequestMapping(value = "list-fields/alist", method = RequestMethod.GET) public void getsList(@PathVariable String entity, HttpServletRequest request, HttpServletResponse response) { - Object[][] list = Application.createQueryNoFilter( - "select configId,configName,shareTo from LayoutConfig where belongEntity = ? and applyType = ? and createdBy.roleId = ? order by configName") - .setParameter(1, entity) - .setParameter(2, BaseLayoutManager.TYPE_DATALIST) - .setParameter(3, RoleService.ADMIN_ROLE) - .array(); + final ID user = getRequestUser(request); + + String sql = "select configId,configName,shareTo,createdBy from LayoutConfig where "; + if (UserHelper.isAdmin(user)) { + sql += String.format("belongEntity = '%s' and applyType = '%s' and createdBy.roleId = '%s' order by configName", + entity, DataListManager.TYPE_DATALIST, RoleService.ADMIN_ROLE); + } else { + // 普通用户可用的 + ID[] uses = DataListManager.instance.getUsesDataListId(entity, user); + sql += "configId in ('" + StringUtils.join(uses, "', '") + "')"; + } + + Object[][] list = Application.createQueryNoFilter(sql).array(); writeSuccess(response, list); } } diff --git a/src/main/java/com/rebuild/web/base/configuration/NavSettings.java b/src/main/java/com/rebuild/web/base/configuration/NavSettings.java index a2959c991..e8a7f7461 100644 --- a/src/main/java/com/rebuild/web/base/configuration/NavSettings.java +++ b/src/main/java/com/rebuild/web/base/configuration/NavSettings.java @@ -28,10 +28,12 @@ import com.rebuild.server.configuration.portals.ShareToManager; import com.rebuild.server.metadata.EntityHelper; import com.rebuild.server.service.bizz.RoleService; +import com.rebuild.server.service.bizz.UserHelper; import com.rebuild.server.service.bizz.privileges.ZeroEntry; import com.rebuild.server.service.configuration.LayoutConfigService; import com.rebuild.web.BaseControll; import com.rebuild.web.PortalsConfiguration; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.RequestMapping; @@ -58,15 +60,22 @@ public void gets(String entity, HttpServletRequest request, HttpServletResponse @RequestMapping(value = "nav-settings", method = RequestMethod.POST) public void sets(HttpServletRequest request, HttpServletResponse response) throws IOException { - ID user = getRequestUser(request); + final ID user = getRequestUser(request); Assert.isTrue(Application.getSecurityManager().allow(user, ZeroEntry.AllowCustomNav), "没有权限"); - JSON config = ServletUtils.getRequestJson(request); ID cfgid = getIdParameter(request, "id"); + // 普通用户只能有一个 if (cfgid != null && !ShareToManager.isSelf(user, cfgid)) { - cfgid = null; + ID useNav = NavManager.instance.detectUseConfig(user, null, NavManager.TYPE_NAV); + if (useNav != null && ShareToManager.isSelf(user, useNav)) { + cfgid = useNav; + } else { + cfgid = null; + } } - + + JSON config = ServletUtils.getRequestJson(request); + Record record; if (cfgid == null) { record = EntityHelper.forNew(EntityHelper.LayoutConfig, user); @@ -85,8 +94,10 @@ record = EntityHelper.forUpdate(cfgid, user); @RequestMapping(value = "nav-settings", method = RequestMethod.GET) public void gets(HttpServletRequest request, HttpServletResponse response) { - ID user = getRequestUser(request); - String cfgid = request.getParameter("id"); + final ID user = getRequestUser(request); + final String cfgid = request.getParameter("id"); + + // 管理员新建 if ("NEW".equalsIgnoreCase(cfgid)) { writeSuccess(response); } else if (ID.isId(cfgid)) { @@ -98,11 +109,19 @@ public void gets(HttpServletRequest request, HttpServletResponse response) { @RequestMapping(value = "nav-settings/alist", method = RequestMethod.GET) public void getsList(HttpServletRequest request, HttpServletResponse response) { - Object[][] list = Application.createQueryNoFilter( - "select configId,configName,shareTo from LayoutConfig where applyType = ? and createdBy.roleId = ? order by configName") - .setParameter(1, BaseLayoutManager.TYPE_NAV) - .setParameter(2, RoleService.ADMIN_ROLE) - .array(); + final ID user = getRequestUser(request); + + String sql = "select configId,configName,shareTo,createdBy from LayoutConfig where "; + if (UserHelper.isAdmin(user)) { + sql += String.format("applyType = '%s' and createdBy.roleId = '%s' order by configName", + NavManager.TYPE_NAV, RoleService.ADMIN_ROLE); + } else { + // 普通用户可用的 + ID[] uses = NavManager.instance.getUsesNavId(user); + sql += "configId in ('" + StringUtils.join(uses, "', '") + "')"; + } + + Object[][] list = Application.createQueryNoFilter(sql).array(); writeSuccess(response, list); } } diff --git a/src/main/java/com/rebuild/web/base/configuration/WidgetControll.java b/src/main/java/com/rebuild/web/base/configuration/WidgetControll.java index 8850c92ca..3d5a7893c 100644 --- a/src/main/java/com/rebuild/web/base/configuration/WidgetControll.java +++ b/src/main/java/com/rebuild/web/base/configuration/WidgetControll.java @@ -79,7 +79,7 @@ record = Application.getBean(LayoutConfigService.class).createOrUpdate(record); public void gets(@PathVariable String entity, HttpServletRequest request, HttpServletResponse response) throws IOException { ID user = getRequestUser(request); - ConfigEntry config = BaseLayoutManager.instance.getWidgetOfCharts(user, entity); + ConfigEntry config = BaseLayoutManager.instance.getWidgetCharts(user, entity); writeSuccess(response, config == null ? null : config.toJSON()); } } diff --git a/src/main/java/com/rebuild/web/base/general/ApprovalControll.java b/src/main/java/com/rebuild/web/base/general/ApprovalControll.java index 1fd67640a..26b3502af 100644 --- a/src/main/java/com/rebuild/web/base/general/ApprovalControll.java +++ b/src/main/java/com/rebuild/web/base/general/ApprovalControll.java @@ -20,6 +20,7 @@ import cn.devezhao.commons.ObjectUtils; import cn.devezhao.commons.web.ServletUtils; +import cn.devezhao.persist4j.Record; import cn.devezhao.persist4j.engine.ID; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -29,10 +30,12 @@ import com.rebuild.server.business.approval.ApprovalProcessor; import com.rebuild.server.business.approval.ApprovalState; import com.rebuild.server.business.approval.FlowNodeGroup; +import com.rebuild.server.business.approval.FormBuilder; import com.rebuild.server.configuration.FlowDefinition; import com.rebuild.server.configuration.RobotApprovalManager; import com.rebuild.server.metadata.EntityHelper; import com.rebuild.server.metadata.MetadataHelper; +import com.rebuild.server.service.DataSpecificationException; import com.rebuild.server.service.bizz.UserHelper; import com.rebuild.utils.JSONUtils; import com.rebuild.web.BasePageControll; @@ -121,7 +124,7 @@ public void fetchNextStep(HttpServletRequest request, HttpServletResponse respon ApprovalProcessor approvalProcessor = new ApprovalProcessor(recordId, approvalId); FlowNodeGroup nextNodes = approvalProcessor.getNextNodes(); - + JSONArray approverList = new JSONArray(); for (ID o : nextNodes.getApproveUsers(user, recordId, null)) { approverList.add(new Object[] { o, UserHelper.getName(o) }); @@ -138,6 +141,16 @@ public void fetchNextStep(HttpServletRequest request, HttpServletResponse respon data.put("ccSelfSelecting", nextNodes.allowSelfSelectingCc()); data.put("isLastStep", nextNodes.isLastStep()); data.put("signMode", nextNodes.getSignMode()); + + // 可修改字段 + JSONArray editableFields = approvalProcessor.getCurrentNode().getEditableFields(); + if (editableFields != null && !editableFields.isEmpty()) { + JSONArray aform = new FormBuilder(recordId, user).build(editableFields); + if (aform != null && !aform.isEmpty()) { + data.put("aform", aform); + } + } + writeSuccess(response, data); } @@ -175,10 +188,23 @@ public void doApprove(HttpServletRequest request, HttpServletResponse response) JSONObject post = (JSONObject) ServletUtils.getRequestJson(request); JSONObject selectUsers = post.getJSONObject("selectUsers"); String remark = post.getString("remark"); - + + // 可编辑字段 + JSONObject aformData = post.getJSONObject("aformData"); + Record addedRecord = null; + // 没有或无更新 + if (aformData != null && aformData.size() > 1) { + try { + addedRecord = EntityHelper.parse(aformData, getRequestUser(request)); + } catch (DataSpecificationException know) { + writeFailure(response, know.getLocalizedMessage()); + return; + } + } + try { new ApprovalProcessor(recordId) - .approve(approver, (ApprovalState) ApprovalState.valueOf(state), remark, selectUsers); + .approve(approver, (ApprovalState) ApprovalState.valueOf(state), remark, selectUsers, addedRecord); writeSuccess(response); } catch (ApprovalException ex) { writeFailure(response, ex.getMessage()); @@ -190,7 +216,7 @@ public void doCancel(HttpServletRequest request, HttpServletResponse response) t ID recordId = getIdParameterNotNull(request, "record"); try { - new ApprovalProcessor(recordId).cancel(null); + new ApprovalProcessor(recordId).cancel(); writeSuccess(response); } catch (ApprovalException ex) { writeFailure(response, ex.getMessage()); diff --git a/src/main/java/com/rebuild/web/base/general/GeneralModelControll.java b/src/main/java/com/rebuild/web/base/general/GeneralModelControll.java index 09970e8fb..dc80ee759 100644 --- a/src/main/java/com/rebuild/web/base/general/GeneralModelControll.java +++ b/src/main/java/com/rebuild/web/base/general/GeneralModelControll.java @@ -53,10 +53,10 @@ public ModelAndView pageView(@PathVariable String entity, @PathVariable String i final ID user = getRequestUser(request); Entity thatEntity = MetadataHelper.getEntity(entity); - if (!Application.getSecurityManager().allowRead(user, thatEntity.getEntityCode())) { - response.sendError(403, "你没有访问此实体的权限"); - return null; - } +// if (!Application.getSecurityManager().allowRead(user, thatEntity.getEntityCode())) { +// response.sendError(403, "你没有访问此实体的权限"); +// return null; +// } ID record = ID.valueOf(id); ModelAndView mv; diff --git a/src/main/java/com/rebuild/web/common/FileDownloader.java b/src/main/java/com/rebuild/web/common/FileDownloader.java index cf7e2dc96..699b7b0b1 100644 --- a/src/main/java/com/rebuild/web/common/FileDownloader.java +++ b/src/main/java/com/rebuild/web/common/FileDownloader.java @@ -20,6 +20,7 @@ import cn.devezhao.commons.CodecUtils; import cn.devezhao.commons.web.ServletUtils; +import com.rebuild.server.Application; import com.rebuild.server.helper.QiniuCloud; import com.rebuild.server.helper.SysConfiguration; import com.rebuild.web.BaseControll; @@ -38,7 +39,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; /** * 文件下载/查看 @@ -84,10 +85,22 @@ public void viewImg(HttpServletRequest request, HttpServletResponse response) th response.sendRedirect(privateUrl); } - @RequestMapping(value = "download/**", method = RequestMethod.GET) + @RequestMapping(value = { "download/**", "access/**" }, method = RequestMethod.GET) public void download(HttpServletRequest request, HttpServletResponse response) throws IOException { String filePath = request.getRequestURI(); - filePath = filePath.split("/filex/download/")[1]; + + // 共享查看 + if (request.getRequestURI().contains("/filex/access/")) { + String e = getParameter(request, "e"); + if (StringUtils.isBlank(e) || Application.getCommonCache().get(e) == null) { + response.sendError(403, "文件已过期"); + return; + } + + filePath = filePath.split("/filex/access/")[1]; + } else { + filePath = filePath.split("/filex/download/")[1]; + } boolean temp = BooleanUtils.toBoolean(request.getParameter("temp")); String fileName = QiniuCloud.parseFileName(filePath); @@ -108,7 +121,7 @@ public void download(HttpServletRequest request, HttpServletResponse response) t // -- /** - * 文件下载 + * 本地文件下载 * * @param filePath * @param temp @@ -123,7 +136,7 @@ public static boolean writeLocalFile(String filePath, boolean temp, HttpServletR } /** - * 文件下载 + * 本地文件下载 * * @param file * @param response @@ -177,12 +190,8 @@ public static void setDownloadHeaders(HttpServletRequest request, HttpServletRes String UA = request.getHeader("user-agent").toUpperCase(); if (UA.contains("FIREFOX") || UA.contains("SAFARI")) { attname = CodecUtils.urlDecode(attname); - try { - attname = new String(attname.getBytes("utf-8"), "iso-8859-1"); - } catch (UnsupportedEncodingException ignored) { - // NOOP - } - } + attname = new String(attname.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); + } setDownloadHeaders(response, attname); } } diff --git a/src/main/java/com/rebuild/web/common/FileShare.java b/src/main/java/com/rebuild/web/common/FileShare.java index ef6241d4a..38d2f749d 100644 --- a/src/main/java/com/rebuild/web/common/FileShare.java +++ b/src/main/java/com/rebuild/web/common/FileShare.java @@ -59,12 +59,8 @@ public void makeUrl(HttpServletRequest request, HttpServletResponse response) th @RequestMapping("/filex/make-share") public void makeShareUrl(HttpServletRequest request, HttpServletResponse response) throws IOException { String fileUrl = getParameterNotNull(request, "url"); - if (!QiniuCloud.instance().available()) { - writeFailure(response, "本地存储暂不支持"); - return; - } - int minte = getIntParameter(request, "time", 5); + String shareKey = CodecUtils.randomCode(40); Application.getCommonCache().put(shareKey, fileUrl, minte * 60); @@ -81,7 +77,18 @@ public ModelAndView makeShareUrl(@PathVariable String shareKey, return null; } - String publicUrl = QiniuCloud.instance().url(fileUrl, 60); + String publicUrl; + if (QiniuCloud.instance().available()) { + publicUrl = QiniuCloud.instance().url(fileUrl, 60); + } else { + // @see FileDownloader#download + String e = CodecUtils.randomCode(40); + Application.getCommonCache().put(e, "rb", 60); + + publicUrl = "filex/access/" + fileUrl + "?e=" + e; + publicUrl = SysConfiguration.getHomeUrl(publicUrl); + } + ModelAndView mv = createModelAndView("/commons/shared-file.jsp"); mv.getModelMap().put("publicUrl", publicUrl); return mv; diff --git a/src/main/java/com/rebuild/web/common/FileUploader.java b/src/main/java/com/rebuild/web/common/FileUploader.java index 8599f3d86..da1536601 100644 --- a/src/main/java/com/rebuild/web/common/FileUploader.java +++ b/src/main/java/com/rebuild/web/common/FileUploader.java @@ -119,13 +119,13 @@ public void storeFilesize(HttpServletRequest request, HttpServletResponse respon private static FileItemFactory fileItemFactory; static { File track = SysConfiguration.getFileOfTemp("track"); - if (!track.exists() || !track.isDirectory()) { - if (!track.mkdirs()) { - throw new ExceptionInInitializerError("Could't mkdir track repository"); - } + try { + FileUtils.forceMkdir(track); + } catch (IOException ex) { + throw new ExceptionInInitializerError(ex); } fileItemFactory = new DiskFileItemFactory( - DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD * 2/*20MB*/, track); + DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD * 5 /*50MB*/, track); } /** diff --git a/src/main/java/com/rebuild/web/common/UrlSafe.java b/src/main/java/com/rebuild/web/common/UrlSafe.java index b9129fb95..b8db73403 100644 --- a/src/main/java/com/rebuild/web/common/UrlSafe.java +++ b/src/main/java/com/rebuild/web/common/UrlSafe.java @@ -38,7 +38,7 @@ import java.util.Set; /** - * 外部URL跳转 + * 外部URL监测跳转 * * @author zhaofang123@gmail.com * @since 09/20/2018 @@ -49,6 +49,8 @@ public class UrlSafe extends BasePageControll { @RequestMapping(value="/commons/url-safe", method=RequestMethod.GET) public ModelAndView safeRedirect(HttpServletRequest request, HttpServletResponse response) throws IOException { String url = getParameterNotNull(request, "url"); + if (!url.startsWith("http")) url = "http://" + url; + if (isTrusted(url)) { response.sendRedirect(url); return null; @@ -72,6 +74,7 @@ public static boolean isTrusted(String url) { return true; } + // 首次 if (TRUSTED_URLS.isEmpty()) { TRUSTED_URLS.add(".getrebuild.com"); diff --git a/src/main/java/com/rebuild/web/feeds/AnnouncementControll.java b/src/main/java/com/rebuild/web/feeds/AnnouncementControll.java new file mode 100644 index 000000000..f1f6bc1f2 --- /dev/null +++ b/src/main/java/com/rebuild/web/feeds/AnnouncementControll.java @@ -0,0 +1,118 @@ +/* +rebuild - Building your business-systems freely. +Copyright (C) 2018-2019 devezhao + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +package com.rebuild.web.feeds; + +import cn.devezhao.commons.CalendarUtils; +import cn.devezhao.persist4j.engine.ID; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.rebuild.server.Application; +import com.rebuild.server.business.feeds.FeedsHelper; +import com.rebuild.server.business.feeds.FeedsScope; +import com.rebuild.server.service.bizz.UserHelper; +import com.rebuild.utils.AppUtils; +import com.rebuild.web.BaseControll; +import org.apache.commons.lang.StringUtils; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 动态公告 + * + * @author devezhao + * @since 2019/12/19 + */ +@Controller +public class AnnouncementControll extends BaseControll { + + @RequestMapping("/commons/announcements") + public void list(HttpServletRequest request, HttpServletResponse response) throws IOException { + ID user = AppUtils.getRequestUser(request); + int fromWhere = 0; + + // 1=动态页 2=首页 4=登录页 + String refererUrl = request.getHeader("Referer"); + if (refererUrl.contains("/user/login")) { + fromWhere = 4; + } else if (refererUrl.contains("/dashboard/home")) { + fromWhere = 2; + } else if (refererUrl.contains("/feeds/")) { + fromWhere = 1; + } + + Object[][] array = Application.createQueryNoFilter( + "select content,contentMore,scope,createdBy,createdOn,feedsId from Feeds where type = 3") + .array(); + + List as = new ArrayList<>(); + long timeNow = CalendarUtils.now().getTime(); + for (Object[] o : array) { + JSONObject options = JSON.parseObject((String) o[1]); + + // 不在指定位置 + + int whereMask = options.getIntValue("showWhere"); + if ((fromWhere & whereMask) == 0) { + continue; + } + + // 不在展示时间 + Date timeStart = StringUtils.isBlank(options.getString("timeStart")) ? null : CalendarUtils.parse(options.getString("timeStart")); + if (timeStart != null && timeNow < timeStart.getTime()) { + continue; + } + Date timeEnd = StringUtils.isBlank(options.getString("timeEnd")) ? null : CalendarUtils.parse(options.getString("timeEnd")); + if (timeEnd != null && timeNow > timeEnd.getTime()) { + continue; + } + + // 不可见 + boolean allow = false; + String scope = (String) o[2]; + if (FeedsScope.ALL.name().equalsIgnoreCase(scope)) { + allow = true; + } else if (FeedsScope.SELF.name().equalsIgnoreCase(scope) && o[3].equals(user)) { + allow = true; + } else if (ID.isId(scope) && user != null) { + ID teamId = ID.valueOf(scope); + if (Application.getUserStore().existsAny(teamId)) { + allow = Application.getUserStore().getTeam(teamId).isMember(user); + } + } + + if (allow) { + JSONObject a = new JSONObject(); + a.put("content", FeedsHelper.formatContent((String) o[0])); + a.put("publishOn", CalendarUtils.getUTCDateTimeFormat().format(o[4])); + a.put("publishBy", UserHelper.getName((ID) o[3])); + a.put("id", o[5]); + as.add(a); + } + } + + writeSuccess(response, as); + } +} diff --git a/src/main/java/com/rebuild/web/feeds/FeedsGroupControll.java b/src/main/java/com/rebuild/web/feeds/FeedsGroupControll.java index 2fb1bf931..7472aa138 100644 --- a/src/main/java/com/rebuild/web/feeds/FeedsGroupControll.java +++ b/src/main/java/com/rebuild/web/feeds/FeedsGroupControll.java @@ -27,6 +27,7 @@ import com.rebuild.server.service.bizz.privileges.User; import com.rebuild.utils.JSONUtils; import com.rebuild.web.BaseControll; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -49,26 +50,38 @@ public class FeedsGroupControll extends BaseControll { @RequestMapping("group-list") public void groupList(HttpServletRequest request, HttpServletResponse response) throws IOException { - ID user = getRequestUser(request); + final ID user = getRequestUser(request); + final String query = getParameter(request, "q"); Set teams = Application.getUserStore().getUser(user).getOwningTeams(); JSONArray ret = new JSONArray(); for (Team t : teams) { - JSONObject o = JSONUtils.toJSONObject( - new String[] { "id", "name" }, new Object[] { t.getIdentity(), t.getName() }); - ret.add(o); + if (StringUtils.isBlank(query) + || StringUtils.containsIgnoreCase(t.getName(), query)) { + JSONObject o = JSONUtils.toJSONObject( + new String[] { "id", "name" }, new Object[] { t.getIdentity(), t.getName() }); + ret.add(o); + if (ret.size() >= 20) break; + } } writeSuccess(response, ret); } @RequestMapping("user-list") public void userList(HttpServletRequest request, HttpServletResponse response) throws IOException { + final String query = getParameter(request, "q"); + JSONArray ret = new JSONArray(); for (User u : UserHelper.sortUsers()) { - JSONObject o = JSONUtils.toJSONObject( - new String[] { "id", "name" }, - new Object[] { u.getId(), u.getFullName() }); - ret.add(o); + if (StringUtils.isBlank(query) + || StringUtils.containsIgnoreCase(u.getFullName(), query) + || (u.getEmail() != null && StringUtils.containsIgnoreCase(u.getEmail(), query))) { + JSONObject o = JSONUtils.toJSONObject( + new String[] { "id", "name" }, + new Object[] { u.getId(), u.getFullName() }); + ret.add(o); + if (ret.size() >= 20) break; + } } writeSuccess(response, ret); } diff --git a/src/main/java/com/rebuild/web/feeds/FeedsListControll.java b/src/main/java/com/rebuild/web/feeds/FeedsListControll.java index c98439317..3202cf593 100644 --- a/src/main/java/com/rebuild/web/feeds/FeedsListControll.java +++ b/src/main/java/com/rebuild/web/feeds/FeedsListControll.java @@ -29,11 +29,9 @@ import com.rebuild.server.business.feeds.FeedsHelper; import com.rebuild.server.business.feeds.FeedsScope; import com.rebuild.server.configuration.portals.FieldValueWrapper; -import com.rebuild.server.metadata.EntityHelper; import com.rebuild.server.metadata.MetadataHelper; import com.rebuild.server.metadata.entity.EasyMeta; import com.rebuild.server.service.bizz.UserHelper; -import com.rebuild.server.service.notification.MessageBuilder; import com.rebuild.server.service.query.AdvFilterParser; import com.rebuild.utils.JSONUtils; import com.rebuild.web.BasePageControll; @@ -50,7 +48,6 @@ import java.util.Date; import java.util.List; import java.util.Set; -import java.util.regex.Matcher; /** * 列表相关 @@ -120,7 +117,7 @@ public void fetchFeeds(HttpServletRequest request, HttpServletResponse response) } } - String sql = "select feedsId,createdBy,createdOn,modifiedOn,content,images,attachments,scope,type,relatedRecord from Feeds where " + sqlWhere; + String sql = "select feedsId,createdBy,createdOn,modifiedOn,content,images,attachments,scope,type,relatedRecord,contentMore from Feeds where " + sqlWhere; if ("older".equalsIgnoreCase(sort)) { sql += " order by createdOn asc"; } else if ("modified".equalsIgnoreCase(sort)) { @@ -157,6 +154,11 @@ public void fetchFeeds(HttpServletRequest request, HttpServletResponse response) item.put("related", mixValue); } + // 更多内容 + if (o[10] != null) { + item.put("contentMore", JSON.parse((String) o[10])); + } + list.add(item); } writeSuccess(response, @@ -211,7 +213,7 @@ private JSONObject buildBase(Object[] o, ID user) { item.put("createdOn", CalendarUtils.getUTCDateTimeFormat().format(o[2])); item.put("createdOnFN", Moment.moment((Date) o[2]).fromNow()); item.put("modifedOn", CalendarUtils.getUTCDateTimeFormat().format(o[3])); - item.put("content", formatContent((String) o[4])); + item.put("content", FeedsHelper.formatContent((String) o[4])); if (o[5] != null) { item.put("images", JSON.parse((String) o[5])); } @@ -226,21 +228,4 @@ private JSONObject buildBase(Object[] o, ID user) { } return item; } - - /** - * @param content - * @return - */ - private String formatContent(String content) { - Matcher atMatcher = MessageBuilder.AT_PATTERN.matcher(content); - while (atMatcher.find()) { - String at = atMatcher.group(); - ID user = ID.valueOf(at.substring(1)); - if (user.getEntityCode() == EntityHelper.User && Application.getUserStore().exists(user)) { - String fullName = Application.getUserStore().getUser(user).getFullName(); - content = content.replace(at, String.format("@%s", user, fullName)); - } - } - return content; - } } diff --git a/src/main/java/com/rebuild/web/files/FileListControll.java b/src/main/java/com/rebuild/web/files/FileListControll.java index c3e56687c..9be15daa3 100644 --- a/src/main/java/com/rebuild/web/files/FileListControll.java +++ b/src/main/java/com/rebuild/web/files/FileListControll.java @@ -46,7 +46,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -62,7 +61,7 @@ public class FileListControll extends BasePageControll { private static final String CK_LASTPATH = "rb.lastFilesPath"; @RequestMapping({ "home", "attachment", "docs" }) - public ModelAndView pageIndex(HttpServletRequest request, HttpServletResponse response) throws IOException { + public ModelAndView pageIndex(HttpServletRequest request, HttpServletResponse response) { String path = request.getRequestURI(); if (path.contains("/files/docs")) { path = "docs"; @@ -81,7 +80,7 @@ public ModelAndView pageIndex(HttpServletRequest request, HttpServletResponse re } @RequestMapping("list-file") - public void listFile(HttpServletRequest request, HttpServletResponse response) throws IOException { + public void listFile(HttpServletRequest request, HttpServletResponse response) { final ID user = getRequestUser(request); int pageNo = getIntParameter(request, "pageNo", 1); int pageSize = getIntParameter(request, "pageSize", 100); @@ -130,7 +129,7 @@ public void listFile(HttpServletRequest request, HttpServletResponse response) t } } - String sql = "select attachmentId,filePath,fileType,fileSize,createdBy,modifiedOn,inFolder,relatedRecord from Attachment where (1=1)"; + String sql = "select attachmentId,filePath,fileType,fileSize,createdBy,modifiedOn,inFolder,relatedRecord from Attachment where (1=1) and (isDeleted = ?)"; sql = sql.replace("(1=1)", StringUtils.join(sqlWhere.iterator(), " and ")); if ("older".equals(sort)) { sql += " order by createdOn asc"; @@ -138,6 +137,7 @@ public void listFile(HttpServletRequest request, HttpServletResponse response) t sql += " order by modifiedOn desc"; } Object[][] array = Application.createQueryNoFilter(sql) + .setParameter(1, false) .setLimit(pageSize, pageNo * pageSize - pageSize) .array(); @@ -165,7 +165,7 @@ public void listFile(HttpServletRequest request, HttpServletResponse response) t // 文档目录 @RequestMapping("list-folder") - public void listFolder(HttpServletRequest request, HttpServletResponse response) throws IOException { + public void listFolder(HttpServletRequest request, HttpServletResponse response) { ID user = getRequestUser(request); JSONArray folders = FilesHelper.getFolders(user); writeSuccess(response, folders); @@ -173,7 +173,7 @@ public void listFolder(HttpServletRequest request, HttpServletResponse response) // 附件实体 @RequestMapping("list-entity") - public void listEntity(HttpServletRequest request, HttpServletResponse response) throws IOException { + public void listEntity(HttpServletRequest request, HttpServletResponse response) { ID user = getRequestUser(request); JSONArray ret = new JSONArray(); diff --git a/src/main/java/com/rebuild/web/files/FileManagerControll.java b/src/main/java/com/rebuild/web/files/FileManagerControll.java index 86d8a92f2..4b6e8dfa4 100644 --- a/src/main/java/com/rebuild/web/files/FileManagerControll.java +++ b/src/main/java/com/rebuild/web/files/FileManagerControll.java @@ -126,7 +126,7 @@ public void checkReadable(HttpServletRequest request, HttpServletResponse respon ID user = getRequestUser(request); ID record = getIdParameterNotNull(request, "id"); - boolean OK = false; + boolean OK; if (record.getEntityCode() == EntityHelper.Feeds || record.getEntityCode() == EntityHelper.FeedsComment) { OK = FeedsHelper.checkReadable(record, user); } else { diff --git a/src/main/java/com/rebuild/web/setup/InstallControll.java b/src/main/java/com/rebuild/web/setup/InstallControll.java index c1e57493c..ef8634fd4 100644 --- a/src/main/java/com/rebuild/web/setup/InstallControll.java +++ b/src/main/java/com/rebuild/web/setup/InstallControll.java @@ -18,19 +18,25 @@ package com.rebuild.web.setup; +import cn.devezhao.commons.ObjectUtils; +import cn.devezhao.commons.ThrowableUtils; import cn.devezhao.commons.web.ServletUtils; import com.alibaba.fastjson.JSONObject; import com.rebuild.server.Application; import com.rebuild.server.helper.ConfigurableItem; import com.rebuild.server.helper.SysConfiguration; -import com.rebuild.server.helper.setup.InstallAfter; +import com.rebuild.server.helper.setup.InstallState; import com.rebuild.server.helper.setup.Installer; import com.rebuild.utils.JSONUtils; import com.rebuild.web.BasePageControll; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisPool; +import redis.clients.jedis.JedisPoolConfig; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -38,6 +44,7 @@ import java.io.IOException; import java.sql.Connection; import java.sql.DatabaseMetaData; +import java.sql.ResultSet; import java.sql.SQLException; /** @@ -46,11 +53,11 @@ */ @Controller @RequestMapping("/setup/") -public class InstallControll extends BasePageControll implements InstallAfter { +public class InstallControll extends BasePageControll implements InstallState { @RequestMapping("install") public ModelAndView pageIndex(HttpServletResponse response) throws IOException { - if (Application.serversReady()) { + if (Application.serversReady() && !Application.devMode()) { response.sendError(404); return null; } @@ -70,10 +77,22 @@ public void testConnection(HttpServletRequest request, HttpServletResponse respo try (Connection conn = new Installer(props).getConnection(null)) { DatabaseMetaData dmd = conn.getMetaData(); String msg = String.format("连接成功 : %s %s", dmd.getDatabaseProductName(), dmd.getDatabaseProductVersion()); + + // 查询表 + try (ResultSet rs = dmd.getTables(null, null, null, new String[] { "TABLE" })) { + if (rs.next()) { + String hasTable = rs.getString("TABLE_NAME"); + if (hasTable != null) { + msg += " (非空数据库，可能导致安装失败)"; + } + } + } catch (SQLException ignored) { + } + writeSuccess(response, msg); } catch (SQLException e) { if (e.getLocalizedMessage().contains("Unknown database")) { - writeSuccess(response, "连接成功 : 数据库不存在，将自动创建"); + writeSuccess(response, "连接成功 : 数据库不存在，系统将自动创建"); } else { writeFailure(response, "连接错误 : " + e.getLocalizedMessage()); } @@ -108,6 +127,25 @@ public void testDirectory(HttpServletRequest request, HttpServletResponse respon } } + @RequestMapping("test-cache") + public void testCache(HttpServletRequest request, HttpServletResponse response) throws IOException { + JSONObject cacheProps = (JSONObject) ServletUtils.getRequestJson(request); + + JedisPool pool = new JedisPool(new JedisPoolConfig(), + StringUtils.defaultIfBlank(cacheProps.getString("CacheHost"), "127.0.0.1"), + ObjectUtils.toInt(cacheProps.getString("CachePort"), 6379), + 3000, + StringUtils.defaultIfBlank(cacheProps.getString("CachePassword"), null)); + try (Jedis client = pool.getResource()) { + String info = client.info("server"); + if (info.length() > 80) info = info.substring(0, 80) + "..."; + pool.destroy(); + writeSuccess(response, "连接成功 : " + info); + } catch (Exception ex) { + writeFailure(response, "连接失败 : " + ThrowableUtils.getRootCause(ex).getLocalizedMessage()); + } + } + @RequestMapping("install-rebuild") public void installExec(HttpServletRequest request, HttpServletResponse response) throws IOException { JSONObject installProps = (JSONObject) ServletUtils.getRequestJson(request); diff --git a/src/main/java/com/rebuild/web/user/account/UserAvatar.java b/src/main/java/com/rebuild/web/user/account/UserAvatar.java index 0528c8222..0f8cc1692 100644 --- a/src/main/java/com/rebuild/web/user/account/UserAvatar.java +++ b/src/main/java/com/rebuild/web/user/account/UserAvatar.java @@ -102,7 +102,7 @@ protected void renderUserAvatat(Object user, HttpServletRequest request, HttpSer BufferedImage avatarBi = null; try { String fullName = realUser.getFullName(); - if (realUser.getId().equals(UserService.SYSTEM_USER)) { + if (realUser.getId().equals(UserService.SYSTEM_USER) || realUser.getId().equals(UserService.ADMIN_USER)) { fullName = "RB"; } File avatarFile = UserHelper.generateAvatar(fullName, false); diff --git a/src/main/java/com/rebuild/web/user/signin/LoginControll.java b/src/main/java/com/rebuild/web/user/signin/LoginControll.java index 138a2efb7..c5695b791 100644 --- a/src/main/java/com/rebuild/web/user/signin/LoginControll.java +++ b/src/main/java/com/rebuild/web/user/signin/LoginControll.java @@ -26,10 +26,14 @@ import cn.devezhao.commons.web.WebUtils; import cn.devezhao.persist4j.Record; import cn.devezhao.persist4j.engine.ID; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.rebuild.api.LoginToken; import com.rebuild.server.Application; +import com.rebuild.server.helper.ConfigurableItem; +import com.rebuild.server.helper.License; import com.rebuild.server.helper.SMSender; +import com.rebuild.server.helper.SysConfiguration; import com.rebuild.server.helper.VCode; import com.rebuild.server.helper.cache.CommonCache; import com.rebuild.server.metadata.EntityHelper; @@ -119,7 +123,7 @@ public ModelAndView checkLogin(HttpServletRequest request, HttpServletResponse r LOG.error("Can't decode User from alt : " + alt, ex); } - if (altUser != null && Application.getUserStore().exists(altUser)) { + if (altUser != null && Application.getUserStore().existsUser(altUser)) { loginSuccessed(request, response, altUser, true); String nexturl = StringUtils.defaultIfBlank(request.getParameter("nexturl"), DEFAULT_HOME); @@ -304,4 +308,19 @@ public void userConfirmPasswd(HttpServletRequest request, HttpServletResponse re Application.getSessionStore().clean(); } } + + @RequestMapping("live-wallpaper") + public void getLiveWallpaper(HttpServletRequest request, HttpServletResponse response) throws IOException { + if (!SysConfiguration.getBool(ConfigurableItem.LiveWallpaper)) { + writeFailure(response); + return; + } + + JSON ret = License.siteApi("api/misc/bgimg"); + if (ret == null) { + writeFailure(response); + } else { + writeSuccess(response, ((JSONObject) ret).getString("url")); + } + } } diff --git a/src/main/resources/application-ctx.xml b/src/main/resources/application-ctx.xml index f4f91fc3a..489378167 100644 --- a/src/main/resources/application-ctx.xml +++ b/src/main/resources/application-ctx.xml @@ -76,10 +76,9 @@ - + - - + diff --git a/src/main/resources/application-job.xml b/src/main/resources/application-job.xml index ab54bf24f..acdc19a1c 100644 --- a/src/main/resources/application-job.xml +++ b/src/main/resources/application-job.xml @@ -31,7 +31,16 @@ - + + + + + + + + + + @@ -41,6 +50,7 @@ + diff --git a/src/main/resources/metadata-conf.xml b/src/main/resources/metadata-conf.xml index b3b2daa68..9dde3e7dc 100644 --- a/src/main/resources/metadata-conf.xml +++ b/src/main/resources/metadata-conf.xml @@ -44,7 +44,7 @@ - + @@ -53,9 +53,9 @@ - - - + + + @@ -68,9 +68,9 @@ - - - + + + @@ -177,8 +177,8 @@ - - + + @@ -197,7 +197,7 @@ - + @@ -206,14 +206,15 @@ - + - - + + + + - @@ -265,10 +266,10 @@ - + - + @@ -311,12 +312,12 @@ - + - + @@ -324,23 +325,25 @@ - + - + + + - + @@ -349,7 +352,7 @@ - + @@ -358,7 +361,7 @@ - + @@ -366,9 +369,9 @@ - - - + + + diff --git a/src/main/resources/scripts/db-init.sql b/src/main/resources/scripts/db-init.sql index 0a111fbc3..75d75687e 100644 --- a/src/main/resources/scripts/db-init.sql +++ b/src/main/resources/scripts/db-init.sql @@ -315,14 +315,15 @@ create table if not exists `attachment` ( `FILE_TYPE` varchar(20), `FILE_SIZE` int(11) default '0' comment 'in bytes', `IN_FOLDER` char(20), + `IS_DELETED` char(1) default 'F' comment '标记删除', `MODIFIED_BY` char(20) not null comment '修改人', `CREATED_ON` timestamp not null default current_timestamp comment '创建时间', `CREATED_BY` char(20) not null comment '创建人', `MODIFIED_ON` timestamp not null default current_timestamp comment '修改时间', primary key (`ATTACHMENT_ID`), - index IX0_attachment (`BELONG_ENTITY`, `BELONG_FIELD`, `FILE_PATH`), - index IX1_attachment (`RELATED_RECORD`), - index IX2_attachment (`IN_FOLDER`, `CREATED_ON`) + index IX0_attachment (`BELONG_ENTITY`, `BELONG_FIELD`, `FILE_PATH`, `IS_DELETED`), + index IX1_attachment (`IN_FOLDER`, `CREATED_ON`, `FILE_PATH`), + index IX2_attachment (`RELATED_RECORD`) )Engine=InnoDB; -- ************ Entity [AttachmentFolder] DDL ************ @@ -498,6 +499,7 @@ create table if not exists `feeds` ( `FEEDS_ID` char(20) not null, `TYPE` smallint(6) not null default '1' comment '类型', `CONTENT` text(3000) not null comment '内容', + `CONTENT_MORE` text(3000) comment '不同类型的扩展内容, JSON格式KV', `IMAGES` varchar(700) comment '图片', `ATTACHMENTS` varchar(700) comment '附件', `RELATED_RECORD` char(20) comment '相关业务记录', @@ -588,4 +590,4 @@ INSERT INTO `classification` (`DATA_ID`, `NAME`, `DESCRIPTION`, `OPEN_LEVEL`, `I -- DB Version INSERT INTO `system_config` (`CONFIG_ID`, `ITEM`, `VALUE`) - VALUES ('021-9000000000000001', 'DBVer', 18); + VALUES ('021-9000000000000001', 'DBVer', 20); diff --git a/src/main/resources/scripts/db-upgrade.sql b/src/main/resources/scripts/db-upgrade.sql index a5f658723..0e763a42c 100644 --- a/src/main/resources/scripts/db-upgrade.sql +++ b/src/main/resources/scripts/db-upgrade.sql @@ -1,6 +1,14 @@ -- Database upgrade scripts for rebuild 1.x -- Each upgraded starts with `-- #VERSION` +-- #20 Attachment delete mark +alter table `attachment` + add column `IS_DELETED` char(1) default 'F' comment '标记删除'; + +-- #19 Announcement in Feeds +alter table `feeds` + add column `CONTENT_MORE` text(3000) comment '不同类型的扩展内容, JSON格式KV'; + -- #18 Folder scope alter table `attachment_folder` add column `SCOPE` varchar(20) default 'ALL' comment '哪些人可见, 可选值: ALL/SELF/$TeamID', diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 8eda31be2..af0e60886 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -58,6 +58,10 @@ 500 /error500.jsp + + java.lang.Exception + /error500.jsp + 404 /error40x.jsp diff --git a/src/main/webapp/_include/NavLeftAdmin.jsp b/src/main/webapp/_include/NavLeftAdmin.jsp index 7060d4b3b..bf79fbfe3 100644 --- a/src/main/webapp/_include/NavLeftAdmin.jsp +++ b/src/main/webapp/_include/NavLeftAdmin.jsp @@ -18,7 +18,6 @@ diff --git a/src/main/webapp/account/settings.jsp b/src/main/webapp/account/settings.jsp index 786d50025..d8ab3303b 100644 --- a/src/main/webapp/account/settings.jsp +++ b/src/main/webapp/account/settings.jsp @@ -55,7 +55,7 @@ .avatar > label input { display: none; } -.form-group.row { +form .form-group.row { margin-left: 5px; margin-right: 5px; padding: 8px 0; @@ -182,7 +182,7 @@ - + diff --git a/src/main/webapp/admin/bizuser/role-privileges.jsp b/src/main/webapp/admin/bizuser/role-privileges.jsp index 01fbac159..ebdb21440 100644 --- a/src/main/webapp/admin/bizuser/role-privileges.jsp +++ b/src/main/webapp/admin/bizuser/role-privileges.jsp @@ -62,7 +62,7 @@
            -
            # 登录时间 客户端 IP地址
            +
            @@ -100,7 +100,7 @@
            -
            业务实体
            +
            diff --git a/src/main/webapp/admin/bizuser/user-view.jsp b/src/main/webapp/admin/bizuser/user-view.jsp index 52ff0df49..47d2b52dc 100644 --- a/src/main/webapp/admin/bizuser/user-view.jsp +++ b/src/main/webapp/admin/bizuser/user-view.jsp @@ -39,9 +39,10 @@
            - 删除 启用 停用 + 删除 + 重置密码
            变更部门 变更角色 diff --git a/src/main/webapp/admin/entityhub/auto-fillin.jsp b/src/main/webapp/admin/entityhub/auto-fillin.jsp index 7f741a3b7..cc99c74f8 100644 --- a/src/main/webapp/admin/entityhub/auto-fillin.jsp +++ b/src/main/webapp/admin/entityhub/auto-fillin.jsp @@ -67,7 +67,7 @@ span.badge {
          • 字段信息
          • 表单回填配置
            • -
            +
            @@ -105,6 +105,7 @@ span.badge {
            +

            通过 触发器 (数据回写) 可以实现更加复杂的回填规则

            @@ -116,6 +117,6 @@ window.__PageConfig = { referenceEntity: '${referenceEntity}' } - + diff --git a/src/main/webapp/admin/entityhub/data-reports.jsp b/src/main/webapp/admin/entityhub/data-reports.jsp index 24c5032e0..094e17da5 100644 --- a/src/main/webapp/admin/entityhub/data-reports.jsp +++ b/src/main/webapp/admin/entityhub/data-reports.jsp @@ -73,7 +73,7 @@
            <%@ include file="/_include/Foot.jsp"%> - - + + \ No newline at end of file diff --git a/src/main/webapp/admin/entityhub/entity-grid.jsp b/src/main/webapp/admin/entityhub/entity-grid.jsp index 5bc6cb7f3..0aca722aa 100644 --- a/src/main/webapp/admin/entityhub/entity-grid.jsp +++ b/src/main/webapp/admin/entityhub/entity-grid.jsp @@ -5,16 +5,45 @@ <%@ include file="/_include/Head.jsp"%> 实体管理 @@ -26,7 +55,7 @@
            -
            +
            diff --git a/src/main/webapp/admin/entityhub/entity-new.jsp b/src/main/webapp/admin/entityhub/entity-new.jsp index 98fbb42ba..1d1bcb640 100644 --- a/src/main/webapp/admin/entityhub/entity-new.jsp +++ b/src/main/webapp/admin/entityhub/entity-new.jsp @@ -69,6 +69,6 @@
            <%@ include file="/_include/Foot.jsp"%> - + diff --git a/src/main/webapp/admin/entityhub/field-edit.jsp b/src/main/webapp/admin/entityhub/field-edit.jsp index 5ae47206e..f8c60572b 100644 --- a/src/main/webapp/admin/entityhub/field-edit.jsp +++ b/src/main/webapp/admin/entityhub/field-edit.jsp @@ -306,6 +306,6 @@ window.__PageConfig = { isSuperAdmin: ${isSuperAdmin} } - + diff --git a/src/main/webapp/admin/entityhub/field-new.jsp b/src/main/webapp/admin/entityhub/field-new.jsp index db36c12fa..52461ce23 100644 --- a/src/main/webapp/admin/entityhub/field-new.jsp +++ b/src/main/webapp/admin/entityhub/field-new.jsp @@ -24,19 +24,19 @@ - - - - + + + + - + + - diff --git a/src/main/webapp/admin/entityhub/form-design.jsp b/src/main/webapp/admin/entityhub/form-design.jsp index ab802849b..54ec429fc 100644 --- a/src/main/webapp/admin/entityhub/form-design.jsp +++ b/src/main/webapp/admin/entityhub/form-design.jsp @@ -59,7 +59,7 @@ -
            +
            点击右侧字段添加到布局
            @@ -68,6 +68,7 @@
            +

            新建/编辑页暂不支持双列布局

            diff --git a/src/main/webapp/admin/integration/apis-manager.jsp b/src/main/webapp/admin/integration/apis-manager.jsp index 90f000bef..36b0b8d2e 100644 --- a/src/main/webapp/admin/integration/apis-manager.jsp +++ b/src/main/webapp/admin/integration/apis-manager.jsp @@ -58,6 +58,6 @@
            <%@ include file="/_include/Foot.jsp"%> - + \ No newline at end of file diff --git a/src/main/webapp/admin/integration/cache-redis.jsp b/src/main/webapp/admin/integration/cache-redis.jsp deleted file mode 100644 index 287a19b7c..000000000 --- a/src/main/webapp/admin/integration/cache-redis.jsp +++ /dev/null @@ -1,57 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - - - -<%@ include file="/_include/Head.jsp"%> -缓存系统配置 - - -
            权限项
            - - - - - - - - - - -
            缓存服务器 - 未配置 - ${cacheAccount[0]}:${cacheAccount[1]} -
            访问秘钥${cacheAccount == null ? "未配置" : cacheAccount[2]}
            - -
            -
            -
            REDIS 未配置或配置有误，当前已启用 EHCACHE 内建缓存
            -
            -             - - - -
            -
            - - - - -<%@ include file="/_include/Foot.jsp"%> - - \ No newline at end of file diff --git a/src/main/webapp/admin/integration/storage-qiniu.jsp b/src/main/webapp/admin/integration/storage-qiniu.jsp index 64fe4a80a..5a344676e 100644 --- a/src/main/webapp/admin/integration/storage-qiniu.jsp +++ b/src/main/webapp/admin/integration/storage-qiniu.jsp @@ -19,26 +19,29 @@
            -
            云存储
            +
            + 七牛云 QINIU + 修改 +
            -
            七牛云
            +
            云存储
            - + - - + + - + - +
            访问域名${storageAccount == null ? "未配置" : storageAccount[3]}${storageAccount == null ? "未配置" : storageAccount[3]}
            存储空间${storageAccount == null ? "未配置" : storageAccount[2]}存储空间

            存储空间变更需你自行迁移原有数据

            		${storageAccount == null ? "未配置" : storageAccount[2]}
            秘钥 AK${storageAccount == null ? "未配置" : storageAccount[0]}${storageAccount == null ? "未配置" : storageAccount[0]}
            秘钥 SK${storageAccount == null ? "未配置" : storageAccount[1]}${storageAccount == null ? "未配置" : storageAccount[1]}
            @@ -48,6 +51,10 @@
            七牛云存储账户未配置或配置有误，当前已启用本地文件存储
            +
            + + +
            @@ -58,5 +65,6 @@ <%@ include file="/_include/Foot.jsp"%> + \ No newline at end of file diff --git a/src/main/webapp/admin/integration/submail.jsp b/src/main/webapp/admin/integration/submail.jsp index 0a59e9e03..c268e6c98 100644 --- a/src/main/webapp/admin/integration/submail.jsp +++ b/src/main/webapp/admin/integration/submail.jsp @@ -19,66 +19,73 @@
            -
            赛邮 SUBMAIL
            +
            + 赛邮 SUBMAIL + 修改 +
            邮件服务
            - - - - - - - - - - - - - - - - - - - - - -
            APPID${mailAccount[0]}
            APPKEY${mailAccount[1]}
            发件人地址${mailAccount[2]}
            发件人名称${mailAccount[3]}
            -             - -
            -
            -
            邮件账号未配置，邮件相关功能不可用
            -
            -             -             + + + + + + + + + + + + + + + + + + + + + + + +
            APPID${mailAccount == null ? "未配置" : mailAccount[0]}
            APPKEY${mailAccount == null ? "未配置" : mailAccount[1]}
            发件人地址

            地址域名需与 SUBMAIL 中配置的域名匹配

            		${mailAccount == null ? "未配置" : mailAccount[2]}
            发件人名称${mailAccount == null ? "未配置" : mailAccount[3]}
            + +
            +
            +
            邮件账号未配置，邮件相关功能不可用
            +
            +
            短信服务
            - - - - - - - - - - - - - - - - - -
            APPID${smsAccount[0]}
            APPKEY${smsAccount[1]}
            短信签名${smsAccount[2]}
            -             - -
            -
            -
            短信账号未配置，短信相关功能不可用
            -
            -             -             + + + + + + + + + + + + + + + + + + + +
            APPID${smsAccount == null ? "未配置" : smsAccount[0]}
            APPKEY${smsAccount == null ? "未配置" : smsAccount[1]}
            短信签名${smsAccount == null ? "未配置" : smsAccount[2]}
            + +
            +
            +
            短信账号未配置，短信相关功能不可用
            +
            +             +
            + + +
            @@ -89,5 +96,51 @@
            <%@ include file="/_include/Foot.jsp"%> + + diff --git a/src/main/webapp/admin/robot/approval-design.jsp b/src/main/webapp/admin/robot/approval-design.jsp index 525d31bd7..d42cfcff0 100644 --- a/src/main/webapp/admin/robot/approval-design.jsp +++ b/src/main/webapp/admin/robot/approval-design.jsp @@ -69,6 +69,7 @@ window.__PageConfig = { } + diff --git a/src/main/webapp/admin/robot/approval-list.jsp b/src/main/webapp/admin/robot/approval-list.jsp index fe66edf8a..ec02bd23c 100644 --- a/src/main/webapp/admin/robot/approval-list.jsp +++ b/src/main/webapp/admin/robot/approval-list.jsp @@ -74,7 +74,7 @@ <%@ include file="/_include/Foot.jsp"%> - - + + diff --git a/src/main/webapp/admin/robot/trigger-design.jsp b/src/main/webapp/admin/robot/trigger-design.jsp index c3132b241..feb85cc4d 100644 --- a/src/main/webapp/admin/robot/trigger-design.jsp +++ b/src/main/webapp/admin/robot/trigger-design.jsp @@ -105,7 +105,7 @@
            -

            优先级高的会被先执行

            +

            优先级高（数字大）的会被先执行

            @@ -143,6 +143,7 @@ window.__PageConfig = { + diff --git a/src/main/webapp/admin/robot/trigger-list.jsp b/src/main/webapp/admin/robot/trigger-list.jsp index e4527644e..e468614d7 100644 --- a/src/main/webapp/admin/robot/trigger-list.jsp +++ b/src/main/webapp/admin/robot/trigger-list.jsp @@ -75,7 +75,7 @@ <%@ include file="/_include/Foot.jsp"%> - - + + diff --git a/src/main/webapp/admin/system-general.jsp b/src/main/webapp/admin/system-general.jsp index 95495ad0c..8ce3efbdc 100644 --- a/src/main/webapp/admin/system-general.jsp +++ b/src/main/webapp/admin/system-general.jsp @@ -7,11 +7,17 @@ <%@ include file="/_include/Head.jsp"%> 通用配置 @@ -27,7 +33,10 @@
            -
            通用配置
            +
            + 通用配置 + 修改 +
            通用
            @@ -45,15 +54,15 @@ - + - + - +
            主页地址/域名

            基础 URL 所有链接将以此作为前缀

            		${HomeURL}${HomeURL}
            公开注册${OpenSignUp ? "是" : "否"}${OpenSignUp ? "是" : "否"}
            登录页每日一图${LiveWallpaper ? "是" : "否"}${LiveWallpaper ? "是" : "否"}
            @@ -62,7 +71,7 @@ 登录密码安全策略 - + 高 (最低8位，必须同时包含数字、字母、特殊字符) 中 (最低6位，必须同时包含数字、字母) @@ -71,11 +80,23 @@ - 回收站数据保留时间 - ${RecycleBinKeepingDays}天 + 回收站数据保留天数 + ${RecycleBinKeepingDays} + + + 数据库备份

            每日0点备份到数据目录，请预留足够磁盘空间

            + ${DBBackupsEnable ? "是" : "否"} + + + 数据库备份保留天数 + ${DBBackupsKeepingDays} +
            + + +
            @@ -91,7 +112,7 @@
          • 技术支持
            • - © REBUILD 使用开源 GPL-3.0 和 商用 双重授权许可，请遵守许可协议。 + © REBUILD 使用开源 GPL-3.0 和 商用 双重授权许可，请遵守许可协议。
            @@ -101,6 +122,7 @@ <%@ include file="/_include/Foot.jsp"%> + + + diff --git a/src/main/webapp/entity/approval/approval-view.jsp b/src/main/webapp/entity/approval/approval-view.jsp index d298291ca..8cec21122 100644 --- a/src/main/webapp/entity/approval/approval-view.jsp +++ b/src/main/webapp/entity/approval/approval-view.jsp @@ -20,6 +20,7 @@ <%@ include file="/_include/Foot.jsp"%> + diff --git a/src/main/webapp/error40x.jsp b/src/main/webapp/error40x.jsp index 75f570a61..64b331f54 100644 --- a/src/main/webapp/error40x.jsp +++ b/src/main/webapp/error40x.jsp @@ -38,7 +38,16 @@ if (ServletUtils.isAjaxRequest(request)) { diff --git a/src/main/webapp/error500.jsp b/src/main/webapp/error500.jsp index 084a80225..e8ef43757 100644 --- a/src/main/webapp/error500.jsp +++ b/src/main/webapp/error500.jsp @@ -43,7 +43,16 @@ if (ServletUtils.isAjaxRequest(request)) { \ No newline at end of file diff --git a/src/main/webapp/feeds/home.jsp b/src/main/webapp/feeds/home.jsp index be8886145..e0d4d8dfa 100644 --- a/src/main/webapp/feeds/home.jsp +++ b/src/main/webapp/feeds/home.jsp @@ -15,6 +15,7 @@
            +
            @@ -65,6 +66,7 @@
            @@ -77,6 +79,7 @@
            +
            @@ -88,6 +91,7 @@
            +
            @@ -102,6 +106,7 @@
            <%@ include file="/_include/Foot.jsp"%> + diff --git a/src/main/webapp/general-entity/show-fields.jsp b/src/main/webapp/general-entity/show-fields.jsp index 5cb1f516c..30e376767 100644 --- a/src/main/webapp/general-entity/show-fields.jsp +++ b/src/main/webapp/general-entity/show-fields.jsp @@ -40,8 +40,8 @@ $(document).ready(function () { let shareTo let cfgid = $urlp('id') - $.get(baseUrl + '?id=' + cfgid, function (res) { - let _data = res.data || {} + $.get(baseUrl + '?id=' + (cfgid || ''), function (res) { + const _data = res.data || {} $(_data.fieldList).each(function () { render_unset([this.field, this.label]) }) @@ -50,19 +50,19 @@ $(document).ready(function () { }) cfgid = _data.configId || '' - if (rb.isAdminUser) { - $.get(baseUrl + '/alist', (res) => { - let configName = null - $(res.data).each(function () { - if (this[0] === _data.configId) { - configName = this[1] - return false - } + $.get(baseUrl + '/alist', (res) => { + const cc = res.data.find((x) => { return x[0] === cfgid }) + if (rb.isAdminUser) { + renderRbcomp(, + 'shareTo', function () { shareTo = this }) + } else { + const data = res.data.map((x)=>{ + x[4] = entity + return x }) - // eslint-disable-next-line react/jsx-no-undef - renderRbcomp(, 'shareTo', function () { shareTo = this }) - }) - } + renderSwitchButton(data, '列显示', cfgid) + } + }) }) $('.J_save').click(function () { @@ -71,12 +71,12 @@ $(document).ready(function () { config.push({field: $(this).data('key')}) }); if (config.length == 0) { - RbHighbar.create('请至少设置一个显示列'); + RbHighbar.create('请至少设置一个显示列') return } - let btn = $(this).button('loading') - let shareToData = shareTo ? shareTo.getData() : {} + const btn = $(this).button('loading') + const shareToData = shareTo ? shareTo.getData() : {} $.post(baseUrl + '?id=' + cfgid + '&configName=' + $encode(shareToData.configName || '') + '&shareTo=' + shareToData.shareTo, JSON.stringify(config), function (res) { if (res.error_code == 0) parent.location.reload() btn.button('reset') diff --git a/src/main/webapp/server-status.jsp b/src/main/webapp/server-status.jsp index 3d26e4d98..447126247 100644 --- a/src/main/webapp/server-status.jsp +++ b/src/main/webapp/server-status.jsp @@ -19,15 +19,15 @@ -<% if (!ServerStatus.isStatusOK()) { %> +<% if (!ServerStatus.isStatusOK() || !Application.serversReady()) { %>

            系统故障

            -
            部分服务未能正常启动，请通过快速检查列表排除故障，故障排除后重启服务。你也可以获取 技术支持
            +
            服务未能正常启动，请通过快速检查列表排除故障，故障排除后请重启服务。你也可以 报告此问题
            <% } %> @@ -35,9 +35,13 @@
            快速检查
            + + + + <% for (Status s : ServerStatus.getLastStatus()) { %> - + <% } %> @@ -92,7 +96,7 @@ <% } %>
            - © 2019 REBUILD + © 2020 REBUILD <% if (AppUtils.getRequestUser(request) != null) { %>  ·  Status Api diff --git a/src/main/webapp/setup/install.jsp b/src/main/webapp/setup/install.jsp index 5c20bd716..656320353 100644 --- a/src/main/webapp/setup/install.jsp +++ b/src/main/webapp/setup/install.jsp @@ -1,30 +1,30 @@ <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ page import="com.rebuild.server.Application"%> <%@ include file="/_include/Head.jsp"%> +REBUILD 安装程序 -REBUILD 安装程序
            @@ -59,15 +64,17 @@
            - © 2019 REBUILD -  ·  - 安装指南 -
            + © 2020 REBUILD  ·  版本 <%=Application.VER%>  ·  安装手册 +
            + REBUILD 使用开源 GPL-3.0 和 商用 双重授权许可，安装即表示你已阅读并同意许可内容 +
            +
            -<%@ include file="/_include/Foot.jsp"%> + diff --git a/src/test/java/com/rebuild/api/ApiGatewayTest.java b/src/test/java/com/rebuild/api/ApiGatewayTest.java index 37ff07399..a26c9ba38 100644 --- a/src/test/java/com/rebuild/api/ApiGatewayTest.java +++ b/src/test/java/com/rebuild/api/ApiGatewayTest.java @@ -18,9 +18,17 @@ package com.rebuild.api; +import cn.devezhao.commons.CodecUtils; +import cn.devezhao.persist4j.Record; import com.rebuild.api.sdk.OpenApiSDK; +import com.rebuild.server.Application; +import com.rebuild.server.configuration.RebuildApiManager; +import com.rebuild.server.helper.FormDataBuilder; +import com.rebuild.server.metadata.EntityHelper; +import com.rebuild.server.service.bizz.UserService; import com.rebuild.web.MvcResponse; import com.rebuild.web.TestSupportWithMVC; +import org.apache.commons.lang.math.RandomUtils; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -39,15 +47,34 @@ public class ApiGatewayTest extends TestSupportWithMVC { @Test public void testSimple() throws Exception { + final String[] app = createApp(); + String apiUrl = "/gw/api/system-time?"; Map bizParams = new HashMap<>(); - apiUrl += new OpenApiSDK("230853250", "LA31SVGBqxUT5ncjgfDItPMP7yh9bJJ4eyCjGmG0") - .signMD5(bizParams); + apiUrl += new OpenApiSDK(app[0], app[1]).signMD5(bizParams); System.out.println("Request API : " + apiUrl); MockHttpServletRequestBuilder builder = MockMvcRequestBuilders.get(apiUrl); MvcResponse resp = perform(builder, null); System.out.println(resp); } + + /** + * @return + */ + protected static String[] createApp() { + String appId = (100000000 + RandomUtils.nextInt(899999999)) + ""; + String appSecret = CodecUtils.randomCode(40); + + Record record = FormDataBuilder.builder(EntityHelper.RebuildApi) + .add("appId", appId) + .add("appSecret", appSecret) + .add("bindUser", UserService.SYSTEM_USER) + .buildRecord(UserService.SYSTEM_USER); + Application.getCommonService().create(record, false); + RebuildApiManager.instance.clean(appId); + + return new String[]{appId, appSecret}; + } } diff --git a/src/test/java/com/rebuild/server/MiscTest.java b/src/test/java/com/rebuild/server/MiscTest.java index cd3c3863f..1b40f58ce 100644 --- a/src/test/java/com/rebuild/server/MiscTest.java +++ b/src/test/java/com/rebuild/server/MiscTest.java @@ -20,6 +20,7 @@ import cn.devezhao.persist4j.engine.ID; import com.alibaba.fastjson.JSON; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -54,10 +55,10 @@ public void testMask() throws Exception { @Test public void testEquation() throws Exception { - final String equation = "((1 OR 2) AND (2 OR 3) )"; + final String equation = "((1 OR 2) AND (2 OR 3) )"; String clear = equation.toUpperCase(); - clear = clear.replaceAll("[\\(|\\)|AND|OR|1-9| ]", ""); - System.out.println(clear); + clear = clear.replaceAll("[(|)|AND|OR|1-9| ]", ""); + Assert.assertEquals(0, clear.length()); } } diff --git a/src/test/java/com/rebuild/server/SchemaGen.java b/src/test/java/com/rebuild/server/SchemaGen.java index e37fc6914..17b08501f 100644 --- a/src/test/java/com/rebuild/server/SchemaGen.java +++ b/src/test/java/com/rebuild/server/SchemaGen.java @@ -23,6 +23,7 @@ import cn.devezhao.persist4j.engine.PersistManagerFactoryImpl; import cn.devezhao.persist4j.metadata.impl.ConfigurationMetadataFactory; import cn.devezhao.persist4j.util.support.Table; +import com.rebuild.server.metadata.EntityHelper; import org.dom4j.Element; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -34,28 +35,36 @@ * @since 0.2, 2014-4-10 */ public class SchemaGen { - + private static ApplicationContext CTX; private static PersistManagerFactory PMF; private static boolean DROP_EXISTS = false; - private static boolean TEMPSTAMP_ZERO = false; public static void main(String[] args) { CTX = new ClassPathXmlApplicationContext(new String[] { "application-ctx.xml", }); PMF = CTX.getBean(PersistManagerFactoryImpl.class); - genAll(); +// genAll(); + gen(EntityHelper.Feeds); System.exit(0); } - - static void genAll() { + + /** + * 生成全部实体 + */ + static void genAll() { for (Entity entity : PMF.getMetadataFactory().getEntities()) { gen(entity.getEntityCode()); } } - + + /** + * 生成指定实体 + * + * @param e + */ static void gen(int e) { Entity entity = PMF.getMetadataFactory().getEntity(e); Element root = ((ConfigurationMetadataFactory) PMF.getMetadataFactory()).getConfigDocument().getRootElement(); @@ -63,15 +72,12 @@ static void gen(int e) { entity, PMF.getDialect(), root.selectSingleNode("//entity[@name='" + entity.getName() + "']").selectNodes("index")); - - String[] ddl = table.generateDDL(DROP_EXISTS, false); + + String[] ddl = table.generateDDL(DROP_EXISTS, false, false); StringBuffer sb = new StringBuffer(); sb.append("-- ************ Entity [" + entity.getName() + "] DDL ************\n"); for (String d : ddl) { - if (!TEMPSTAMP_ZERO) { - d = d.replace(" default '0000-00-00 00:00:00'", " default current_timestamp"); - } sb.append(d).append("\n"); } System.out.println(sb); diff --git a/src/test/java/com/rebuild/server/StartupTest.java b/src/test/java/com/rebuild/server/StartupTest.java index 3c8f21f5e..06cff3e26 100644 --- a/src/test/java/com/rebuild/server/StartupTest.java +++ b/src/test/java/com/rebuild/server/StartupTest.java @@ -32,7 +32,7 @@ public void initAllBeans() { LOG.warn("Initialize all beans ^_^"); Application.getApplicationContext().getBeansOfType(Object.class); - double used[] = ServerStatus.getHeapMemoryUsed(); + double[] used = ServerStatus.getHeapMemoryUsed(); LOG.warn("Memory Used : " + used[1] + " " + used[0]); } } diff --git a/src/test/java/com/rebuild/server/TestSupportWithUser.java b/src/test/java/com/rebuild/server/TestSupportWithUser.java index a52f6655f..1c067e029 100644 --- a/src/test/java/com/rebuild/server/TestSupportWithUser.java +++ b/src/test/java/com/rebuild/server/TestSupportWithUser.java @@ -56,7 +56,7 @@ public void setDown() { * @return */ protected ID getSessionUser() { - return SIMPLE_USER; + return UserService.ADMIN_USER; } /** diff --git a/src/test/java/com/rebuild/server/business/approval/ApprovalProcessorTest.java b/src/test/java/com/rebuild/server/business/approval/ApprovalProcessorTest.java index e1b3b5511..06aa192bb 100644 --- a/src/test/java/com/rebuild/server/business/approval/ApprovalProcessorTest.java +++ b/src/test/java/com/rebuild/server/business/approval/ApprovalProcessorTest.java @@ -35,11 +35,6 @@ */ public class ApprovalProcessorTest extends TestSupportWithUser { - @Override - protected ID getSessionUser() { - return UserService.ADMIN_USER; - } - @Test public void testFlowGroup() throws Exception { final ID recordNew = addRecordOfTestAllFields(); diff --git a/src/test/java/com/rebuild/server/business/charts/ChartsTest.java b/src/test/java/com/rebuild/server/business/charts/ChartsTest.java index ade2208d3..7920e4b51 100644 --- a/src/test/java/com/rebuild/server/business/charts/ChartsTest.java +++ b/src/test/java/com/rebuild/server/business/charts/ChartsTest.java @@ -20,8 +20,9 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.rebuild.server.TestSupport; +import com.rebuild.server.TestSupportWithUser; import com.rebuild.server.service.bizz.UserService; +import org.junit.Before; import org.junit.Test; /** @@ -29,7 +30,14 @@ * @author devezhao * @since 01/04/2019 */ -public class ChartsTest extends TestSupport { +public class ChartsTest extends TestSupportWithUser { + + @Before + @Override + public void setUp() { + super.setUp(); + this.addRecordOfTestAllFields(); + } @Test public void testTable() throws Exception { diff --git a/src/test/java/com/rebuild/server/business/datareport/DataReportGeneratorTest.java b/src/test/java/com/rebuild/server/business/datareport/DataReportGeneratorTest.java index 5c87a83cc..6b02b7ba3 100644 --- a/src/test/java/com/rebuild/server/business/datareport/DataReportGeneratorTest.java +++ b/src/test/java/com/rebuild/server/business/datareport/DataReportGeneratorTest.java @@ -32,11 +32,6 @@ */ public class DataReportGeneratorTest extends TestSupportWithUser { - @Override - protected ID getSessionUser() { - return UserService.ADMIN_USER; - } - @Test public void testGenerator() throws Exception { File template = ResourceUtils.getFile("classpath:report-template.xlsx"); diff --git a/src/test/java/com/rebuild/server/business/feeds/FeedsHelperTest.java b/src/test/java/com/rebuild/server/business/feeds/FeedsHelperTest.java index b4b983987..1367bd207 100644 --- a/src/test/java/com/rebuild/server/business/feeds/FeedsHelperTest.java +++ b/src/test/java/com/rebuild/server/business/feeds/FeedsHelperTest.java @@ -23,6 +23,7 @@ import com.rebuild.server.Application; import com.rebuild.server.TestSupportWithUser; import com.rebuild.server.metadata.EntityHelper; +import com.rebuild.server.service.bizz.UserService; import org.junit.Assert; import org.junit.Test; @@ -34,6 +35,11 @@ */ public class FeedsHelperTest extends TestSupportWithUser { + @Override + protected ID getSessionUser() { + return SIMPLE_USER; + } + @Test public void findMentions() { Map map = FeedsHelper.findMentionsMap("@RB示例用户 @没有 @RB 示例用户 @超级管理员\n你还的呵呵我复合 @ @ "); @@ -46,7 +52,7 @@ public void getNumOfComment() { createComment(feedsId); int num = FeedsHelper.getNumOfComment(feedsId); - Assert.assertTrue(num == 1); + Assert.assertEquals(1, num); Application.getService(EntityHelper.Feeds).delete(feedsId); FeedsHelper.isMyLike(feedsId, SIMPLE_USER); @@ -54,16 +60,21 @@ public void getNumOfComment() { FeedsHelper.checkReadable(feedsId, SIMPLE_USER); } + @Test + public void formatContent() { + FeedsHelper.formatContent("123 @" + UserService.ADMIN_USER); + } + private ID createFeeds() { Record feeds = EntityHelper.forNew(EntityHelper.Feeds, SIMPLE_USER); feeds.setString("content", "你好，测试动态 @RB示例用户 @admin"); return Application.getService(EntityHelper.Feeds).create(feeds).getPrimary(); } - private ID createComment(ID feedsId) { + private void createComment(ID feedsId) { Record comment = EntityHelper.forNew(EntityHelper.FeedsComment, SIMPLE_USER); comment.setString("content", "你好，测试评论"); comment.setID("feedsId", feedsId); - return Application.getService(EntityHelper.FeedsComment).create(comment).getPrimary(); + Application.getService(EntityHelper.FeedsComment).create(comment).getPrimary(); } } \ No newline at end of file diff --git a/src/test/java/com/rebuild/server/business/files/FilesHelperTest.java b/src/test/java/com/rebuild/server/business/files/FilesHelperTest.java index 274a4eb53..b5b200cc6 100644 --- a/src/test/java/com/rebuild/server/business/files/FilesHelperTest.java +++ b/src/test/java/com/rebuild/server/business/files/FilesHelperTest.java @@ -19,17 +19,25 @@ package com.rebuild.server.business.files; import cn.devezhao.persist4j.Record; +import cn.devezhao.persist4j.engine.ID; import com.rebuild.server.Application; import com.rebuild.server.TestSupportWithUser; import com.rebuild.server.metadata.EntityHelper; import org.junit.Test; +import java.util.Arrays; + /** * @author devezhao * @since 2019/11/15 */ public class FilesHelperTest extends TestSupportWithUser { + @Override + protected ID getSessionUser() { + return SIMPLE_USER; + } + @Test public void getFolders() { Record folder = EntityHelper.forNew(EntityHelper.AttachmentFolder, getSessionUser()); @@ -47,7 +55,7 @@ public void getPrivateFolders() { folder.setString("scope", FilesHelper.SCOPE_SELF); folder = Application.getService(EntityHelper.AttachmentFolder).create(folder); - System.out.println(FilesHelper.getPrivateFolders(getSessionUser())); + System.out.println(Arrays.toString(FilesHelper.getPrivateFolders(getSessionUser()))); Application.getService(EntityHelper.AttachmentFolder).delete(folder.getPrimary()); } } \ No newline at end of file diff --git a/src/test/java/com/rebuild/server/business/trigger/impl/AutoAssignTest.java b/src/test/java/com/rebuild/server/business/trigger/impl/AutoAssignTest.java index 4e711b5dc..3ec61ddb4 100644 --- a/src/test/java/com/rebuild/server/business/trigger/impl/AutoAssignTest.java +++ b/src/test/java/com/rebuild/server/business/trigger/impl/AutoAssignTest.java @@ -36,11 +36,6 @@ */ public class AutoAssignTest extends TestSupportWithUser { - @Override - protected ID getSessionUser() { - return UserService.ADMIN_USER; - } - @Test public void execute() throws Exception { addExtTestEntities(false); diff --git a/src/test/java/com/rebuild/server/business/trigger/impl/AutoShareTest.java b/src/test/java/com/rebuild/server/business/trigger/impl/AutoShareTest.java index 7267c1045..ef37f21a2 100644 --- a/src/test/java/com/rebuild/server/business/trigger/impl/AutoShareTest.java +++ b/src/test/java/com/rebuild/server/business/trigger/impl/AutoShareTest.java @@ -37,11 +37,6 @@ */ public class AutoShareTest extends TestSupportWithUser { - @Override - protected ID getSessionUser() { - return UserService.ADMIN_USER; - } - @Test public void execute() throws Exception { addExtTestEntities(false); diff --git a/src/test/java/com/rebuild/server/business/trigger/impl/FieldAggregationTest.java b/src/test/java/com/rebuild/server/business/trigger/impl/FieldAggregationTest.java index 86e6ed7eb..c22f7d612 100644 --- a/src/test/java/com/rebuild/server/business/trigger/impl/FieldAggregationTest.java +++ b/src/test/java/com/rebuild/server/business/trigger/impl/FieldAggregationTest.java @@ -21,6 +21,8 @@ import cn.devezhao.persist4j.Entity; import cn.devezhao.persist4j.Record; import cn.devezhao.persist4j.engine.ID; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.rebuild.server.Application; import com.rebuild.server.TestSupportWithUser; import com.rebuild.server.business.trigger.ActionType; @@ -39,18 +41,11 @@ */ public class FieldAggregationTest extends TestSupportWithUser { - @Override - protected ID getSessionUser() { - return UserService.ADMIN_USER; - } - @Test public void testExecute() throws Exception { addExtTestEntities(false); // 添加配置 - Application.getSQLExecutor().execute("delete from robot_trigger_config where BELONG_ENTITY = 'SalesOrderItem999'"); - Record triggerConfig = EntityHelper.forNew(EntityHelper.RobotTriggerConfig, UserService.SYSTEM_USER); triggerConfig.setString("belongEntity", "SalesOrderItem999"); triggerConfig.setInt("when", TriggerWhen.CREATE.getMaskValue() + TriggerWhen.DELETE.getMaskValue()); @@ -71,4 +66,20 @@ public void testExecute() throws Exception { // 清理 Application.getBean(RobotTriggerConfigService.class).delete(triggerConfig.getPrimary()); } + + @Test + public void testEvaluator() throws Exception { + addExtTestEntities(false); + Entity sourceEntity = MetadataHelper.getEntity("SalesOrder999"); + + JSONObject configUseFormula = JSON.parseObject("{ targetField:'totalAmount', calcMode:'FORMULA', sourceFormula:'{totalAmount$$$$SUM}*1.35' }"); + new AggregationEvaluator( + configUseFormula, sourceEntity, "relatedAccount", null) + .eval(ID.newId(sourceEntity.getEntityCode())); + + JSONObject configUseMAX = JSON.parseObject("{ targetField:'totalAmount', calcMode:'MAX', sourceField:'totalAmount' }"); + new AggregationEvaluator( + configUseMAX, sourceEntity, "relatedAccount", "(2=2)") + .eval(ID.newId(sourceEntity.getEntityCode())); + } } diff --git a/src/test/java/com/rebuild/server/business/trigger/impl/FieldWritebackTest.java b/src/test/java/com/rebuild/server/business/trigger/impl/FieldWritebackTest.java new file mode 100644 index 000000000..6edfd12e8 --- /dev/null +++ b/src/test/java/com/rebuild/server/business/trigger/impl/FieldWritebackTest.java @@ -0,0 +1,57 @@ +/* +rebuild - Building your business-systems freely. +Copyright (C) 2020 devezhao + +rebuild is dual-licensed under commercial and open source licenses (GPLv3). +For more information, please see +*/ + +package com.rebuild.server.business.trigger.impl; + +import cn.devezhao.persist4j.Entity; +import cn.devezhao.persist4j.Record; +import com.rebuild.server.Application; +import com.rebuild.server.TestSupportWithUser; +import com.rebuild.server.business.trigger.ActionType; +import com.rebuild.server.business.trigger.TriggerWhen; +import com.rebuild.server.metadata.EntityHelper; +import com.rebuild.server.metadata.MetadataHelper; +import com.rebuild.server.service.bizz.UserService; +import com.rebuild.server.service.configuration.RobotTriggerConfigService; +import org.junit.Test; + +/** + * @author devezhao + * @since 2020/2/7 + */ +public class FieldWritebackTest extends TestSupportWithUser { + + @Test + public void testExecute() throws Exception { + addExtTestEntities(false); + + // 添加配置 + Record triggerConfig = EntityHelper.forNew(EntityHelper.RobotTriggerConfig, UserService.SYSTEM_USER); + triggerConfig.setString("belongEntity", "SalesOrder999"); + triggerConfig.setInt("when", TriggerWhen.CREATE.getMaskValue()); + triggerConfig.setString("actionType", ActionType.FIELDWRITEBACK.name()); + String content = "{targetEntity:'relatedAccount.Account999', items:[{sourceField:'createdOn', targetField:'accountName'}]}"; + triggerConfig.setString("actionContent", content); + Application.getBean(RobotTriggerConfigService.class).create(triggerConfig); + + // 测试执行 + Entity salesOrder999 = MetadataHelper.getEntity("SalesOrder999"); + Entity account999 = MetadataHelper.getEntity("Account999"); + + Record account999Record = EntityHelper.forNew(account999.getEntityCode(), getSessionUser()); + account999Record.setString("accountName", "FWB" + System.nanoTime()); + account999Record = Application.getService(account999.getEntityCode()).create(account999Record); + + Record salesOrder999Record = EntityHelper.forNew(salesOrder999.getEntityCode(), getSessionUser()); + salesOrder999Record.setID("relatedAccount", account999Record.getPrimary()); + Application.getService(account999.getEntityCode()).create(salesOrder999Record); + + // 清理 + Application.getBean(RobotTriggerConfigService.class).delete(triggerConfig.getPrimary()); + } +} \ No newline at end of file diff --git a/src/test/java/com/rebuild/server/business/trigger/impl/SendNotificationTest.java b/src/test/java/com/rebuild/server/business/trigger/impl/SendNotificationTest.java index 727751120..7d2a61fc7 100644 --- a/src/test/java/com/rebuild/server/business/trigger/impl/SendNotificationTest.java +++ b/src/test/java/com/rebuild/server/business/trigger/impl/SendNotificationTest.java @@ -40,11 +40,6 @@ */ public class SendNotificationTest extends TestSupportWithUser { - @Override - protected ID getSessionUser() { - return UserService.ADMIN_USER; - } - @Test public void testExecute() throws Exception { // 添加配置 @@ -54,7 +49,7 @@ public void testExecute() throws Exception { triggerConfig.setString("belongEntity", "TestAllFields"); triggerConfig.setInt("when", TriggerWhen.CREATE.getMaskValue() + TriggerWhen.DELETE.getMaskValue()); triggerConfig.setString("actionType", ActionType.SENDNOTIFICATION.name()); - String content = String.format("{ sendTo:['%s'], content:'SENDNOTIFICATION' }", SIMPLE_USER); + String content = String.format("{ sendTo:['%s'], content:'SENDNOTIFICATION {createdBy} {3782732}' }", SIMPLE_USER); triggerConfig.setString("actionContent", content); Application.getBean(RobotTriggerConfigService.class).create(triggerConfig); @@ -78,4 +73,12 @@ record = Application.getEntityService(test.getEntityCode()).create(record); // 清理 Application.getBean(RobotTriggerConfigService.class).delete(triggerConfig.getPrimary()); } + + @Test + public void formatMessage() { + ID test = addRecordOfTestAllFields(); + String msg = "你好哈哈哈{TestAllFieldsName} 肩痛 {createdBy} {4324fewfe}"; + msg = new SendNotification(null).formatMessage(msg, test); + System.out.println(msg); + } } diff --git a/src/test/java/com/rebuild/server/configuration/AutoFillinManagerTest.java b/src/test/java/com/rebuild/server/configuration/AutoFillinManagerTest.java index 4827c7944..50c27c84e 100644 --- a/src/test/java/com/rebuild/server/configuration/AutoFillinManagerTest.java +++ b/src/test/java/com/rebuild/server/configuration/AutoFillinManagerTest.java @@ -25,7 +25,6 @@ import cn.devezhao.persist4j.engine.ID; import com.alibaba.fastjson.JSONArray; import com.rebuild.server.Application; -import com.rebuild.server.TestSupport; import com.rebuild.server.TestSupportWithUser; import com.rebuild.server.metadata.EntityHelper; import com.rebuild.server.metadata.MetadataHelper; diff --git a/src/test/java/com/rebuild/server/helper/SMSenderTest.java b/src/test/java/com/rebuild/server/helper/SMSenderTest.java index d0718d1c1..791e6b03e 100644 --- a/src/test/java/com/rebuild/server/helper/SMSenderTest.java +++ b/src/test/java/com/rebuild/server/helper/SMSenderTest.java @@ -32,13 +32,15 @@ public class SMSenderTest extends TestSupport { @Ignore @Test public void testSendSMS() throws Exception { - SMSender.availableSMS(); - SMSender.sendSMS("17187472172", "SMSenderTest#testSendSMS"); + if (SMSender.availableSMS()) { + SMSender.sendSMS("17187472172", "SMSenderTest#testSendSMS"); + } } @Test public void testSendMail() throws Exception { - SMSender.availableMail(); - SMSender.sendMail("getrebuild@sina.com", "SMSenderTest#testSendMail", "test content"); + if (SMSender.availableMail()) { + SMSender.sendMail("getrebuild@sina.com", "SMSenderTest#testSendMail", "test content"); + } } } diff --git a/src/test/java/com/rebuild/server/helper/datalist/DataListControlTest.java b/src/test/java/com/rebuild/server/helper/datalist/DataListControlTest.java index b1e307075..6fb938686 100644 --- a/src/test/java/com/rebuild/server/helper/datalist/DataListControlTest.java +++ b/src/test/java/com/rebuild/server/helper/datalist/DataListControlTest.java @@ -37,8 +37,7 @@ protected ID getSessionUser() { return SIMPLE_USER; } - private static JSONObject queryExpr = null; - + private static JSONObject queryExpr; static { queryExpr = JSON.parseObject("{ entity:'User' }"); JSON fields = JSON.parseArray("[ 'userId', 'loginName', 'createdOn', 'createdBy', 'createdBy.fullName', 'modifiedBy.fullName' ]"); diff --git a/src/test/java/com/rebuild/server/helper/language/LanguagesTest.java b/src/test/java/com/rebuild/server/helper/language/LanguagesTest.java index 074541228..e5d9e487f 100644 --- a/src/test/java/com/rebuild/server/helper/language/LanguagesTest.java +++ b/src/test/java/com/rebuild/server/helper/language/LanguagesTest.java @@ -23,7 +23,7 @@ import java.util.Locale; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * @author devezhao @@ -37,8 +37,10 @@ public void getBundle() { System.out.println(Languages.instance.getCurrentBundle()); System.out.println(Languages.instance.getBundle(Locale.getDefault())); - assertEquals(Locale.US.toString(), Languages.instance.getBundle(Locale.US).locale()); - assertEquals(Locale.JAPAN.toString(), Languages.instance.getBundle(Locale.JAPAN).locale()); + assertEquals(Locale.US, + Locale.forLanguageTag(Languages.instance.getBundle(Locale.US).locale())); + assertEquals(Locale.JAPAN, + Locale.forLanguageTag(Languages.instance.getBundle(Locale.JAPAN).locale())); } @Test diff --git a/src/test/java/com/rebuild/server/helper/setup/DatabaseBackupTest.java b/src/test/java/com/rebuild/server/helper/setup/DatabaseBackupTest.java new file mode 100644 index 000000000..df4103733 --- /dev/null +++ b/src/test/java/com/rebuild/server/helper/setup/DatabaseBackupTest.java @@ -0,0 +1,24 @@ +/* +rebuild - Building your business-systems freely. +Copyright (C) 2020 devezhao + +rebuild is dual-licensed under commercial and open source licenses (GPLv3). +For more information, please see +*/ + +package com.rebuild.server.helper.setup; + +import com.rebuild.server.TestSupport; +import org.junit.Test; + +/** + * @author devezhao + * @since 02/04/2020 + */ +public class DatabaseBackupTest extends TestSupport { + + @Test + public void backup() throws Exception { + new DatabaseBackup().backup(); + } +} \ No newline at end of file diff --git a/src/test/java/com/rebuild/server/helper/setup/InstallerTest.java b/src/test/java/com/rebuild/server/helper/setup/InstallerTest.java index 5a7514bdc..00450dd9d 100644 --- a/src/test/java/com/rebuild/server/helper/setup/InstallerTest.java +++ b/src/test/java/com/rebuild/server/helper/setup/InstallerTest.java @@ -20,7 +20,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.rebuild.server.helper.Lisence; +import com.rebuild.server.helper.License; import org.junit.Test; import java.sql.Connection; @@ -56,12 +56,11 @@ public void getConnection() throws Exception { public void install() throws Exception { Installer installer = new Installer(USE_H2); installer.installDatabase(); - installer.installSystem(); installer.installAdmin(); } @Test public void testLisence() throws Exception { - Lisence.queryAuthority(); + License.queryAuthority(); } } \ No newline at end of file diff --git a/src/test/java/com/rebuild/server/metadata/entity/Meta2SchemaTest.java b/src/test/java/com/rebuild/server/metadata/entity/Meta2SchemaTest.java index c52be9f54..e36b72c39 100644 --- a/src/test/java/com/rebuild/server/metadata/entity/Meta2SchemaTest.java +++ b/src/test/java/com/rebuild/server/metadata/entity/Meta2SchemaTest.java @@ -19,7 +19,6 @@ package com.rebuild.server.metadata.entity; import cn.devezhao.persist4j.Entity; -import cn.devezhao.persist4j.engine.ID; import com.rebuild.server.TestSupportWithUser; import com.rebuild.server.metadata.MetadataHelper; import com.rebuild.server.service.bizz.UserService; @@ -31,11 +30,6 @@ */ public class Meta2SchemaTest extends TestSupportWithUser { - @Override - protected ID getSessionUser() { - return UserService.ADMIN_USER; - } - @Test public void testCreateEntity() throws Exception { String newEntityName = new Entity2Schema(UserService.ADMIN_USER).createEntity("测试实体", null, null, false); diff --git a/src/test/java/com/rebuild/server/service/base/BulkOperatorTest.java b/src/test/java/com/rebuild/server/service/base/BulkOperatorTest.java index 78446152c..7d2250473 100644 --- a/src/test/java/com/rebuild/server/service/base/BulkOperatorTest.java +++ b/src/test/java/com/rebuild/server/service/base/BulkOperatorTest.java @@ -31,11 +31,6 @@ */ public class BulkOperatorTest extends TestSupportWithUser { - @Override - public ID getSessionUser() { - return UserService.ADMIN_USER; - } - @Test public void share() throws Exception { // 测试记录 diff --git a/src/test/java/com/rebuild/server/service/base/GeneralEntityServiceTest.java b/src/test/java/com/rebuild/server/service/base/GeneralEntityServiceTest.java index 229b81af3..c063401a7 100644 --- a/src/test/java/com/rebuild/server/service/base/GeneralEntityServiceTest.java +++ b/src/test/java/com/rebuild/server/service/base/GeneralEntityServiceTest.java @@ -38,11 +38,6 @@ */ public class GeneralEntityServiceTest extends TestSupportWithUser { - @Override - public ID getSessionUser() { - return UserService.ADMIN_USER; - } - @Test public void getServiceSpec() throws Exception { ServiceSpec ies = Application.getService(EntityHelper.User); @@ -62,7 +57,7 @@ record = Application.getService(EntityHelper.Role).create(record); // 更新 record = EntityHelper.forUpdate(roleId, UserService.ADMIN_USER); record.setString("name", "测试角色-2"); - record = Application.getService(EntityHelper.Role).createOrUpdate(record); + Application.getService(EntityHelper.Role).createOrUpdate(record); System.out.println(Application.getUserStore().getRole(roleId).getName()); diff --git a/src/test/java/com/rebuild/server/service/bizz/UserServiceTest.java b/src/test/java/com/rebuild/server/service/bizz/UserServiceTest.java new file mode 100644 index 000000000..3221677fa --- /dev/null +++ b/src/test/java/com/rebuild/server/service/bizz/UserServiceTest.java @@ -0,0 +1,48 @@ +/* +rebuild - Building your business-systems freely. +Copyright (C) 2020 devezhao + +rebuild is dual-licensed under commercial and open source licenses (GPLv3). +For more information, please see +*/ + +package com.rebuild.server.service.bizz; + +import cn.devezhao.commons.CodecUtils; +import cn.devezhao.persist4j.Record; +import cn.devezhao.persist4j.engine.ID; +import com.rebuild.server.Application; +import com.rebuild.server.TestSupportWithUser; +import com.rebuild.server.metadata.EntityHelper; +import org.apache.commons.lang.math.RandomUtils; +import org.junit.Test; + +/** + * @author devezhao + * @since 2020/2/6 + */ +public class UserServiceTest extends TestSupportWithUser { + + @Override + protected ID getSessionUser() { + return UserService.SYSTEM_USER; + } + + @Test + public void someFlow() { + Record record = EntityHelper.forNew(EntityHelper.User, UserService.SYSTEM_USER); + record.setString("loginName", "testuser" + RandomUtils.nextInt(999999)); + record.setString("password", CodecUtils.randomCode(10) + "Aa1!"); + record = Application.getBean(UserService.class).create(record); + + final ID userId = record.getPrimary(); + System.out.println("Created User : " + userId); + + Application.getBean(UserService.class) + .updateEnableUser(userId, SIMPLE_DEPT, SIMPLE_ROLE, true); + System.out.println("Enabled User : " + userId + " >> " + Application.getUserStore().getUser(userId).isActive()); + + Application.getBean(UserService.class).delete(userId); + System.out.println("Deleted User : " + userId); + } +} \ No newline at end of file diff --git a/src/test/java/com/rebuild/server/service/bizz/UserStoreTest.java b/src/test/java/com/rebuild/server/service/bizz/UserStoreTest.java index c37dfadcd..0a8656dfd 100644 --- a/src/test/java/com/rebuild/server/service/bizz/UserStoreTest.java +++ b/src/test/java/com/rebuild/server/service/bizz/UserStoreTest.java @@ -23,8 +23,9 @@ import com.rebuild.server.service.bizz.privileges.User; import org.junit.Test; -import java.util.Arrays; +import java.util.Collections; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** @@ -56,25 +57,30 @@ public void testRefresh() throws Exception { @Test public void testExists() throws Exception { - assertTrue(Application.getUserStore().exists("admin")); - assertTrue(!Application.getUserStore().exists("not_exists")); + assertTrue(Application.getUserStore().existsUser("admin")); + assertFalse(Application.getUserStore().existsUser("not_exists")); } @Test public void testMemberToTeam() { Application.getSessionStore().set(SIMPLE_USER); try { - Application.getBean(TeamService.class).createMembers(SIMPLE_TEAM, Arrays.asList(SIMPLE_USER)); + Application.getBean(TeamService.class).createMembers(SIMPLE_TEAM, Collections.singletonList(SIMPLE_USER)); User user = Application.getUserStore().getUser(SIMPLE_USER); System.out.println(user.getOwningTeams()); - assertTrue(!user.getOwningTeams().isEmpty()); + assertFalse(user.getOwningTeams().isEmpty()); assertTrue(Application.getUserStore().getTeam(SIMPLE_TEAM).isMember(SIMPLE_USER)); - Application.getBean(TeamService.class).deleteMembers(SIMPLE_TEAM, Arrays.asList(SIMPLE_USER)); + Application.getBean(TeamService.class).deleteMembers(SIMPLE_TEAM, Collections.singletonList(SIMPLE_USER)); System.out.println(user.getOwningTeams()); } finally { Application.getSessionStore().clean(); } } + + @Test + public void existsAny() { + Application.getUserStore().existsAny(RoleService.ADMIN_ROLE); + } } diff --git a/src/test/java/com/rebuild/utils/JSONUtilsTest.java b/src/test/java/com/rebuild/utils/JSONUtilsTest.java new file mode 100644 index 000000000..b341bd490 --- /dev/null +++ b/src/test/java/com/rebuild/utils/JSONUtilsTest.java @@ -0,0 +1,35 @@ +/* +rebuild - Building your business-systems freely. +Copyright (C) 2020 devezhao + +rebuild is dual-licensed under commercial and open source licenses (GPLv3). +For more information, please see +*/ + +package com.rebuild.utils; + +import com.alibaba.fastjson.JSON; +import org.junit.Test; + +/** + * @author devezhao + * @since 2020/2/4 + */ +public class JSONUtilsTest { + + @Test + public void toJSONObjectArray() { + String[] keys = new String[]{"a", "b", "c"}; + Object[][] values = new Object[][]{ + new Object[]{1, 2, 3}, + new Object[]{11, 22, 33}, + new Object[]{111, 222, 333} + }; + System.out.println(JSONUtils.toJSONObjectArray(keys, values)); + } + + @Test + public void clone1() { + JSONUtils.clone(JSON.parseObject("{a:1,b:2}")); + } +} \ No newline at end of file diff --git a/src/test/java/com/rebuild/utils/RbCodecTest.java b/src/test/java/com/rebuild/utils/RbCodecTest.java new file mode 100644 index 000000000..b3b8c32df --- /dev/null +++ b/src/test/java/com/rebuild/utils/RbCodecTest.java @@ -0,0 +1,45 @@ +/* +rebuild - Building your business-systems freely. +Copyright (C) 2020 devezhao + +rebuild is dual-licensed under commercial and open source licenses (GPLv3). +For more information, please see +*/ + +package com.rebuild.utils; + +import cn.devezhao.commons.CalendarUtils; +import cn.devezhao.persist4j.Record; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.serializer.JSONSerializer; +import com.rebuild.server.TestSupport; +import com.rebuild.server.metadata.EntityHelper; +import com.rebuild.server.service.bizz.UserService; +import org.junit.Test; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +/** + * @author devezhao + * @since 2020/2/4 + */ +public class RbCodecTest extends TestSupport { + + @Test + public void testRbRecordCodec() throws IOException { + Record record = EntityHelper.forNew(EntityHelper.User, UserService.SYSTEM_USER); + RbRecordCodec.instance.write(new JSONSerializer(), record, null, null, 0); + + Map map = new HashMap<>(); + map.put("fieldName2", record); + System.out.println(JSON.toJSONString(map)); + } + + @Test + public void testRbDateCodec() throws IOException { + RbDateCodec.instance.write(new JSONSerializer(), CalendarUtils.now(), null, null, 0); + } +} +
            Master Service<%=Application.serversReady() ? "OK" : "启动失败"%>
            <%=s.name%><%=s.name%> <%=s.success ? "OK" : ("ERROR : " + s.error)%>