From fbeb2e18ab30d6e9c5c11b87f56b41d729db0c67 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 23 Dec 2021 17:37:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8D=E6=89=B6=E5=A2=99=E4=B9=9F?= =?UTF-8?q?=E5=BE=97=E6=9C=8D=E4=BD=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/GridMobileListResultDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridMobileListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridMobileListResultDTO.java index 6d4e1dded0..080f4709b8 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridMobileListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridMobileListResultDTO.java @@ -36,6 +36,11 @@ public class GridMobileListResultDTO { */ private String staffHeadPhoto; + /** + * 工作人员头像 + */ + private String mobile; + /** * 人员角色列表 */ From de4903426d754a420be64067184dc1f3842bc96f Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Dec 2021 20:57:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/LoginController.java | 4 +- .../com/epmet/controller/WxController.java | 4 +- .../service/impl/CaptchaServiceImpl.java | 6 +- .../src/main/resources/static/js/common.js | 12 +- .../src/main/resources/static/libs/router.js | 8 +- .../resources/template/add-or-update.vue.vm | 34 +- .../src/main/resources/template/index.vue.vm | 2 +- .../src/main/resources/views/index.html | 6 +- .../com/epmet/common/token/util/UserUtil.java | 3 - .../interceptor/DataFilterInterceptor.java | 2 +- .../sign/openapi/OpenApiSignUtils.java | 8 +- .../com/epmet/commons/thirdplat/DemoApp.java | 5 +- .../epmet/wx/mp/handler/LocationHandler.java | 2 +- .../tools/security/password/BCrypt.java | 61 +- .../epmet/commons/tools/utils/IpUtils.java | 3 +- .../epmet/commons/tools/utils/Md5Util.java | 15 +- .../commons/tools/utils/ModuleUtils.java | 13 +- .../com/epmet/commons/tools/utils/Result.java | 2 +- .../commons/tools/utils/net/OkHttpUtil.java | 2 +- .../validator/IdCardNoValidatorUtils.java | 12 +- .../com/epmet/auth/ExtAppAuthProcessor.java | 5 +- .../com/epmet/filter/EpmetGatewayFilter.java | 4 +- .../epmetuser/impl/EpmetUserServiceImpl.java | 2 +- .../impl/QuestionnaireServiceImpl.java | 2 +- .../impl/PartyMemberLeadServiceImpl.java | 4 +- .../service/publicity/PublicityService.java | 12 +- .../editor/main/StencilsetRestResource.java | 3 +- .../model/ModelEditorJsonRestResource.java | 4 +- .../editor/model/ModelSaveRestResource.java | 5 +- .../com/epmet/service/ActHistoryService.java | 4 +- .../com/epmet/service/ActModelService.java | 3 +- .../com/epmet/service/ActProcessService.java | 7 +- .../com/epmet/service/ActTaskService.java | 2 +- .../public/diagram-viewer/js/ActivitiRest.js | 16 +- .../public/diagram-viewer/js/Polyline.js | 144 +- .../diagram-viewer/js/ProcessDiagramCanvas.js | 874 +- .../public/diagram-viewer/js/jquery/jquery.js | 84 +- .../public/diagram-viewer/js/textlayout.js | 142 +- .../public/editor-app/editor-utils.js | 6 +- .../editor-app/editor/i18n/translation_de.js | 14 +- .../editor/i18n/translation_en_us.js | 14 +- .../editor/i18n/translation_signavio_de.js | 6 +- .../editor/i18n/translation_signavio_en_us.js | 2 +- .../public/editor-app/editor/oryx.debug.js | 8538 ++++++++--------- .../libs/bootstrap_3.1.1/js/bootstrap.js | 1146 +-- .../libs/es5-shim-15.3.4.5/es5-sham.js | 6 +- .../libs/es5-shim-15.3.4.5/es5-shim.js | 2 +- .../tests/helpers/h-matchers.js | 8 +- .../libs/jquery.autogrow-textarea.js | 4 +- .../editor-app/libs/json3_3.2.6/lib/json3.js | 4 +- .../public/editor-app/libs/path_parser.js | 6 +- .../public/editor-app/libs/prototype-1.5.1.js | 74 +- .../java/com/epmet/utils/ShowApiUtil.java | 27 +- .../externalapp/ExtAppAuthProcessor.java | 5 +- .../impl/IcUserDemandRecServiceImpl.java | 8 +- .../main/java/com/epmet/email/EmailUtils.java | 4 +- .../epmet/service/impl/InfoServiceImpl.java | 6 +- .../epmet/service/impl/SysSmsServiceImpl.java | 2 +- .../service/impl/WxmpMessageServiceImpl.java | 6 +- .../main/java/com/epmet/redis/PointRedis.java | 4 +- .../service/impl/PointRuleServiceImpl.java | 6 +- .../impl/PointVerificationLogServiceImpl.java | 4 +- .../java/com/epmet/apiservice/ApiService.java | 11 +- .../java/com/epmet/mpaes/AesDecryptUtil.java | 5 +- .../java/com/epmet/mpaes/PKCS7Encoder.java | 15 +- .../java/com/epmet/mpaes/WXBizMsgCrypt.java | 23 +- .../java/com/epmet/mpaes/WXXmlToMapUtil.java | 2 +- .../service/ComponentVerifyTicketService.java | 2 +- .../java/com/epmet/wxapi/result/WxResult.java | 2 +- .../epmet/config/PermissionInitializer.java | 2 +- .../service/impl/AccessConfigServiceImpl.java | 2 +- .../epmet/service/impl/AccessServiceImpl.java | 5 +- .../epmet/feign/GovIssueOpenFeignClient.java | 2 +- .../epmet/redis/IssueProjectTagDictRedis.java | 10 +- .../epmet/service/impl/IssueServiceImpl.java | 3 +- .../dto/form/SubjectArticleListFormDTO.java | 2 +- .../service/impl/ArticleServiceImpl.java | 2 +- .../impl/SpecialSubjectServiceImpl.java | 2 +- .../impl/CustomerRelationServiceImpl.java | 4 +- .../service/impl/CustomerServiceImpl.java | 4 +- .../group/dto/QRCodeMultipartFileDTO.java | 2 +- .../impl/ActSignInRecordServiceImpl.java | 20 +- .../service/impl/GroupActInfoServiceImpl.java | 8 +- .../impl/ResiGroupCodeServiceImpl.java | 13 +- .../service/impl/ResiTopicServiceImpl.java | 2 +- .../impl/TopicShareLinkRecordServiceImpl.java | 4 +- .../scan/service/impl/ScanService.java | 4 +- .../scan/service/impl/ScanServiceImpl.java | 64 +- .../epmet/openapi/sdk/encrypt/Md5Util.java | 15 +- .../openapi/sdk/sign/OpenApiSignUtils.java | 8 +- .../epmet/dto/form/StatsResiWarnFormDTO.java | 7 +- .../service/impl/IcResiUserServiceImpl.java | 8 +- .../service/impl/UserBadgeServiceImpl.java | 2 +- .../service/impl/UserRoleServiceImpl.java | 7 +- .../epmet/service/impl/UserServiceImpl.java | 10 +- 95 files changed, 5815 insertions(+), 5880 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/controller/LoginController.java b/epmet-auth/src/main/java/com/epmet/controller/LoginController.java index bfc425b8e1..c9df95100b 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/LoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/LoginController.java @@ -177,7 +177,7 @@ public class LoginController { content = null; // 将sha1加密后的字符串可与signature对比，标识该请求来源于微信 System.out.println(tmpStr.equals(signature.toUpperCase())); - return tmpStr != null ? tmpStr.equals(signature.toUpperCase()) : false; + return tmpStr != null && tmpStr.equals(signature.toUpperCase()); } /** @@ -225,7 +225,7 @@ public class LoginController { if (echostr == null || echostr.isEmpty()) { return nonce; } - if (this.checkSignature(signature, timestamp, nonce)) { + if (checkSignature(signature, timestamp, nonce)) { return echostr; } return nonce; diff --git a/epmet-auth/src/main/java/com/epmet/controller/WxController.java b/epmet-auth/src/main/java/com/epmet/controller/WxController.java index 3ea0b091a5..857e0ecc9d 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/WxController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/WxController.java @@ -84,7 +84,7 @@ public class WxController { content = null; // 将sha1加密后的字符串可与signature对比，标识该请求来源于微信 System.out.println(tmpStr.equals(signature.toUpperCase())); - return tmpStr != null ? tmpStr.equals(signature.toUpperCase()) : false; + return tmpStr != null && tmpStr.equals(signature.toUpperCase()); } /** @@ -132,7 +132,7 @@ public class WxController { if (echostr == null || echostr.isEmpty()) { return nonce; } - if (this.checkSignature(signature, timestamp, nonce)) { + if (checkSignature(signature, timestamp, nonce)) { return echostr; } return nonce; diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/CaptchaServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/CaptchaServiceImpl.java index cbb68142ee..115009f9e9 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/CaptchaServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/CaptchaServiceImpl.java @@ -60,10 +60,6 @@ public class CaptchaServiceImpl implements CaptchaService { String captcha = captchaRedis.get(uuid); //验证码是否正确 - if(code.equalsIgnoreCase(captcha)){ - return true; - } - - return false; + return code.equalsIgnoreCase(captcha); } } diff --git a/epmet-cloud-generator/src/main/resources/static/js/common.js b/epmet-cloud-generator/src/main/resources/static/js/common.js index 2594d4ca32..9ea9a4ca98 100644 --- a/epmet-cloud-generator/src/main/resources/static/js/common.js +++ b/epmet-cloud-generator/src/main/resources/static/js/common.js @@ -40,7 +40,7 @@ window.alert = function(msg, callback){ callback("ok"); } }); -} +}; //重写confirm式样框 window.confirm = function(msg, callback){ @@ -50,7 +50,7 @@ window.confirm = function(msg, callback){ callback("ok"); } }); -} +}; //选择一条记录 function getSelectedRow() { @@ -60,13 +60,13 @@ function getSelectedRow() { alert("请选择一条记录"); return ; } - + var selectedIDs = grid.getGridParam("selarrrow"); if(selectedIDs.length > 1){ alert("只能选择一条记录"); return ; } - + return selectedIDs[0]; } @@ -78,6 +78,6 @@ function getSelectedRows() { alert("请选择一条记录"); return ; } - + return grid.getGridParam("selarrrow"); -} \ No newline at end of file +} diff --git a/epmet-cloud-generator/src/main/resources/static/libs/router.js b/epmet-cloud-generator/src/main/resources/static/libs/router.js index 57ff6efa05..d5b33611aa 100644 --- a/epmet-cloud-generator/src/main/resources/static/libs/router.js +++ b/epmet-cloud-generator/src/main/resources/static/libs/router.js @@ -69,7 +69,7 @@ cb.apply(self, arr); } else { - self.index && self.go(self.index); + self.index && self.go(self.index); } }; @@ -80,7 +80,7 @@ var self = this; self.reload(); - } + }; /** * 获取callback @@ -89,9 +89,9 @@ function getCb(addr, hashList) { for(var key in hashList) { if(key == addr) { - return hashList[key] + return hashList[key] } } return false; } -})(); \ No newline at end of file +})(); diff --git a/epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm b/epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm index 154ff11b6d..435224d75b 100644 --- a/epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm +++ b/epmet-cloud-generator/src/main/resources/template/add-or-update.vue.vm @@ -22,9 +22,9 @@ export default { data () { return { visible: false, - dataForm: { + dataForm: {; #foreach($column in $columns) - ${column.attrname}: ''#if($velocityCount != $columns.size()),#end + ${column.attrname}: ''#if($velocityCount != $columns.size()),;#end #end } @@ -32,12 +32,12 @@ export default { }, computed: { dataRule () { - return { + return {; #foreach($column in $columns) #if($column.columnName != $pk.columnName) ${column.attrname}: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ]#if($velocityCount != $columns.size()),#end + ]#if($velocityCount != $columns.size()),;#end #end #end @@ -46,19 +46,19 @@ export default { }, methods: { init () { - this.visible = true + this.visible = true; this.$nextTick(() => { this.$refs['dataForm'].resetFields() - if (this.dataForm.${pk.attrname}) { + if (this.dataForm.${pk.attrname}); { this.getInfo() } }) }, // 获取信息 getInfo () { - #[[this.$http.get(]]#`/${moduleName}/${pathName}/#[[${]]#this.dataForm.${pk.attrname}}`).then(({ data: res }) => { + #[[this.$http.get(]];#`/${moduleName}/${pathName}/#[[${]]#this.dataForm.${pk.attrname}}`;).then(({ data: res }) => { if (res.code !== 0) { - #[[return this.$message.error(res.msg)]]# + #[[;return this.$message.error(res.msg);]]# } this.dataForm = { ...this.dataForm, @@ -69,19 +69,19 @@ export default { // 表单提交 dataFormSubmitHandle: debounce(function () { #[[this.$refs['dataForm'].validate((valid) => {]]# - if (!valid) { + if (!valid); { return false } - #[[this.$http]]#[!this.dataForm.${pk.attrname} ? 'post' : 'put']('/${moduleName}/${pathName}/', this.dataForm).then(({ data: res }) => { + #[[this.$http]];#[!this.dataForm.$;{pk.attrname} ? 'post' : 'put';]('/${moduleName}/${pathName}/', this.dataForm).then(({ data: res }) => { if (res.code !== 0) { - #[[return this.$message.error(res.msg)]]# + #[[;return this.$message.error(res.msg);]]# } - this.$message({ - #[[message: this.$t('prompt.success'),]]# - type: 'success', - duration: 500, - onClose: () => { - this.visible = false + this.$message({; + #[[message;: this.$t('prompt.success'),;]]# + type;: 'success', + duration;: 500, + onClose;: () => { + this.visible = false; this.$emit('refreshDataList') } }) diff --git a/epmet-cloud-generator/src/main/resources/template/index.vue.vm b/epmet-cloud-generator/src/main/resources/template/index.vue.vm index 2a4c8ba292..f2cb7597fd 100644 --- a/epmet-cloud-generator/src/main/resources/template/index.vue.vm +++ b/epmet-cloud-generator/src/main/resources/template/index.vue.vm @@ -55,7 +55,7 @@ export default { deleteURL: '/${moduleName}/${pathName}', deleteIsBatch: true }, - dataForm: { + dataForm: {; ${pk.attrname}: '' } } diff --git a/epmet-cloud-generator/src/main/resources/views/index.html b/epmet-cloud-generator/src/main/resources/views/index.html index 7a329f867b..39b6a1833d 100644 --- a/epmet-cloud-generator/src/main/resources/views/index.html +++ b/epmet-cloud-generator/src/main/resources/views/index.html @@ -40,7 +40,7 @@
代码的搬运工
@@ -58,7 +58,7 @@