Merge remote-tracking branch 'origin/main'

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/UserGatewayImpl.java

@@ -189,7 +189,7 @@ public class UserGatewayImpl implements UserGateway {
         // 2 校验当前用户是否已登录
         boolean isLogin = StpUtil.isLogin();
         if (!isLogin) {
-            StpUtil.login(userInfo.getUserId(), DeviceType.WX.getCode());
+            StpUtil.login(RedisCacheConstant.WX_USER_PRE + userInfo.getUserId(), DeviceType.WX.getCode());
 
             // 这里可以考虑 在session 中插入信息
             // 同账户多设备 登录共享信息
@@ -290,7 +290,7 @@ public class UserGatewayImpl implements UserGateway {
         redisService.del(redisKey);
 
         // 登录
-        StpUtil.login(String.valueOf(user.getUserId()));
+        StpUtil.login(RedisCacheConstant.WX_USER_PRE + user.getUserId(), DeviceType.WX.getCode());
         SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
 
         // 构造返回对象
@@ -333,7 +333,9 @@ public class UserGatewayImpl implements UserGateway {
             HttpEntity<String> request = new HttpEntity<>(param.toJSONString(), headers);
 
             // 发起请求
+            log.info("小程序获取电话号码，调用微信后台 url:{}, request:{}", url,  request);
             String response = restTemplate.postForObject(url, request, String.class);
+            log.info("小程序获取电话号码，调用微信后台 response:{}", response);
             JSONObject json = JSONObject.parseObject(response);
 
             // 判断微信返回是否成功
@@ -569,7 +571,7 @@ public class UserGatewayImpl implements UserGateway {
         }
 
         if (!StpUtil.isLogin()) {
-            StpUtil.login(userInfo.getUserId(), DeviceType.WX.getCode());
+            StpUtil.login(RedisCacheConstant.WX_USER_PRE + userInfo.getUserId(), DeviceType.WX.getCode());
         }
     }
 

portal-service-server/src/test/java/com/hfln/portal/test/service/TblDicItemServiceTest.java

@@ -18,6 +18,7 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -47,14 +48,17 @@ public class TblDicItemServiceTest {
     private TblDicItemMapper tblDicItemMapper;
 
     @Test
+    @Transactional
     public void add() {
 
         TblDicItem tblDicItem = new TblDicItem();
-        tblDicItem.setDicType("test");
-        tblDicItem.setItemCode("test");
-        tblDicItem.setItemName("test");
+        tblDicItem.setDicType("test3");
+        tblDicItem.setItemCode("test4");
+        tblDicItem.setItemName("test5");
         boolean save = tblDicItemService.save(tblDicItem);
+
         System.out.println(JSON.toJSONString(save, JSONWriter.Feature.PrettyFormat));
+        System.out.println(JSON.toJSONString(tblDicItem, JSONWriter.Feature.PrettyFormat));
     }
 
     @Test