Readjust code architecture wansenai#13

api/pom.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.wansensoft</groupId>
+        <artifactId>wansen-erp-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>api</artifactId>
+
+    <properties>
+        <maven.compiler.source>20</maven.compiler.source>
+        <maven.compiler.target>20</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.wansensoft</groupId>
+            <artifactId>utils</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.wansensoft</groupId>
+            <artifactId>service</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.wansensoft</groupId>
+            <artifactId>domain</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>4.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <finalName>wansenerp</finalName>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

src/main/java/com/wansensoft/ErpApplication.java → api/src/main/java/com/wansensoft/ErpApplication.java

@@ -1,26 +1,20 @@
 package com.wansensoft;
 
-import com.wansensoft.utils.ComputerInfo;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-import java.io.IOException;
-
 @SpringBootApplication
-@MapperScan(basePackages = {"com.wansensoft.datasource.mappers"})
-@ServletComponentScan
 @EnableScheduling
-public class ErpApplication{
-    public static void main(String[] args) throws IOException {
+public class ErpApplication {
+
+    public static void main(String[] args) {
         ConfigurableApplicationContext context = SpringApplication.run(ErpApplication.class, args);
         Environment environment = context.getBean(Environment.class);
         System.out.println("启动成功，后端服务API地址：http://" + ComputerInfo.getIpAddr() + ":"
-                + environment.getProperty("server.port") + "/wansenerp/doc.html");
+                + environment.getProperty("server.port") + "/jshERP-boot/doc.html");
         System.out.println("您还需启动前端服务，启动命令：yarn run serve 或 npm run serve，测试用户：jsh，密码：123456");
     }
 }

src/main/java/com/wansensoft/controller/FunctionController.java → api/src/main/java/com/wansensoft/FunctionController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/wansensoft/controller/InOutItemController.java → api/src/main/java/com/wansensoft/InOutItemController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/wansensoft/controller/MsgController.java → api/src/main/java/com/wansensoft/MsgController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft;
 
 import com.alibaba.fastjson.JSONObject;
 import com.wansensoft.datasource.entities.MsgEx;

src/main/java/com/wansensoft/controller/OrganizationController.java → api/src/main/java/com/wansensoft/OrganizationController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;

src/main/java/com/wansensoft/controller/PersonController.java → api/src/main/java/com/wansensoft/PersonController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/wansensoft/controller/PlatformConfigController.java → api/src/main/java/com/wansensoft/PlatformConfigController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft;
 
 import com.alibaba.fastjson.JSONObject;
 import com.wansensoft.datasource.entities.PlatformConfig;

src/main/java/com/wansensoft/controller/PluginController.java → api/src/main/java/com/wansensoft/PluginController.java

@@ -1,4 +1,4 @@
-//package com.wansensoft.erp.controller;
+package com.wansensoft;//package com.wansensoft.erp.controller;
 //
 //import constants.com.wansensoft.BusinessConstants;
 //import entities.datasource.com.wansensoft.User;

src/main/java/com/wansensoft/controller/ResourceController.java → api/src/main/java/com/wansensoft/ResourceController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft;
 
 import com.alibaba.fastjson.JSONObject;
 import com.wansensoft.constants.BusinessConstants;

src/main/java/com/wansensoft/controller/RoleController.java → api/src/main/java/com/wansensoft/RoleController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/wansensoft/controller/SequenceController.java → api/src/main/java/com/wansensoft/SequenceController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft;
 
 import com.wansensoft.service.sequence.SequenceService;
 import com.wansensoft.utils.BaseResponseInfo;

src/main/java/com/wansensoft/controller/SerialNumberController.java → api/src/main/java/com/wansensoft/SerialNumberController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft;
 
 import com.alibaba.fastjson.JSONObject;
 import com.wansensoft.datasource.entities.DepotItem;

src/main/java/com/wansensoft/controller/SupplierController.java → api/src/main/java/com/wansensoft/SupplierController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/wansensoft/controller/UnitController.java → api/src/main/java/com/wansensoft/UnitController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft;
 
 import com.alibaba.fastjson.JSONObject;
 import com.wansensoft.datasource.entities.Unit;

src/main/java/com/wansensoft/controller/AccountController.java → api/src/main/java/com/wansensoft/account/AccountController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft.account;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/wansensoft/controller/AccountHeadController.java → api/src/main/java/com/wansensoft/account/AccountHeadController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft.account;
 
 import com.alibaba.fastjson.JSONObject;
 import com.wansensoft.datasource.entities.AccountHead;

src/main/java/com/wansensoft/controller/AccountItemController.java → api/src/main/java/com/wansensoft/account/AccountItemController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft.account;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/wansensoft/controller/DepotController.java → api/src/main/java/com/wansensoft/depot/DepotController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft.depot;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/wansensoft/controller/DepotHeadController.java → api/src/main/java/com/wansensoft/depot/DepotHeadController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft.depot;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/wansensoft/controller/DepotItemController.java → api/src/main/java/com/wansensoft/depot/DepotItemController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft.depot;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/wansensoft/controller/MaterialAttributeController.java → api/src/main/java/com/wansensoft/material/MaterialAttributeController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft.material;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/wansensoft/controller/MaterialCategoryController.java → api/src/main/java/com/wansensoft/material/MaterialCategoryController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft.material;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;

src/main/java/com/wansensoft/controller/MaterialController.java → api/src/main/java/com/wansensoft/material/MaterialController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft.material;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/wansensoft/controller/MaterialExtendController.java → api/src/main/java/com/wansensoft/material/MaterialExtendController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft.material;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/wansensoft/controller/MaterialPropertyController.java → api/src/main/java/com/wansensoft/material/MaterialPropertyController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft.material;
 
 import com.wansensoft.datasource.entities.MaterialProperty;
 import com.wansensoft.service.materialProperty.MaterialPropertyService;

src/main/java/com/wansensoft/controller/SystemConfigController.java → api/src/main/java/com/wansensoft/system/SystemConfigController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft.system;
 
 import com.wansensoft.datasource.entities.SystemConfig;
 import com.wansensoft.service.depot.DepotService;

src/main/java/com/wansensoft/controller/TenantController.java → api/src/main/java/com/wansensoft/tenant/TenantController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft.tenant;
 
 import com.alibaba.fastjson.JSONObject;
 import com.wansensoft.service.tenant.TenantService;

src/main/java/com/wansensoft/controller/UserBusinessController.java → api/src/main/java/com/wansensoft/user/UserBusinessController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft.user;
 
 import com.alibaba.fastjson.JSONObject;
 import com.wansensoft.datasource.entities.UserBusiness;

src/main/java/com/wansensoft/controller/UserController.java → api/src/main/java/com/wansensoft/user/UserController.java

@@ -1,4 +1,4 @@
-package com.wansensoft.controller;
+package com.wansensoft.user;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;

dao/pom.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.wansensoft</groupId>
+        <artifactId>wansen-erp-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>dao</artifactId>
+
+    <properties>
+        <maven.compiler.source>20</maven.compiler.source>
+        <maven.compiler.target>20</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.wansensoft</groupId>
+            <artifactId>domain</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.wansensoft</groupId>
+            <artifactId>utils</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+</project>

src/main/java/com/wansensoft/datasource/mappers/AccountHeadMapper.java → dao/src/main/java/com/wansensoft/account/AccountHeadMapper.java

@@ -1,12 +1,12 @@
-package com.wansensoft.datasource.mappers;
-
-import com.wansensoft.datasource.entities.AccountHead;
-import com.wansensoft.datasource.entities.AccountHeadExample;
-import java.util.List;
+package com.wansensoft.account;
 
+import com.wansensoft.entities.account.AccountHead;
+import com.wansensoft.entities.account.AccountHeadExample;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface AccountHeadMapper {
     long countByExample(AccountHeadExample example);

src/main/java/com/wansensoft/datasource/mappers/AccountHeadMapperEx.java → dao/src/main/java/com/wansensoft/account/AccountHeadMapperEx.java

@@ -1,8 +1,8 @@
-package com.wansensoft.datasource.mappers;
+package com.wansensoft.account;
 
-import com.wansensoft.datasource.entities.AccountHead;
-import com.wansensoft.datasource.entities.AccountHeadVo4ListEx;
-import com.wansensoft.datasource.entities.AccountItem;
+import com.wansensoft.entities.account.AccountHead;
+import com.wansensoft.entities.account.AccountHeadVo4ListEx;
+import com.wansensoft.entities.account.AccountItem;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/wansensoft/datasource/mappers/AccountItemMapper.java → dao/src/main/java/com/wansensoft/account/AccountItemMapper.java

@@ -1,7 +1,7 @@
-package com.wansensoft.datasource.mappers;
+package com.wansensoft.account;
 
-import com.wansensoft.datasource.entities.AccountItem;
-import com.wansensoft.datasource.entities.AccountItemExample;
+import com.wansensoft.entities.account.AccountItem;
+import com.wansensoft.entities.account.AccountItemExample;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/wansensoft/datasource/mappers/AccountItemMapperEx.java → dao/src/main/java/com/wansensoft/account/AccountItemMapperEx.java

@@ -1,7 +1,7 @@
-package com.wansensoft.datasource.mappers;
+package com.wansensoft.account;
 
-import com.wansensoft.datasource.entities.AccountItem;
-import com.wansensoft.datasource.vo.AccountItemVo4List;
+import com.wansensoft.entities.account.AccountItem;
+import com.wansensoft.vo.AccountItemVo4List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/wansensoft/datasource/mappers/AccountMapper.java → dao/src/main/java/com/wansensoft/account/AccountMapper.java

@@ -1,7 +1,7 @@
-package com.wansensoft.datasource.mappers;
+package com.wansensoft.account;
 
-import com.wansensoft.datasource.entities.Account;
-import com.wansensoft.datasource.entities.AccountExample;
+import com.wansensoft.entities.account.Account;
+import com.wansensoft.entities.account.AccountExample;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/wansensoft/datasource/mappers/AccountMapperEx.java → dao/src/main/java/com/wansensoft/account/AccountMapperEx.java

@@ -1,8 +1,8 @@
-package com.wansensoft.datasource.mappers;
+package com.wansensoft.account;
 
-import com.wansensoft.datasource.entities.Account;
-import com.wansensoft.datasource.vo.AccountVo4InOutList;
-import com.wansensoft.datasource.vo.AccountVo4List;
+import com.wansensoft.entities.account.Account;
+import com.wansensoft.vo.AccountVo4InOutList;
+import com.wansensoft.vo.AccountVo4List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;