From 26a17cec9aedc27f9b9089dabb9c20a0d3539523 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 10 Dec 2024 12:01:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E7=BA=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppUserAutoLoginController.java           |  2 ++
 pjcloud-upms/pjcloud-upms-biz/pom.xml         | 10 +++---
 .../admin/controller/SysUserController.java   |  1 -
 .../src/main/resources/logback-spring.xml     |  2 +-
 seata/conf/application.yml                    | 31 +------------------
 5 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java b/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java
index b8c0bfb84..caf0dc476 100644
--- a/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java
+++ b/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java
@@ -167,8 +167,10 @@ public class AppUserAutoLoginController {
 
 		R<Boolean> booleanR = remoteUserService.registerUser(userDTO);
 		//通过唯一手机号查询到刚注册的用户信息，生成token
+
 		R<List<SysUser>> userByMobile=remoteUserService.getUserByMobile(mobile);
 		SysUser sysUser = userByMobile.getData().get(0);
+//		int i=8/0;
 		UserTokenDTO userTokenDTO = new UserTokenDTO();
 		userTokenDTO.setSysUser(sysUser);
 		//登录成功,根据新注册的用户信息返回token
diff --git a/pjcloud-upms/pjcloud-upms-biz/pom.xml b/pjcloud-upms/pjcloud-upms-biz/pom.xml
index 086b9dc78..6413ffd8d 100644
--- a/pjcloud-upms/pjcloud-upms-biz/pom.xml
+++ b/pjcloud-upms/pjcloud-upms-biz/pom.xml
@@ -33,6 +33,11 @@
     <description>pjcloud 通用用户权限管理系统业务处理模块</description>
 
     <dependencies>
+        <!--        引入分布式事务-->
+        <dependency>
+            <groupId>com.bsd</groupId>
+            <artifactId>pjcloud-common-seata</artifactId>
+        </dependency>
         <!-- mysql -->
         <dependency>
             <groupId>com.mysql</groupId>
@@ -184,11 +189,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
-        <!--        引入分布式事务-->
-        <dependency>
-            <groupId>com.bsd</groupId>
-            <artifactId>pjcloud-common-seata</artifactId>
-        </dependency>
 
     </dependencies>
 
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java
index 8b932e3da..8a8d83ab9 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java
@@ -329,7 +329,6 @@ public class SysUserController {
     @Inner
     @Transactional(rollbackFor = Exception.class)
     public R<List<SysUser>> getUserByMobile(@RequestParam("mobile") String mobile) {
-        		int i=8/0;
         return R.ok(userService.list(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getPhone, mobile)));
     }
 }
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/logback-spring.xml b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/logback-spring.xml
index 20ed663e5..435b2160e 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/logback-spring.xml
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/logback-spring.xml
@@ -26,7 +26,7 @@
 	</appender>
 
 	<!-- Log file debug output -->
-	<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	<appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${log.path}/debug.log</file>
 		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
 			<fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
diff --git a/seata/conf/application.yml b/seata/conf/application.yml
index 5f8fdc324..1ac4b1d23 100644
--- a/seata/conf/application.yml
+++ b/seata/conf/application.yml
@@ -52,7 +52,6 @@ seata:
   registry:
     # support: nacos, eureka, redis, zk, consul, etcd3, sofa
     type: nacos
-    preferred-networks: 30.240.*
     nacos:
       application: seata-server
       server-addr: 127.0.0.1:8848
@@ -62,35 +61,7 @@ seata:
       username: nacos
       password: nacos
       context-path:
-  store:
-    # support: file 、 db 、 redis 、 raft
-    mode: db
-    session:
-      mode: db
-    lock:
-      mode: db
-    file:
-      dir: sessionStore
-      max-branch-session-size: 16384
-      max-global-session-size: 512
-      file-write-buffer-cache-size: 16384
-      session-reload-read-size: 100
-      flush-disk-mode: async
-    db:
-      datasource: druid
-      db-type: mysql
-      driver-class-name: com.mysql.jdbc.Driver
-      url: jdbc:mysql://127.0.0.1:3306/seata?rewriteBatchedStatements=true
-      user: root
-      password: root
-      min-conn: 10
-      max-conn: 100
-      global-table: global_table
-      branch-table: branch_table
-      lock-table: lock_table
-      distributed-lock-table: distributed_lock
-      query-limit: 1000
-      max-wait: 5000
+  tx-service-group: pjcloud_tx_group
   security:
     secretKey: SeataSecretKey0c382ef121d778043159209298fd40bf3850a017
     tokenValidityInMilliseconds: 1800000