fys/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

Merge remote-tracking branch 'origin/fys-prod'

Browse Source
This commit is contained in:
daiyongfei
2025-08-21 15:12:00 +08:00
parent 7b842f5cc7 c34a39a308
commit 8c883688bd
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fys-admin/pom.xml
View File

@ -94,10 +94,10 @@
</dependency>
<!-- demo模块 -->
<!--<dependency>
<groupId>com.fuyuanshen</groupId>
<artifactId>fys-demo</artifactId>
</dependency>-->
<!-- <dependency> -->
<!-- <groupId>com.fuyuanshen</groupId> -->
<!-- <artifactId>fys-demo</artifactId> -->
<!-- </dependency> -->
<!-- 工作流模块 -->
<dependency>

2
fys-admin/src/main/resources/application-prod.yml
View File

@ -52,7 +52,7 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
url: jdbc:mysql://47.107.152.87:3306/fys_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
url: jdbc:mysql://47.107.152.87:3306/fys-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: root
password: Jz_5623_cl1
# # 从库数据源

9
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppUserController.java → fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/WebAppUserController.java
View File

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

9
pom.xml
View File

@ -83,7 +83,10 @@
<monitor.username>fys</monitor.username>
<monitor.password>123456</monitor.password>
</properties>
<!-- <activation> -->
<!-- &lt;!&ndash; 默认环境 &ndash;&gt; -->
<!-- <activeByDefault>true</activeByDefault> -->
<!-- </activation> -->
</profile>
<profile>
<id>prod</id>
@ -97,10 +100,6 @@
<!-- 默认环境 -->
<activeByDefault>true</activeByDefault>
</activation>
<!-- <activation> -->
<!-- &lt;!&ndash; 默认环境 &ndash;&gt; -->
<!-- <activeByDefault>true</activeByDefault> -->
<!-- </activation> -->
</profile>
<profile>
<id>jingquan</id>