Test Session USER Bug 修复

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller;
 
 import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +19,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
  * @Modify:
  **/
 @Controller
-@RequestMapping("/upload_demo")
+@RequestMapping("/demo-upload")
 @Api(description="复杂对象服务demo")
 public class DemoUploadController {
     private static final Logger LOGGER = LoggerFactory.getLogger(DemoUploadController.class);
@@ -43,16 +44,17 @@ public class DemoUploadController {
         return "/upload";
     }
 
-    @GetMapping("/uploadStatus")
+    @GetMapping("/upload-status")
     public String uploadStatus() {
-        return "/upload_status";
+        return "/upload-status";
     }
 
     @PostMapping("/upload")
+    @ApiOperation(value = "文件上传",notes = "文件上传")
     public String singleFileUpload(@RequestParam("file") MultipartFile file, RedirectAttributes redirectAttributes) {
         if (file.isEmpty()) {
             redirectAttributes.addFlashAttribute("message", "请选择需要上传的文件。");
-            return "redirect:/upload_demo/uploadStatus";
+            return "redirect:/demo-upload/uploadStatus";
         }
         try {
             // Get the file and save it somewhere
@@ -62,6 +64,6 @@ public class DemoUploadController {
         } catch (Exception e) {
             LOGGER.error("upload file failed",e);
         }
-        return "redirect:/upload_demo/uploadStatus";
+        return "redirect:/demo-upload/uploadStatus";
     }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java

@@ -172,4 +172,7 @@ public class SysFileController {
             return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
+
+    /****************** 对文件操作 ******************/
+
 }

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java

@@ -1,10 +1,12 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
+import cn.estsh.impp.framework.boot.init.ApplicationProperties;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.FixMethodOrder;
 import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -22,9 +24,13 @@ import org.springframework.test.context.junit4.SpringRunner;
 @FixMethodOrder(value = MethodSorters.DEFAULT)  // <<--- I will change here for testing ...
 public class TestBase {
 
+    @Autowired
+    private ApplicationProperties app;
+
     @Before
     public void init() {
         System.out.println("-----------------开始测试-----------------");
+        app.setProfilesActive("test");
     }
 
     @After

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestInitData.java

@@ -0,0 +1,111 @@
+package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
+
+import cn.estsh.i3plus.core.api.iservice.busi.*;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
+import cn.estsh.i3plus.pojo.platform.bean.*;
+import com.alibaba.fastjson.JSON;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.transaction.Transactional;
+
+/**
+ * 系统数据初始化
+ */
+public class TestInitData extends TestBase {
+
+    @Autowired
+    private IOrganizeService organizeService;
+
+    @Autowired
+    private IPositionService positionService;
+
+    @Autowired
+    private IDepartmentService departmentService;
+
+    @Autowired
+    private ISysMenuService sysMenuService;
+
+    @Autowired
+    private ISysRoleService sysRoleService;
+
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private ISysUserInfoService sysUserInfoService;
+
+    @Test
+    @Transactional
+    public void testInitPosition(){
+
+    }
+
+    @Test
+    @Transactional
+    public void testInitOrganize(){
+
+    }
+
+    @Test
+    @Transactional
+    public void testInitDepartment(){
+
+    }
+
+    @Test
+    @Transactional
+    public void testInitSysRole(){
+
+    }
+
+    @Test
+    @Transactional
+    public void testInitSysUser()throws Exception{
+        Organize organize = new Organize();
+        organize.setName("Junit 组织");
+        organize.setOrganizeTypeId(ImppEnumUtil.ORGANIZE_YTPE.TYPE_COMPANY.getValue());
+        organize.setOrganizeCode("junit 001");
+        Organize insertOrganize = organizeService.insertOrganize(organize);
+        System.out.println(JSON.toJSON(insertOrganize));
+
+        Department department = new Department();
+        department.setName("Junit 部门");
+        department.setDepartmentCode("junit 001");
+        department.setOrganizeId(insertOrganize.getId());
+        Department insertDepartment = departmentService.insertDepartment(department);
+        System.out.println(JSON.toJSON(insertDepartment));
+
+        Position position = new Position();
+        position.setName("Junit 岗位");
+        position.setPositionCode("junit 001");
+        Position insertPosition = positionService.insertPosition(position);
+        System.out.println(JSON.toJSON(insertPosition));
+
+        SysUserInfo info = new SysUserInfo();
+        info.setName("Junit 用户");
+        info.setOrganizeId(insertOrganize.getId());
+        info.setDepartmentId(insertDepartment.getId());
+        info.setPositionId(insertPosition.getId());
+
+        SysUserInfo insertSysUserInfo = sysUserInfoService.insertSysUserInfo(info);
+
+        SysRole role = new SysRole();
+        role.setName("Junit 角色");
+        SysRole insertSysRole = sysRoleService.insertSysRole(role);
+        System.out.println(JSON.toJSON(insertSysRole));
+
+
+        SysUser user = new SysUser();
+        user.setUserLoginName("root");
+        user.setUserLoginPassword("root");
+        user.setUserInfoId(insertSysUserInfo.getId());
+        user.setRoleId(insertSysRole.getId());
+
+        SysUser sysUser = sysUserService.insertSysUser(user);
+        System.out.println(JSON.toJSON(sysUser));
+    }
+
+
+}