Merge remote-tracking branch 'origin/developer' into developer

# Conflicts:
#	gic-store-service/src/main/resources/dubbo-gic-store-service.xml
#	gic-store-web/src/main/resources/dubbo-gic-store-web.xml

gic-store-api/src/main/java/com/gic/store/dto/StoreDictDTO.java

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * tab_store_dict
+ */
+public class StoreDictDTO implements Serializable {
+    /**
+     *
+     */
+    private Integer storeDictId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     * storeType门店类型；storeStatus门店状态
+     */
+    private String type;
+
+    /**
+     *
+     */
+    private String value;
+
+    private String key;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    private Integer checked=0;
+
+    public Integer getStoreDictId() {
+        return storeDictId;
+    }
+
+    public void setStoreDictId(Integer storeDictId) {
+        this.storeDictId = storeDictId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getChecked() {
+        return checked;
+    }
+
+    public void setChecked(Integer checked) {
+        this.checked = checked;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+}
\ No newline at end of file

gic-store-api/src/main/java/com/gic/store/service/StoreDictApiService.java

+package com.gic.store.service;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.store.dto.StoreDictDTO;
+
+import java.util.List;
+
+public interface StoreDictApiService {
+    /**
+     * 查询运维后台所有门店类型，企业选中checked=1
+     * @param enterpriseId
+     * @return
+     */
+    ServiceResponse<List<StoreDictDTO>> listAllStoreType(Integer enterpriseId);
+
+    /**
+     * 查询运维后台所有门店状态，企业选中checked=1
+     * @param enterpriseId
+     * @return
+     */
+    ServiceResponse<List<StoreDictDTO>> listAllStoreStatus(Integer enterpriseId);
+
+    /**
+     * 查询企业下门店类型
+     * @param enterpriseId
+     * @return
+     */
+    ServiceResponse<List<StoreDictDTO>> listStoreType(Integer enterpriseId);
+
+    /**
+     * 查询企业下门店状态
+     * @param enterpriseId
+     * @return
+     */
+    ServiceResponse<List<StoreDictDTO>> listStoreStatus(Integer enterpriseId);
+
+    /**
+     * 保存门店类型
+     * @param enterpriseId
+     * @param storeTypeArr
+     * @return
+     */
+    ServiceResponse saveStoreType(Integer enterpriseId, String[] storeTypeArr);
+
+    /**
+     * 保存门店类型
+     * @param enterpriseId
+     * @param storeStatusArr
+     * @return
+     */
+    ServiceResponse saveStoreStatus(Integer enterpriseId, String[] storeStatusArr);
+}

gic-store-service/pom.xml

@@ -22,6 +22,7 @@
         <!-- api依赖，正式版会在 gic-pom-base 里生成 -->
         <gic-store-api>4.0-SNAPSHOT</gic-store-api>
         <gic-redis-data>4.0-SNAPSHOT</gic-redis-data>
+        <gic-bizdict-api>4.0.0-SNAPSHOT</gic-bizdict-api>
     </properties>
 
     <dependencies>
@@ -96,6 +97,11 @@
             <artifactId>gic-redis-data </artifactId>
             <version>${gic-redis-data} </version>
         </dependency>
+        <dependency>
+            <groupId>com.gic.bizdict</groupId>
+            <artifactId>gic-bizdict-api</artifactId>
+            <version>${gic-bizdict-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreDictMapper.java

+package com.gic.store.dao.mapper;
+
+import com.gic.store.entity.TabStoreDict;
+
+import java.util.List;
+
+public interface TabStoreDictMapper {
+    /**
+     * 根据主键删除
+     *
+     * @param storeDictId 主键
+     * @return 更新条目数
+     */
+    int deleteByPrimaryKey(Integer storeDictId);
+
+    /**
+     * 插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insert(TabStoreDict record);
+
+    /**
+     * 动态插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insertSelective(TabStoreDict record);
+
+    /**
+     * 根据主键查询
+     *
+     * @param storeDictId 主键
+     * @return 实体对象
+     */
+    TabStoreDict selectByPrimaryKey(Integer storeDictId);
+
+    /**
+     * 根据主键动态更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKeySelective(TabStoreDict record);
+
+    /**
+     * 根据主键更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKey(TabStoreDict record);
+
+    /**
+     * 根据企业id查询门店类型
+     * @param enterpriseId
+     * @return
+     */
+    List<String> listStoreType(Integer enterpriseId);
+
+    List<String> listStoreStatus(Integer enterpriseId);
+}
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/entity/TabStoreDict.java

+package com.gic.store.entity;
+
+import java.util.Date;
+
+/**
+ * tab_store_dict
+ */
+public class TabStoreDict {
+    /**
+     * 
+     */
+    private Integer storeDictId;
+
+    /**
+     * 
+     */
+    private Integer enterpriseId;
+
+    /**
+     * storeType门店类型；storeStatus门店状态
+     */
+    private String type;
+
+    /**
+     * 
+     */
+    private String value;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    public Integer getStoreDictId() {
+        return storeDictId;
+    }
+
+    public void setStoreDictId(Integer storeDictId) {
+        this.storeDictId = storeDictId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/service/StoreDictService.java

+package com.gic.store.service;
+
+import com.gic.store.entity.TabStoreDict;
+
+import java.util.List;
+
+public interface StoreDictService {
+    /**
+     * 获取企业下的门店类型
+     * @param enterpriseId
+     * @return
+     */
+    List<String> listStoreType(Integer enterpriseId);
+
+    /**
+     * 获取企业下的门店状态
+     * @param enterpriseId
+     * @return
+     */
+    List<String> listStoreStatus(Integer enterpriseId);
+
+    /**
+     * 保存门店类型
+     * @param tabStoreDict
+     */
+    void saveStoreType(TabStoreDict tabStoreDict);
+
+    /**
+     * 保存门店状态
+     * @param tabStoreDict
+     */
+    void saveStoreStatus(TabStoreDict  tabStoreDict);
+}

gic-store-service/src/main/java/com/gic/store/service/impl/StoreDictServiceImpl.java

+package com.gic.store.service.impl;
+
+import com.gic.store.dao.mapper.TabStoreDictMapper;
+import com.gic.store.entity.TabStoreDict;
+import com.gic.store.service.StoreDictService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("storeDictService")
+public class StoreDictServiceImpl implements StoreDictService {
+    @Autowired
+    private TabStoreDictMapper tabStoreDictMapper;
+    @Override
+    public List<String> listStoreType(Integer enterpriseId) {
+        return this.tabStoreDictMapper.listStoreType(enterpriseId);
+    }
+
+    @Override
+    public List<String> listStoreStatus(Integer enterpriseId) {
+        return this.tabStoreDictMapper.listStoreStatus(enterpriseId);
+    }
+
+    @Override
+    public void saveStoreType(TabStoreDict tabStoreDict){
+        tabStoreDict.setType("storeType");
+        this.tabStoreDictMapper.insert(tabStoreDict);
+    }
+
+    @Override
+    public void saveStoreStatus(TabStoreDict tabStoreDict){
+        tabStoreDict.setType("storeStatus");
+        this.tabStoreDictMapper.insert(tabStoreDict);
+    }
+}

gic-store-service/src/main/java/com/gic/store/service/outer/StoreDictApiServiceImpl.java

+package com.gic.store.service.outer;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.bizdict.api.dto.BizdictDTO;
+import com.gic.bizdict.api.service.BizdictService;
+import com.gic.store.dto.StoreDictDTO;
+import com.gic.store.entity.TabStoreDict;
+import com.gic.store.service.StoreDictApiService;
+import com.gic.store.service.StoreDictService;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service("storeDictApiService")
+public class StoreDictApiServiceImpl implements StoreDictApiService {
+    @Autowired
+    private StoreDictService storeDictService;
+    @Autowired
+    private BizdictService bizdictService;
+
+    @Override
+    public ServiceResponse<List<StoreDictDTO>> listAllStoreType(Integer enterpriseId) {
+        return ServiceResponse.success(this.listAllStoreDict(enterpriseId, "storeType"));
+    }
+
+    @Override
+    public ServiceResponse<List<StoreDictDTO>> listAllStoreStatus(Integer enterpriseId) {
+        return ServiceResponse.success(this.listAllStoreDict(enterpriseId, "storeStatus"));
+    }
+
+    @Override
+    public ServiceResponse<List<StoreDictDTO>> listStoreType(Integer enterpriseId) {
+        return ServiceResponse.success(this.listStoreDict(enterpriseId, "storeType"));
+    }
+
+    @Override
+    public ServiceResponse<List<StoreDictDTO>> listStoreStatus(Integer enterpriseId) {
+        return ServiceResponse.success(this.listStoreDict(enterpriseId, "storeStatus"));
+    }
+
+    @Override
+    public ServiceResponse saveStoreType(Integer enterpriseId, String[] storeTypeArr) {
+        if(enterpriseId == null || storeTypeArr == null || (storeTypeArr != null && storeTypeArr.length==0)){
+            return ServiceResponse.failure("1111", "参数错误");
+        }
+        List<String> listSelected = this.storeDictService.listStoreType(enterpriseId);
+        for(String storeType : storeTypeArr){
+            boolean isExist = false;
+            for(String s : listSelected){
+                if(s.equals(storeType)){
+                    isExist = true;
+                }
+            }
+            if(!isExist){
+                TabStoreDict tabStoreDict = new TabStoreDict();
+                tabStoreDict.setEnterpriseId(enterpriseId);
+                tabStoreDict.setCreateTime(new Date());
+                tabStoreDict.setValue(storeType);
+                this.storeDictService.saveStoreType(tabStoreDict);
+            }
+        }
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse saveStoreStatus(Integer enterpriseId, String[] storeStatusArr) {
+        if(enterpriseId == null || storeStatusArr == null || (storeStatusArr != null && storeStatusArr.length==0)){
+            return ServiceResponse.failure("1111", "参数错误");
+        }
+        List<String> listSelected = this.storeDictService.listStoreType(enterpriseId);
+        for(String storeStatus : storeStatusArr){
+            boolean isExist = false;
+            for(String s : listSelected){
+                if(s.equals(storeStatus)){
+                    isExist = true;
+                }
+            }
+            if(!isExist){
+                TabStoreDict tabStoreDict = new TabStoreDict();
+                tabStoreDict.setEnterpriseId(enterpriseId);
+                tabStoreDict.setCreateTime(new Date());
+                tabStoreDict.setValue(storeStatus);
+                this.storeDictService.saveStoreStatus(tabStoreDict);
+            }
+        }
+        return ServiceResponse.success();
+    }
+
+    private List<StoreDictDTO> listAllStoreDict(Integer enterpriseId, String type){
+        List<StoreDictDTO> result = new ArrayList<>();
+        List<BizdictDTO> list = this.bizdictService.treeByCategoryCode(type);
+        if(CollectionUtils.isNotEmpty(list)){
+            List<String> listSelected = this.storeDictService.listStoreType(enterpriseId);
+            for(BizdictDTO bizdictDTO : list){
+                StoreDictDTO dictDTO = new StoreDictDTO();
+                dictDTO.setEnterpriseId(enterpriseId);
+                dictDTO.setKey(bizdictDTO.getName());
+                dictDTO.setValue(bizdictDTO.getValueContent());
+                for(String s : listSelected){
+                    if(s.equals(bizdictDTO.getValueContent())){
+                        dictDTO.setChecked(1);
+                    }
+                }
+                result.add(dictDTO);
+            }
+        }
+        return result;
+    }
+
+    private List<StoreDictDTO> listStoreDict(Integer enterpriseId, String type){
+        List<StoreDictDTO> result = new ArrayList<>();
+        List<BizdictDTO> list = this.bizdictService.treeByCategoryCode(type);
+        if(CollectionUtils.isNotEmpty(list)){
+            List<String> listSelected = this.storeDictService.listStoreType(enterpriseId);
+            for(BizdictDTO bizdictDTO : list){
+                for(String s : listSelected){
+                    if(s.equals(bizdictDTO.getValueContent())){
+                        StoreDictDTO dictDTO = new StoreDictDTO();
+                        dictDTO.setEnterpriseId(enterpriseId);
+                        dictDTO.setKey(bizdictDTO.getName());
+                        dictDTO.setValue(bizdictDTO.getValueContent());
+                        dictDTO.setChecked(1);
+                        result.add(dictDTO);
+                    }
+                }
+            }
+        }
+        return result;
+    }
+}

gic-store-service/src/main/resources/dubbo-gic-store-service.xml

@@ -17,5 +17,8 @@
 
     <dubbo:service interface="com.gic.store.service.StoreRegionApiService" ref="storeRegionApiService" timeout="60000" />
     <dubbo:service interface="com.gic.store.service.StoreBrandApiService" ref="storeBrandApiService" timeout="60000" />
+    <dubbo:service interface="com.gic.store.service.StoreDictApiService" ref="storeDictApiService" timeout="6000" />
 
+
+    <dubbo:reference interface="com.gic.bizdict.api.service.BizdictService" id="bizdictService " timeout="6000" retries="0"/>
 </beans>

gic-store-service/src/main/resources/mapper/TabStoreDictMapper.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.store.dao.mapper.TabStoreDictMapper">
+  <resultMap id="BaseResultMap" type="com.gic.store.entity.TabStoreDict">
+    <id column="store_dict_id" jdbcType="INTEGER" property="storeDictId" />
+    <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="value" jdbcType="VARCHAR" property="value" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    store_dict_id, enterprise_id, type, value, create_time, update_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tab_store_dict
+    where store_dict_id = #{storeDictId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tab_store_dict
+    where store_dict_id = #{storeDictId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.gic.store.entity.TabStoreDict" useGeneratedKeys="true" keyProperty="storeDictId" keyColumn="storeDictId">
+    insert into tab_store_dict (store_dict_id, enterprise_id, type, 
+      value, create_time, update_time
+      )
+    values (#{storeDictId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, 
+      #{value,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreDict" useGeneratedKeys="true" keyProperty="storeDictId" keyColumn="storeDictId">
+    insert into tab_store_dict
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="storeDictId != null">
+        store_dict_id,
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="value != null">
+        value,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="storeDictId != null">
+        #{storeDictId,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseId != null">
+        #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="value != null">
+        #{value,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.store.entity.TabStoreDict">
+    update tab_store_dict
+    <set>
+      <if test="enterpriseId != null">
+        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="value != null">
+        value = #{value,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where store_dict_id = #{storeDictId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gic.store.entity.TabStoreDict">
+    update tab_store_dict
+    set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      type = #{type,jdbcType=VARCHAR},
+      value = #{value,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where store_dict_id = #{storeDictId,jdbcType=INTEGER}
+  </update>
+  <select id="listStoreType" parameterType="java.lang.Integer" resultType="arraylist">
+    select
+    value
+    from tab_store_dict
+    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and type='storeType'
+  </select>
+  <select id="listStoreStatus" parameterType="java.lang.Integer" resultType="arraylist">
+    select
+    value
+    from tab_store_dict
+    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and type='storeStatus'
+  </select>
+</mapper>
\ No newline at end of file

gic-store-web/src/main/java/com/gic/store/web/controller/StoreDictController.java

+package com.gic.store.web.controller;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.store.dto.StoreDictDTO;
+import com.gic.store.service.StoreDictApiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+@Controller
+public class StoreDictController {
+    @Autowired
+    private StoreDictApiService storeDictApiService;
+
+    @RequestMapping("list-all-storetype")
+    @ResponseBody
+    public Object listAllStoreType(){
+        Integer enterpriseId = 1111;
+        ServiceResponse<List<StoreDictDTO>> serviceResponse = this.storeDictApiService.listAllStoreType(enterpriseId);
+        if(serviceResponse.isSuccess()){
+            return RestResponse.success(serviceResponse.getResult());
+        }else {
+            return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+        }
+    }
+
+    @RequestMapping("list-all-storestatus")
+    @ResponseBody
+    public RestResponse listAllStoreStatus(){
+        Integer enterpriseId = 1111;
+        ServiceResponse<List<StoreDictDTO>> serviceResponse = this.storeDictApiService.listAllStoreStatus(enterpriseId);
+        if(serviceResponse.isSuccess()){
+            return RestResponse.success(serviceResponse.getResult());
+        }else {
+            return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+        }
+    }
+
+    @RequestMapping("list-storetype")
+    @ResponseBody
+    public RestResponse listStoreType(){
+        Integer enterpriseId = 1111;
+        ServiceResponse<List<StoreDictDTO>> serviceResponse = this.storeDictApiService.listStoreType(enterpriseId);
+        if(serviceResponse.isSuccess()){
+            return RestResponse.success(serviceResponse.getResult());
+        }else {
+            return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+        }
+    }
+
+    @RequestMapping("list-storestatus")
+    @ResponseBody
+    public RestResponse listStoreStatus(){
+        Integer enterpriseId = 1111;
+        ServiceResponse<List<StoreDictDTO>> serviceResponse = this.storeDictApiService.listStoreStatus(enterpriseId);
+        if(serviceResponse.isSuccess()){
+            return RestResponse.success(serviceResponse.getResult());
+        }else {
+            return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+        }
+    }
+}

gic-store-web/src/main/java/com/gic/store/web/controller/TestController.java

-package com.gic.store.web.controller;
-
-import com.gic.store.service.StoreRegionApiService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@Controller
-public class TestController {
-    @Autowired
-    private StoreRegionApiService storeRegionApiService;
-
-    @RequestMapping("test")
-    @ResponseBody
-    public Object test(){
-        return this.storeRegionApiService.listStoreRegion(1, "", 1, 1);
-    }
-}

gic-store-web/src/main/resources/dubbo-gic-store-web.xml

@@ -14,7 +14,8 @@
     <!-- 应用名称 -->
     <dubbo:application name="gic-store-web"/>
 
-    <dubbo:reference interface="com.gic.store.service.StoreRegionApiService" id="storeRegionApiService" timeout="60000" retries="0"/>
+    <dubbo:reference interface="com.gic.store.service.StoreRegionApiService" id="storeRegionApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.store.service.StoreBrandApiService" id="storeBrandApiService" timeout="60000" retries="0"/>
+    <dubbo:reference interface="com.gic.store.service.StoreDictApiService" id="storeDictApiService" timeout="6000" retries="0"/>
 
 </beans>
\ No newline at end of file