From 6985cf39aa2bf2ad5510b61c8bd938e00f5c91fd Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Mon, 11 Aug 2025 08:38:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ssl=E8=AF=81=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/course/CourseController.java | 2 +- .../userInfo/impl/UserInfoServiceImpl.java | 10 +- src/main/resources/application-prod.yml | 112 ++++++++++++++++++ src/main/resources/application.yml | 2 +- src/main/resources/static/chenxinzhi.top.jks | Bin 5718 -> 0 bytes src/main/resources/static/install-libs.ps1 | 12 -- .../resources/static/www.chenxinzhi.top.jks | Bin 0 -> 4126 bytes 7 files changed, 120 insertions(+), 18 deletions(-) create mode 100644 src/main/resources/application-prod.yml delete mode 100644 src/main/resources/static/chenxinzhi.top.jks delete mode 100644 src/main/resources/static/install-libs.ps1 create mode 100644 src/main/resources/static/www.chenxinzhi.top.jks diff --git a/src/main/java/com/greenorange/promotion/controller/course/CourseController.java b/src/main/java/com/greenorange/promotion/controller/course/CourseController.java index 432f914..afcf3cc 100644 --- a/src/main/java/com/greenorange/promotion/controller/course/CourseController.java +++ b/src/main/java/com/greenorange/promotion/controller/course/CourseController.java @@ -109,7 +109,7 @@ public class CourseController { public BaseResponse> miniQueryCourseByKeyword(@Valid @RequestBody CommonStringRequest commonStringRequest) { String keyword = commonStringRequest.getTemplateString(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(Course::getIsShelves, true); + lambdaQueryWrapper.eq(Course::getIsShelves, 1); lambdaQueryWrapper.like(Course::getName, keyword); List courseList = courseService.list(lambdaQueryWrapper); List courseCardVOS = commonService.convertList(courseList, CourseCardVO.class); diff --git a/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java b/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java index b7c6661..586a875 100644 --- a/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java +++ b/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java @@ -174,7 +174,7 @@ public class UserInfoServiceImpl extends ServiceImpl LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(UserInfo::getNickName, nickName).eq(UserInfo::getUserRole, UserConstant.SUPERVISOR_ROLE); UserInfo userInfo = this.getOne(lambdaQueryWrapper); - ThrowUtils.throwIf(userInfo != null, ErrorCode.OPERATION_ERROR, "昵称重复"); + ThrowUtils.throwIf(userInfo != null, ErrorCode.OPERATION_ERROR, "昵称已存在"); } // 根据邀请码获得上级用户信息 @@ -371,9 +371,11 @@ public class UserInfoServiceImpl extends ServiceImpl phoneNumberLambdaQueryWrapper.eq(UserInfo::getPhoneNumber, phoneNumber); phoneNumberLambdaQueryWrapper = getQueryWrapperByUserRole(userRoleEnum, phoneNumberLambdaQueryWrapper); UserInfo userInfo = this.getOne(phoneNumberLambdaQueryWrapper); - String userRole = userInfo.getUserRole(); - UserRoleEnum currentUserRoleEnum = UserRoleEnum.getEnumByValue(userRole); - ThrowUtils.throwIf(userInfo != null, ErrorCode.OPERATION_ERROR, "该手机号为"+ currentUserRoleEnum.getText() +"账号"); + if (userInfo != null) { + String userRole = userInfo.getUserRole(); + UserRoleEnum currentUserRoleEnum = UserRoleEnum.getEnumByValue(userRole); + throw new BusinessException(ErrorCode.OPERATION_ERROR, "该手机号为"+ currentUserRoleEnum.getText() +"账号"); + } } String code = redisTemplate.opsForValue().get(SystemConstant.VERIFICATION_CODE + ":" + verificationCode); ThrowUtils.throwIf(code == null, ErrorCode.OPERATION_ERROR, "验证码已失效"); diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml new file mode 100644 index 0000000..2d24858 --- /dev/null +++ b/src/main/resources/application-prod.yml @@ -0,0 +1,112 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://160.202.242.36:3306/qingcheng_test?serverTimezone=Asia/Shanghai + username: qingcheng + password: Qc@8ls2jf + hikari: + maximum-pool-size: 300 + max-lifetime: 120000 + + + rabbitmq: + host: 160.202.242.36 + port: 5672 + username: qingcheng + password: cksys6509 + virtual-host: vhost-test + listener: + simple: + prefetch: 1 + + + data: + redis: + port: 6379 + host: 160.202.242.36 + database: 8 + password: Cksys6509 + + + servlet: + multipart: + max-file-size: 20MB + max-request-size: 20MB + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + + +# 文件上传和下载地址 +file: + upload-dir: /www/wwwroot/fileUpload_qc/ +# upload-dir: D:/qingcheng/image/ + + + +springdoc: + default-flat-param-object: true + +#线程池配置 +threadpool: + corePoolSize: 10 + maxPoolSize: 50 + queueCapacity: 1024 + keepAliveTime: 60 + + +server: + port: 9092 + ssl: + key-store: classpath:static/www.chenxinzhi.top.jks + key-store-password: 3fqodotz + key-store-type: JKS + + + + +mybatis-plus: + mapper-locations: classpath:mapper/*.xml + configuration: + map-underscore-to-camel-case: false + # log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl + # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + global-config: + db-config: + logic-delete-field: isDelete #全局逻辑删除的实体字段名 + logic-delete-value: 1 #逻辑已删除值(默认为1) + logic-not-delete-value: 0 #逻辑未删除值(默认为0) + type-handlers-package: com.cultural.heritage.handler + + + +wx: + mini: + appId: wx3f968a09e31d6bed + appSecret: 0b23498d19665dc323efdd3ed5367041 + + pay: + #应用id（小程序id） + appId: wx61b63e27bddf4ea2 + #商户号 + merchantId: 1700326544 + #商户API私钥 + privateKeyPath: apiclient_key.pem + #商户证书序列号 + merchantSerialNumber: 6DC8953AB741D309920DA650B92F837BE38A2757 + #商户APIv3密钥 + apiV3Key: fbemuj4Xql7CYlQJAoTEPYxvPSNgYT2t + #通知地址 + notifyUrl: https://winning-mouse-internally.ngrok-free.app + #微信服务器地址 + domain: https://api.mch.weixin.qq.com + #商户APIv2密钥 + apiV2Key: cvsOH6TgbbdNUUqFJyLmWGaIEKoSqANg + #商户API证书 + certificatePath: static/apiclient_cert.p12 + + + + +knife4j: + enable: true \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a17ec4c..fadf7d2 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test + active: prod diff --git a/src/main/resources/static/chenxinzhi.top.jks b/src/main/resources/static/chenxinzhi.top.jks deleted file mode 100644 index 2dd0ff63f05cac38c2cd29366800b429772828dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5718 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 diff --git a/src/main/resources/static/install-libs.ps1 b/src/main/resources/static/install-libs.ps1 deleted file mode 100644 index 667dbf2..0000000 --- a/src/main/resources/static/install-libs.ps1 +++ /dev/null @@ -1,12 +0,0 @@ -$libDir = "D:\青橙\backend\src\main\resources\lib" # 使用绝对路径指定 lib 目录 -$repositoryDir = "D:\software\Maven\maven-repository" # 设置自定义仓库目录 - -# 遍历 lib 目录下的所有 JAR 文件并安装到指定的仓库 -Get-ChildItem -Path $libDir -Filter "*.jar" | ForEach-Object { - mvn install:install-file -Dfile=$_.FullName ` - -DgroupId=com.example ` - -DartifactId=$($_.BaseName) ` - -Dversion=1.0 ` - -Dpackaging=jar ` - -DlocalRepositoryPath=$repositoryDir -} diff --git a/src/main/resources/static/www.chenxinzhi.top.jks b/src/main/resources/static/www.chenxinzhi.top.jks new file mode 100644 index 0000000000000000000000000000000000000000..2da43c001f0db92ae040eb7cc67dd684c5cce58b GIT binary patch literal 4126 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