diff --git a/backend/pom.xml b/backend/pom.xml index 75f0a6c..5d978ab 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -40,38 +40,6 @@ - - org.codehaus.xfire - xfire-all - 1.2.6 - - - spring - org.springframework - - - xfire-spring - org.codehaus.xfire - - - xercesImpl - xerces - - - stax-api - stax - - - xfire-xmlbeans - org.codehaus.xfire - - - - - org.springframework.boot - spring-boot-starter-data-redis - 2.7.0 - cn.afterturn easypoi-base @@ -127,13 +95,6 @@ mysql-connector-java ${mysql-connector-java.version} - - - - - - - org.nutz nutzboot-starter-redis @@ -164,6 +125,11 @@ nutzboot-starter-quartz ${nutzboot.version} + + org.nutz + nutzboot-starter-swagger + ${nutzboot.version} + com.vdurmont emoji-java 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 4a8445a..807813c 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 @@ -11,6 +11,8 @@ import com.budwk.app.sys.services.SysUserService; import com.budwk.app.web.commons.auth.satoken.StpClientUtil; import com.budwk.app.web.commons.auth.service.ValidateService; import com.budwk.app.web.commons.slog.SLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.nutz.dao.Dao; import org.nutz.integration.jedis.RedisService; @@ -29,6 +31,7 @@ import javax.servlet.http.HttpSession; @IocBean @At("/client/auth") @Slf4j +@Api(tags = "客户端登录认证") public class ClientAuthController { @Inject @@ -58,6 +61,7 @@ public class ClientAuthController { @At("/sms-login") @Ok("json") @AdaptBy(type = JsonAdaptor.class) + @ApiOperation(value = "短信登录") public Object doSmsLogin(ClientLoginBody loginBody, HttpServletRequest req) { try { String token = clientAuthService.doSmsLogin(loginBody); diff --git a/backend/src/main/java/com/budwk/app/module/activity/models/ActItemGroupScore.java b/backend/src/main/java/com/budwk/app/module/activity/models/ActItemGroupScore.java index 0ae5a26..2a1c91d 100644 --- a/backend/src/main/java/com/budwk/app/module/activity/models/ActItemGroupScore.java +++ b/backend/src/main/java/com/budwk/app/module/activity/models/ActItemGroupScore.java @@ -45,5 +45,5 @@ public class ActItemGroupScore extends BaseModel { @Column @Comment("队伍排名") - private Integer rank; + private Integer ranking; } diff --git a/backend/src/main/java/com/budwk/app/web/commons/ext/sms/SmsService.java b/backend/src/main/java/com/budwk/app/web/commons/ext/sms/SmsService.java index 0ff82af..4a39c16 100644 --- a/backend/src/main/java/com/budwk/app/web/commons/ext/sms/SmsService.java +++ b/backend/src/main/java/com/budwk/app/web/commons/ext/sms/SmsService.java @@ -1,27 +1,12 @@ package com.budwk.app.web.commons.ext.sms; -import cn.hutool.core.date.DateUtil; import com.budwk.app.base.exception.BaseException; import com.budwk.app.base.service.BaseService; -import org.apache.commons.codec.binary.Base64; -import org.codehaus.xfire.client.Client; import org.nutz.ioc.impl.PropertiesProxy; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.json.Json; -import org.nutz.lang.Strings; -import org.nutz.lang.util.NutMap; import org.nutz.log.Log; import org.nutz.log.Logs; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.core.io.Resource; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; /** * 短信服务