From e35955f1563f6436473a64fe03e32441640b993f Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Thu, 17 Jul 2025 17:27:14 +0800 Subject: [PATCH 1/4] prod --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 8cb9b27..ef9033d 100644 --- a/pom.xml +++ b/pom.xml @@ -81,10 +81,10 @@ fys 123456 - - - true - + + + + prod @@ -94,10 +94,10 @@ fys 123456 - - - - + + + true + From 6dde6c3a3b60074ed4bedac85016c5eac19e7df8 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Mon, 21 Jul 2025 08:42:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fys-admin/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fys-admin/pom.xml b/fys-admin/pom.xml index e706cd4..548b50f 100644 --- a/fys-admin/pom.xml +++ b/fys-admin/pom.xml @@ -94,10 +94,10 @@ - - com.fuyuanshen - fys-demo - + + + + From 8106d09e67e87f801a816515a999da58b922ff3b Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Wed, 20 Aug 2025 16:53:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fys-admin/src/main/resources/application-prod.yml b/fys-admin/src/main/resources/application-prod.yml index 67cca4f..3196fda 100644 --- a/fys-admin/src/main/resources/application-prod.yml +++ b/fys-admin/src/main/resources/application-prod.yml @@ -52,9 +52,9 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://47.120.79.150: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: Jq_123456# + password: Jz_5623_cl1 # # 从库数据源 # slave: # lazy: true @@ -177,14 +177,15 @@ sms: # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 supplier: alibaba # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。 - access-key-id: LTAI5tJdDNpZootsPQ5hdELx + access-key-id: LTAI5tDGfJd4kMvrGtvyzCHz # 称为accessSecret有些称之为apiSecret - access-key-secret: mU4WtffcCXpHPz5tLwQpaGtLsJXONt + access-key-secret: a4ZlVHVSYeMQHn0p1R18thA6xCdHQh #模板ID 非必须配置，如果使用sendMessage的快速发送需此配置 - template-id: SMS_322180518 + template-id: SMS_324526343 #模板变量 上述模板的变量 templateName: code - signature: 湖北星汉研创科技 + signature: 深圳市富源晟科技 + # sdk-app-id: 您的sdkAppId config2: # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分 supplier: tencent @@ -280,10 +281,10 @@ justauth: # MQTT配置 mqtt: username: admin - password: #YtvpSfCNG - url: tcp://47.120.79.150:2883 + password: fys123456 + url: tcp://47.107.152.87:1883 subClientId: fys_subClient - subTopic: A/#,B/#,worker/location/# + subTopic: A/#,worker/location/# pubTopic: B/# pubClientId: fys_pubClient From c34a39a3083ba1f4a497017bb33422dfa63f6bc8 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Thu, 21 Aug 2025 15:11:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?WebApp=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...{AppUserController.java => WebAppUserController.java} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) rename fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/{AppUserController.java => WebAppUserController.java} (95%) diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppUserController.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/WebAppUserController.java similarity index 95% rename from fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppUserController.java rename to fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/WebAppUserController.java index 4c24feb..f3e794b 100644 --- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppUserController.java +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/WebAppUserController.java @@ -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 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)); } + }