代码规范

README.md

@@ -1,4 +1,4 @@
-# 项目结构:
+# 项目结构
 
 ```
 ├─saas-platform
@@ -66,7 +66,7 @@
 │  │
 ```
 
-# 开发环境：
+# 开发环境
 
 > 数据库
 
@@ -82,6 +82,7 @@
 | 类型 | 地址 | 账号 | 密码 | 说明 |
 | ---- | :----: | :----: | :----: | ---- |
 | rabbitmq | 192.168.0.176:5672 | saas | select123*** | 消息中间件 [控制台](http://192.168.0.176:15672)|
+| redis | 192.168.253.12:6379 | | | 内存数据库 |
 
 
 > 服务器

applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MaxnumberService.java

@@ -19,7 +19,7 @@ public interface MaxnumberService {
      * @Date: 2018/10/19 api/commons
      */
     @PostMapping("/number/pushMaxnubmer")
-    public String pushMaxnubmer(@RequestParam("count") Integer count,@RequestParam("code") String code,
+    public Result<String> pushMaxnubmer(@RequestParam("count") Integer count,@RequestParam("code") String code,
                                 @RequestParam("caller") String caller);
     /**
      * @Description 获取单号
@@ -29,5 +29,5 @@ public interface MaxnumberService {
      * @Date: 2018/10/22
      */
     @PostMapping("/getMaxnumber")
-    public Result getMaxnumber(@RequestParam("caller") String caller, @RequestParam("update") boolean update);
+    public Result<String> getMaxnumber(@RequestParam("caller") String caller, @RequestParam("update") boolean update);
 }

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/controller/MaxnumberController.java

@@ -25,15 +25,13 @@ public class MaxnumberController {
     private MaxnumberService maxnumberService;
 
     @PostMapping("/getMaxnumber")
-    public Result getMaxnumber(String caller, boolean update) {
-        Map<String, Object> code = new HashMap<>();
-        code.put("code",  maxnumberService.getMaxnumner(caller, update));
-        return Result.success(code);
+    public Result<String> getMaxnumber(String caller, boolean update) {
+        return Result.success(maxnumberService.getMaxnumner(caller, update));
     }
 
     @PostMapping("/pushMaxnubmer")
-    public String pushMaxnubmer(@RequestParam("count") Integer count, @RequestParam("code") String code,
+    public Result<String> pushMaxnubmer(@RequestParam("count") Integer count, @RequestParam("code") String code,
                                 @RequestParam("caller") String caller) {
-        return maxnumberService.pushMaxnubmer(count, code, caller);
+        return Result.success(maxnumberService.pushMaxnubmer(count, code, caller));
     }
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/AddressController.java

@@ -1,7 +1,5 @@
 package com.usoftchina.saas.document.controller;
 
-
-import com.sun.org.apache.regexp.internal.RE;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.document.entities.Address;
 import com.usoftchina.saas.document.service.AddressService;

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -465,7 +465,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         }
         Integer count = "0".equals(String.valueOf(id)) ? purchaseMapper.validateCodeWhenInsert(code) :
                 purchaseMapper.validateCodeWhenUpdate(code, id);
-        return maxnumberService.pushMaxnubmer(count, code, "Purchase");
+        return maxnumberService.pushMaxnubmer(count, code, "Purchase").getData();
     }
     
     /** 

applications/purchase/purchase-server/src/main/resources/application.yml

@@ -47,7 +47,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
   port: 8800
   tomcat:

applications/sale/pom.xml

@@ -17,86 +17,4 @@
         <module>sale-dto</module>
     </modules>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.usoftchina.saas</groupId>
-            <artifactId>sale-dto</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.usoftchina.saas</groupId>
-            <artifactId>document-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.usoftchina.saas</groupId>
-            <artifactId>auth-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.usoftchina.saas</groupId>
-            <artifactId>server-starter</artifactId>
-        </dependency>
-
-        <!--test-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
-
-        <!-- db -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-        </dependency>
-        <!-- sleuth -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-zipkin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.amqp</groupId>
-            <artifactId>spring-rabbit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.logstash.logback</groupId>
-            <artifactId>logstash-logback-encoder</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-        </dependency>
-        <!-- feign -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.usoftchina.saas</groupId>
-            <artifactId>commons-dto</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.usoftchina.saas</groupId>
-            <artifactId>commons-api</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>

applications/sale/sale-server/pom.xml

@@ -14,7 +14,6 @@
         <dependency>
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>sale-dto</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

pom.xml

@@ -296,6 +296,11 @@
                 <artifactId>sale-dto</artifactId>
                 <version>${project.release.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.usoftchina.saas</groupId>
+                <artifactId>sale-dto</artifactId>
+                <version>${project.release.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>test-starter</artifactId>