diff --git a/src/main/java/com/budwk/app/base/sms/impl/SmsServiceImpl.java b/src/main/java/com/budwk/app/base/sms/impl/SmsServiceImpl.java index ef467b5..ac3dd6a 100644 --- a/src/main/java/com/budwk/app/base/sms/impl/SmsServiceImpl.java +++ b/src/main/java/com/budwk/app/base/sms/impl/SmsServiceImpl.java @@ -362,7 +362,7 @@ public class SmsServiceImpl implements SmsService { } /** - * 调用地大通讯平台 REST 接口。 + * 调用浙江师范大学通讯平台 REST 接口。 * * @param apiPath 具体接口路径 * @param payload 发送报文 diff --git a/src/main/java/com/budwk/app/web/commons/proc/WkFailProcessor.java b/src/main/java/com/budwk/app/web/commons/proc/WkFailProcessor.java index 18731e7..422a575 100644 --- a/src/main/java/com/budwk/app/web/commons/proc/WkFailProcessor.java +++ b/src/main/java/com/budwk/app/web/commons/proc/WkFailProcessor.java @@ -206,7 +206,7 @@ public class WkFailProcessor extends ViewProcessor { // new ServerRedirectView(authUrl).render(request, response, null); // } - // 武汉城市职业学院 跳转到企业微信cas登录页 + // 浙江师范大学 跳转到企业微信cas登录页 String callBackUrl = propertiesProxy.get("wecom.wecom-client-host-url") + propertiesProxy.get("wecom.wecom-client-call-back-url") + "?redirect=" + redirect; String authUrl = propertiesProxy.get("wecom.wecom-server-login-url") + "?service=" + URLEncoder.encode(callBackUrl, StandardCharsets.UTF_8); log.info("auth:"+authUrl); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/buildHome/controller/BuildHomeKpiWriteController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/buildHome/controller/BuildHomeKpiWriteController.java index 42e19c6..af9572a 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/buildHome/controller/BuildHomeKpiWriteController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/buildHome/controller/BuildHomeKpiWriteController.java @@ -94,7 +94,7 @@ public class BuildHomeKpiWriteController { buildHomeKpiWriteService.exportDocx(id, os); // 下载生成的文件 CommonDownloadUtil.download( - "中国地质大学分工会教职工之家建设考核评议自评表.docx", + "浙江师范大学分工会教职工之家建设考核评议自评表.docx", os.toByteArray(), response ); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/buildHome/controller/BuildHomeLogBookController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/buildHome/controller/BuildHomeLogBookController.java index b268c10..cebc7cd 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/buildHome/controller/BuildHomeLogBookController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/buildHome/controller/BuildHomeLogBookController.java @@ -136,7 +136,7 @@ public class BuildHomeLogBookController { template.render(map).writeAndClose(os); // 下载生成的文件 CommonDownloadUtil.download( - "中国地质大学分工会建家记录册.docx", + "浙江师范大学分工会建家记录册.docx", os.toByteArray(), response ); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpReadingController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpReadingController.java index db9fd30..59d1ace 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpReadingController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpReadingController.java @@ -299,7 +299,7 @@ public class DifficultHelpReadingController { docData.put("bankCardNum", record.getString("bankCardNum")); docData.put("reason", record.getString("reason")); docData.put("applyTime", DateUtil.format(DateUtil.parse(record.getString("applyTime")), "yyyy年MM月dd日")); - docData.put("schoolname", "中国地质大学(武汉)"); + docData.put("schoolname", "浙江师范大学"); docData.put("year", DateUtil.format(DateUtil.parse(record.getString("applyTime")), "yyyy")); String familyListStr = record.getString("familyList"); @@ -350,7 +350,7 @@ public class DifficultHelpReadingController { docData.put("bankCardNum", difficultHelp.getBankCardNum()); docData.put("reason", difficultHelp.getReason()); docData.put("applyTime", DateUtil.format(difficultHelp.getApplyTime(), "yyyy-MM-dd")); - docData.put("schoolname","中国地质大学(武汉)"); + docData.put("schoolname","浙江师范大学"); docData.put("year",DateUtil.format(difficultHelp.getApplyTime(), "yyyy")); docData.put("familyList", difficultHelp.getFamilyList() != null ? difficultHelp.getFamilyList() : new ArrayList<>()); @@ -371,7 +371,7 @@ public class DifficultHelpReadingController { @At private void exportAsPDF(String templateName, HashMap docData,Configure config, DifficultHelpInfo difficultHelp, HttpServletResponse response) throws Exception { - String fileName = "中国地质大学(武汉)困难慰问申请表_" + difficultHelp.getUserName() + "_" + + String fileName = "浙江师范大学困难慰问申请表_" + difficultHelp.getUserName() + "_" + DateUtil.format(difficultHelp.getApplyTime(), "yyyyMMdd") + ".pdf"; try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) { @@ -396,7 +396,7 @@ public class DifficultHelpReadingController { @At private void exportAsWord(String templateName, HashMap docData,Configure config, DifficultHelpInfo difficultHelp, HttpServletResponse response) throws Exception { - String fileName = "中国地质大学(武汉)困难慰问申请表_" + difficultHelp.getUserName() + "_" + + String fileName = "浙江师范大学困难慰问申请表_" + difficultHelp.getUserName() + "_" + DateUtil.format(difficultHelp.getApplyTime(), "yyyyMMdd") + ".docx"; try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) { @@ -450,7 +450,7 @@ public class DifficultHelpReadingController { list.get(i).put("index", (i + 1)); } - result.put("schoolName", "中国地址大学(武汉)"); + result.put("schoolName", "浙江师范大学"); result.put("year", DateUtil.format(new Date(), "yyyy")); result.put("applyTime", DateUtil.format(new Date(), "yyyy年MM月dd日")); result.put("proxyUserName",SecurityUtil.getUserUsername() ); diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index ba4d1b6..76ca262 100644 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -11,7 +11,7 @@ redis: host: 175.27.165.74 port: 6379 - database: 4 + database: 5 mode: normal password: ddss@2025 jdbc: diff --git a/src/main/resources/application-prd.yaml b/src/main/resources/application-prd.yaml index b71b3e8..6585421 100644 --- a/src/main/resources/application-prd.yaml +++ b/src/main/resources/application-prd.yaml @@ -1,6 +1,6 @@ framework: server: - port: 8088 + port: 8080 host: 0.0.0.0 nutz: application: diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 5cb645b..605cd01 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -76,6 +76,7 @@ redis: max_redir: 10 database: '${framework.redis.database}' maxTotal: 850 + password: '${framework.redis.password}' pool: maxTotal: 900 maxIdle: 500 @@ -189,7 +190,7 @@ data-center: msg: platform: enabled: '${custom.msg.platform.enabled}' - # 地大通讯平台基础地址,默认对接正式地址 + # 浙江师范大学通讯平台基础地址,默认对接正式地址 base-url: '${custom.msg.platform.base-url}' # 授权系统名称,对应文档中的 tp_name tp-name: '${custom.msg.platform.tp-name}' diff --git a/src/main/resources/templates/proposal/export/proposal.docx b/src/main/resources/templates/proposal/export/proposal.docx index 6bb5bf2..39e6c9b 100644 Binary files a/src/main/resources/templates/proposal/export/proposal.docx and b/src/main/resources/templates/proposal/export/proposal.docx differ diff --git a/src/main/resources/views/platform/zhgh/activity/sports/ActivityPrize/index.html b/src/main/resources/views/platform/zhgh/activity/sports/ActivityPrize/index.html index d582b9f..cffbe63 100644 --- a/src/main/resources/views/platform/zhgh/activity/sports/ActivityPrize/index.html +++ b/src/main/resources/views/platform/zhgh/activity/sports/ActivityPrize/index.html @@ -56,7 +56,7 @@ layout("/layouts/platform.html"){ + :label="pageForm.status==='2'?('浙江师范大学'+pageForm.year+'年教职工运动会获奖个数汇总表'):'奖品名单'"> - 中国地质大学(武汉){{ activityList.find(v=>v.id === pageForm.activityId).name }} + 浙江师范大学{{ activityList.find(v=>v.id === pageForm.activityId).name }} ({{unionName}})获奖名单 diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/write/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/write/index.html index a54f457..8568fc4 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/write/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/write/index.html @@ -105,7 +105,7 @@ layout("/layouts/platform.html"){ - + @@ -183,7 +183,7 @@ layout("/layouts/platform.html"){ this.$refs.formRef.validate(valid => { if (!valid) return // if (!this.isAgree) { - // this.$message.error("请先阅读并同意《南昌大学教职工医疗互助“爱心”基金管理办法》") + // this.$message.error("请先阅读并同意《浙江师范大学教职工医疗互助“爱心”基金管理办法》") // return // } this.$confirm("您确定要提交吗?", "提示", { diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/apply/index.html index 5e7b945..9220c72 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/medicalMutualAid/aidFund/apply/index.html @@ -63,7 +63,7 @@ layout("/layouts/platform.html"){
- 中国地质大学(武汉)教职工重大疾病互助基金管理办法 + 浙江师范大学教职工重大疾病互助基金管理办法
@@ -137,7 +137,7 @@ layout("/layouts/platform.html"){ this.$commonUtil.previewFile({ suffix: "pdf", downloadPath: "/platform/sys/file/download?id=15eblmambgh3hoj7hg20n4obsg", - name: "中国地质大学(武汉)教职工重大疾病互助基金管理办法.pdf", + name: "浙江师范大学教职工重大疾病互助基金管理办法.pdf", id: "15eblmambgh3hoj7hg20n4obsg" }) }, diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/medicalMutualAid/aidFund/apply/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/medicalMutualAid/aidFund/apply/index.html index 0f8f02a..1b8e13a 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/medicalMutualAid/aidFund/apply/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/medicalMutualAid/aidFund/apply/index.html @@ -92,7 +92,7 @@ layout("/layouts/platform_h5.html"){
- 中国地质大学(武汉)教职工重大疾病互助基金管理办法 + 浙江师范大学教职工重大疾病互助基金管理办法
@@ -203,7 +203,7 @@ layout("/layouts/platform_h5.html"){ this.$commonUtil.previewFile({ suffix: "pdf", downloadPath: "/platform/sys/file/download?id=orpgde84uggjmpflbob83tadan", - name: "中国地质大学(武汉)教职工重大疾病互助基金管理办法.pdf", + name: "浙江师范大学教职工重大疾病互助基金管理办法.pdf", id: "orpgde84uggjmpflbob83tadan" }) },