暂定

gic-demo-project-api/pom.xml

@@ -42,10 +42,6 @@
                     <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>flatten-maven-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 

gic-demo-project-service/src/main/java/com/gic/demo/project/service/dao/mapper/DemoEnterpriseMapper.java → gic-demo-project-service/src/main/java/com/gic/demo/project/dao/mapper/DemoEnterpriseMapper.java

-package com.gic.demo.project.service.dao.mapper;
+package com.gic.demo.project.dao.mapper;
 
-import com.gic.demo.project.service.entity.TabGicDemoEnterprise;
+import com.gic.demo.project.entity.TabGicDemoEnterprise;
 
 public interface DemoEnterpriseMapper {
     int deleteByPrimaryKey(String enterpriseId);

gic-demo-project-service/src/main/java/com/gic/demo/project/service/dao/mapper/DemoStoreMapper.java → gic-demo-project-service/src/main/java/com/gic/demo/project/dao/mapper/DemoStoreMapper.java

-package com.gic.demo.project.service.dao.mapper;
+package com.gic.demo.project.dao.mapper;
 
-import com.gic.demo.project.service.entity.TabGicDemoStore;
+import com.gic.demo.project.entity.TabGicDemoStore;
 
 public interface DemoStoreMapper {
     int deleteByPrimaryKey(String storeId);

gic-demo-project-service/src/main/java/com/gic/demo/project/service/entity/TabGicDemoEnterprise.java → gic-demo-project-service/src/main/java/com/gic/demo/project/entity/TabGicDemoEnterprise.java

-package com.gic.demo.project.service.entity;
+package com.gic.demo.project.entity;
 
 import com.gic.commons.plugin.mybatis.InjectId;
 

gic-demo-project-service/src/main/java/com/gic/demo/project/service/entity/TabGicDemoStore.java → gic-demo-project-service/src/main/java/com/gic/demo/project/entity/TabGicDemoStore.java

-package com.gic.demo.project.service.entity;
+package com.gic.demo.project.entity;
 
 import com.gic.commons.plugin.mybatis.InjectId;
 

gic-demo-project-service/src/main/java/com/gic/demo/project/service/inner/service/DemoStoreInnerService.java → gic-demo-project-service/src/main/java/com/gic/demo/project/service/DemoStoreService.java

-package com.gic.demo.project.service.inner.service;
+package com.gic.demo.project.service;
 
-import com.gic.demo.project.service.entity.TabGicDemoStore;
+import com.gic.demo.project.entity.TabGicDemoStore;
 
 /**
  * 门店内部服务
  *
  * @author zhurz
  */
-public interface DemoStoreInnerService {
+public interface DemoStoreService {
 
     /**
      * 根据id查询

gic-demo-project-service/src/main/java/com/gic/demo/project/service/inner/service/impl/DemoStoreInnerServiceImpl.java → gic-demo-project-service/src/main/java/com/gic/demo/project/service/impl/DemoStoreServiceImpl.java

-package com.gic.demo.project.service.inner.service.impl;
+package com.gic.demo.project.service.impl;
 
-import com.gic.demo.project.service.dao.mapper.DemoStoreMapper;
-import com.gic.demo.project.service.entity.TabGicDemoStore;
-import com.gic.demo.project.service.inner.service.DemoStoreInnerService;
+import com.gic.demo.project.dao.mapper.DemoStoreMapper;
+import com.gic.demo.project.service.DemoStoreService;
+import com.gic.demo.project.entity.TabGicDemoStore;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @author zhurz
  */
 @Service
-public class DemoStoreInnerServiceImpl implements DemoStoreInnerService {
+public class DemoStoreServiceImpl implements DemoStoreService {
 
     @Autowired
     private DemoStoreMapper mapper;

gic-demo-project-service/src/main/java/com/gic/demo/project/service/service/impl/DemoStoreApiServiceImpl.java → gic-demo-project-service/src/main/java/com/gic/demo/project/service/outer/impl/DemoStoreApiServiceImpl.java

-package com.gic.demo.project.service.service.impl;
+package com.gic.demo.project.service.outer.impl;
 
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.demo.project.api.dto.DemoStoreDTO;
 import com.gic.demo.project.api.service.DemoStoreApiService;
 import com.gic.demo.project.api.utils.DemoProjectApiConstant;
-import com.gic.demo.project.service.entity.TabGicDemoStore;
-import com.gic.demo.project.service.inner.service.DemoStoreInnerService;
+import com.gic.demo.project.service.DemoStoreService;
+import com.gic.demo.project.entity.TabGicDemoStore;
 import org.apache.commons.lang3.RandomUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -18,7 +18,7 @@ import org.springframework.stereotype.Service;
 public class DemoStoreApiServiceImpl implements DemoStoreApiService {
 
     @Autowired
-    private DemoStoreInnerService localService;
+    private DemoStoreService localService;
 
     /**
      * 根据id查询

gic-demo-project-service/src/main/resources/mapper/DemoEnterpriseMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gic.demo.project.service.dao.mapper.DemoEnterpriseMapper">
-  <resultMap id="BaseResultMap" type="com.gic.demo.project.service.entity.TabGicDemoEnterprise">
+<mapper namespace="com.gic.demo.project.dao.mapper.DemoEnterpriseMapper">
+  <resultMap id="BaseResultMap" type="com.gic.demo.project.entity.TabGicDemoEnterprise">
     <id column="enterprise_id" jdbcType="CHAR" property="enterpriseId" />
     <result column="enterprise_name" jdbcType="VARCHAR" property="enterpriseName" />
     <result column="enterprise_code" jdbcType="VARCHAR" property="enterpriseCode" />
@@ -33,7 +33,7 @@
     delete from tab_gic_demo_enterprise
     where enterprise_id = #{enterpriseId,jdbcType=CHAR}
   </delete>
-  <insert id="insert" parameterType="com.gic.demo.project.service.entity.TabGicDemoEnterprise">
+  <insert id="insert" parameterType="com.gic.demo.project.entity.TabGicDemoEnterprise">
     insert into tab_gic_demo_enterprise (enterprise_id, enterprise_name, enterprise_code, 
       brand_name, logo_url, enterprise_description, 
       license_number, country_id, province_id, 
@@ -47,7 +47,7 @@
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.gic.demo.project.service.entity.TabGicDemoEnterprise">
+  <insert id="insertSelective" parameterType="com.gic.demo.project.entity.TabGicDemoEnterprise">
     insert into tab_gic_demo_enterprise
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="enterpriseId != null">
@@ -144,7 +144,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.gic.demo.project.service.entity.TabGicDemoEnterprise">
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.demo.project.entity.TabGicDemoEnterprise">
     update tab_gic_demo_enterprise
     <set>
       <if test="enterpriseName != null">
@@ -192,7 +192,7 @@
     </set>
     where enterprise_id = #{enterpriseId,jdbcType=CHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.gic.demo.project.service.entity.TabGicDemoEnterprise">
+  <update id="updateByPrimaryKey" parameterType="com.gic.demo.project.entity.TabGicDemoEnterprise">
     update tab_gic_demo_enterprise
     set enterprise_name = #{enterpriseName,jdbcType=VARCHAR},
       enterprise_code = #{enterpriseCode,jdbcType=VARCHAR},

gic-demo-project-service/src/main/resources/mapper/DemoStoreMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gic.demo.project.service.dao.mapper.DemoStoreMapper">
-  <resultMap id="BaseResultMap" type="com.gic.demo.project.service.entity.TabGicDemoStore">
+<mapper namespace="com.gic.demo.project.dao.mapper.DemoStoreMapper">
+  <resultMap id="BaseResultMap" type="com.gic.demo.project.entity.TabGicDemoStore">
     <id column="store_id" jdbcType="CHAR" property="storeId" />
     <result column="enterprise_id" jdbcType="CHAR" property="enterpriseId" />
     <result column="store_name" jdbcType="VARCHAR" property="storeName" />
@@ -23,7 +23,7 @@
     delete from tab_gic_demo_store
     where store_id = #{storeId,jdbcType=CHAR}
   </delete>
-  <insert id="insert" parameterType="com.gic.demo.project.service.entity.TabGicDemoStore">
+  <insert id="insert" parameterType="com.gic.demo.project.entity.TabGicDemoStore">
     insert into tab_gic_demo_store (store_id, enterprise_id, store_name, 
       post_address, status, create_time, 
       update_time)
@@ -31,7 +31,7 @@
       #{postAddress,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.gic.demo.project.service.entity.TabGicDemoStore">
+  <insert id="insertSelective" parameterType="com.gic.demo.project.entity.TabGicDemoStore">
     insert into tab_gic_demo_store
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="storeId != null">
@@ -80,7 +80,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.gic.demo.project.service.entity.TabGicDemoStore">
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.demo.project.entity.TabGicDemoStore">
     update tab_gic_demo_store
     <set>
       <if test="enterpriseId != null">
@@ -104,7 +104,7 @@
     </set>
     where store_id = #{storeId,jdbcType=CHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.gic.demo.project.service.entity.TabGicDemoStore">
+  <update id="updateByPrimaryKey" parameterType="com.gic.demo.project.entity.TabGicDemoStore">
     update tab_gic_demo_store
     set enterprise_id = #{enterpriseId,jdbcType=CHAR},
       store_name = #{storeName,jdbcType=VARCHAR},

gic-demo-project-service/src/test/java/com/gic/AppTest.java

@@ -2,10 +2,10 @@ package com.gic;
 
 import com.alibaba.fastjson.JSON;
 import com.dexcoder.commons.utils.UUIDUtils;
-import com.gic.demo.project.service.dao.mapper.DemoEnterpriseMapper;
-import com.gic.demo.project.service.dao.mapper.DemoStoreMapper;
-import com.gic.demo.project.service.entity.TabGicDemoEnterprise;
-import com.gic.demo.project.service.entity.TabGicDemoStore;
+import com.gic.demo.project.dao.mapper.DemoEnterpriseMapper;
+import com.gic.demo.project.dao.mapper.DemoStoreMapper;
+import com.gic.demo.project.entity.TabGicDemoEnterprise;
+import com.gic.demo.project.entity.TabGicDemoStore;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;

gic-demo-project-web/pom.xml

@@ -49,11 +49,6 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-core</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>

gic-demo-project-web/src/main/java/com/gic/demo/project/web/Main.java

@@ -22,7 +22,7 @@ public class Main {
 
     public static void main(String[] args) {
         ConfigurableApplicationContext context = SpringApplication.run(Main.class, args);
-        DubboContextUtil.setApplicationContext(context.getParent());
+        DubboContextUtil.setApplicationContext(context);
     }
 
 }
\ No newline at end of file