From 8f00b7e55f382667118810f01ed1e786b9d1452a Mon Sep 17 00:00:00 2001 From: zhengziru Date: Tue, 6 May 2025 20:31:29 +0800 Subject: [PATCH 1/2] commit --- backend/src/main/resources/application.yaml | 8 ++++---- frontend/vite.config.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/main/resources/application.yaml b/backend/src/main/resources/application.yaml index 6b65baf..c4a4d5b 100644 --- a/backend/src/main/resources/application.yaml +++ b/backend/src/main/resources/application.yaml @@ -23,7 +23,7 @@ jetty: #结合ftp使用,或用nginx代理ftp路径 #staticPath: E:/project/NutzWk/upload #开发模式静态资源 - staticPathLocal: G:/project/hmc_gbhd/src/main/resources/static + staticPathLocal: C:/dev/projects/hmc_gbhd/src/main/resources/static security: tokenName: token @@ -52,9 +52,9 @@ redis: #nodes=192.168.6.31:6377,192.168.6.31:6378,192.168.6.28:6377,192.168.6.28:6378,192.168.6.34:6377,192.168.6.34:6378 jdbc: - url: jdbc:mysql://192.168.21.207:3306/hmc_gbhd?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3306/hmc_gbhd?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true username: root - password: root + password: dd3s@#2025 validationQuery: select 1 maxActive: 150 testWhileIdle: true @@ -69,7 +69,7 @@ xsssql: beetl: RESOURCE: #本地路径,开发时设置本地路径,便于调试 - rootLocal: G:/projects/hmc_gbhd/src/main/resources/views/ + rootLocal: C:/dev/projects/hmc_gbhd/src/main/resources/views/ root: views/ DELIMITER_STATEMENT_START: '' diff --git a/frontend/vite.config.js b/frontend/vite.config.js index 845fe00..3833e13 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -34,7 +34,7 @@ export default defineConfig({ },*/ proxy: { '/api': { - target: 'http://localhost:9090', + target: 'https://3skj.ltd', changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '') } From e2f388641b34ba9ef5ec5484f9c0a9766e9a6a71 Mon Sep 17 00:00:00 2001 From: zhengziru Date: Thu, 8 May 2025 18:01:33 +0800 Subject: [PATCH 2/2] commit --- .../auth/controller/ClientAuthController.java | 6 +- .../auth/service/ClientAuthServiceImpl.java | 3 + .../controller/ClientActivityController.java | 5 +- .../impl/ClientActivityServiceImpl.java | 5 +- .../controller/ActUserController.java | 12 +- .../ActWonderfulMomentController.java | 3 - .../controller/ActivityManageController.java | 1 - .../app/sys/controller/SysHomeController.java | 3 +- .../commons/auth/service/ValidateService.java | 2 +- .../open/file/UploadController.java | 2 +- .../components/plugins/textEditor/index.vue | 3 +- .../platform/activity/manage/actQrCode.js | 4 +- .../platform/activity/manage/itemForm.js | 1 - .../activity/signInUserQuery/index.html | 6 +- .../views/platform/activity/user/index.html | 183 +++++++++++++----- frontend/src/App.vue | 10 + frontend/src/pages.json | 6 +- frontend/src/pages/activity/team/index.vue | 22 ++- .../pages/activity/wonderfulMoment/index.vue | 1 + frontend/src/pages/index/index.vue | 8 +- frontend/src/pages/login/index.vue | 2 +- frontend/src/pages/login/register.vue | 2 +- frontend/src/utils/config.js | 2 +- frontend/src/utils/routerInterceptor.js | 5 +- frontend/vite.config.js | 2 +- 25 files changed, 209 insertions(+), 90 deletions(-) diff --git a/backend/src/main/java/com/budwk/app/client/auth/controller/ClientAuthController.java b/backend/src/main/java/com/budwk/app/client/auth/controller/ClientAuthController.java index 7018fc7..c26457e 100644 --- a/backend/src/main/java/com/budwk/app/client/auth/controller/ClientAuthController.java +++ b/backend/src/main/java/com/budwk/app/client/auth/controller/ClientAuthController.java @@ -117,6 +117,10 @@ public class ClientAuthController { @ApiOperation(value = "发送短信验证码", nickname = "/send-sms-code", httpMethod = "POST") public Object sendSmsCode(String phone) { try { + int count = dao.count(Client_user.class, Cnd.where("phone", "=", phone)); + if (count == 0) { + return Result.error("手机号码未注册"); + } validateService.getSmsCode(phone); return Result.success(NutMap.NEW().addv("key", RedisConstant.UCENTER_SMSCODE + phone)).addMsg("发送成功"); } catch (BaseException e) { @@ -140,7 +144,7 @@ public class ClientAuthController { @AdaptBy(type = JsonAdaptor.class) public Result updateUserInfo(Client_user user) { user.setId(StpClientUtil.STP.getLoginIdAsLong()); - user.setAvatar("https://tdesign.gtimg.com/mobile/demos/avatar1.png"); +// user.setAvatar("https://tdesign.gtimg.com/mobile/demos/avatar1.png"); dao.updateIgnoreNull(user); return Result.success(user); } diff --git a/backend/src/main/java/com/budwk/app/client/auth/service/ClientAuthServiceImpl.java b/backend/src/main/java/com/budwk/app/client/auth/service/ClientAuthServiceImpl.java index c12d31f..763c1e9 100644 --- a/backend/src/main/java/com/budwk/app/client/auth/service/ClientAuthServiceImpl.java +++ b/backend/src/main/java/com/budwk/app/client/auth/service/ClientAuthServiceImpl.java @@ -1,6 +1,7 @@ package com.budwk.app.client.auth.service; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.IdcardUtil; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.exception.BaseException; import com.budwk.app.base.utils.PwdUtil; @@ -69,6 +70,8 @@ public class ClientAuthServiceImpl implements ClientAuthService { validateService.checkSMSCode(registerBody.getPhone(), registerBody.getSmsCode()); Client_user user = BeanUtil.copyProperties(registerBody, Client_user.class); + int gender = IdcardUtil.getGenderByIdCard(user.getIdCard()); + user.setSex(gender==1?"男":"女"); dao.insert(user); StpClientUtil.STP.login(user.getId()); StpClientUtil.STP.checkLogin(); diff --git a/backend/src/main/java/com/budwk/app/client/module/activity/controller/ClientActivityController.java b/backend/src/main/java/com/budwk/app/client/module/activity/controller/ClientActivityController.java index 15a0959..b1a965b 100644 --- a/backend/src/main/java/com/budwk/app/client/module/activity/controller/ClientActivityController.java +++ b/backend/src/main/java/com/budwk/app/client/module/activity/controller/ClientActivityController.java @@ -24,6 +24,7 @@ import org.nutz.mvc.annotation.GET; import org.nutz.mvc.annotation.Ok; import java.time.LocalDateTime; +import java.util.Collections; import java.util.List; @IocBean @@ -95,7 +96,9 @@ public class ClientActivityController { group.or(ActUser::getUserId, "=", StpClientUtil.STP.getLoginIdAsLong()); group.or(ActUser::getSignUpUserId, "=", StpClientUtil.STP.getLoginIdAsLong()); ActUser actUser = dao.fetch(ActUser.class, Cnd.where(ActUser::getActivityId, "=", activityId).and(group)); - + if (actUser == null) { + return Result.success(Collections.emptyList()); + } List list = dao.query(ActUser.class, Cnd.where(ActUser::getActivityId, "=", activityId) .and(ActUser::getSignUpUserId, "=", actUser.getSignUpUserId())); return Result.success(list); diff --git a/backend/src/main/java/com/budwk/app/client/module/activity/service/impl/ClientActivityServiceImpl.java b/backend/src/main/java/com/budwk/app/client/module/activity/service/impl/ClientActivityServiceImpl.java index 242d307..4705455 100644 --- a/backend/src/main/java/com/budwk/app/client/module/activity/service/impl/ClientActivityServiceImpl.java +++ b/backend/src/main/java/com/budwk/app/client/module/activity/service/impl/ClientActivityServiceImpl.java @@ -1,5 +1,6 @@ package com.budwk.app.client.module.activity.service.impl; +import cn.hutool.core.util.IdcardUtil; import com.budwk.app.base.exception.BaseException; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.impl.BaseServiceImpl; @@ -62,6 +63,8 @@ public class ClientActivityServiceImpl extends BaseServiceImpl impleme clientUser.setPhone(user.getPhone()); clientUser.setIdCard(user.getIdCard()); clientUser.setUnitId(selfUser.getUnitId()); + int gender = IdcardUtil.getGenderByIdCard(clientUser.getIdCard()); + clientUser.setSex(gender==1?"男":"女"); dao().insert(clientUser); } else { // 验证用户之前是不是已经报名 别人帮报 自己报 管理员报 @@ -76,7 +79,7 @@ public class ClientActivityServiceImpl extends BaseServiceImpl impleme user.setActivityId(signVO.getActivityId()); user.setUserId(clientUser.getId()); user.setUnitId(selfUser.getUnitId()); - user.setUnitName(signVO.getUnitName()); + user.setUnitName(selfUser.getUnit().getName()); user.setSignUpContacts(signVO.getContactName()); user.setSignUpMobile(signVO.getContactPhone()); user.setSignUpUserId(StpClientUtil.STP.getLoginIdAsLong()); diff --git a/backend/src/main/java/com/budwk/app/module/activity/controller/ActUserController.java b/backend/src/main/java/com/budwk/app/module/activity/controller/ActUserController.java index 876d7a3..02fada5 100644 --- a/backend/src/main/java/com/budwk/app/module/activity/controller/ActUserController.java +++ b/backend/src/main/java/com/budwk/app/module/activity/controller/ActUserController.java @@ -20,6 +20,7 @@ import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; @@ -157,7 +158,7 @@ public class ActUserController { @At @SaCheckPermission("activity.user") @SLog(tag = "报名人员管理", msg = "删除报名人员") - public Result doDeleteActUser(String id){ + public Result doDeleteActUser(Long id){ dao.delete(ActUser.class, id); return Result.success(); } @@ -171,10 +172,17 @@ public class ActUserController { return Result.success(); } + @At + @SaCheckPermission("activity.user") + @SLog(tag = "报名人员管理", msg = "设置已签到") + public Result proxySignIn(Long id){ + dao.update(ActUser.class, Chain.make("isSignIn",1).add("signInTime",LocalDateTime.now()),Cnd.where(ActUser::getId,"=",id)); + return Result.success(); + } @At @SaCheckPermission("activity.user") - public Result findSignUserInfo(String id){ + public Result findSignUserInfo(Long id){ return Result.success(dao.fetch(ActUser.class, Cnd.where(ActUser::getId, "=", id))); } diff --git a/backend/src/main/java/com/budwk/app/module/activity/controller/ActWonderfulMomentController.java b/backend/src/main/java/com/budwk/app/module/activity/controller/ActWonderfulMomentController.java index 41ee653..6ec8c3e 100644 --- a/backend/src/main/java/com/budwk/app/module/activity/controller/ActWonderfulMomentController.java +++ b/backend/src/main/java/com/budwk/app/module/activity/controller/ActWonderfulMomentController.java @@ -85,7 +85,6 @@ public class ActWonderfulMomentController { } @At - @SaCheckLogin(type = StpClientUtil.TYPE) public Result getWonderfulMoment(@Param("id") Long id) { Cnd cnd = Cnd.where("published", "=", true).andEX("id", "=", id); cnd.desc("publishTime"); @@ -106,14 +105,12 @@ public class ActWonderfulMomentController { } @At("/getWonderfulMomentById/?") - @SaCheckLogin(type = StpClientUtil.TYPE) public Result getWonderfulMomentById(Long id) { ActWonderfulMoment moment = wonderfulMomentService.fetch(id); return Result.success(moment); } @At("/handleWonderfulMoment/?") - @SaCheckLogin(type = StpClientUtil.TYPE) public Result handleWonderfulMoment(Long id) { ActWonderfulMoment moment = wonderfulMomentService.fetch(id); moment.setReadCount(moment.getReadCount() + 1); diff --git a/backend/src/main/java/com/budwk/app/module/activity/controller/ActivityManageController.java b/backend/src/main/java/com/budwk/app/module/activity/controller/ActivityManageController.java index 827b7d8..2fb95d5 100644 --- a/backend/src/main/java/com/budwk/app/module/activity/controller/ActivityManageController.java +++ b/backend/src/main/java/com/budwk/app/module/activity/controller/ActivityManageController.java @@ -167,7 +167,6 @@ public class ActivityManageController { @At @Aop(TransAop.READ_COMMITTED) - @SaCheckLogin(type = StpClientUtil.TYPE) public Result getActivity() { List activityList = activityService.query(Cnd.NEW()); return Result.success(activityList); diff --git a/backend/src/main/java/com/budwk/app/sys/controller/SysHomeController.java b/backend/src/main/java/com/budwk/app/sys/controller/SysHomeController.java index 0d5a3ae..76e0a34 100644 --- a/backend/src/main/java/com/budwk/app/sys/controller/SysHomeController.java +++ b/backend/src/main/java/com/budwk/app/sys/controller/SysHomeController.java @@ -37,7 +37,8 @@ public class SysHomeController { // if (StpUtil.hasRole("sysadmin")) { // return "beetl:/platform/sys/dashboard.html"; // } - return "beetl:/platform/sys/home.html"; +// return "beetl:/platform/sys/home.html"; + return "beetl:/platform/activity/manage/index.html"; } @At("/403") diff --git a/backend/src/main/java/com/budwk/app/web/commons/auth/service/ValidateService.java b/backend/src/main/java/com/budwk/app/web/commons/auth/service/ValidateService.java index 12a1f06..337b608 100644 --- a/backend/src/main/java/com/budwk/app/web/commons/auth/service/ValidateService.java +++ b/backend/src/main/java/com/budwk/app/web/commons/auth/service/ValidateService.java @@ -51,7 +51,7 @@ public class ValidateService { // throw new BaseException("请1分钟之后再试"); } ThreadUtil.execute(() -> { - smsSendServer.sendCode(mobile, "验证码为：" + text); + smsSendServer.sendCode(mobile, text); log.debug("sms code:::" + text); redisService.setex(RedisConstant.UCENTER_SMSCODE + mobile, 300, text); redisService.setex(RedisConstant.UCENTER_SMSCODE + mobile + ":LOCK", 60, text); diff --git a/backend/src/main/java/com/budwk/app/web/controllers/open/file/UploadController.java b/backend/src/main/java/com/budwk/app/web/controllers/open/file/UploadController.java index 925b249..2d3a11c 100644 --- a/backend/src/main/java/com/budwk/app/web/controllers/open/file/UploadController.java +++ b/backend/src/main/java/com/budwk/app/web/controllers/open/file/UploadController.java @@ -146,7 +146,7 @@ public class UploadController { response.setStatus(HttpServletResponse.SC_BAD_REQUEST); response.getWriter().write("Invalid file path"); } - String fullPath = "D:/files" + filepath; + String fullPath = "C:/files" + filepath; File file = new File(fullPath); if (!file.exists() || !file.isFile()) { response.setStatus(HttpServletResponse.SC_NOT_FOUND); diff --git a/backend/src/main/resources/static/components/plugins/textEditor/index.vue b/backend/src/main/resources/static/components/plugins/textEditor/index.vue index b8734e7..7c8e2e5 100644 --- a/backend/src/main/resources/static/components/plugins/textEditor/index.vue +++ b/backend/src/main/resources/static/components/plugins/textEditor/index.vue @@ -66,7 +66,8 @@ module.exports = { console.log(v) if (v.code === 0) { console.log(v.data) - insertImgFn(v.data) + insertImgFn('/open/file/upload/download?filepath='+v.data) + // insertImgFn(v.data) } else { this.$message.error(v.msg) } diff --git a/backend/src/main/resources/views/platform/activity/manage/actQrCode.js b/backend/src/main/resources/views/platform/activity/manage/actQrCode.js index 9eff929..735cde4 100644 --- a/backend/src/main/resources/views/platform/activity/manage/actQrCode.js +++ b/backend/src/main/resources/views/platform/activity/manage/actQrCode.js @@ -40,13 +40,13 @@ const actQrCode = { width: 150, height: 150 }) - signUpCode.makeCode("https://192.168.41.118:5173" + "/pages/activity/detail/index?id=" + this.actId) + signUpCode.makeCode("https://3skj.ltd" + "/pages/activity/detail/index?id=" + this.actId) let signInCode = new QRCode(document.getElementById("signInCode"), { width: 150, height: 150 }) - signInCode.makeCode("https://192.168.41.118:5173" + "/pages/activity/scan-sign/index?id=" + this.actId) + signInCode.makeCode("https://3skj.ltd" + "/pages/activity/scan-sign/index?id=" + this.actId) }, download() { // 获取base64 diff --git a/backend/src/main/resources/views/platform/activity/manage/itemForm.js b/backend/src/main/resources/views/platform/activity/manage/itemForm.js index 6ae184b..85e37da 100644 --- a/backend/src/main/resources/views/platform/activity/manage/itemForm.js +++ b/backend/src/main/resources/views/platform/activity/manage/itemForm.js @@ -36,7 +36,6 @@ const itemForm = { diff --git a/backend/src/main/resources/views/platform/activity/signInUserQuery/index.html b/backend/src/main/resources/views/platform/activity/signInUserQuery/index.html index 68e6782..39959e5 100644 --- a/backend/src/main/resources/views/platform/activity/signInUserQuery/index.html +++ b/backend/src/main/resources/views/platform/activity/signInUserQuery/index.html @@ -97,7 +97,7 @@ layout("/layouts/platform_1.html"){ {{row.isStay?'住宿':'不住宿'}} - +