Merge branch 'back' of https://github.com/java110/MicroCommunity into back

Api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java

@@ -3,6 +3,7 @@ package com.java110.api.bmo.fee.impl;
 
 import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.IApiBaseBMO;
+import com.java110.api.bmo.fee.IFeeBMO;
 import org.springframework.stereotype.Service;
 
 /**
@@ -14,5 +15,5 @@ import org.springframework.stereotype.Service;
  * add by wuxw 2020/3/9
  **/
 @Service("feeBMOImpl")
-public class FeeBMOImpl extends ApiBaseBMO implements IApiBaseBMO {
+public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
 }

FrontService/docker/Dockerfile

@@ -2,9 +2,9 @@ FROM registry.cn-beijing.aliyuncs.com/sxd/ubuntu-java8:1.0
 MAINTAINER wuxw <928255095@qq.com>
 
 
-ADD bin/start_appFront.sh /root/
+ADD bin/start_front.sh /root/
 
 
-RUN chmod u+x /root/start_appFront.sh
+RUN chmod u+x /root/start_front.sh
 
-CMD ["/root/start_appFront.sh","dev"]
+CMD ["/root/start_front.sh","dev"]

FrontService/docker/bin/start_appFront.sh

@@ -11,6 +11,6 @@
 #### normal dev model
 #nohup java -jar -Dspring.profiles.active=dev target/AppFrontService.jar > appFront.log 2>&1 &
 
-nohup java -jar -Dspring.profiles.active=$1 target/AppFrontService.jar > appFront.log 2>&1 &
+nohup java -jar -Dspring.profiles.active=$1 target/FrontService.jar > front.log 2>&1 &
 
-tail -100f appFront.log
+tail -100f front.log

FrontService/docker/docker-compose.yml

@@ -1,15 +1,15 @@
 version: '2'
 services:
-   appfrontserivce:
-       container_name: appfrontserivce-1
+   frontserivce:
+       container_name: frontserivce-1
        build:
           context: .
           dockerfile: Dockerfile
        restart: always
        ports:
-       - "8012:8012"
+       - "8020:8020"
        volumes:
-       - ../target/AppFrontService.jar:/root/target/AppFrontService.jar
+       - ../target/FrontService.jar:/root/target/FrontService.jar
        networks:
        - java110-net
 #       mem_limit: 1024m

FrontService/docker/onStart.sh

@@ -4,8 +4,8 @@ cp -r ../bin .
 
 cp  -r ../target .
 
-docker build -t java110/appFront .
+docker build -t java110/front .
 
-docker run -ti --name appFront_test -p8012:8012 -idt java110/appFront:latest
+docker run -ti --name front_test -p8020:8020 -idt java110/front:latest
 
-docker logs -f appFront_test
+docker logs -f front_test

FrontService/pom.xml

@@ -69,7 +69,7 @@
     </dependencies>
 
     <build>
-        <finalName>AppFrontService</finalName>
+        <finalName>FrontService</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

FrontService/src/main/java/com/java110/front/FrontServiceApplicationStart.java

@@ -27,12 +27,9 @@ import java.nio.charset.Charset;
  * @tag
  */
 @SpringBootApplication(scanBasePackages = {
-        "com.java110.front.aop",
         "com.java110.service.configuration",
-        "com.java110.front.configuration",
-        "com.java110.front.filter",
         "com.java110.service.init",
-        "com.java110.app",
+        "com.java110.front",
         "com.java110.core",
         "com.java110.config.properties.code",
         "com.java110.cache",