1
0

4 Commits

Author SHA1 Message Date
c34a39a308 WebApp用户信息 2025-08-21 15:11:22 +08:00
b08d23eef4 Merge branch 'main' into fys-prod
# Conflicts:
#	fys-admin/src/main/resources/application-prod.yml
2025-08-21 09:59:23 +08:00
add0738b28 Merge remote-tracking branch 'origin/main' 2025-08-21 09:55:26 +08:00
b61c9c7a06 配置文件提交 2025-08-21 09:54:42 +08:00
2 changed files with 8 additions and 7 deletions

View File

@ -101,13 +101,13 @@ spring:
spring.data: spring.data:
redis: redis:
# 地址 # 地址
host: 47.120.79.150 host: 47.107.152.87
# 端口默认为6379 # 端口默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引
database: 1 database: 1
# redis 密码必须配置 # redis 密码必须配置
password: xhYc_djkl382^#780! password: re_fs_11520631
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
# 是否开启ssl # 是否开启ssl
@ -185,7 +185,6 @@ sms:
#模板变量 上述模板的变量 #模板变量 上述模板的变量
templateName: code templateName: code
signature: 深圳市富源晟科技 signature: 深圳市富源晟科技
# sdk-app-id: 您的sdkAppId
config2: config2:
# 厂商标识,标定此配置是哪个厂商,详细请看厂商标识介绍部分 # 厂商标识,标定此配置是哪个厂商,详细请看厂商标识介绍部分
supplier: tencent supplier: tencent
@ -287,6 +286,7 @@ mqtt:
subTopic: A/#,worker/location/# subTopic: A/#,worker/location/#
pubTopic: B/# pubTopic: B/#
pubClientId: fys_pubClient pubClientId: fys_pubClient
enabled: false
# 文件存储路径 # 文件存储路径

View File

@ -24,7 +24,7 @@ import com.fuyuanshen.app.service.IAppUserService;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
/** /**
* APP用户信息 * WebApp用户信息
* *
* @author Lion Li * @author Lion Li
* @date 2025-06-27 * @date 2025-06-27
@ -32,8 +32,8 @@ import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
@Validated @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/app/user") @RequestMapping("/WebApp/user")
public class AppUserController extends BaseController { public class WebAppUserController extends BaseController {
private final IAppUserService appUserService; private final IAppUserService appUserService;
@ -67,7 +67,7 @@ public class AppUserController extends BaseController {
@SaCheckPermission("app:user:query") @SaCheckPermission("app:user:query")
@GetMapping("/{userId}") @GetMapping("/{userId}")
public R<AppUserVo> getInfo(@NotNull(message = "主键不能为空") public R<AppUserVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long userId) { @PathVariable Long userId) {
return R.ok(appUserService.queryById(userId)); return R.ok(appUserService.queryById(userId));
} }
@ -105,4 +105,5 @@ public class AppUserController extends BaseController {
@PathVariable Long[] userIds) { @PathVariable Long[] userIds) {
return toAjax(appUserService.deleteWithValidByIds(List.of(userIds), true)); return toAjax(appUserService.deleteWithValidByIds(List.of(userIds), true));
} }
} }