Merge branch 'master' of http://git.meloinfo.com/wangwei/interface_platform

src/main/java/com/hr/controller/DemoController.java

@@ -19,10 +19,12 @@ import com.yy.basedevelop.common.data.BaseReturnDto;
 
 import com.yy.basedevelop.common.http.config.RedisService;
 
+import com.yy.basedevelop.common.http.config.TokenUtil;
 import com.yy.basedevelop.common.util.DictUtil;
 import com.yy.basedevelop.common.util.ExcelUtil;
 import com.yy.basedevelop.common.util.HttpClientUtils;
 import com.yy.basedevelop.common.util.OSSUtil;
+import com.yy.basedevelop.dto.LoginUser;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +62,16 @@ public class DemoController {
     @Autowired
     private OSSUtil oSSUtil;
 
+    @GetMapping("aa")
+    public MyDto aa() {
 
+        sv.savee();
+        LoginUser u= TokenUtil.getUser();
+        if(u==null){
+            throw new RuntimeException("没有找到用户");
+        }
+        return  MyDto.success(u);
+    }
 
     @PostMapping("listdict")
     public TestDemoDto listdict(@RequestBody TestDemoDto dto) {

src/main/java/com/hr/repository/jpa/Demo1Jpa.java

@@ -16,6 +16,8 @@ import java.util.List;
 
 public interface Demo1Jpa extends JpaRepository<Demo1Entity, String> {
 
+    public Demo1Entity findByFid(Long id);
+
 
     public List<TestEntity> findByFname(String name);
 

src/main/java/com/hr/repository/service/DemoService.java

@@ -3,6 +3,7 @@ package com.hr.repository.service;
 import com.alibaba.fastjson2.JSONObject;
 import com.hr.dto.QueryDto;
 import com.hr.fegin.dto.MyDemoDto;
+import com.hr.repository.domain.Demo1Entity;
 import com.hr.repository.domain.TestEntity;
 import com.hr.repository.jpa.Demo1Jpa;
 import com.hr.repository.jpa.TestJpa;
@@ -24,6 +25,24 @@ public class DemoService {
     @Autowired
     private Demo1Jpa demo1Jpa;
 
+
+    public void savee(){
+        Demo1Entity md=demo1Jpa.findByFid(1L);
+        if(md!=null){
+            md.setFname("test");
+        }
+        else{
+            md=new Demo1Entity();
+            md.setFname("test");
+        }
+        log.info("save test");
+        demo1Jpa.save(md);
+
+//        if(1==1){
+//            throw new RuntimeException("测试事务");
+//        }
+    }
+
     @Transactional
     public void insertLog(){
         TestEntity tt1=new TestEntity();