项目架构优化、代码编码规范

lipengjun92 · Oct 16, 2023 · 2b0e1ef · 2b0e1ef
1 parent 1fbdbcd
commit 2b0e1ef
Show file tree

Hide file tree

Showing 74 changed files with 469 additions and 602 deletions.
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Entity里提示报错不是缺少get、set方法，Eclipse、IDEA请先安装`lo
 ## 重要信息
 1. 项目合作洽谈，请联系客服微信（使用微信扫码添加好友，请注明来意）。
 2. 如需购买 [商业版源码](https://fly2you.cn/ma.html) 请联系客服。<br>
-![](https://platform-wxmall.oss-cn-beijing.aliyuncs.com/image/2023_09_20/UNKNOWN_11_33_59.png "微信")
+![](https://platform-wxmall.oss-cn-beijing.aliyuncs.com/image/2023_09_20/11_33_59.png "微信")
 3. 微信扫码并关注公众号回复“文档”，获取《微同开源商城启动部署手册.docx》<br>
   ![](https://platform-wxmall.oss-cn-beijing.aliyuncs.com/upload/20180708/qr.jpg "微信公众号")
 
@@ -62,13 +62,11 @@ Entity里提示报错不是缺少get、set方法，Eclipse、IDEA请先安装`lo
 ## 项目结构
 ~~~
 platform
-|--platform-admin 后台管理
+|--platform-admin 后台管理（打包发布此项目）
 |--platform-api 微信小程序商城api接口
 |--platform-common 公共模块
-|--platform-framework 打包发布此项目
 |--platform-gen 代码生成
 |--platform-schedule 定时任务
-|--platform-shop 商城后台管理
 |--uni-mall uniapp版商城
 |--wx-mall 微信小程序原生商城
 ~~~

diff --git a/platform-admin/pom.xml b/platform-admin/pom.xml
@@ -13,11 +13,26 @@
     <description>管理后台</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.platform</groupId>
+            <artifactId>platform-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.platform</groupId>
             <artifactId>platform-common</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.platform</groupId>
+            <artifactId>platform-gen</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.platform</groupId>
+            <artifactId>platform-schedule</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <!--验证码生成工具-->
         <dependency>
             <groupId>com.github.penggle</groupId>
@@ -45,6 +60,7 @@
     </profiles>
 
     <build>
+        <finalName>platform-framework</finalName>
         <scriptSourceDirectory>src/main/java</scriptSourceDirectory>
         <resources>
             <resource>
@@ -68,6 +84,14 @@
             </resource>
         </resources>
         <plugins>
