修改验证错误以及新增模块

dgtly-admin/pom.xml

@@ -79,21 +79,6 @@
             <artifactId>dgtly-generator</artifactId>
         </dependency>
 
-        <!-- 考勤管理-->
-        <dependency>
-            <groupId>com.dgtly</groupId>
-            <artifactId>dgtly-sign-manager</artifactId>
-            <version>4.0.0</version>
-        </dependency>
-
-        <!-- 优图-->
-        <dependency>
-            <groupId>com.dgtly</groupId>
-            <artifactId>dgtly-youtu-common</artifactId>
-            <version>4.0.0</version>
-            <scope>compile</scope>
-        </dependency>
-
 
     </dependencies>
 

dgtly-api/src/main/java/com/dgtly/api/controller/HellowController.java

@@ -1,37 +1,30 @@
 package com.dgtly.api.controller;
 
 
+import com.dgtly.common.core.controller.BaseController;
 import com.dgtly.common.core.domain.AjaxResult;
 import com.dgtly.system.service.ISysModelLayoutService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 @RestController
-public class HellowController {
+public class HellowController extends BaseController {
 
-    @Autowired
-    private ISysModelLayoutService sysModelLayoutService;
 
     @GetMapping("getTest")
-    public Object get(){
-
-        List<Map<String,Long>> param = new ArrayList<>();
-
-        return AjaxResult.success();
+    public Object getTest(String param){
+        return AjaxResult.success().putKV("param",param);
     }
 
     @PostMapping("/post/json")
     public Object j(){
-        return AjaxResult.success();
+        String param = getJsonMap().get("param").toString();
+        return AjaxResult.success().putKV("param",param);
     }
 
     @PostMapping("/post/form")
-    public Object f( ){
-        return AjaxResult.success();
+    public Object f(String param ){
+        return AjaxResult.success().putKV("param",param);
     }
 
 

dgtly-api/src/main/resources/application-dev.yml

@@ -15,9 +15,9 @@ ruoyi:
 #接口安全验证
 security:
   #接口过期时间
-  apiTimeOut: 10
+  apiTimeOut: 50
   #接口的plat和对应的AppKey 支持多个用，号分割
-  platMap: "{wx:'cd72c223-923f-44a3-aede-b9f07dcd56b8'}"
+  platMap: "{steelfurniture:'cd72c223-923f-44a3-aede-b9f07dcd56b8'}"
   #开发模式下 可以使用swagger测试 放过验签环节
   isDev: true
 

dgtly-api/src/main/resources/application-test-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://182.92.160.141:3306/SteelfurnitureManager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/SteelfurnitureManager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: qxp
                 password: qxp
             # 从库数据源

dgtly-api/src/main/resources/application-test.yml

@@ -7,7 +7,7 @@ ruoyi:
   # 版权年份
   copyrightYear: 2019
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/dgtly/uploadPath
+  profile: /home/softfile/steelfurniture
   # 获取ip地址开关
   addressEnabled: true
   #是否开启swagger
@@ -17,7 +17,7 @@ security:
   #接口过期时间
   apiTimeOut: 10
   #接口的plat和对应的AppKey 支持多个用，号分割
-  platMap: "{wx:'cd72c223-923f-44a3-aede-b9f07dcd56b8'}"
+  platMap: "{steelfurniture:'cd72c223-923f-44a3-aede-b9f07dcd56b8'}"
   #开发模式下 可以使用swagger测试 放过验签环节
   isDev: true
 
@@ -28,7 +28,7 @@ server:
   port: 8888
   servlet:
     # 应用的访问路径
-    context-path: /
+    context-path: /steelfurnitureAPI
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8

dgtly-api/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: test
 #开发环境dev 测试环境test 正式环境prod  启动时可以设置参数Java -jar xxxxxx.jar spring.profiles.actiove=prod

dgtly-apiframework/src/main/java/com/dgtly/apiframework/interceptor/VerifyInterceptor.java

@@ -121,7 +121,8 @@ public class VerifyInterceptor  extends HandlerInterceptorAdapter {
                         return false;
                     }
                 }
-                logger.info("==收到请求："+((HandlerMethod) handler).getMethod().getName()+"方法==");
+                logger.info("======收到请求======"+((HandlerMethod) handler).getClass().getName()+"类的"+
+                        ((HandlerMethod) handler).getMethod().getName()+"方法");
             }
             return true;
         }else

dgtly-goods/dgtly-goods-admin/pom.xml

@@ -0,0 +1,42 @@
+<?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">
+    <parent>
+        <artifactId>dgtly-goods</artifactId>
+        <groupId>com.dgtly</groupId>
+        <version>4.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dgtly-goods-admin</artifactId>
+    <dependencies>
+        <!--管理端核心类-->
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>dgtly-framework</artifactId>
+        </dependency>
+
+        <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+        <!--公用组件-->
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>dgtly-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>dgtly-goods-common</artifactId>
+        </dependency>
+
+    </dependencies>
+</project>

dgtly-goods/dgtly-goods-api/pom.xml

@@ -0,0 +1,31 @@
+<?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">
+    <parent>
+        <artifactId>dgtly-goods</artifactId>
+        <groupId>com.dgtly</groupId>
+        <version>4.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dgtly-goods-api</artifactId>
+    <dependencies>
+        <!--接口核心类-->
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>dgtly-apiframework</artifactId>
+        </dependency>
+        <!--常用公共类-->
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>dgtly-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>dgtly-goods-common</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>

dgtly-goods/dgtly-goods-common/pom.xml

@@ -0,0 +1,15 @@
+<?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">
+    <parent>
+        <artifactId>dgtly-goods</artifactId>
+        <groupId>com.dgtly</groupId>
+        <version>4.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dgtly-goods-common</artifactId>
+
+
+</project>

dgtly-goods/pom.xml

@@ -0,0 +1,22 @@
+<?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">
+    <parent>
+        <artifactId>dgtly</artifactId>
+        <groupId>com.dgtly</groupId>
+        <version>4.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dgtly-goods</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>dgtly-goods-admin</module>
+        <module>dgtly-goods-api</module>
+        <module>dgtly-goods-common</module>
+        <module>dgtly-goods-common</module>
+    </modules>
+
+
+</project>

dgtly-member/dgtly-member-admin/pom.xml

@@ -0,0 +1,43 @@
+<?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">
+    <parent>
+        <artifactId>dgtly-member</artifactId>
+        <groupId>com.dgtly</groupId>
+        <version>4.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dgtly-member-admin</artifactId>
+
+    <dependencies>
+        <!--管理端核心类-->
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>dgtly-framework</artifactId>
+        </dependency>
+
+        <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+        <!--公用组件-->
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>dgtly-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>dgtly-member-common</artifactId>
+        </dependency>
+    </dependencies>
+</project>

dgtly-member/dgtly-member-api/pom.xml

@@ -0,0 +1,30 @@
+<?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">
+    <parent>
+        <artifactId>dgtly-member</artifactId>
+        <groupId>com.dgtly</groupId>
+        <version>4.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dgtly-member-api</artifactId>
+    <dependencies>
+        <!--接口核心类-->
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>dgtly-apiframework</artifactId>
+        </dependency>
+        <!--常用公共类-->
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>dgtly-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>dgtly-member-common</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

dgtly-member/dgtly-member-common/pom.xml

@@ -0,0 +1,15 @@
+<?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">
+    <parent>
+        <artifactId>dgtly-member</artifactId>
+        <groupId>com.dgtly</groupId>
+        <version>4.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dgtly-member-common</artifactId>
+
+
+</project>

dgtly-member/pom.xml

@@ -0,0 +1,21 @@
+<?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">
+    <parent>
+        <artifactId>dgtly</artifactId>
+        <groupId>com.dgtly</groupId>
+        <version>4.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dgtly-member</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>dgtly-member-admin</module>
+        <module>dgtly-member-common</module>
+        <module>dgtly-member-api</module>
+    </modules>
+
+
+</project>

pom.xml

@@ -216,6 +216,8 @@
 		<module>dgtly-generator</module>
         <module>dgtly-common</module>
         <module>dgtly-api</module>
+        <module>dgtly-goods</module>
+        <module>dgtly-member</module>
     </modules>
     <packaging>pom</packaging>