diff --git a/jero-boot/jero-boot-single-startup/pom.xml b/jero-boot/jero-boot-single-startup/pom.xml index b8c6481cd..3b1948b0f 100644 --- a/jero-boot/jero-boot-single-startup/pom.xml +++ b/jero-boot/jero-boot-single-startup/pom.xml @@ -35,7 +35,7 @@ - laws-weilai + laws-nio org.springframework.boot diff --git a/jero-boot/jero-boot-single-startup/src/main/java/com/jero/JeroSystemSingleApplication.java b/jero-boot/jero-boot-single-startup/src/main/java/com/jero/LawNioApplication.java similarity index 89% rename from jero-boot/jero-boot-single-startup/src/main/java/com/jero/JeroSystemSingleApplication.java rename to jero-boot/jero-boot-single-startup/src/main/java/com/jero/LawNioApplication.java index 078a88a17..39c8817cf 100644 --- a/jero-boot/jero-boot-single-startup/src/main/java/com/jero/JeroSystemSingleApplication.java +++ b/jero-boot/jero-boot-single-startup/src/main/java/com/jero/LawNioApplication.java @@ -19,15 +19,15 @@ import java.net.UnknownHostException; **/ @Slf4j @SpringBootApplication -public class JeroSystemSingleApplication extends SpringBootServletInitializer { +public class LawNioApplication extends SpringBootServletInitializer { @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(JeroSystemSingleApplication.class); + return application.sources(LawNioApplication.class); } public static void main(String[] args) throws UnknownHostException { - ConfigurableApplicationContext application = SpringApplication.run(JeroSystemSingleApplication.class, args); + ConfigurableApplicationContext application = SpringApplication.run(LawNioApplication.class, args); Environment env = application.getEnvironment(); String ip = InetAddress.getLocalHost().getHostAddress(); String port = env.getProperty("server.port"); diff --git a/jero-boot/jero-boot-single-startup/src/test/java/com/jero/modules/online/desform/test/DesformApiTest.java b/jero-boot/jero-boot-single-startup/src/test/java/com/jero/modules/online/desform/test/DesformApiTest.java index be692dc0a..e23068807 100644 --- a/jero-boot/jero-boot-single-startup/src/test/java/com/jero/modules/online/desform/test/DesformApiTest.java +++ b/jero-boot/jero-boot-single-startup/src/test/java/com/jero/modules/online/desform/test/DesformApiTest.java @@ -1,7 +1,7 @@ package com.jero.modules.online.desform.test; import com.alibaba.fastjson.JSONObject; -import com.jero.JeroSystemSingleApplication; +import com.jero.LawNioApplication; import com.jero.common.constant.CommonConstant; import com.jero.common.system.util.JwtUtil; import com.jero.common.util.RedisUtil; @@ -20,7 +20,7 @@ import org.springframework.test.context.junit4.SpringRunner; * 表单设计器 API 接口单元测试 */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeroSystemSingleApplication.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = LawNioApplication.class) @SuppressWarnings({"FieldCanBeLocal", "SpringJavaAutowiredMembersInspection"}) public class DesformApiTest { diff --git a/jero-boot/jero-boot-single-startup/src/test/java/com/jero/modules/online/desform/test/OnlineApiTest.java b/jero-boot/jero-boot-single-startup/src/test/java/com/jero/modules/online/desform/test/OnlineApiTest.java index 73ec7470d..b91075821 100644 --- a/jero-boot/jero-boot-single-startup/src/test/java/com/jero/modules/online/desform/test/OnlineApiTest.java +++ b/jero-boot/jero-boot-single-startup/src/test/java/com/jero/modules/online/desform/test/OnlineApiTest.java @@ -1,7 +1,7 @@ package com.jero.modules.online.desform.test; import com.alibaba.fastjson.JSONObject; -import com.jero.JeroSystemSingleApplication; +import com.jero.LawNioApplication; import com.jero.common.constant.CommonConstant; import com.jero.common.system.util.JwtUtil; import com.jero.common.util.RedisUtil; @@ -20,7 +20,7 @@ import org.springframework.test.context.junit4.SpringRunner; * online api online表单单元测试 */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeroSystemSingleApplication.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = LawNioApplication.class) @SuppressWarnings({"FieldCanBeLocal", "SpringJavaAutowiredMembersInspection"}) public class OnlineApiTest { @Autowired diff --git a/jero-boot/jero-boot-single-startup/src/test/java/com/jero/modules/system/test/SysUserTest.java b/jero-boot/jero-boot-single-startup/src/test/java/com/jero/modules/system/test/SysUserTest.java index 9b9bd397d..d38fc842b 100644 --- a/jero-boot/jero-boot-single-startup/src/test/java/com/jero/modules/system/test/SysUserTest.java +++ b/jero-boot/jero-boot-single-startup/src/test/java/com/jero/modules/system/test/SysUserTest.java @@ -1,6 +1,6 @@ package com.jero.modules.system.test; -import com.jero.JeroSystemSingleApplication; +import com.jero.LawNioApplication; import com.jero.common.constant.CommonConstant; import com.jero.common.system.util.JwtUtil; import com.jero.common.util.RedisUtil; @@ -20,7 +20,7 @@ import org.springframework.http.ResponseEntity; * 系统用户单元测试 */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeroSystemSingleApplication.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = LawNioApplication.class) @SuppressWarnings({"FieldCanBeLocal", "SpringJavaAutowiredMembersInspection"}) public class SysUserTest { @Autowired diff --git a/jero-web/README.md b/jero-web/README.md index c93368f6d..4e1846122 100644 --- a/jero-web/README.md +++ b/jero-web/README.md @@ -24,17 +24,33 @@ Jero-boot 的前端UI框架，采用前后端分离方案，提供强大代码 - [@antv/g2](https://antv.alipay.com/zh-cn/index.html) - Alipay AntV 数据可视化图表 - [Viser-vue](https://viserjs.github.io/docs.html#/viser/guide/installation) - antv/g2 封装实现 +#### 代码规范 +- 代码迁移需要注意 + 不重复的代码文件，直接拷贝到对应的目录下；重复文件（主要是配置文件），对比代码后copy/修改代码。 + + +- 代码引入组件相关事项 + + +- 代码规范 + + 1.命名要有含义，变量命名使用驼峰命名； + + 2.每写一个功能需要加上注释； + + 3.代码优化，尽量共用 + + +- 新增功能文件创建规范 + + 1.命名要有含义 + + 2.新增组件写在components文件里面 项目下载和运行 ---- -- 拉取项目代码 -```bash -git clone http://git.hzwlsoft.com/JeroBoot/jero-boot.git -cd jero-boot/jero-web -``` - - 安装依赖 ``` yarn install @@ -81,27 +97,6 @@ yarn run lint } } ``` -- 代码迁移需要注意 - - 不重复的代码文件，直接拷贝到对应的目录下；重复文件（主要是配置文件），对比代码后copy/修改代码。 - -- 代码引入组件相关事项 - - -- 代码规范 - - 1.命名要有含义，变量命名使用驼峰命名； - - 2.每写一个功能需要加上注释； - - 3.代码优化，尽量共用 - - - 新增功能文件创建规范 - - 1.命名要有含义 - - 2.新增组件写在components文件里面 - 附属文档 ----