修复bug
This commit is contained in:
@ -19,7 +19,7 @@ public interface SystemConstant {
|
|||||||
/**
|
/**
|
||||||
* 默认头像view值
|
* 默认头像view值
|
||||||
*/
|
*/
|
||||||
String DEFAULT_AVATAR_VIEW = "default-QU7P9SD5";
|
String DEFAULT_AVATAR_VIEW = "default-WKQ0M3LI";
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -363,7 +363,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo>
|
|||||||
// 判断手机号是否已注册
|
// 判断手机号是否已注册
|
||||||
LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
UserRoleEnum userRoleEnum = UserRoleEnum.getEnumByValue(userRole);
|
UserRoleEnum userRoleEnum = UserRoleEnum.getEnumByValue(userRole);
|
||||||
if (userRoleEnum == UserRoleEnum.USER) {
|
if (UserRoleEnum.USER.equals(userRoleEnum)) {
|
||||||
lambdaQueryWrapper.eq(UserInfo::getUserRole, UserConstant.DEFAULT_ROLE);
|
lambdaQueryWrapper.eq(UserInfo::getUserRole, UserConstant.DEFAULT_ROLE);
|
||||||
} else {
|
} else {
|
||||||
lambdaQueryWrapper.in(UserInfo::getUserRole, UserConstant.STAFF_ROLE, UserConstant.SUPERVISOR_ROLE, UserConstant.MANAGER_ROLE);
|
lambdaQueryWrapper.in(UserInfo::getUserRole, UserConstant.STAFF_ROLE, UserConstant.SUPERVISOR_ROLE, UserConstant.MANAGER_ROLE);
|
||||||
|
@ -39,6 +39,7 @@ import java.awt.*;
|
|||||||
import java.awt.image.BufferedImage;
|
import java.awt.image.BufferedImage;
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
@ -120,7 +121,8 @@ public class WechatGetQrcodeServiceImpl implements WechatGetQrcodeService {
|
|||||||
param.put("page", "pages/loginModule/register/register");
|
param.put("page", "pages/loginModule/register/register");
|
||||||
param.put("scene", inviteCode + "=" + userRoleEnum.getValue());
|
param.put("scene", inviteCode + "=" + userRoleEnum.getValue());
|
||||||
param.put("width", 430);
|
param.put("width", 430);
|
||||||
param.put("env_version", "release");
|
param.put("check_path", false);
|
||||||
|
param.put("env_version", "develop");
|
||||||
String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken;
|
String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken;
|
||||||
String jsonParams = JSONUtil.toJsonStr(param);
|
String jsonParams = JSONUtil.toJsonStr(param);
|
||||||
byte[] responseBytes = HttpUtil.createPost(url)
|
byte[] responseBytes = HttpUtil.createPost(url)
|
||||||
@ -129,6 +131,7 @@ public class WechatGetQrcodeServiceImpl implements WechatGetQrcodeService {
|
|||||||
.execute()
|
.execute()
|
||||||
.bodyBytes();
|
.bodyBytes();
|
||||||
|
|
||||||
|
System.out.println(Arrays.toString(responseBytes));
|
||||||
// 将二维码数据转换为 BufferedImage
|
// 将二维码数据转换为 BufferedImage
|
||||||
BufferedImage qrImage = ImageIO.read(new ByteArrayInputStream(responseBytes));
|
BufferedImage qrImage = ImageIO.read(new ByteArrayInputStream(responseBytes));
|
||||||
// // 获取用户头像
|
// // 获取用户头像
|
||||||
|
107
src/main/resources/application-graduation.yml
Normal file
107
src/main/resources/application-graduation.yml
Normal file
@ -0,0 +1,107 @@
|
|||||||
|
spring:
|
||||||
|
datasource:
|
||||||
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
|
url: jdbc:mysql://160.202.242.36:3306/qingcheng_graduation?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-graduation
|
||||||
|
listener:
|
||||||
|
simple:
|
||||||
|
prefetch: 1
|
||||||
|
|
||||||
|
|
||||||
|
data:
|
||||||
|
redis:
|
||||||
|
port: 6379
|
||||||
|
host: 160.202.242.36
|
||||||
|
database: 6
|
||||||
|
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: 9099
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
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: wx8711c8d4fb04fef9
|
||||||
|
appSecret: 3ec1f19949d99f059e2ae4be62d02123
|
||||||
|
#
|
||||||
|
# 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
|
@ -1,4 +1,4 @@
|
|||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: test
|
active: graduation
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user