Compare commits
3 Commits
5d1500f4f6
...
223d2c5a21
Author | SHA1 | Date |
---|---|---|
|
223d2c5a21 | |
|
37a42ccd3c | |
|
214962ff9a |
|
@ -24,6 +24,6 @@ public class ServiceNameConstants {
|
|||
/**
|
||||
* 车辆服务的serviceid
|
||||
*/
|
||||
public static final String ENTERPRISE_SERVICE = "cloud-enterprise";
|
||||
public static final String ENTERPRISE_SERVICE = "cloud-saas";
|
||||
|
||||
}
|
||||
|
|
|
@ -19,6 +19,6 @@ public class TokenConstants {
|
|||
/**
|
||||
* 令牌秘钥
|
||||
*/
|
||||
public final static String SECRET = "abcdefghijklmnsalieopadfaqawefwerstuvwxyz";
|
||||
public final static String SECRET = "abcdefghijklmnsalieopadfaqawefwerstuvxyryz";
|
||||
|
||||
}
|
||||
|
|
|
@ -21,7 +21,7 @@ public class ServiceException extends RuntimeException {
|
|||
/**
|
||||
* 错误明细,内部调试错误
|
||||
* <p>
|
||||
* 和 {@link CommonResult#getDetailMessage()} 一致的设计
|
||||
* 和 {@link #()} 一致的设计
|
||||
*/
|
||||
private String detailMessage;
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ nacos:
|
|||
addr: 123.57.152.124:8848
|
||||
user-name: nacos
|
||||
password: nacos
|
||||
namespace: xyr
|
||||
namespace: wx
|
||||
|
||||
# Spring
|
||||
spring:
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package com.muyu.remote;
|
||||
|
||||
import com.muyu.common.core.constant.SecurityConstants;
|
||||
import com.muyu.common.core.constant.ServiceNameConstants;
|
||||
import com.muyu.common.core.domain.Result;
|
||||
import com.muyu.common.system.domain.SysUser;
|
||||
|
@ -21,8 +22,8 @@ import java.util.List;
|
|||
@FeignClient(contextId = "remoteMessageValueService", value = ServiceNameConstants.ENTERPRISE_SERVICE, fallbackFactory = RemoteMessageValueFallbackFactory.class,path = "messageValue")
|
||||
public interface RemoteFirmUserService {
|
||||
|
||||
@GetMapping("/firmUser/info/{username}")
|
||||
public Result<SysUser> info(@PathVariable("username") String username);
|
||||
@GetMapping("/saas/firmUser/info/{username}")
|
||||
public Result<SysUser> info(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FIRM_KEY) String firmKey);
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ public class RemoteFirmFallbackFactory implements FallbackFactory<RemoteFirmUser
|
|||
return new RemoteFirmUserService() {
|
||||
|
||||
@Override
|
||||
public Result<SysUser> info(String username) {
|
||||
public Result<SysUser> info(String username, String firmKey) {
|
||||
return Result.error("查询数据失败:"+cause.getMessage());
|
||||
}
|
||||
};
|
||||
|
|
|
@ -7,7 +7,7 @@ nacos:
|
|||
addr: 123.57.152.124:8848
|
||||
user-name: nacos
|
||||
password: nacos
|
||||
namespace: xyr
|
||||
namespace: wx
|
||||
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
|
||||
# Spring
|
||||
spring:
|
||||
|
|
|
@ -9,6 +9,7 @@ import com.muyu.common.core.utils.StringUtils;
|
|||
import com.muyu.common.core.utils.bean.BeanValidators;
|
||||
import com.muyu.common.datascope.annotation.DataScope;
|
||||
import com.muyu.common.security.utils.SecurityUtils;
|
||||
import com.muyu.common.system.domain.SysFirmDatasource;
|
||||
import com.muyu.common.system.domain.SysRole;
|
||||
import com.muyu.common.system.domain.SysUser;
|
||||
import com.muyu.remote.RemoteFirmUserService;
|
||||
|
@ -16,6 +17,7 @@ import com.muyu.system.domain.SysPost;
|
|||
import com.muyu.system.domain.SysUserPost;
|
||||
import com.muyu.system.domain.SysUserRole;
|
||||
import com.muyu.system.mapper.*;
|
||||
import com.muyu.system.service.SysFirmDatasourceService;
|
||||
import com.muyu.system.service.SysUserService;
|
||||
import com.muyu.system.service.SysConfigService;
|
||||
import jakarta.annotation.Resource;
|
||||
|
@ -55,17 +57,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
private SysConfigService configService;
|
||||
@Resource
|
||||
private RemoteFirmUserService remoteFirmUserService;
|
||||
@Resource
|
||||
private SysFirmDatasourceService sysFirmDatasourceService;
|
||||
|
||||
/**
|
||||
* 根据条件分页查询用户列表
|
||||
*
|
||||
* @param user 用户信息
|
||||
*
|
||||
* @return 用户信息集合信息
|
||||
*/
|
||||
@Override
|
||||
@DataScope(deptAlias = "d", userAlias = "u")
|
||||
public List<SysUser> selectUserList (SysUser user) {
|
||||
public List<SysUser> selectUserList(SysUser user) {
|
||||
return userMapper.selectUserList(user);
|
||||
}
|
||||
|
||||
|
@ -73,12 +76,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* 根据条件分页查询已分配用户角色列表
|
||||
*
|
||||
* @param user 用户信息
|
||||
*
|
||||
* @return 用户信息集合信息
|
||||
*/
|
||||
@Override
|
||||
@DataScope(deptAlias = "d", userAlias = "u")
|
||||
public List<SysUser> selectAllocatedList (SysUser user) {
|
||||
public List<SysUser> selectAllocatedList(SysUser user) {
|
||||
return userMapper.selectAllocatedList(user);
|
||||
}
|
||||
|
||||
|
@ -86,12 +88,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* 根据条件分页查询未分配用户角色列表
|
||||
*
|
||||
* @param user 用户信息
|
||||
*
|
||||
* @return 用户信息集合信息
|
||||
*/
|
||||
@Override
|
||||
@DataScope(deptAlias = "d", userAlias = "u")
|
||||
public List<SysUser> selectUnallocatedList (SysUser user) {
|
||||
public List<SysUser> selectUnallocatedList(SysUser user) {
|
||||
return userMapper.selectUnallocatedList(user);
|
||||
}
|
||||
|
||||
|
@ -103,14 +104,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* @return 用户对象信息
|
||||
*/
|
||||
@Override
|
||||
public SysUser selectUserByUserName (String userName, Long firmId) {
|
||||
public SysUser selectUserByUserName(String userName, Long firmId) {
|
||||
SysUser sysUser = null;
|
||||
|
||||
if (firmId == 1){
|
||||
if (firmId == 1) {
|
||||
sysUser = userMapper.selectUserByUserName(userName);
|
||||
}else {
|
||||
Result<SysUser> result = remoteFirmUserService.info(userName);
|
||||
if (result.getCode() == Result.SUCCESS){
|
||||
} else {
|
||||
SysFirmDatasource datasource = sysFirmDatasourceService.getById(firmId);
|
||||
Result<SysUser> result = remoteFirmUserService.info(userName, datasource.getDatabaseName());
|
||||
if (result.getCode() == Result.SUCCESS) {
|
||||
sysUser = result.getData();
|
||||
}
|
||||
List<SysRole> byUserIdAndFirmId = roleMapper.findByUserIdAndFirmId(sysUser.getUserId(), sysUser.getFirmId());
|
||||
|
@ -124,11 +126,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* 通过用户ID查询用户
|
||||
*
|
||||
* @param userId 用户ID
|
||||
*
|
||||
* @return 用户对象信息
|
||||
*/
|
||||
@Override
|
||||
public SysUser selectUserById (Long userId) {
|
||||
public SysUser selectUserById(Long userId) {
|
||||
return userMapper.selectUserById(userId);
|
||||
}
|
||||
|
||||
|
@ -136,11 +137,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* 查询用户所属角色组
|
||||
*
|
||||
* @param userName 用户名
|
||||
*
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public String selectUserRoleGroup (String userName) {
|
||||
public String selectUserRoleGroup(String userName) {
|
||||
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
|
||||
if (CollectionUtils.isEmpty(list)) {
|
||||
return StringUtils.EMPTY;
|
||||
|
@ -152,11 +152,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* 查询用户所属岗位组
|
||||
*
|
||||
* @param userName 用户名
|
||||
*
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public String selectUserPostGroup (String userName) {
|
||||
public String selectUserPostGroup(String userName) {
|
||||
List<SysPost> list = postMapper.selectPostsByUserName(userName);
|
||||
if (CollectionUtils.isEmpty(list)) {
|
||||
return StringUtils.EMPTY;
|
||||
|
@ -168,11 +167,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* 校验用户名称是否唯一
|
||||
*
|
||||
* @param user 用户信息
|
||||
*
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public boolean checkUserNameUnique (SysUser user) {
|
||||
public boolean checkUserNameUnique(SysUser user) {
|
||||
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
|
||||
SysUser info = userMapper.checkUserNameUnique(user.getUserName());
|
||||
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
|
||||
|
@ -185,11 +183,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* 校验手机号码是否唯一
|
||||
*
|
||||
* @param user 用户信息
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public boolean checkPhoneUnique (SysUser user) {
|
||||
public boolean checkPhoneUnique(SysUser user) {
|
||||
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
|
||||
SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
|
||||
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
|
||||
|
@ -202,11 +199,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* 校验email是否唯一
|
||||
*
|
||||
* @param user 用户信息
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public boolean checkEmailUnique (SysUser user) {
|
||||
public boolean checkEmailUnique(SysUser user) {
|
||||
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
|
||||
SysUser info = userMapper.checkEmailUnique(user.getEmail());
|
||||
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
|
||||
|
@ -221,7 +217,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* @param user 用户信息
|
||||
*/
|
||||
@Override
|
||||
public void checkUserAllowed (SysUser user) {
|
||||
public void checkUserAllowed(SysUser user) {
|
||||
if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) {
|
||||
throw new ServiceException("不允许操作超级管理员用户");
|
||||
}
|
||||
|
@ -233,7 +229,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* @param userId 用户id
|
||||
*/
|
||||
@Override
|
||||
public void checkUserDataScope (Long userId) {
|
||||
public void checkUserDataScope(Long userId) {
|
||||
if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
|
||||
SysUser user = new SysUser();
|
||||
user.setUserId(userId);
|
||||
|
@ -248,12 +244,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* 新增保存用户信息
|
||||
*
|
||||
* @param user 用户信息
|
||||
*
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public int insertUser (SysUser user) {
|
||||
public int insertUser(SysUser user) {
|
||||
// 新增用户信息
|
||||
int rows = userMapper.insertUser(user);
|
||||
// 新增用户岗位关联
|
||||
|
@ -267,11 +262,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* 注册用户信息
|
||||
*
|
||||
* @param user 用户信息
|
||||
*
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public boolean registerUser (SysUser user) {
|
||||
public boolean registerUser(SysUser user) {
|
||||
return userMapper.insertUser(user) > 0;
|
||||
}
|
||||
|
||||
|
@ -279,12 +273,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* 修改保存用户信息
|
||||
*
|
||||
* @param user 用户信息
|
||||
*
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public int updateUser (SysUser user) {
|
||||
public int updateUser(SysUser user) {
|
||||
Long userId = user.getUserId();
|
||||
// 删除用户与角色关联
|
||||
userRoleMapper.deleteUserRoleByUserId(userId);
|
||||
|
@ -305,7 +298,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void insertUserAuth (Long userId, Long[] roleIds) {
|
||||
public void insertUserAuth(Long userId, Long[] roleIds) {
|
||||
userRoleMapper.deleteUserRoleByUserId(userId);
|
||||
insertUserRole(userId, roleIds);
|
||||
}
|
||||
|
@ -314,11 +307,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* 修改用户状态
|
||||
*
|
||||
* @param user 用户信息
|
||||
*
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateUserStatus (SysUser user) {
|
||||
public int updateUserStatus(SysUser user) {
|
||||
return userMapper.updateUser(user);
|
||||
}
|
||||
|
||||
|
@ -326,11 +318,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* 修改用户基本信息
|
||||
*
|
||||
* @param user 用户信息
|
||||
*
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateUserProfile (SysUser user) {
|
||||
public int updateUserProfile(SysUser user) {
|
||||
return userMapper.updateUser(user);
|
||||
}
|
||||
|
||||
|
@ -339,11 +330,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
*
|
||||
* @param userName 用户名
|
||||
* @param avatar 头像地址
|
||||
*
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public boolean updateUserAvatar (String userName, String avatar) {
|
||||
public boolean updateUserAvatar(String userName, String avatar) {
|
||||
return userMapper.updateUserAvatar(userName, avatar) > 0;
|
||||
}
|
||||
|
||||
|
@ -351,11 +341,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* 重置用户密码
|
||||
*
|
||||
* @param user 用户信息
|
||||
*
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int resetPwd (SysUser user) {
|
||||
public int resetPwd(SysUser user) {
|
||||
return userMapper.updateUser(user);
|
||||
}
|
||||
|
||||
|
@ -364,11 +353,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
*
|
||||
* @param userName 用户名
|
||||
* @param password 密码
|
||||
*
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int resetUserPwd (String userName, String password) {
|
||||
public int resetUserPwd(String userName, String password) {
|
||||
return userMapper.resetUserPwd(userName, password);
|
||||
}
|
||||
|
||||
|
@ -377,7 +365,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
*
|
||||
* @param user 用户对象
|
||||
*/
|
||||
public void insertUserRole (SysUser user) {
|
||||
public void insertUserRole(SysUser user) {
|
||||
this.insertUserRole(user.getUserId(), user.getRoleIds());
|
||||
}
|
||||
|
||||
|
@ -386,7 +374,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
*
|
||||
* @param user 用户对象
|
||||
*/
|
||||
public void insertUserPost (SysUser user) {
|
||||
public void insertUserPost(SysUser user) {
|
||||
Long[] posts = user.getPostIds();
|
||||
if (StringUtils.isNotEmpty(posts)) {
|
||||
// 新增用户与岗位管理
|
||||
|
@ -407,7 +395,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* @param userId 用户ID
|
||||
* @param roleIds 角色组
|
||||
*/
|
||||
public void insertUserRole (Long userId, Long[] roleIds) {
|
||||
public void insertUserRole(Long userId, Long[] roleIds) {
|
||||
if (StringUtils.isNotEmpty(roleIds)) {
|
||||
// 新增用户与角色管理
|
||||
List<SysUserRole> list = new ArrayList<SysUserRole>();
|
||||
|
@ -425,12 +413,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* 通过用户ID删除用户
|
||||
*
|
||||
* @param userId 用户ID
|
||||
*
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public int deleteUserById (Long userId) {
|
||||
public int deleteUserById(Long userId) {
|
||||
// 删除用户与角色关联
|
||||
userRoleMapper.deleteUserRoleByUserId(userId);
|
||||
// 删除用户与岗位表
|
||||
|
@ -442,12 +429,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* 批量删除用户信息
|
||||
*
|
||||
* @param userIds 需要删除的用户ID
|
||||
*
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public int deleteUserByIds (Long[] userIds) {
|
||||
public int deleteUserByIds(Long[] userIds) {
|
||||
for (Long userId : userIds) {
|
||||
checkUserAllowed(new SysUser(userId));
|
||||
checkUserDataScope(userId);
|
||||
|
@ -465,11 +451,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
* @param userList 用户数据列表
|
||||
* @param isUpdateSupport 是否更新支持,如果已存在,则进行更新数据
|
||||
* @param operName 操作用户
|
||||
*
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public String importUser (List<SysUser> userList, Boolean isUpdateSupport, String operName) {
|
||||
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
|
||||
if (StringUtils.isNull(userList) || userList.size() == 0) {
|
||||
throw new ServiceException("导入用户数据不能为空!");
|
||||
}
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -9,7 +9,7 @@ const privateKey = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYour
|
|||
'7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKN\n' +
|
||||
'PuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gA\n' +
|
||||
'kM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWow\n' +
|
||||
'cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99Ecv\n' +
|
||||
'cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvxyrpcw99Ecv\n' +
|
||||
'DQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthh\n' +
|
||||
'YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3\n' +
|
||||
'UP8iWi1Qw0Y='
|
||||
|
|
|
@ -4,16 +4,16 @@ import org.springframework.boot.SpringApplication;
|
|||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
||||
/**
|
||||
* @className: WxApplication ️✈️
|
||||
* @className: xyrApplication ️✈️
|
||||
* @author: Yang 鹏 🦅
|
||||
* @date: 2024/9/16 20:39 ⏰
|
||||
* @Version: 1.0
|
||||
* @description:
|
||||
*/
|
||||
@SpringBootApplication
|
||||
public class WxApplication {
|
||||
public class xyrApplication {
|
||||
public static void main(String[] args) {
|
||||
System.out.println("微信服务启动成功");
|
||||
SpringApplication.run(WxApplication.class);
|
||||
SpringApplication.run(xyrApplication.class);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@ import jakarta.servlet.http.HttpServletRequest;
|
|||
import lombok.extern.log4j.Log4j2;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
import com.muyu.service.WxService;
|
||||
import com.muyu.service.xyrService;
|
||||
import com.muyu.util.WechatUtil;
|
||||
import io.micrometer.common.util.StringUtils;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
@ -13,7 +13,7 @@ import java.security.NoSuchAlgorithmException;
|
|||
import java.util.*;
|
||||
|
||||
/**
|
||||
* @className: GetWxController ️✈️
|
||||
* @className: GetxyrController ️✈️
|
||||
* @author: Yang 鹏 🦅
|
||||
* @date: 2024/9/16 20:38 ⏰
|
||||
* @Version: 1.0
|
||||
|
@ -21,13 +21,13 @@ import java.util.*;
|
|||
*/
|
||||
@Log4j2
|
||||
@RestController
|
||||
public class WxController {
|
||||
public class xyrController {
|
||||
|
||||
// @Autowired
|
||||
// private RedisService redisService;
|
||||
|
||||
@Autowired
|
||||
private WxService wxService;
|
||||
private xyrService xyrService;
|
||||
|
||||
@GetMapping("/")
|
||||
public String check(@RequestParam("signature") String signature,@RequestParam("timestamp") String timestamp ,
|
||||
|
@ -71,7 +71,7 @@ public class WxController {
|
|||
public String receiveMessage(HttpServletRequest request){
|
||||
|
||||
|
||||
String message = wxService.handleMessage(request);
|
||||
String message = xyrService.handleMessage(request);
|
||||
|
||||
return message;
|
||||
}
|
||||
|
@ -82,17 +82,17 @@ public class WxController {
|
|||
|
||||
String code = request.getParameter("code");
|
||||
|
||||
return wxService.getSignUpUserInfo(code);
|
||||
return xyrService.getSignUpUserInfo(code);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/send")
|
||||
public void sendWxMsg(@RequestParam("toUser") String toUser,@RequestParam("content") String content) {
|
||||
public void sendxyrMsg(@RequestParam("toUser") String toUser,@RequestParam("content") String content) {
|
||||
WechatUtil.send(toUser,content);
|
||||
}
|
||||
|
||||
|
||||
// @GetMapping("/getWxUserList")
|
||||
// @GetMapping("/getxyrUserList")
|
||||
// public List getUserList(){
|
||||
// String accessToken = TokenUtil.getAccessToken();
|
||||
// String url="https://api.weixin.qq.com/cgi-bin/user/get?access_token="+accessToken;
|
||||
|
|
|
@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
|
|||
import com.muyu.domain.Message;
|
||||
import com.muyu.domain.SubscribedUser;
|
||||
|
||||
import com.muyu.service.WxService;
|
||||
import com.muyu.service.xyrService;
|
||||
import com.muyu.util.OkHttpUtils;
|
||||
import com.muyu.util.TokenUtil;
|
||||
import com.muyu.util.WechatUtil;
|
||||
|
@ -24,14 +24,14 @@ import java.util.HashMap;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @className: WxServiceImpl ️✈️
|
||||
* @className: xyrServiceImpl ️✈️
|
||||
* @author: Yang 鹏 🦅
|
||||
* @date: 2024/9/18 12:05 ⏰
|
||||
* @Version: 1.0
|
||||
* @description:
|
||||
*/
|
||||
@Service
|
||||
public class WxServiceImpl implements WxService {
|
||||
public class xyrServiceImpl implements xyrService {
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -3,13 +3,13 @@ package com.muyu.service;
|
|||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
* @className: WxService ️✈️
|
||||
* @className: xyrService ️✈️
|
||||
* @author: Yang 鹏 🦅
|
||||
* @date: 2024/9/18 12:05 ⏰
|
||||
* @Version: 1.0
|
||||
* @description:
|
||||
*/
|
||||
public interface WxService {
|
||||
public interface xyrService {
|
||||
String handleMessage(HttpServletRequest request);
|
||||
|
||||
String getSignUpUserInfo(String code);
|
||||
|
|
|
@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
|
|||
*/
|
||||
@Component
|
||||
public class TokenUtil {
|
||||
public final static String APP_ID = "wxa10c6f55da3c0553";
|
||||
public final static String APP_ID = "xyra10c6f55da3c0553";
|
||||
|
||||
public final static String APP_SECRET ="72d285981f3f51274e79dcda5e498a81";
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ server:
|
|||
#redirect:
|
||||
# domain:123
|
||||
##公众号appId和secret
|
||||
#wx:
|
||||
#xyr:
|
||||
# appId:123
|
||||
# secret:123
|
||||
|
||||
|
|
Loading…
Reference in New Issue