+            <!-- maven 打包时跳过测试 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
@@ -105,4 +129,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/platform-admin/src/main/java/com/platform/controller/SysRegionController.java b/platform-admin/src/main/java/com/platform/controller/SysRegionController.java
@@ -181,9 +181,8 @@ public R getAreaTree() {
     public R getAreaByType(@RequestParam(required = false) Integer type) {
 
         List<SysRegionEntity> list = new ArrayList<>();
-        if (type.equals(0)) {
-
-        } else if (type.equals(1)) {//省份
+        if (type.equals(1)) {
+            //省份
             list = RegionCacheUtil.getAllCountry();
         } else if (type.equals(2)) {
             list = RegionCacheUtil.getAllProvice();

diff --git a/...java/com/platform/BaseSpringTestCase.java → ...java/com/platform/BaseSpringTestCase.java b/...java/com/platform/BaseSpringTestCase.java → ...java/com/platform/BaseSpringTestCase.java
diff --git a/...orm/controller/TestSysUserController.java → ...orm/controller/TestSysUserController.java b/...orm/controller/TestSysUserController.java → ...orm/controller/TestSysUserController.java
@@ -5,7 +5,6 @@
 import com.platform.service.SysUserService;
 import com.platform.service.TestSysUserService;
 import org.junit.Test;
-import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.HashMap;
@@ -24,14 +23,13 @@ public class TestSysUserController extends BaseSpringTestCase {
     TestSysUserService testSysUserService;
     @Autowired
     SysUserService sysUserService;
-    private Logger logger = getLogger();
 
     /**
      * 使用测试类
      */
     @Test
     public void queryTestSysUserList() {
-        Map params = new HashMap();
+        Map<String, Object> params = new HashMap<>();
         List<SysUserEntity> list = testSysUserService.queryList(params);
         if (list != null && list.size() != 0) {
             for (SysUserEntity userEntity : list) {
@@ -45,7 +43,7 @@ public void queryTestSysUserList() {
      */
     @Test
     public void querySysUserList() {
-        Map params = new HashMap();
+        Map<String, Object> params = new HashMap<>();
         List<SysUserEntity> list = sysUserService.queryList(params);
         if (list != null && list.size() != 0) {
             for (SysUserEntity userEntity : list) {

diff --git a/...java/com/platform/dao/TestSysUserDao.java → ...java/com/platform/dao/TestSysUserDao.java b/...java/com/platform/dao/TestSysUserDao.java → ...java/com/platform/dao/TestSysUserDao.java
diff --git a/.../platform/service/TestSysUserService.java → .../platform/service/TestSysUserService.java b/.../platform/service/TestSysUserService.java → .../platform/service/TestSysUserService.java
diff --git a/.../service/impl/TestSysUserServiceImpl.java → .../service/impl/TestSysUserServiceImpl.java b/.../service/impl/TestSysUserServiceImpl.java → .../service/impl/TestSysUserServiceImpl.java
diff --git a/...est/resources/applicationContext-test.xml → ...est/resources/applicationContext-test.xml b/...est/resources/applicationContext-test.xml → ...est/resources/applicationContext-test.xml
diff --git a/...urces/com/platform/dao/TestSysUserDao.xml → ...urces/com/platform/dao/TestSysUserDao.xml b/...urces/com/platform/dao/TestSysUserDao.xml → ...urces/com/platform/dao/TestSysUserDao.xml
diff --git a/...ework/src/test/resources/log4j.properties → ...admin/src/test/resources/log4j.properties b/...ework/src/test/resources/log4j.properties → ...admin/src/test/resources/log4j.properties
diff --git a/...rk/src/test/resources/platform.properties → ...in/src/test/resources/platform.properties b/...rk/src/test/resources/platform.properties → ...in/src/test/resources/platform.properties
diff --git a/platform-api/src/main/java/com/platform/api/ApiAuthController.java b/platform-api/src/main/java/com/platform/api/ApiAuthController.java
@@ -21,15 +21,14 @@
 import com.platform.utils.CharUtil;
 import com.platform.utils.R;
 import com.platform.utils.ResourceUtil;
-import com.platform.validator.Assert;
+import com.platform.validator.AbstractAssert;
 import com.qiniu.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.collections.MapUtils;
-import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -50,7 +49,6 @@
 @RestController
 @RequestMapping("/api/auth")
 public class ApiAuthController extends ApiBaseAction {
-    private Logger logger = Logger.getLogger(getClass());
     @Autowired
     private ApiUserService userService;
     @Autowired
@@ -65,8 +63,8 @@ public class ApiAuthController extends ApiBaseAction {
     @PostMapping("login")
     @ApiOperation(value = "登录接口")
     public R login(String mobile, String password) {
-        Assert.isBlank(mobile, "手机号不能为空");
-        Assert.isBlank(password, "密码不能为空");
+        AbstractAssert.isBlank(mobile, "手机号不能为空");
+        AbstractAssert.isBlank(password, "密码不能为空");
 
         //用户登录
         long userId = userService.login(mobile, password);
@@ -214,7 +212,7 @@ public Object loginByCode(@PathVariable String code) {
     @ApiOperation(value = "支付宝登录")
     @IgnoreAuth
     @PostMapping("login_by_ali")
-    public Object login_by_ali() {
+    public Object loginByAli() {
         JSONObject jsonParam = this.getJsonRequest();
         String code = "";
         if (!StringUtils.isNullOrEmpty(jsonParam.getString("code"))) {

diff --git a/platform-api/src/main/java/com/platform/api/ApiBrandController.java b/platform-api/src/main/java/com/platform/api/ApiBrandController.java
@@ -40,7 +40,7 @@ public class ApiBrandController extends ApiBaseAction {
     public Object list(@RequestParam(value = "page", defaultValue = "1") Integer page,
                        @RequestParam(value = "size", defaultValue = "10") Integer size) {
         //查询列表数据
-        Map params = new HashMap();
+        Map<String, Object> params = new HashMap<>();
         params.put("fields", "id, name, floor_price, app_list_pic_url");
         params.put("page", page);
         params.put("limit", size);
@@ -62,7 +62,7 @@ public Object list(@RequestParam(value = "page", defaultValue = "1") Integer pag
     @IgnoreAuth
     @PostMapping("detail")
     public Object detail(@RequestParam Integer id) {
-        Map<String, Object> resultObj = new HashMap();
+        Map<String, Object> resultObj = new HashMap<>();
         //查询列表数据
         BrandVo entity = brandService.queryObject(id);
         //