fanli-server.git

parent: c460c9d4 | 补丁 | 提交 | ignore whitespace

Merge branch 'div' of ssh://yujian@193.112.35.168:29418/fanli-server.git in...

Administrator

2020-02-18 616b119c283147deef21fbc519291221ba4897b1

Merge branch 'div' of ssh://yujian@193.112.35.168:29418/fanli-server.git into div

2个文件已添加

21个文件已修改

	fanli/src/main/java/com/yeshi/fanli/controller/TestController.java	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java	188 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/RecommendController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java	54 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/entity/AppVersionInfo.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/log/LogType.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/config/BusinessSystemServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java	59 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java	57 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/inter/shop/BanLiShopOrderPayService.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/BanLiShopOrderMessageListener.java	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/resource/env-sandbox/mongo.properties	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/resource/log4j2.xml	137 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/resource/uml/小程序登录逻辑.acd	1992 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java

@@ -5,6 +5,7 @@
import java.io.FileReader;

import java.io.IOException;

import java.io.PrintWriter;

import java.io.UnsupportedEncodingException;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Iterator;

@@ -40,9 +41,11 @@
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;

import com.yeshi.fanli.entity.dynamic.InviteMaterial;

import com.yeshi.fanli.entity.jd.JDGoods;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.ActivityException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.activity.ActivityService;

import com.yeshi.fanli.service.inter.config.ConfigService;

@@ -61,6 +64,7 @@
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

import com.yeshi.fanli.util.jd.JDApiUtil;

import com.yeshi.fanli.util.push.OPPOPushUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.vo.goods.GoodsDetailVO;



import net.sf.json.JSONArray;

@@ -115,8 +119,6 @@


    @Resource

    private UserMoneyExtraService userMoneyExtraService;

	
	


    @RequestMapping(value = "kefu")

    public void kefu(HttpServletRequest request, PrintWriter out) {

@@ -435,5 +437,21 @@
            }

        } catch (Exception e) {

        }

    }
    }



    @RequestMapping("getTBGoodsCate")

    public void getTaoBaoGoodsCat(Long id, PrintWriter out) {

        TaoBaoGoodsBrief goods = null;

        try {

            goods = TaoKeApiUtil.getSimpleGoodsInfo(id);

        } catch (TaobaoGoodsDownException e) {

            e.printStackTrace();

        }

        if (goods == null)

            out.println("ååå·²ä¸æ¶");

        else

            out.println("<html><head><meta charset=utf-8></head><body>"

                    + String.format("cat_name:%s <br> cat_leaf_name:%s", goods.getRootCategoryName(), goods.getLeafName())

                    + "</body></html>");

    }

}


 fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java

@@ -169,10 +169,20 @@
            List<AppVersionInfo> listAndroid = new ArrayList<AppVersionInfo>();

            listAndroid.add(appVersionInfo);

            listAndroid.addAll(list2);

            //å°ç¨åºçæ¬

            List<AppVersionInfo> list3 = appVersionService

                    .getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_XCX);

            if (list3 == null) {

                list3 = new ArrayList<AppVersionInfo>();

            }

            List<AppVersionInfo> listWxmp = new ArrayList<AppVersionInfo>();

            listWxmp.add(appVersionInfo);

            listWxmp.addAll(list3);



            JSONObject data = new JSONObject();

            data.put("android", listAndroid);

            data.put("ios", listIOS);

            data.put("wxmp", listWxmp);



            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));




 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java

@@ -73,6 +73,7 @@
            JSONObject data = new JSONObject();

            data.put("list", gson.toJson(infoList));

            data.put("count", count);

            data.put("page",page);

            out.print(JsonUtil.loadTrueResult(data));

        } catch (Exception e) {

            out.print(JsonUtil.loadFalseResult(1, "è·åæ°æ®å¤±è´¥"));

@@ -161,6 +162,7 @@
        Gson gson = gsonBuilder.create();

        JSONObject data = new JSONObject();

        data.put("count", count);

        data.put("page", page);

        data.put("list", gson.toJson(list));

        out.print(JsonUtil.loadTrueResult(data));

    }


 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/GoodsController.java

@@ -45,6 +45,7 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;

import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

@@ -87,11 +88,8 @@
@RequestMapping("/wxmp/api/v1/goods")

public class GoodsController {





    @Resource

    private ConfigService configService;







    @Resource

    private ShamUserService shamUserService;

@@ -102,11 +100,8 @@
    @Resource

    private HongBaoManageService hongBaoManageService;







    @Resource

    private UserInfoExtraService userInfoExtraService;





    @Resource

    private ScanHistoryV2Service scanHistoryV2Service;

@@ -131,16 +126,19 @@


    @Resource

    private QrCodeService qrCodeService;

	


    @Resource

    private ShareGoodsService shareGoodsService;

	


    @Resource

    private UserShareGoodsRecordService userShareGoodsRecordService;

	


    @Resource

    private SwiperPictureService swiperPictureService;

	


    @Resource

    private HongBaoV2CountService hongBaoV2CountService;



    /**

     * ä¸çº§åç±»

     * 

@@ -148,13 +146,38 @@
     * @param out

     */

    @RequestMapping(value = "getTopCategory", method = RequestMethod.POST)

    public void getTopCategory(WXMPAcceptData acceptData, PrintWriter out) {

    public void getTopCategory(WXMPAcceptData acceptData, Long uid, PrintWriter out) {

        JSONObject data = new JSONObject();

        data.put("list", configService.get(ConfigKeyEnum.jdWXMPClass.getKey()));



        String tips = null;

        if (uid == null || uid <= 0) {

            tips = configService.get(ConfigKeyEnum.tipGuideNewUser.getKey());

        } else {

            long rebateOrder = hongBaoV2CountService.countRebateOrder(uid);

            long shareOrInviteOrder = hongBaoV2CountService.countShareOrInviteOrder(uid);

            if (rebateOrder + shareOrInviteOrder >= 3) {

                // çå®¢ç

            } else if (rebateOrder <= 0 && shareOrInviteOrder <= 0) {

                // æ°äººç

                tips = configService.get(ConfigKeyEnum.tipGuideNewUser.getKey());

            } else if (rebateOrder > 0 && shareOrInviteOrder <= 0) {

                // çé±ç

                tips = configService.get(ConfigKeyEnum.tipGuideSaveMoney.getKey());

            } else {

                // èµé±ç

                tips = configService.get(ConfigKeyEnum.tipGuideShareInvite.getKey());

            }

        }



        if (!StringUtil.isNullOrEmpty(tips)) {

            JSONObject tipData = JSONObject.fromObject(tips);

            data.put("tipData", tipData);

        }



        out.print(JsonUtil.loadTrueResult(data));

    }



	
    /**

     * ä¸çº§åç±»åå

     * 

@@ -167,7 +190,7 @@
            out.print(JsonUtil.loadFalseResult("åç±»IDä¸ºç©º"));

            return;

        }

		


        JSONObject data = new JSONObject();

        if (page == 1) {

            // è½®æå¾

@@ -185,11 +208,10 @@
                    params = JSONObject.fromObject(swiper.getParams());

                }

                swiper.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(swiper.getJumpDetail()));

                swiper.setParams(null);

            }

            data.put("bannerList", JsonUtil.getApiCommonGson().toJson(picList));

        }

		


        JDFilter filterAPI = new JDFilter();

        filterAPI.setPageIndex(page);

        filterAPI.setPageSize(Constant.PAGE_SIZE);

@@ -197,7 +219,7 @@
        filterAPI.setIsHot(1); // çæ¬¾

        filterAPI.setCid1(cid);

        JDSearchResult result = JDApiUtil.queryByKey(filterAPI);

		


        long count = 0;

        JSONArray array = new JSONArray();

        if (result != null) {

@@ -226,21 +248,24 @@
        out.print(JsonUtil.loadTrueResult(data));

    }



	
	
    /**

     * è·åååè¯¦æ

     * 
     * @param acceptData

     * @param goodsId ååid

     * @param uid 
     * @param code éè¯·ç 

     * @param goodsType ååç±»å

     * @param from é¡µé¢æ¥æº

     * @param goodsId

     *            ååid

     * @param uid

     * @param code

     *            éè¯·ç 

     * @param goodsType

     *            ååç±»å

     * @param from

     *            é¡µé¢æ¥æº

     * @param out

     */

    @RequestMapping(value = "getGoodsDetial", method = RequestMethod.POST)

    public void getGoodsDetial(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, 
             Long uid, PrintWriter out) {

    public void getGoodsDetial(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, Long uid,

            PrintWriter out) {

        if (goodsType == null || goodsType < 2 || goodsType > 3) {

            out.print(JsonUtil.loadFalseResult(1, "è¯·ä¼ éæ£ç¡®å¹³å°åæ°"));

            return;

@@ -320,9 +345,7 @@
                    // ä½¿ç¨å¥å±å¸æé«è¿

                    if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {

                        maxMoneyPlus = "ï¼äº¬ä¸plusè¿Â¥"

                                + JDUtil.getGoodsFanLiMoneyPlus(jdGoods,

                                        hongBaoManageService.getVIPFanLiRate())

                                + "ï¼";

                                + JDUtil.getGoodsFanLiMoneyPlus(jdGoods, hongBaoManageService.getVIPFanLiRate()) + "ï¼";

                    } else

                        maxMoneyPlus = "ï¼äº¬ä¸plusæé«è¿Â¥"

                                + fanliMoneyPlus.add(MoneyBigDecimalUtil.mul(fanliMoneyPlus, Constant.MAX_REWARD_RATE))

@@ -475,10 +498,10 @@
                goodsDetail.setShopInfo(null);

            }

        }

		


        GoodsDetailExtraVO extraVO = new GoodsDetailExtraVO();

        extraVO.setDetailUrl("http://apph5.banliapp.com/apppage/goods_img_pdd.html?id=" + id);

		


        String salesTip = pddGoods.getSalesTip();

        if (!StringUtil.isNullOrEmpty(salesTip)) {

            int indexOf = salesTip.indexOf("+");

@@ -657,20 +680,24 @@
        }

    }



	
    /**

     * è·åååè¯¦æ

     * 
     * @param acceptData

     * @param goodsId ååid

     * @param uid 
     * @param code éè¯·ç 

     * @param goodsType ååç±»å

     * @param from é¡µé¢æ¥æº

     * @param goodsId

     *            ååid

     * @param uid

     * @param code

     *            éè¯·ç 

     * @param goodsType

     *            ååç±»å

     * @param from

     *            é¡µé¢æ¥æº

     * @param out

     */

    @RequestMapping(value = "getBuyLink", method = RequestMethod.POST)

    public void getBuyLink(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from,

            String couponUrl, Long uid, String inviteCode, PrintWriter out) {

    public void getBuyLink(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, String couponUrl,

            Long uid, String inviteCode, PrintWriter out) {

        if (goodsId == null || goodsType == null) {

            out.print(JsonUtil.loadFalseResult(1, "ååä¿¡æ¯ä¼ ééè¯¯"));

            return;

@@ -678,7 +705,7 @@


        // å¤ææ¯èªè´ è¿æ¯æ ¹æ®éè¯·ç 

        boolean share = false;

		


        String subUnionId = "";

        if (uid != null) {

            UserInfo user = userInfoService.getUserByIdWithMybatis(uid);

@@ -687,7 +714,7 @@
                return;

            }

            subUnionId = uid.toString();

        } else if ((uid == null || uid < 1) && !StringUtil.isNullOrEmpty(inviteCode) ) {

        } else if ((uid == null || uid < 1) && !StringUtil.isNullOrEmpty(inviteCode)) {

            try {

                UserInfo user = userInfoExtraService.getUserByInviteCode(inviteCode);

                if (user != null && user.getState() == UserInfo.STATE_NORMAL) {

@@ -697,8 +724,8 @@
            } catch (UserInfoExtraException e) {

                e.printStackTrace();

            }

        } 
		
        }



        String jumpLink = null;

        if (goodsType.intValue() == Constant.SOURCE_TYPE_JD) { // äº¬ä¸

            JDGoods goods = jdGoodsCacheUtil.getGoodsInfo(goodsId);

@@ -706,7 +733,7 @@
                out.print(JsonUtil.loadFalseResult(2, "ååå·²ä¸æ¶"));

                return;

            }

			


            String materialId = "https://item.jd.com/" + goodsId + ".html";

            if (StringUtil.isNullOrEmpty(couponUrl)) {

                JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(goods.getCouponInfoList(), goods.getPrice());

@@ -714,9 +741,8 @@
                    couponUrl = couponInfo.getLink();

                }

            }

			
			
            long position =  JDApiUtil.POSITION_FANLI;



            long position = JDApiUtil.POSITION_FANLI;

            if (share) {

                position = JDApiUtil.POSITION_SHARE;

            }

@@ -732,7 +758,7 @@
                out.print(JsonUtil.loadFalseResult(2, "ååå·²ä¸æ¶"));

                return;

            }

			


            String position = PinDuoDuoApiUtil.PID_FANLI;

            if (share) {

                position = PinDuoDuoApiUtil.PID_SHARE;

@@ -747,17 +773,16 @@
            out.print(JsonUtil.loadFalseResult(1, "åå»ºè´ä¹°ä¿¡æ¯å¤±è´¥"));

            return;

        }

		


        JSONObject data = new JSONObject();

        data.put("goodsType", goodsType);

        data.put("jumpLink", jumpLink);

        out.print(JsonUtil.loadTrueResult(data));

    }

	
	
	


    /**

     * åäº«ååæµ·æ¥

     * 
     * @param acceptData

     * @param goodsId

     * @param goodsType

@@ -767,36 +792,35 @@
     * @param out

     */

    @RequestMapping(value = "sharePoster", method = RequestMethod.POST)

    public void sharePoster(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, Integer type, 
    public void sharePoster(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, Integer type,

            Long uid, PrintWriter out) {

        if (uid == null || uid < 1) {

            out.print(JsonUtil.loadFalseResult(1, "ç¨æ·æªç»å½"));

            return;

        }

		


        if (goodsId == null || goodsType == null) {

            out.print(JsonUtil.loadFalseResult(1, "ååä¿¡æ¯ä¼ ééè¯¯"));

            return;

        }

		


        if (type == null || type < 1 || type > 2) {

            out.print(JsonUtil.loadFalseResult(1, "åäº«ç±»åéè¯¯"));

            return;

        }

		


        UserInfo user = userInfoService.getUserByIdWithMybatis(uid);

        if (user != null && user.getState() != UserInfo.STATE_NORMAL) {

            out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));

            return;

        }

		


        String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);

        if (StringUtil.isNullOrEmpty(inviteCode)) {

            out.print(JsonUtil.loadFalseResult(1, "éè¯·ç æªæ¿æ´»"));

            return;

        }

		


        if (goodsType.intValue() == Constant.SOURCE_TYPE_JD) { // äº¬ä¸

            createPosterJD(acceptData, goodsId, goodsType, from, type, user, inviteCode, out);

        } else if (goodsType.intValue() == Constant.SOURCE_TYPE_PDD) { // æ¼å¤å¤

@@ -805,43 +829,44 @@
            out.print(JsonUtil.loadFalseResult(1, "åæ°ä¼ ééè¯¯"));

        }

    }

	
	


    /**

     * åå»ºäº¬ä¸åäº«æµ·æ¥

     */

    private void createPosterJD(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, Integer type, UserInfo user,

            String inviteCode,  PrintWriter out) {

    private void createPosterJD(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, Integer type,

            UserInfo user, String inviteCode, PrintWriter out) {

        JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsId);

        if (jdGoods == null) {

            out.print(JsonUtil.loadFalseResult(2, "ååå·²ä¸æ¶"));

            return;

        }

        ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),acceptData.getVersion());

        ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

                acceptData.getVersion());

        GoodsDetailVO goods = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);

		
        String scene = goodsType+"#"+goodsId+"#" + inviteCode;



        String scene = goodsType + "#" + goodsId + "#" + inviteCode;

        FileUploadResult uploadResult = null;

        if (type == 1) {

            String erCodeUrl = "https://wxmp.banliapp.com/goods?i="+ scene;

            String erCodeUrl = "https://wxmp.banliapp.com/goods?i=" + scene;

            uploadResult = qrCodeService.drawGoodsPoster(erCodeUrl, user.getPortrait(), goods);

        } else {

            String acessToken = WXUtil.getAcessToken(Constant.WXMP_APP_INFO.getAppId(), Constant.WXMP_APP_INFO.getAppSecret());

            String acessToken = WXUtil.getAcessToken(Constant.WXMP_APP_INFO.getAppId(),

                    Constant.WXMP_APP_INFO.getAppSecret());

            InputStream xcxCode = WXXCXUtil.getXCXCode(acessToken, "/pages/goods/goods", scene);

            uploadResult = qrCodeService.drawGoodsPosterXCX(xcxCode, user, goods);

        }

		


        try {

            userShareGoodsRecordService.saveShareRecord(user.getId(), CommonGoodsFactory.create(jdGoods));

        } catch (UserShareGoodsRecordException e) {

            e.printStackTrace();

        }

        String posterLink = uploadResult.getUrl();

		


        JSONObject data = new JSONObject();

        data.put("posterLink", posterLink);

        out.print(JsonUtil.loadTrueResult(data));

		


        com.yeshi.fanli.util.ThreadUtil.run(new Runnable() {

            @Override

            public void run() {

@@ -862,43 +887,44 @@
            }

        });

    }

	
	


    /**

     * åå»ºæ¼å¤å¤åäº«æµ·æ¥

     */

    private void createPosterPDD(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, Integer type, UserInfo user,

            String inviteCode,  PrintWriter out) {

    private void createPosterPDD(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, Integer type,

            UserInfo user, String inviteCode, PrintWriter out) {

        PDDGoodsDetail pddGoods = pinDuoDuoCacheUtil.getGoodsInfo(goodsId);

        if (pddGoods == null) {

            out.print(JsonUtil.loadFalseResult(2, "ååå·²ä¸æ¶"));

            return;

        }

        ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion());

        ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

                acceptData.getVersion());

        GoodsDetailVO goods = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);

		
        String scene = goodsType+"#"+goodsId+"#" + inviteCode;



        String scene = goodsType + "#" + goodsId + "#" + inviteCode;

        FileUploadResult uploadResult = null;

        if (type == 1) {

            String erCodeUrl = "https://wxmp.banliapp.com/goods?info="+ scene;

            String erCodeUrl = "https://wxmp.banliapp.com/goods?info=" + scene;

            uploadResult = qrCodeService.drawGoodsPoster(erCodeUrl, user.getPortrait(), goods);

        } else {

            String acessToken = WXUtil.getAcessToken(Constant.WXMP_APP_INFO.getAppId(), Constant.WXMP_APP_INFO.getAppSecret());

            String acessToken = WXUtil.getAcessToken(Constant.WXMP_APP_INFO.getAppId(),

                    Constant.WXMP_APP_INFO.getAppSecret());

            InputStream xcxCode = WXXCXUtil.getXCXCode(acessToken, "/pages/goods/goods", scene);

            uploadResult = qrCodeService.drawGoodsPosterXCX(xcxCode, user, goods);

        }

		


        try {

            userShareGoodsRecordService.saveShareRecord(user.getId(), CommonGoodsFactory.create(pddGoods));

        } catch (UserShareGoodsRecordException e) {

            e.printStackTrace();

        }

        String posterLink = uploadResult.getUrl();

	


        JSONObject data = new JSONObject();

        data.put("posterLink", posterLink);

        out.print(JsonUtil.loadTrueResult(data));

		


        // å¼æ¥æä½

        com.yeshi.fanli.util.ThreadUtil.run(new Runnable() {

            @Override


 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/RecommendController.java

@@ -137,7 +137,6 @@
                    params = JSONObject.fromObject(swiper.getParams());

                }

                swiper.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(swiper.getJumpDetail()));

                swiper.setParams(null);

            }



            // åå½¢ä¸é¢

@@ -157,7 +156,6 @@
                }

                

                special.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(jumpDetail));

                special.setParams(null);

            }



            // æ´»å¨

@@ -172,7 +170,6 @@
                    params = JSONObject.fromObject(swiper.getParams());

                }

                swiper.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(swiper.getJumpDetail()));

                swiper.setParams(null);

            }



            JSONObject data = new JSONObject();

@@ -221,6 +218,7 @@
            JSONObject data = new JSONObject();

            data.put("list", new JSONArray());

            data.put("count", 0);

            data.put("page", page);

            out.print(JsonUtil.loadTrueResult(data));

        }

    }

@@ -260,6 +258,7 @@


        data.put("list", array);

        data.put("count", count);

        data.put("page", page);

        out.print(JsonUtil.loadTrueResult(data));

    }



@@ -292,6 +291,7 @@
        JSONObject data = new JSONObject();

        data.put("list", array);

        data.put("count", count);

        data.put("page", page);

        out.print(JsonUtil.loadTrueResult(data));

    }




 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/SearchController.java

@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.wxmp.v1;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;

import java.util.regex.Matcher;

import java.util.regex.Pattern;

@@ -24,12 +25,15 @@
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;

import com.yeshi.fanli.dto.pdd.PDDGoodsResult;

import com.yeshi.fanli.dto.pdd.PDDSearchFilter;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.search.HotSearch;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.jd.JDGoods;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.brand.BrandInfoService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.HotSearchService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.manger.goods.jd.JDGoodsLinkParseManager;

import com.yeshi.fanli.tag.PageEntity;

@@ -66,7 +70,9 @@


    @Resource

    private JDGoodsLinkParseManager jdGoodsLinkParseManager;

	


    @Resource

    private HotSearchService hotSearchService;



    /**

     * ç²è´´æ¿ä¿¡æ¯æ¨è

@@ -82,7 +88,7 @@
            out.print(JsonUtil.loadFalseResult("å¼ä¸ºç©º"));

            return;

        }

		


        // å»é¤ååç©ºæ ¼

        int type = 1;

        text = text.trim();

@@ -163,7 +169,7 @@
                }

            }

        }

			


        if (commonGoods == null) {

            out.println(JsonUtil.loadFalseResult("ææªæ¾å°è¯¥ååï¼è¯·ç¨ååè¯ï¼"));

            return;

@@ -179,17 +185,48 @@
            data.put("goods", goodsJSON);

            out.print(JsonUtil.loadTrueResult(data));

            return;

        } 
		
        }



        JSONObject data = new JSONObject();

        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

        data.put("type", type);

        data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, hongBaoManageService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion()))));

        data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods,

                hongBaoManageService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion()))));

        out.print(JsonUtil.loadTrueResult(data));

        return;

    }



    /**

     * çé¨æç´¢

     * 
     * @param acceptData

     * @param goodsType

     * @param out

     */

    @RequestMapping(value = "gethotsearch", method = RequestMethod.POST)

    public void getHotSearch(AcceptData acceptData, Integer goodsType, PrintWriter out) {

        // é»è®¤æ·å®

        if (goodsType == null) {

            goodsType = Constant.SOURCE_TYPE_TAOBAO;

        }



        List<HotSearch> list = hotSearchService.getHotSearchCache(goodsType);

        if (list == null || list.size() == 0) {

            out.print(JsonUtil.loadFalseResult("æ²¡ææ°æ®"));

            return;

        }

        List<String> hotSearchList = new ArrayList<String>();

        if(list!=null)

        for (HotSearch hot : list)

            hotSearchList.add(hot.getName());



        JSONObject data = new JSONObject();

        data.put("count", list.size());

        data.put("hotSearchList", hotSearchList);

        data.put("helpLink", configService.get(ConfigKeyEnum.newerGonglue.getKey()));

        out.print(JsonUtil.loadTrueResult(data));

    }



    /**

     * æç´¢åéè¯

@@ -253,11 +290,11 @@
            out.print(JsonUtil.loadFalseResult(1, "è¯·è¾å¥æç´¢åå®¹"));

            return;

        }

		


        if (page == null || page < 1) {

            page = 1;

        }

		


        final String searchkey = key.trim();

        if (searchkey.startsWith("http://") || searchkey.startsWith("https://")) {

            JSONObject data = new JSONObject();

@@ -279,7 +316,6 @@
            return;

        }

    }





    /**

     * äº¬ä¸


 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java

@@ -239,11 +239,11 @@
     * @param out

     */

    @UserActive(uid = "#uid")

    @RequestMapping(value = "getUserInfo", method = RequestMethod.POST)

    public void getuserinfoNew(AcceptData acceptData, Long uid, HttpServletRequest requst, PrintWriter out) {

    @RequestMapping(value = "getUserInfo")

    public void getuserinfoNew(WXMPAcceptData acceptData, Long uid, HttpServletRequest requst, PrintWriter out) {

        try {

            BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

                    acceptData.getPackages());

                    acceptData.getAppId());

            if (system == null) {

                out.print(JsonUtil.loadFalseResult("ç³»ç»ä¸åå¨"));

                return;

@@ -258,12 +258,12 @@


            // æ·»å ç¨æ·æ´»è·è®°å½

            UserActiveLog userActiveLog = new UserActiveLog();

            userActiveLog.setChannel(acceptData.getChannel());

            userActiveLog.setChannel("wxmp");

            userActiveLog.setIp(requst.getRemoteHost());

            userActiveLog.setUid(userInfo.getId());

            userActiveLog.setVersionCode(acceptData.getVersion());

            userActiveLog.setOsVersion(acceptData.getOsVersion());

            userActiveLog.setDeviceType(acceptData.getDeviceType());

            userActiveLog.setOsVersion(acceptData.getWxVersion());

            userActiveLog.setDeviceType("wxmp");

            userActiveLog.setDevice(acceptData.getDevice());

            userActiveLogService.addUserActiveLog(userActiveLog);




 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java

@@ -150,7 +150,7 @@
                

                commonMsgList.add(new UserCommonMsgVO(zhuShouMsg.getIcon(), zhuShouMsg.getTitle(),

                        zhuShouMsg.getUpdateTime(), UserCommonMsgVO.TYPE_ZHUSHOU, zhuShouMsg.getContent(), read,

                        wxmpJumDetail, null, 0));

                        wxmpJumDetail, zhuShouMsg.getParams(), 0));

                

                

            }


 fanli/src/main/java/com/yeshi/fanli/entity/AppVersionInfo.java

@@ -15,7 +15,7 @@
public class AppVersionInfo {

    public final static String PLATFORM_ANDROID = "android";

    public final static String PLATFORM_IOS = "ios";

    public final static String PLATFORM_XCX = "å°ç¨åº";

    public final static String PLATFORM_XCX = "wxmp";

    

    public AppVersionInfo(Long id) {

        super();


 fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java

@@ -166,7 +166,8 @@
    //ææ¡è½¬é¾

    convertDocWebLink("convert_doc_web_link","ææ¡è½¬é¾ç½é¡µ"),

    convertDocHelpLink("convert_doc_help_link","ææ¡è½¬é¾å¸®å©ç½é¡µ"),

    convertDocTip("convert_doc_tip","ææ¡è½¬é¾æ¸©é¦¨æç¤º")

    convertDocTip("convert_doc_tip","ææ¡è½¬é¾æ¸©é¦¨æç¤º"),

    newerGonglue("newer_gonglue_url","æ°ææ»ç¥é¾æ¥")

    ;



    private final String key;


 fanli/src/main/java/com/yeshi/fanli/log/LogType.java

@@ -7,6 +7,7 @@
    taobaoTaoke("æ·å®¢api"),

    taobaoTrade("æ·å®äº¤æï¼åäº«/èªè´ï¼"),

    taobaoAuth("æ·å®ææ"),

    taobaoGoods("æ·å®ååä¿¡æ¯"),

    userLogin("ç¨æ·ç»å½");



    private String desc;


 fanli/src/main/java/com/yeshi/fanli/service/impl/config/BusinessSystemServiceImpl.java

@@ -22,6 +22,7 @@
    private static final String ANDROID = "ANDROID";

    private static final String IOS = "IOS";

    private static final String WEB = "WEB";

    private static final String WXMP = "WXMP";



    private static final Map<String, Integer> map = new HashMap<String, Integer>();



@@ -29,6 +30,7 @@
        map.put(ANDROID, 1);

        map.put(IOS, 2);

        map.put(WEB, 3);

        map.put(WXMP, 4);

    }



    @Override


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -45,6 +45,8 @@
import com.yeshi.fanli.exception.order.CommonOrderException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.log.LogManager;

import com.yeshi.fanli.log.LogType;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemCouponService;

@@ -173,7 +175,7 @@
        if (source != null) {

            listSource.add(source);

        }

		


        return commonOrderMapper.listUserOrder(start, count, uid, state, type, orderState, orderNo, startTime, endTime,

                dateType, listSource);

    }

@@ -187,12 +189,12 @@


    @Override

    public List<CommonOrderVO> getOrderByUid(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,

            Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, List<Integer> listSource)

            throws CommonOrderException, Exception {

            Integer orderState, String orderNo, String startTime, String endTime, Integer dateType,

            List<Integer> listSource) throws CommonOrderException, Exception {



        int pageSize = Constant.PAGE_SIZE;

        List<CommonOrderVO> listOrder = commonOrderMapper.listUserOrder((page - 1) * pageSize, pageSize, uid, state, type, 
                orderState, orderNo, startTime, endTime,    dateType, listSource);

        List<CommonOrderVO> listOrder = commonOrderMapper.listUserOrder((page - 1) * pageSize, pageSize, uid, state,

                type, orderState, orderNo, startTime, endTime, dateType, listSource);



        // è®¢åä¿¡æ¯ä¸ºç©º

        if (listOrder == null || listOrder.size() == 0) {

@@ -703,9 +705,9 @@
                return;



            // ä¸åæ¥ææ¯å¦æ¯ç¬¦åä¸çº¿æ¥æ

            long downOrderTime = thirdCreateTime.getTime();
            long downOrderTime = thirdCreateTime.getTime();

            long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);

            if (downOrderTime > limitDate)  {
            if (downOrderTime > limitDate) {

                // 2.1 å¼å§æ°ç

                rewardCounponLimitTime(order, accountTime);

            } else if (hasRewardCoupon) {

@@ -877,7 +879,7 @@
        return commonOrderMapper.listBySourceTypeAndOrderNo(sourceType, orderId);

    }



    @Transactional(rollbackFor=Exception.class)

    @Transactional(rollbackFor = Exception.class)

    @Override

    public List<CommonOrderAddResultDTO> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid)

            throws CommonOrderException {

@@ -914,11 +916,15 @@
                TaoBaoGoodsBrief taoBaoGoods = null;

                try {

                    taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());

                    LogManager.getLogger(LogType.taobaoGoods).info(String.format("è®¢ååååç±»:%s#%s#%s",

                            taoBaoGoods.getAuctionId(), taoBaoGoods.getRootCategoryName(), taoBaoGoods.getLeafName()));

                } catch (TaobaoGoodsDownException e) {

                    e.printStackTrace();

                    LogHelper.errorDetailInfo(e, "AUCTIONID:" + taoBaoOrder.getAuctionId(), "");

                    try {

                        taoBaoGoods = TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());

                        // è®°å½åååç±»



                    } catch (Exception e1) {

                        CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(

                                taoBaoOrder.getAuctionId(), Constant.SOURCE_TYPE_TAOBAO);

@@ -939,7 +945,7 @@
        return commonOrderList;

    }



    @Transactional(rollbackFor=Exception.class)

    @Transactional(rollbackFor = Exception.class)

    @Override

    public List<CommonOrderAddResultDTO> addPDDOrder(List<PDDOrder> pddOrderList, Long uid)

            throws CommonOrderException {

@@ -989,7 +995,7 @@
        return commonOrderList;

    }



    @Transactional(rollbackFor=Exception.class)

    @Transactional(rollbackFor = Exception.class)

    @Override

    public List<CommonOrderAddResultDTO> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException {

        List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();

@@ -1059,7 +1065,7 @@
     * 

     * @param commonOrder

     */

    @Transactional(rollbackFor=Exception.class)

    @Transactional(rollbackFor = Exception.class)

    private CommonOrderAddResultDTO addCommonOrder(CommonOrder commonOrder) throws CommonOrderException {

        // å¤æååæ¯å¦åå¨

        if (commonOrder == null)

@@ -1660,16 +1666,15 @@
    public long count24HValidOrderByUid(Long uid, Date minTime) {

        return commonOrderMapper.count24HValidOrderByUid(uid, minTime);

    }

	
	


    @Override

    public long countSearchOrderByUid(Long uid, List<ESOrder> list) {

        return commonOrderMapper.countSearchOrderByUid(uid, list);

    }

	


    @Override

    public List<CommonOrderVO> searchOrderByUid (int page, int size, Long uid, List<ESOrder> list) throws Exception {

        List<CommonOrderVO> listVO = commonOrderMapper.searchOrderByUid((page-1) * size, size, uid, list);

    public List<CommonOrderVO> searchOrderByUid(int page, int size, Long uid, List<ESOrder> list) throws Exception {

        List<CommonOrderVO> listVO = commonOrderMapper.searchOrderByUid((page - 1) * size, size, uid, list);



        // è®¢åä¿¡æ¯ä¸ºç©º

        if (listVO == null || listVO.size() == 0) {

@@ -1686,11 +1691,10 @@


        // æ°æ®å å·¥éæ°ç»ç»

        orderVOFactoryNew(listVO, listGoods, uid);

		


        return listVO;

    }

	
	


    /**

     * è®¢åä¿¡æ¯å å·¥

     * 

@@ -1699,7 +1703,8 @@
     * @param listGoods

     * @param uid

     */

    private void orderVOFactoryNew(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid) throws Exception {

    private void orderVOFactoryNew(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid)

            throws Exception {

        List<String> listTB = new ArrayList<String>();

        List<String> listJD = new ArrayList<String>();

        List<String> listPDD = new ArrayList<String>();

@@ -1896,8 +1901,7 @@
                        orderStateContent = "å®åæå";

                        WeiQuanInfo weiQuanInfo = new WeiQuanInfo();

                        weiQuanInfo.setOldHongBao("Â¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());

                        weiQuanInfo

                                .setWqHongBao("å®åï¼-Â¥" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

                        weiQuanInfo.setWqHongBao("å®åï¼-Â¥" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

                        hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);

                        order.setWeiQuanInfo(weiQuanInfo);

                    }

@@ -1941,8 +1945,8 @@
                signList.add(CommonOrder.TYPE_INVITE);



                // è¶çº§ä¼åè¡¥è´´ä¿¡æ¯

                InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid,

                        order.getOrderNo(), sourceType);

                InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(),

                        sourceType);

                if (orderSubsidy != null) {

                    ClientTextStyleVO subsidyInfo = new ClientTextStyleVO();

                    subsidyInfo.setContent("(è¡¥è´´Â¥" + orderSubsidy.getMoney() + ")");

@@ -2055,8 +2059,8 @@
     * @param list

     * @param signList

     */

    private void couponFactoryNew(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState, Integer hongBaoType,

            List<UserSystemCouponRecord> list, Long uid, boolean vip) throws Exception {

    private void couponFactoryNew(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState,

            Integer hongBaoType, List<UserSystemCouponRecord> list, Long uid, boolean vip) throws Exception {

        // æ¯å¦åååå

        boolean freeOrder = false;

        // æ¯å¦å¥å±æå

@@ -2153,7 +2157,7 @@
            // ä¸åæ¥ææ¯å¦æ¯ç¬¦åä¸çº¿æ¥æ

            long downOrderTime = thirdCreateTime.getTime();

            long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);

            if (downOrderTime > limitDate)  {

            if (downOrderTime > limitDate) {

                // 2.1 å¼å§æ°ç

                rewardCounponLimitTime(order, accountTime);

            } else if (hasRewardCoupon) {

@@ -2179,6 +2183,5 @@
            }

        }

    }





}


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java

@@ -114,6 +114,15 @@
    @Resource

    private HongBaoV2SettleTempService hongBaoV2SettleTempService;



    //ä¸çº§è¢«å°ç¦ï¼çº¢åå¤±æ

    private void invalidHongBaoForbidden(Long id) {

        HongBaoV2 updateHongBaoV2 = new HongBaoV2(id);

        updateHongBaoV2.setState(HongBaoV2.STATE_SHIXIAO);

        updateHongBaoV2.setBeizhu("å°ç¦å¤±æ");

        updateHongBaoV2.setUpdateTime(new Date());

        hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBaoV2);

    }



    @Transactional(rollbackFor = Exception.class)

    @Override

    public void inviteSettleTB(Long uid) throws OrderMoneySettleException {

@@ -145,6 +154,7 @@
                        // ä¸çº§ç¨æ·ä¸æ¯æ£å¸¸ç¨æ·ï¼è®¢ååä¸è½å°è´¦

                        UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());

                        if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {

                            invalidHongBaoForbidden(item.getId());

                            hongBaoList.remove(i);

                            i--;

                        }

@@ -210,6 +220,7 @@
                        // ä¸çº§ç¨æ·ä¸æ¯æ£å¸¸ç¨æ·ï¼è®¢ååä¸è½å°è´¦

                        UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());

                        if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {

                            invalidHongBaoForbidden(item.getId());

                            hongBaoList.remove(i);

                            i--;

                        }

@@ -269,6 +280,7 @@
                        // ä¸çº§ç¨æ·ä¸æ¯æ£å¸¸ç¨æ·ï¼è®¢ååä¸è½å°è´¦

                        UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());

                        if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {

                            invalidHongBaoForbidden(item.getId());

                            hongBaoList.remove(i);

                            i--;

                        }

@@ -479,7 +491,7 @@
                        Long uid = its.next();

                        if (userSubMoneyMap.get(uid) != null) {

                            // åå»ç»´æèµé

                            userMoney.put(uid, userMoney.get(uid).subtract(userSubMoneyMap.get(uid)));														
                            userMoney.put(uid, userMoney.get(uid).subtract(userSubMoneyMap.get(uid)));

                        }

                    }

                }


 fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java

@@ -73,10 +73,10 @@


    @Resource

    private UserMoneyMsgNotificationService userMoneyMsgNotificationService;

	


    @Resource

    private ConfigService configService;

	


    @Resource

    private AdminUserService adminUserService;



@@ -132,7 +132,7 @@
        }

    }



    @Transactional(rollbackFor=Exception.class)

    @Transactional(rollbackFor = Exception.class)

    @Override

    public void payOrderByMoney(Long orderId, BigDecimal money) throws BanLiShopOrderException {

        BanLiShopOrder order = banLiShopOrderService.selectByPrimaryKeyForUpdate(orderId);

@@ -176,7 +176,7 @@
     */

    private void paySuccess(BanLiShopOrder order) {

        ThreadUtil.run(new Runnable() {

			


            @Override

            public void run() {

                long[] targetUids = new long[] { 3L, 4L };

@@ -191,11 +191,10 @@
                }

            }

        });

		
		


    }



    @Transactional(rollbackFor=Exception.class)

    @Transactional(rollbackFor = Exception.class)

    @Override

    public void refund(Long orderId) throws BanLiShopOrderException {

        // è®¢åéæ¬¾

@@ -392,4 +391,48 @@
        }

    }



    @Transactional(rollbackFor = Exception.class)

    @Override

    public void invalidOrderByOrderId(Long orderId, String stateDesc) throws BanLiShopOrderException {



        BanLiShopOrder order = banLiShopOrderService.selectByPrimaryKeyForUpdate(orderId);

        if (order == null)

            return;

        // éæ¬¾

        if (order.getState() == BanLiShopOrder.STATE_NO_PAY) {// ç¶æè¿æ¯æªæ¯ä»

            // éæ¬¾çº¢å

            if (order.getHongBaoPaymentState() != null

                    && order.getHongBaoPaymentState() == BanLiShopOrder.PAY_STATE_PAID) {

                BanLiShopGoods goods = banLiShopGoodsService.selectByPrimaryKey(order.getGoods().getId());

                BanLiShopGoodsClass goodsClass = banLiShopGoodsClassService

                        .selectByPrimaryKey(goods.getGoodsClass().getId());

                BanLiShopGoodsSets set = banLiShopGoodsSetService.selectByPrimaryKey(order.getGoodsSet().getId());

                // çº¢åéæ¬¾

                RedPackDetail detail = null;

                try {

                    detail = RedPackDetailFactory.createShopOrderDrawBack(orderId, order.getUid(), goodsClass.getName(),

                            set.getName(), order.getHongBaoPayment());

                } catch (RedPackDetailException e) {

                    e.printStackTrace();

                }



                if (detail == null)

                    throw new BanLiShopOrderException(4, "çº¢åè¯¦æå¤±è´¥");

                try {

                    redPackBalanceService.addRedPack(order.getUid(), order.getHongBaoPayment(), detail);

                } catch (RedPackBalanceException e) {

                    throw new BanLiShopOrderException(5, "çº¢åéæ¬¾å¤±è´¥");

                }



                BanLiShopOrder update = new BanLiShopOrder(order.getId());

                update.setHongBaoPaymentState(BanLiShopOrder.PAY_STATE_REFUND);

                update.setUpdateTime(new Date());

                banLiShopOrderService.udpateSelectiveByPrimaryKey(update);

            }



            banLiShopOrderService.invalidOrderByOrderId(orderId, stateDesc);

        }



    }



}


 fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java

@@ -91,12 +91,11 @@


    @Resource

    private UserMoneyMsgNotificationService userMoneyMsgNotificationService;

	


    @Resource

    private RedPackForbidService redPackForbidService;

	


    @Transactional(rollbackFor=Exception.class)

    @Transactional(rollbackFor = Exception.class)

    @Override

    public void addOrder(BanLiShopOrder order) throws BanLiShopOrderException {

        // æ¥è¯¢å¿è¦çåæ°æ¯å¦æ·»å 

@@ -224,7 +223,7 @@
        banLiShopOrderMapper.updateByPrimaryKeySelective(order);

    }



    @Transactional(rollbackFor=Exception.class)

    @Transactional(rollbackFor = Exception.class)

    @Override

    public void payOrderByHongBao(Long orderId) throws BanLiShopOrderException, RedPackBalanceException {

        BanLiShopOrder order = banLiShopOrderMapper.selectByPrimaryKeyForUpdate(orderId);

@@ -329,6 +328,7 @@
        return banLiShopOrderMapper.selectByPrimaryKeyForUpdate(id);

    }



    @Transactional(rollbackFor = Exception.class)

    @Override

    public void invalidOrderByOrderId(Long id, String desc) {

        // å¤æè®¢åæ¯å¦åå¨

@@ -347,8 +347,8 @@
                    if (isS)// æ¯ä»æåï¼éæ°åéæ¯ä»æåæ¶æ¯

                    {

                        BanLiShopOrderMQMsg msg = new BanLiShopOrderMQMsg(order.getId(), order.getUid());

                        Message message =MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER,

                                OrderTopicTagEnum.banLiShopOrderPaid,msg);

                        Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER,

                                OrderTopicTagEnum.banLiShopOrderPaid, msg);

                        producer.send(message);

                        return;

                    }

@@ -379,8 +379,8 @@
        if (order.getState() != BanLiShopOrder.STATE_PAID)

            throw new BanLiShopOrderException(1, "è®¢åæªå¤äºå¾å®¡æ ¸ç¶æ");



        Message message =MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.banLiShopOrderRefund,

            new BanLiShopOrderMQMsg(order.getId(), order.getUid()));

        Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.banLiShopOrderRefund,

                new BanLiShopOrderMQMsg(order.getId(), order.getUid()));

        try {

            orderTransactionProducer.send(message, new LocalTransactionExecuter() {

                @Override

@@ -440,9 +440,9 @@
            throw new BanLiShopOrderException(22, "ååå·²ä¸çº¿");

        }



        if(redPackForbidService.verifyForbid(uid))

        if (redPackForbidService.verifyForbid(uid))

            throw new BanLiShopOrderException(25, "çº¢ååè½å·²è¢«å°ç¦");

		


        if (pay.getHongBaoPrice() != null && pay.getHongBaoPrice().compareTo(new BigDecimal(0)) > 0) {

            BigDecimal money = redPackBalanceService.getBalance(uid);

            if (money.compareTo(pay.getHongBaoPrice()) < 0) {


 fanli/src/main/java/com/yeshi/fanli/service/inter/shop/BanLiShopOrderPayService.java

@@ -45,4 +45,16 @@
     * @throws BanLiShopOrderException

     */

    public void charge(Long orderId) throws BanLiShopOrderException;

	
	
    /**

     * éªè¯è®¢åå¤±æç¶æ

     * @Title: invalidOrderByOrderId

     * @Description: 
     * @param orderId

     * @param stateDesc 
     * void è¿åç±»å

     * @throws

     */

    public void invalidOrderByOrderId(Long orderId, String stateDesc) throws BanLiShopOrderException;

}


 fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java

@@ -213,7 +213,7 @@
        } else if (typeSet.size() == 3) {// å£ä»¤+é¾æ¥+ææ¬

            List<String> tokenList = TaoBaoUtil.getTokenListFromText(text);

            List<String> urlList = HttpUtil.getUrlListFromText(text);

            if (text.startsWith("ã") && tokenList != null && tokenList.size() == 1 && urlList != null

            if (text.contains("ã") && tokenList != null && tokenList.size() == 1 && urlList != null

                    && urlList.size() == 1) {// Androidæ·å®é¾æ¥å¤å¶

                CommonGoods goods = null;

                try {

@@ -222,9 +222,9 @@
                    e1.printStackTrace();

                }

                if (goods == null) {

                    if (text.trim().indexOf("ã") == 0 && text.trim().indexOf("ã") > 0) {

                    if (text.trim().indexOf("ã") > -1 && text.trim().indexOf("ã") > 0) {

                        // æªåæ é¢

                        String title = text.trim().substring(1, text.trim().lastIndexOf("ã"));

                        String title = text.trim().substring(text.trim().indexOf("ã")+1, text.trim().lastIndexOf("ã"));

                        goods = new CommonGoods();

                        goods.setTitle(title);

                        goods.setPicture("http://");


 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/BanLiShopOrderMessageListener.java

@@ -39,9 +39,9 @@


    @Override

    public Action consume(Message message, ConsumeContext context) {

		
        LogHelper.mqInfo("consumer:BanLiShopOrderMessageListener",message.getMsgID(), message.getTopic(), message.getTag(),

                new String(message.getBody()));



        LogHelper.mqInfo("consumer:BanLiShopOrderMessageListener", message.getMsgID(), message.getTopic(),

                message.getTag(), new String(message.getBody()));

        String tag = message.getTag();



        if (MQTopicName.TOPIC_ORDER.name().equalsIgnoreCase(message.getTopic())) {

@@ -49,9 +49,16 @@
                BanLiShopOrderMQMsg banLiShopOrderMQMsg = new Gson().fromJson(new String(message.getBody()),

                        BanLiShopOrderMQMsg.class);

                if (banLiShopOrderMQMsg != null)

                    // ä½¿è®¢åå¤±æ

                    banLiShopOrderService.invalidOrderByOrderId(banLiShopOrderMQMsg.getOrderId(), "è®¢åå¤±æ-é¿ææªä»æ¬¾");

                return Action.CommitMessage;

                    try {

                        banLiShopOrderPayService.invalidOrderByOrderId(banLiShopOrderMQMsg.getOrderId(), "è®¢åå¤±æ-é¿ææªä»æ¬¾");

                        return Action.CommitMessage;

                    } catch (BanLiShopOrderException e) {

                        e.printStackTrace();

                        return Action.CommitMessage;

                    } catch (Exception e) {

                        return Action.ReconsumeLater;

                    }



            } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.banLiShopOrderPaid.name()))// ååè®¢åä»æ¬¾æå

            {

                BanLiShopOrderMQMsg msg = new Gson().fromJson(new String(message.getBody()), BanLiShopOrderMQMsg.class);

@@ -71,7 +78,7 @@
                }

                return Action.CommitMessage;

            }

			


        }

        return Action.CommitMessage;

    }


 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java

@@ -169,6 +169,8 @@
        goods.setPictUrl(item.optString("pict_url"));

        goods.setShopTitle(item.optString("nick"));

        goods.setSellerId(item.optLong("seller_id"));

        goods.setRootCategoryName(item.optString("cat_name"));

        goods.setLeafName(item.optString("cat_leaf_name"));



        String optString = item.optString("shop_dsr");

        if (!StringUtil.isNullOrEmpty(optString)) {

@@ -206,6 +208,9 @@
        } else

            goods.setMaterialLibType(0);



        goods.setRootCategoryName(item.optString("cat_name"));

        goods.setLeafName(item.optString("cat_leaf_name"));



        goods = loadYuShouInfo(goods, item);

        return goods;

    }


 fanli/src/main/resource/env-sandbox/mongo.properties

@@ -1,9 +1,9 @@
mongo.dbname=flq

mongo.dbname=flq-wxmp

mongo.port=27017

Â

mongo.host=172.16.16.40

mongo.username=admin

mongo.password=123456

mongo.host=172.16.16.44

mongo.username=yeshi

mongo.password=Yeshi2016@

mongo.connectionsPerHost=8

mongo.threadsAllowedToBlockForConnectionMultiplier=4

mongo.connectTimeout=1000


 fanli/src/main/resource/log4j2.xml

New file
@@ -0,0 +1,137 @@
<?xml version="1.0" encoding="UTF-8"?>

<Configuration status="INFO">



    <properties>

        <property name="LOG_HOME">logs</property>

    </properties>



    <Appenders>

        <Console name="Console" target="SYSTEM_OUT">

            <PatternLayout pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />

        </Console>



        <RollingRandomAccessFile name="running-log"

            fileName="${LOG_HOME}/${FILE_NAME}.log"

            filePattern="${LOG_HOME}/$${date:yyyy-MM}/${FILE_NAME}-%d{yyyy-MM-dd}-%i.log.gz">

            <PatternLayout

                pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />

            <Policies>

                <TimeBasedTriggeringPolicy />

                <SizeBasedTriggeringPolicy size="10 MB" />

            </Policies>

            <DefaultRolloverStrategy max="20" />

        </RollingRandomAccessFile>



        <!-- æ¶æ¯ -->

        <File name="mqSend" fileName="D:/logs/mq/mqSend.log" append="true">

            <PatternLayout

                pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />

        </File>



        <File name="mqConsume" fileName="logs/mq/mqConsume.log" append="true">

            <PatternLayout

                pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />

        </File>



        <!-- æ·å®ç¸å³ -->

        <File name="taobaoTaoke" fileName="logs/taobao/taobaoTaoke.log"

            append="true">

            <PatternLayout

                pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />

        </File>



        <File name="taobaoAuth" fileName="logs/taobao/taobaoAuth.log"

            append="true">

            <PatternLayout

                pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />

        </File>



        <File name="taobaoTrade" fileName="logs/taobao/taobaoTrade.log"

            append="true">

            <PatternLayout

                pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />

        </File>

		
		
        <File name="taobaoGoods" fileName="logs/taobao/taobaoGoods.log"

            append="true">

            <PatternLayout

                pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />

        </File>

		
		


        <!-- ç¨æ·ç¸å³ -->

        <File name="userLogin" fileName="logs/user/userLogin.log" append="true">

            <PatternLayout

                pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />

        </File>



    </Appenders>



    <Loggers>

        <Logger name="mqSend" level="INFO" additivity="true">

            <AppenderRef ref="mqSend" />

        </Logger>

        <Root level="INFO">

            <AppenderRef ref="Console" />

        </Root>

    </Loggers>



    <Loggers>

        <Logger name="mqConsume" level="INFO" additivity="true">

            <AppenderRef ref="mqConsume" />

        </Logger>

        <Root level="INFO">

            <AppenderRef ref="Console" />

        </Root>

    </Loggers>





    <Loggers>

        <Logger name="taobaoTaoke" level="INFO" additivity="true">

            <AppenderRef ref="taobaoTaoke" />

        </Logger>

        <Root level="INFO">

            <AppenderRef ref="Console" />

        </Root>

    </Loggers>



    <Loggers>

        <Logger name="taobaoAuth" level="INFO" additivity="true">

            <AppenderRef ref="taobaoAuth" />

        </Logger>

        <Root level="INFO">

            <AppenderRef ref="Console" />

        </Root>

    </Loggers>



    <Loggers>

        <Logger name="taobaoTrade" level="INFO" additivity="true">

            <AppenderRef ref="taobaoTrade" />

        </Logger>

        <Root level="INFO">

            <AppenderRef ref="Console" />

        </Root>

    </Loggers>

	
    <Loggers>

        <Logger name="taobaoGoods" level="INFO" additivity="true">

            <AppenderRef ref="taobaoGoods" />

        </Logger>

        <Root level="INFO">

            <AppenderRef ref="Console" />

        </Root>

    </Loggers>



    <Loggers>

        <Logger name="userLogin" level="INFO" additivity="true">

            <AppenderRef ref="userLogin" />

        </Logger>

        <Root level="INFO">

            <AppenderRef ref="Console" />

        </Root>

    </Loggers>





</Configuration>

 fanli/src/main/resource/uml/Ð¡³ÌÐòµÇÂ¼Âß¼.acd

New file
@@ -0,0 +1,1992 @@
<?xml version="1.0" encoding="UTF-8"?>
<net.java.amateras.uml.activitydiagram.model.ActivityModel>
  <backgroundColor>
    <red>255</red>
    <green>255</green>
    <blue>206</blue>
  </backgroundColor>
  <foregroundColor>
    <red>0</red>
    <green>0</green>
    <blue>0</blue>
  </foregroundColor>
  <showIcon>true</showIcon>
  <listeners serialization="custom">
    <java.beans.PropertyChangeSupport>
      <default>
        <source class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../.."/>
        <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
      </default>
      <null/>
    </java.beans.PropertyChangeSupport>
  </listeners>
  <sourceConnections/>
  <targetConnections/>
  <children>
    <net.java.amateras.uml.activitydiagram.model.InitialStateModel>
      <backgroundColor>
        <red>255</red>
        <green>255</green>
        <blue>206</blue>
      </backgroundColor>
      <foregroundColor>
        <red>0</red>
        <green>0</green>
        <blue>0</blue>
      </foregroundColor>
      <showIcon>true</showIcon>
      <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel">
        <backgroundColor reference="../../backgroundColor"/>
        <foregroundColor reference="../../foregroundColor"/>
        <showIcon>true</showIcon>
        <listeners serialization="custom">
          <java.beans.PropertyChangeSupport>
            <default>
              <source class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../.."/>
              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
            </default>
            <null/>
          </java.beans.PropertyChangeSupport>
        </listeners>
        <sourceConnections/>
        <targetConnections/>
        <children>
          <net.java.amateras.uml.activitydiagram.model.InitialStateModel reference="../../.."/>
        </children>
        <filterProperty/>
      </parent>
      <listeners serialization="custom">
        <java.beans.PropertyChangeSupport>
          <default>
            <source class="net.java.amateras.uml.activitydiagram.model.InitialStateModel" reference="../../../.."/>
            <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
          </default>
          <null/>
        </java.beans.PropertyChangeSupport>
      </listeners>
      <constraint>
        <height>-1</height>
        <width>-1</width>
        <x>227</x>
        <y>41</y>
      </constraint>
      <sourceConnections>
        <net.java.amateras.uml.activitydiagram.model.FlowModel>
          <showIcon>true</showIcon>
          <listeners serialization="custom">
            <java.beans.PropertyChangeSupport>
              <default>
                <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
              </default>
              <null/>
            </java.beans.PropertyChangeSupport>
          </listeners>
          <source class="net.java.amateras.uml.activitydiagram.model.InitialStateModel" reference="../../.."/>
          <target class="net.java.amateras.uml.activitydiagram.model.ActionModel">
            <backgroundColor>
              <red>255</red>
              <green>255</green>
              <blue>206</blue>
            </backgroundColor>
            <foregroundColor>
              <red>0</red>
              <green>0</green>
              <blue>0</blue>
            </foregroundColor>
            <showIcon>true</showIcon>
            <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel">
              <backgroundColor reference="../../backgroundColor"/>
              <foregroundColor reference="../../foregroundColor"/>
              <showIcon>true</showIcon>
              <listeners serialization="custom">
                <java.beans.PropertyChangeSupport>
                  <default>
                    <source class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../.."/>
                    <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                  </default>
                  <null/>
                </java.beans.PropertyChangeSupport>
              </listeners>
              <sourceConnections/>
              <targetConnections/>
              <children>
                <net.java.amateras.uml.activitydiagram.model.InitialStateModel reference="../../../../../.."/>
                <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../.."/>
              </children>
              <filterProperty/>
            </parent>
            <listeners serialization="custom">
              <java.beans.PropertyChangeSupport>
                <default>
                  <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../../.."/>
                  <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                </default>
                <null/>
              </java.beans.PropertyChangeSupport>
            </listeners>
            <constraint>
              <height>-1</height>
              <width>-1</width>
              <x>199</x>
              <y>95</y>
            </constraint>
            <sourceConnections>
              <net.java.amateras.uml.activitydiagram.model.FlowModel>
                <showIcon>true</showIcon>
                <listeners serialization="custom">
                  <java.beans.PropertyChangeSupport>
                    <default>
                      <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                      <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                    </default>
                    <null/>
                  </java.beans.PropertyChangeSupport>
                </listeners>
                <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                <target class="net.java.amateras.uml.activitydiagram.model.DecisionModel">
                  <backgroundColor>
                    <red>255</red>
                    <green>255</green>
                    <blue>206</blue>
                  </backgroundColor>
                  <foregroundColor>
                    <red>0</red>
                    <green>0</green>
                    <blue>0</blue>
                  </foregroundColor>
                  <showIcon>true</showIcon>
                  <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel">
                    <backgroundColor reference="../../backgroundColor"/>
                    <foregroundColor reference="../../foregroundColor"/>
                    <showIcon>true</showIcon>
                    <listeners serialization="custom">
                      <java.beans.PropertyChangeSupport>
                        <default>
                          <source class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../.."/>
                          <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                        </default>
                        <null/>
                      </java.beans.PropertyChangeSupport>
                    </listeners>
                    <sourceConnections/>
                    <targetConnections/>
                    <children>
                      <net.java.amateras.uml.activitydiagram.model.InitialStateModel reference="../../../../../../../../.."/>
                      <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../.."/>
                      <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../.."/>
                      <net.java.amateras.uml.activitydiagram.model.FinalStateModel>
                        <backgroundColor reference="../../../../backgroundColor"/>
                        <foregroundColor reference="../../../../foregroundColor"/>
                        <showIcon>true</showIcon>
                        <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../.."/>
                        <listeners serialization="custom">
                          <java.beans.PropertyChangeSupport>
                            <default>
                              <source class="net.java.amateras.uml.activitydiagram.model.FinalStateModel" reference="../../../.."/>
                              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                            </default>
                            <null/>
                          </java.beans.PropertyChangeSupport>
                        </listeners>
                        <constraint>
                          <height>-1</height>
                          <width>-1</width>
                          <x>354</x>
                          <y>185</y>
                        </constraint>
                        <sourceConnections/>
                        <targetConnections>
                          <net.java.amateras.uml.activitydiagram.model.FlowModel>
                            <showIcon>true</showIcon>
                            <listeners serialization="custom">
                              <java.beans.PropertyChangeSupport>
                                <default>
                                  <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                  <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                </default>
                                <null/>
                              </java.beans.PropertyChangeSupport>
                            </listeners>
                            <source class="net.java.amateras.uml.activitydiagram.model.DecisionModel" reference="../../../../../.."/>
                            <target class="net.java.amateras.uml.activitydiagram.model.FinalStateModel" reference="../../.."/>
                            <bendpoints/>
                            <condition>æ¯</condition>
                          </net.java.amateras.uml.activitydiagram.model.FlowModel>
                        </targetConnections>
                        <children/>
                        <filterProperty/>
                      </net.java.amateras.uml.activitydiagram.model.FinalStateModel>
                      <net.java.amateras.uml.activitydiagram.model.ActionModel>
                        <backgroundColor reference="../../../../backgroundColor"/>
                        <foregroundColor reference="../../../../foregroundColor"/>
                        <showIcon>true</showIcon>
                        <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../.."/>
                        <listeners serialization="custom">
                          <java.beans.PropertyChangeSupport>
                            <default>
                              <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../../.."/>
                              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                            </default>
                            <null/>
                          </java.beans.PropertyChangeSupport>
                        </listeners>
                        <constraint>
                          <height>-1</height>
                          <width>-1</width>
                          <x>162</x>
                          <y>254</y>
                        </constraint>
                        <sourceConnections>
                          <net.java.amateras.uml.activitydiagram.model.FlowModel>
                            <showIcon>true</showIcon>
                            <listeners serialization="custom">
                              <java.beans.PropertyChangeSupport>
                                <default>
                                  <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                  <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                </default>
                                <null/>
                              </java.beans.PropertyChangeSupport>
                            </listeners>
                            <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                            <target class="net.java.amateras.uml.activitydiagram.model.DecisionModel">
                              <backgroundColor>
                                <red>255</red>
                                <green>255</green>
                                <blue>206</blue>
                              </backgroundColor>
                              <foregroundColor>
                                <red>0</red>
                                <green>0</green>
                                <blue>0</blue>
                              </foregroundColor>
                              <showIcon>true</showIcon>
                              <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel">
                                <backgroundColor reference="../../backgroundColor"/>
                                <foregroundColor reference="../../foregroundColor"/>
                                <showIcon>true</showIcon>
                                <listeners serialization="custom">
                                  <java.beans.PropertyChangeSupport>
                                    <default>
                                      <source class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../.."/>
                                      <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                    </default>
                                    <null/>
                                  </java.beans.PropertyChangeSupport>
                                </listeners>
                                <sourceConnections/>
                                <targetConnections/>
                                <children>
                                  <net.java.amateras.uml.activitydiagram.model.InitialStateModel reference="../../../../../../../../../../../../../../.."/>
                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../.."/>
                                  <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../.."/>
                                  <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../net.java.amateras.uml.activitydiagram.model.FinalStateModel"/>
                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../.."/>
                                  <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../.."/>
                                  <net.java.amateras.uml.activitydiagram.model.ActionModel>
                                    <backgroundColor reference="../../../../backgroundColor"/>
                                    <foregroundColor reference="../../../../foregroundColor"/>
                                    <showIcon>true</showIcon>
                                    <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../.."/>
                                    <listeners serialization="custom">
                                      <java.beans.PropertyChangeSupport>
                                        <default>
                                          <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../../.."/>
                                          <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                        </default>
                                        <null/>
                                      </java.beans.PropertyChangeSupport>
                                    </listeners>
                                    <constraint>
                                      <height>-1</height>
                                      <width>-1</width>
                                      <x>84</x>
                                      <y>358</y>
                                    </constraint>
                                    <sourceConnections>
                                      <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                        <showIcon>true</showIcon>
                                        <listeners serialization="custom">
                                          <java.beans.PropertyChangeSupport>
                                            <default>
                                              <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                            </default>
                                            <null/>
                                          </java.beans.PropertyChangeSupport>
                                        </listeners>
                                        <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                        <target class="net.java.amateras.uml.activitydiagram.model.ForkNodeModel">
                                          <backgroundColor>
                                            <red>255</red>
                                            <green>255</green>
                                            <blue>206</blue>
                                          </backgroundColor>
                                          <foregroundColor>
                                            <red>0</red>
                                            <green>0</green>
                                            <blue>0</blue>
                                          </foregroundColor>
                                          <showIcon>true</showIcon>
                                          <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel">
                                            <backgroundColor reference="../../backgroundColor"/>
                                            <foregroundColor reference="../../foregroundColor"/>
                                            <showIcon>true</showIcon>
                                            <listeners serialization="custom">
                                              <java.beans.PropertyChangeSupport>
                                                <default>
                                                  <source class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../.."/>
                                                  <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                </default>
                                                <null/>
                                              </java.beans.PropertyChangeSupport>
                                            </listeners>
                                            <sourceConnections/>
                                            <targetConnections/>
                                            <children>
                                              <net.java.amateras.uml.activitydiagram.model.InitialStateModel reference="../../../../../../../../../../../../../../../../../../../../.."/>
                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../.."/>
                                              <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../.."/>
                                              <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FinalStateModel"/>
                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../.."/>
                                              <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../.."/>
                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../.."/>
                                              <net.java.amateras.uml.activitydiagram.model.ActionModel>
                                                <backgroundColor reference="../../../../../../../../../../backgroundColor"/>
                                                <foregroundColor reference="../../../../../../../../../../foregroundColor"/>
                                                <showIcon>true</showIcon>
                                                <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../../../../../../.."/>
                                                <listeners serialization="custom">
                                                  <java.beans.PropertyChangeSupport>
                                                    <default>
                                                      <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../../.."/>
                                                      <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                    </default>
                                                    <null/>
                                                  </java.beans.PropertyChangeSupport>
                                                </listeners>
                                                <constraint>
                                                  <height>-1</height>
                                                  <width>-1</width>
                                                  <x>313</x>
                                                  <y>359</y>
                                                </constraint>
                                                <sourceConnections>
                                                  <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                    <showIcon>true</showIcon>
                                                    <listeners serialization="custom">
                                                      <java.beans.PropertyChangeSupport>
                                                        <default>
                                                          <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                          <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                        </default>
                                                        <null/>
                                                      </java.beans.PropertyChangeSupport>
                                                    </listeners>
                                                    <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                                    <target class="net.java.amateras.uml.activitydiagram.model.ActionModel">
                                                      <backgroundColor>
                                                        <red>255</red>
                                                        <green>255</green>
                                                        <blue>206</blue>
                                                      </backgroundColor>
                                                      <foregroundColor>
                                                        <red>0</red>
                                                        <green>0</green>
                                                        <blue>0</blue>
                                                      </foregroundColor>
                                                      <showIcon>true</showIcon>
                                                      <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel">
                                                        <backgroundColor reference="../../backgroundColor"/>
                                                        <foregroundColor reference="../../foregroundColor"/>
                                                        <showIcon>true</showIcon>
                                                        <listeners serialization="custom">
                                                          <java.beans.PropertyChangeSupport>
                                                            <default>
                                                              <source class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../.."/>
                                                              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                            </default>
                                                            <null/>
                                                          </java.beans.PropertyChangeSupport>
                                                        </listeners>
                                                        <sourceConnections/>
                                                        <targetConnections/>
                                                        <children>
                                                          <net.java.amateras.uml.activitydiagram.model.InitialStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                          <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../.."/>
                                                          <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FinalStateModel"/>
                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../.."/>
                                                          <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../.."/>
                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../.."/>
                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../.."/>
                                                          <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../.."/>
                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel>
                                                            <backgroundColor reference="../../../../../../../../../../backgroundColor"/>
                                                            <foregroundColor reference="../../../../../../../../../../foregroundColor"/>
                                                            <showIcon>true</showIcon>
                                                            <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../../../../../../.."/>
                                                            <listeners serialization="custom">
                                                              <java.beans.PropertyChangeSupport>
                                                                <default>
                                                                  <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../../.."/>
                                                                  <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                </default>
                                                                <null/>
                                                              </java.beans.PropertyChangeSupport>
                                                            </listeners>
                                                            <constraint>
                                                              <height>-1</height>
                                                              <width>-1</width>
                                                              <x>22</x>
                                                              <y>476</y>
                                                            </constraint>
                                                            <sourceConnections>
                                                              <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                <showIcon>true</showIcon>
                                                                <listeners serialization="custom">
                                                                  <java.beans.PropertyChangeSupport>
                                                                    <default>
                                                                      <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                      <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                    </default>
                                                                    <null/>
                                                                  </java.beans.PropertyChangeSupport>
                                                                </listeners>
                                                                <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                                                <target class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../../../../../../../.."/>
                                                                <bendpoints>
                                                                  <net.java.amateras.uml.editpart.ConnectionBendpoint>
                                                                    <weight>0.5</weight>
                                                                    <d1>
                                                                      <width>-4</width>
                                                                      <height>-177</height>
                                                                    </d1>
                                                                    <d2>
                                                                      <width>-301</width>
                                                                      <height>-60</height>
                                                                    </d2>
                                                                  </net.java.amateras.uml.editpart.ConnectionBendpoint>
                                                                  <net.java.amateras.uml.editpart.ConnectionBendpoint>
                                                                    <weight>0.5</weight>
                                                                    <d1>
                                                                      <width>296</width>
                                                                      <height>-173</height>
                                                                    </d1>
                                                                    <d2>
                                                                      <width>-1</width>
                                                                      <height>-56</height>
                                                                    </d2>
                                                                  </net.java.amateras.uml.editpart.ConnectionBendpoint>
                                                                </bendpoints>
                                                                <condition></condition>
                                                              </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                              <net.java.amateras.uml.model.AnchorModel>
                                                                <showIcon>true</showIcon>
                                                                <listeners serialization="custom">
                                                                  <java.beans.PropertyChangeSupport>
                                                                    <default>
                                                                      <source class="net.java.amateras.uml.model.AnchorModel" reference="../../../.."/>
                                                                      <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                    </default>
                                                                    <null/>
                                                                  </java.beans.PropertyChangeSupport>
                                                                </listeners>
                                                                <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                                                <target class="net.java.amateras.uml.model.NoteModel">
                                                                  <backgroundColor>
                                                                    <red>255</red>
                                                                    <green>255</green>
                                                                    <blue>206</blue>
                                                                  </backgroundColor>
                                                                  <foregroundColor>
                                                                    <red>0</red>
                                                                    <green>0</green>
                                                                    <blue>0</blue>
                                                                  </foregroundColor>
                                                                  <showIcon>true</showIcon>
                                                                  <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel">
                                                                    <backgroundColor reference="../../backgroundColor"/>
                                                                    <foregroundColor reference="../../foregroundColor"/>
                                                                    <showIcon>true</showIcon>
                                                                    <listeners serialization="custom">
                                                                      <java.beans.PropertyChangeSupport>
                                                                        <default>
                                                                          <source class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../.."/>
                                                                          <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                        </default>
                                                                        <null/>
                                                                      </java.beans.PropertyChangeSupport>
                                                                    </listeners>
                                                                    <sourceConnections/>
                                                                    <targetConnections/>
                                                                    <children>
                                                                      <net.java.amateras.uml.activitydiagram.model.InitialStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                      <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                      <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                      <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FinalStateModel"/>
                                                                      <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                      <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../.."/>
                                                                      <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../.."/>
                                                                      <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../.."/>
                                                                      <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../../../../../../../.."/>
                                                                      <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../.."/>
                                                                      <net.java.amateras.uml.activitydiagram.model.ActionModel>
                                                                        <backgroundColor reference="../../../../../../../../../../../../../../../../backgroundColor"/>
                                                                        <foregroundColor reference="../../../../../../../../../../../../../../../../foregroundColor"/>
                                                                        <showIcon>true</showIcon>
                                                                        <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../../../../../../../../../../../../.."/>
                                                                        <listeners serialization="custom">
                                                                          <java.beans.PropertyChangeSupport>
                                                                            <default>
                                                                              <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../../.."/>
                                                                              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                            </default>
                                                                            <null/>
                                                                          </java.beans.PropertyChangeSupport>
                                                                        </listeners>
                                                                        <constraint>
                                                                          <height>-1</height>
                                                                          <width>-1</width>
                                                                          <x>213</x>
                                                                          <y>483</y>
                                                                        </constraint>
                                                                        <sourceConnections>
                                                                          <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                            <showIcon>true</showIcon>
                                                                            <listeners serialization="custom">
                                                                              <java.beans.PropertyChangeSupport>
                                                                                <default>
                                                                                  <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                                  <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                </default>
                                                                                <null/>
                                                                              </java.beans.PropertyChangeSupport>
                                                                            </listeners>
                                                                            <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                                                            <target class="net.java.amateras.uml.activitydiagram.model.ForkNodeModel">
                                                                              <backgroundColor>
                                                                                <red>255</red>
                                                                                <green>255</green>
                                                                                <blue>206</blue>
                                                                              </backgroundColor>
                                                                              <foregroundColor>
                                                                                <red>0</red>
                                                                                <green>0</green>
                                                                                <blue>0</blue>
                                                                              </foregroundColor>
                                                                              <showIcon>true</showIcon>
                                                                              <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel">
                                                                                <backgroundColor reference="../../backgroundColor"/>
                                                                                <foregroundColor reference="../../foregroundColor"/>
                                                                                <showIcon>true</showIcon>
                                                                                <listeners serialization="custom">
                                                                                  <java.beans.PropertyChangeSupport>
                                                                                    <default>
                                                                                      <source class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../.."/>
                                                                                      <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                    </default>
                                                                                    <null/>
                                                                                  </java.beans.PropertyChangeSupport>
                                                                                </listeners>
                                                                                <sourceConnections/>
                                                                                <targetConnections/>
                                                                                <children>
                                                                                  <net.java.amateras.uml.activitydiagram.model.InitialStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                  <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                  <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FinalStateModel"/>
                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                  <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../.."/>
                                                                                  <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../.."/>
                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../.."/>
                                                                                  <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../.."/>
                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel>
                                                                                    <backgroundColor reference="../../../../backgroundColor"/>
                                                                                    <foregroundColor reference="../../../../foregroundColor"/>
                                                                                    <showIcon>true</showIcon>
                                                                                    <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../.."/>
                                                                                    <listeners serialization="custom">
                                                                                      <java.beans.PropertyChangeSupport>
                                                                                        <default>
                                                                                          <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../../.."/>
                                                                                          <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                        </default>
                                                                                        <null/>
                                                                                      </java.beans.PropertyChangeSupport>
                                                                                    </listeners>
                                                                                    <constraint>
                                                                                      <height>-1</height>
                                                                                      <width>-1</width>
                                                                                      <x>520</x>
                                                                                      <y>436</y>
                                                                                    </constraint>
                                                                                    <sourceConnections>
                                                                                      <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                        <showIcon>true</showIcon>
                                                                                        <listeners serialization="custom">
                                                                                          <java.beans.PropertyChangeSupport>
                                                                                            <default>
                                                                                              <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                                              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                            </default>
                                                                                            <null/>
                                                                                          </java.beans.PropertyChangeSupport>
                                                                                        </listeners>
                                                                                        <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                                                                        <target class="net.java.amateras.uml.activitydiagram.model.DecisionModel">
                                                                                          <backgroundColor reference="../../../../../../../backgroundColor"/>
                                                                                          <foregroundColor reference="../../../../../../../foregroundColor"/>
                                                                                          <showIcon>true</showIcon>
                                                                                          <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../../../.."/>
                                                                                          <listeners serialization="custom">
                                                                                            <java.beans.PropertyChangeSupport>
                                                                                              <default>
                                                                                                <source class="net.java.amateras.uml.activitydiagram.model.DecisionModel" reference="../../../.."/>
                                                                                                <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                              </default>
                                                                                              <null/>
                                                                                            </java.beans.PropertyChangeSupport>
                                                                                          </listeners>
                                                                                          <constraint>
                                                                                            <height>-1</height>
                                                                                            <width>-1</width>
                                                                                            <x>747</x>
                                                                                            <y>447</y>
                                                                                          </constraint>
                                                                                          <sourceConnections>
                                                                                            <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                              <showIcon>true</showIcon>
                                                                                              <listeners serialization="custom">
                                                                                                <java.beans.PropertyChangeSupport>
                                                                                                  <default>
                                                                                                    <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                                                    <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                  </default>
                                                                                                  <null/>
                                                                                                </java.beans.PropertyChangeSupport>
                                                                                              </listeners>
                                                                                              <source class="net.java.amateras.uml.activitydiagram.model.DecisionModel" reference="../../.."/>
                                                                                              <target class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                              <bendpoints>
                                                                                                <net.java.amateras.uml.editpart.ConnectionBendpoint>
                                                                                                  <weight>0.5</weight>
                                                                                                  <d1>
                                                                                                    <width>-3</width>
                                                                                                    <height>-83</height>
                                                                                                  </d1>
                                                                                                  <d2>
                                                                                                    <width>388</width>
                                                                                                    <height>-3</height>
                                                                                                  </d2>
                                                                                                </net.java.amateras.uml.editpart.ConnectionBendpoint>
                                                                                              </bendpoints>
                                                                                              <condition>æ¯</condition>
                                                                                            </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                            <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                              <showIcon>true</showIcon>
                                                                                              <listeners serialization="custom">
                                                                                                <java.beans.PropertyChangeSupport>
                                                                                                  <default>
                                                                                                    <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                                                    <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                  </default>
                                                                                                  <null/>
                                                                                                </java.beans.PropertyChangeSupport>
                                                                                              </listeners>
                                                                                              <source class="net.java.amateras.uml.activitydiagram.model.DecisionModel" reference="../../.."/>
                                                                                              <target class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                              <bendpoints/>
                                                                                              <condition>å¦</condition>
                                                                                            </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                          </sourceConnections>
                                                                                          <targetConnections>
                                                                                            <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../.."/>
                                                                                          </targetConnections>
                                                                                          <children/>
                                                                                          <filterProperty/>
                                                                                        </target>
                                                                                        <bendpoints/>
                                                                                        <condition>æ¯å¦éè¦ç»å®ææºå·</condition>
                                                                                      </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                      <net.java.amateras.uml.model.AnchorModel>
                                                                                        <showIcon>true</showIcon>
                                                                                        <listeners serialization="custom">
                                                                                          <java.beans.PropertyChangeSupport>
                                                                                            <default>
                                                                                              <source class="net.java.amateras.uml.model.AnchorModel" reference="../../../.."/>
                                                                                              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                            </default>
                                                                                            <null/>
                                                                                          </java.beans.PropertyChangeSupport>
                                                                                        </listeners>
                                                                                        <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                                                                        <target class="net.java.amateras.uml.model.NoteModel">
                                                                                          <backgroundColor>
                                                                                            <red>255</red>
                                                                                            <green>255</green>
                                                                                            <blue>206</blue>
                                                                                          </backgroundColor>
                                                                                          <foregroundColor>
                                                                                            <red>0</red>
                                                                                            <green>0</green>
                                                                                            <blue>0</blue>
                                                                                          </foregroundColor>
                                                                                          <showIcon>true</showIcon>
                                                                                          <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel">
                                                                                            <backgroundColor reference="../../backgroundColor"/>
                                                                                            <foregroundColor reference="../../foregroundColor"/>
                                                                                            <showIcon>true</showIcon>
                                                                                            <listeners serialization="custom">
                                                                                              <java.beans.PropertyChangeSupport>
                                                                                                <default>
                                                                                                  <source class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../.."/>
                                                                                                  <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                </default>
                                                                                                <null/>
                                                                                              </java.beans.PropertyChangeSupport>
                                                                                            </listeners>
                                                                                            <sourceConnections/>
                                                                                            <targetConnections/>
                                                                                            <children>
                                                                                              <net.java.amateras.uml.activitydiagram.model.InitialStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FinalStateModel"/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../.."/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../.."/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../.."/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../.."/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel>
                                                                                                <backgroundColor reference="../../../../../../../../../../backgroundColor"/>
                                                                                                <foregroundColor reference="../../../../../../../../../../foregroundColor"/>
                                                                                                <showIcon>true</showIcon>
                                                                                                <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../../../../../../.."/>
                                                                                                <listeners serialization="custom">
                                                                                                  <java.beans.PropertyChangeSupport>
                                                                                                    <default>
                                                                                                      <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../../.."/>
                                                                                                      <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                    </default>
                                                                                                    <null/>
                                                                                                  </java.beans.PropertyChangeSupport>
                                                                                                </listeners>
                                                                                                <constraint>
                                                                                                  <height>-1</height>
                                                                                                  <width>-1</width>
                                                                                                  <x>518</x>
                                                                                                  <y>521</y>
                                                                                                </constraint>
                                                                                                <sourceConnections>
                                                                                                  <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                    <showIcon>true</showIcon>
                                                                                                    <listeners serialization="custom">
                                                                                                      <java.beans.PropertyChangeSupport>
                                                                                                        <default>
                                                                                                          <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                                                          <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                        </default>
                                                                                                        <null/>
                                                                                                      </java.beans.PropertyChangeSupport>
                                                                                                    </listeners>
                                                                                                    <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                                                                                    <target class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                    <bendpoints>
                                                                                                      <net.java.amateras.uml.editpart.ConnectionBendpoint>
                                                                                                        <weight>0.5</weight>
                                                                                                        <d1>
                                                                                                          <width>349</width>
                                                                                                          <height>0</height>
                                                                                                        </d1>
                                                                                                        <d2>
                                                                                                          <width>0</width>
                                                                                                          <height>83</height>
                                                                                                        </d2>
                                                                                                      </net.java.amateras.uml.editpart.ConnectionBendpoint>
                                                                                                    </bendpoints>
                                                                                                    <condition>ç»å½æå</condition>
                                                                                                  </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                  <net.java.amateras.uml.model.AnchorModel>
                                                                                                    <showIcon>true</showIcon>
                                                                                                    <listeners serialization="custom">
                                                                                                      <java.beans.PropertyChangeSupport>
                                                                                                        <default>
                                                                                                          <source class="net.java.amateras.uml.model.AnchorModel" reference="../../../.."/>
                                                                                                          <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                        </default>
                                                                                                        <null/>
                                                                                                      </java.beans.PropertyChangeSupport>
                                                                                                    </listeners>
                                                                                                    <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                                                                                    <target class="net.java.amateras.uml.model.NoteModel">
                                                                                                      <backgroundColor>
                                                                                                        <red>255</red>
                                                                                                        <green>255</green>
                                                                                                        <blue>206</blue>
                                                                                                      </backgroundColor>
                                                                                                      <foregroundColor>
                                                                                                        <red>0</red>
                                                                                                        <green>0</green>
                                                                                                        <blue>0</blue>
                                                                                                      </foregroundColor>
                                                                                                      <showIcon>true</showIcon>
                                                                                                      <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel">
                                                                                                        <backgroundColor reference="../../backgroundColor"/>
                                                                                                        <foregroundColor reference="../../foregroundColor"/>
                                                                                                        <showIcon>true</showIcon>
                                                                                                        <listeners serialization="custom">
                                                                                                          <java.beans.PropertyChangeSupport>
                                                                                                            <default>
                                                                                                              <source class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../.."/>
                                                                                                              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                            </default>
                                                                                                            <null/>
                                                                                                          </java.beans.PropertyChangeSupport>
                                                                                                        </listeners>
                                                                                                        <sourceConnections/>
                                                                                                        <targetConnections/>
                                                                                                        <children>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.InitialStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FinalStateModel"/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../.."/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../../../../../../../.."/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../.."/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../.."/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.DecisionModel>
                                                                                                            <backgroundColor reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../backgroundColor"/>
                                                                                                            <foregroundColor reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../foregroundColor"/>
                                                                                                            <showIcon>true</showIcon>
                                                                                                            <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                            <listeners serialization="custom">
                                                                                                              <java.beans.PropertyChangeSupport>
                                                                                                                <default>
                                                                                                                  <source class="net.java.amateras.uml.activitydiagram.model.DecisionModel" reference="../../../.."/>
                                                                                                                  <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                </default>
                                                                                                                <null/>
                                                                                                              </java.beans.PropertyChangeSupport>
                                                                                                            </listeners>
                                                                                                            <constraint>
                                                                                                              <height>-1</height>
                                                                                                              <width>-1</width>
                                                                                                              <x>1001</x>
                                                                                                              <y>446</y>
                                                                                                            </constraint>
                                                                                                            <sourceConnections>
                                                                                                              <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                                <showIcon>true</showIcon>
                                                                                                                <listeners serialization="custom">
                                                                                                                  <java.beans.PropertyChangeSupport>
                                                                                                                    <default>
                                                                                                                      <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                                                                      <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                    </default>
                                                                                                                    <null/>
                                                                                                                  </java.beans.PropertyChangeSupport>
                                                                                                                </listeners>
                                                                                                                <source class="net.java.amateras.uml.activitydiagram.model.DecisionModel" reference="../../.."/>
                                                                                                                <target class="net.java.amateras.uml.activitydiagram.model.FinalStateModel">
                                                                                                                  <backgroundColor reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../backgroundColor"/>
                                                                                                                  <foregroundColor reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../foregroundColor"/>
                                                                                                                  <showIcon>true</showIcon>
                                                                                                                  <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                  <listeners serialization="custom">
                                                                                                                    <java.beans.PropertyChangeSupport>
                                                                                                                      <default>
                                                                                                                        <source class="net.java.amateras.uml.activitydiagram.model.FinalStateModel" reference="../../../.."/>
                                                                                                                        <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                      </default>
                                                                                                                      <null/>
                                                                                                                    </java.beans.PropertyChangeSupport>
                                                                                                                  </listeners>
                                                                                                                  <constraint>
                                                                                                                    <height>-1</height>
                                                                                                                    <width>-1</width>
                                                                                                                    <x>1138</x>
                                                                                                                    <y>503</y>
                                                                                                                  </constraint>
                                                                                                                  <sourceConnections/>
                                                                                                                  <targetConnections>
                                                                                                                    <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../.."/>
                                                                                                                  </targetConnections>
                                                                                                                  <children/>
                                                                                                                  <filterProperty/>
                                                                                                                </target>
                                                                                                                <bendpoints/>
                                                                                                                <condition>å¦</condition>
                                                                                                              </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                              <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                                <showIcon>true</showIcon>
                                                                                                                <listeners serialization="custom">
                                                                                                                  <java.beans.PropertyChangeSupport>
                                                                                                                    <default>
                                                                                                                      <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                                                                      <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                    </default>
                                                                                                                    <null/>
                                                                                                                  </java.beans.PropertyChangeSupport>
                                                                                                                </listeners>
                                                                                                                <source class="net.java.amateras.uml.activitydiagram.model.DecisionModel" reference="../../.."/>
                                                                                                                <target class="net.java.amateras.uml.activitydiagram.model.ActionModel">
                                                                                                                  <backgroundColor reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../backgroundColor"/>
                                                                                                                  <foregroundColor reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../foregroundColor"/>
                                                                                                                  <showIcon>true</showIcon>
                                                                                                                  <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                  <listeners serialization="custom">
                                                                                                                    <java.beans.PropertyChangeSupport>
                                                                                                                      <default>
                                                                                                                        <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../../.."/>
                                                                                                                        <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                      </default>
                                                                                                                      <null/>
                                                                                                                    </java.beans.PropertyChangeSupport>
                                                                                                                  </listeners>
                                                                                                                  <constraint>
                                                                                                                    <height>-1</height>
                                                                                                                    <width>-1</width>
                                                                                                                    <x>1062</x>
                                                                                                                    <y>371</y>
                                                                                                                  </constraint>
                                                                                                                  <sourceConnections>
                                                                                                                    <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                                      <showIcon>true</showIcon>
                                                                                                                      <listeners serialization="custom">
                                                                                                                        <java.beans.PropertyChangeSupport>
                                                                                                                          <default>
                                                                                                                            <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                                                                            <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                          </default>
                                                                                                                          <null/>
                                                                                                                        </java.beans.PropertyChangeSupport>
                                                                                                                      </listeners>
                                                                                                                      <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                                                                                                      <target class="net.java.amateras.uml.activitydiagram.model.FinalStateModel">
                                                                                                                        <backgroundColor>
                                                                                                                          <red>255</red>
                                                                                                                          <green>255</green>
                                                                                                                          <blue>206</blue>
                                                                                                                        </backgroundColor>
                                                                                                                        <foregroundColor>
                                                                                                                          <red>0</red>
                                                                                                                          <green>0</green>
                                                                                                                          <blue>0</blue>
                                                                                                                        </foregroundColor>
                                                                                                                        <showIcon>true</showIcon>
                                                                                                                        <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel">
                                                                                                                          <backgroundColor reference="../../backgroundColor"/>
                                                                                                                          <foregroundColor reference="../../foregroundColor"/>
                                                                                                                          <showIcon>true</showIcon>
                                                                                                                          <listeners serialization="custom">
                                                                                                                            <java.beans.PropertyChangeSupport>
                                                                                                                              <default>
                                                                                                                                <source class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../.."/>
                                                                                                                                <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                              </default>
                                                                                                                              <null/>
                                                                                                                            </java.beans.PropertyChangeSupport>
                                                                                                                          </listeners>
                                                                                                                          <sourceConnections/>
                                                                                                                          <targetConnections/>
                                                                                                                          <children>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.InitialStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FinalStateModel"/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../.."/>
                                                                                                                          </children>
                                                                                                                          <filterProperty/>
                                                                                                                        </parent>
                                                                                                                        <listeners serialization="custom">
                                                                                                                          <java.beans.PropertyChangeSupport>
                                                                                                                            <default>
                                                                                                                              <source class="net.java.amateras.uml.activitydiagram.model.FinalStateModel" reference="../../../.."/>
                                                                                                                              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                            </default>
                                                                                                                            <null/>
                                                                                                                          </java.beans.PropertyChangeSupport>
                                                                                                                        </listeners>
                                                                                                                        <constraint>
                                                                                                                          <height>-1</height>
                                                                                                                          <width>-1</width>
                                                                                                                          <x>1171</x>
                                                                                                                          <y>310</y>
                                                                                                                        </constraint>
                                                                                                                        <sourceConnections/>
                                                                                                                        <targetConnections>
                                                                                                                          <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../.."/>
                                                                                                                        </targetConnections>
                                                                                                                        <children/>
                                                                                                                        <filterProperty/>
                                                                                                                      </target>
                                                                                                                      <bendpoints/>
                                                                                                                      <condition>éè¯·ç éªè¯æå</condition>
                                                                                                                    </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                                    <net.java.amateras.uml.model.AnchorModel>
                                                                                                                      <showIcon>true</showIcon>
                                                                                                                      <listeners serialization="custom">
                                                                                                                        <java.beans.PropertyChangeSupport>
                                                                                                                          <default>
                                                                                                                            <source class="net.java.amateras.uml.model.AnchorModel" reference="../../../.."/>
                                                                                                                            <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                          </default>
                                                                                                                          <null/>
                                                                                                                        </java.beans.PropertyChangeSupport>
                                                                                                                      </listeners>
                                                                                                                      <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                                                                                                      <target class="net.java.amateras.uml.model.NoteModel">
                                                                                                                        <backgroundColor>
                                                                                                                          <red>255</red>
                                                                                                                          <green>255</green>
                                                                                                                          <blue>206</blue>
                                                                                                                        </backgroundColor>
                                                                                                                        <foregroundColor>
                                                                                                                          <red>0</red>
                                                                                                                          <green>0</green>
                                                                                                                          <blue>0</blue>
                                                                                                                        </foregroundColor>
                                                                                                                        <showIcon>true</showIcon>
                                                                                                                        <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel">
                                                                                                                          <backgroundColor reference="../../backgroundColor"/>
                                                                                                                          <foregroundColor reference="../../foregroundColor"/>
                                                                                                                          <showIcon>true</showIcon>
                                                                                                                          <listeners serialization="custom">
                                                                                                                            <java.beans.PropertyChangeSupport>
                                                                                                                              <default>
                                                                                                                                <source class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../.."/>
                                                                                                                                <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                              </default>
                                                                                                                              <null/>
                                                                                                                            </java.beans.PropertyChangeSupport>
                                                                                                                          </listeners>
                                                                                                                          <sourceConnections/>
                                                                                                                          <targetConnections/>
                                                                                                                          <children>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.InitialStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FinalStateModel"/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                                            <net.java.amateras.uml.model.NoteModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.model.NoteModel>
                                                                                                                              <backgroundColor>
                                                                                                                                <red>255</red>
                                                                                                                                <green>255</green>
                                                                                                                                <blue>206</blue>
                                                                                                                              </backgroundColor>
                                                                                                                              <foregroundColor>
                                                                                                                                <red>0</red>
                                                                                                                                <green>0</green>
                                                                                                                                <blue>0</blue>
                                                                                                                              </foregroundColor>
                                                                                                                              <showIcon>true</showIcon>
                                                                                                                              <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel">
                                                                                                                                <backgroundColor reference="../../backgroundColor"/>
                                                                                                                                <foregroundColor reference="../../foregroundColor"/>
                                                                                                                                <showIcon>true</showIcon>
                                                                                                                                <listeners serialization="custom">
                                                                                                                                  <java.beans.PropertyChangeSupport>
                                                                                                                                    <default>
                                                                                                                                      <source class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../.."/>
                                                                                                                                      <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                                    </default>
                                                                                                                                    <null/>
                                                                                                                                  </java.beans.PropertyChangeSupport>
                                                                                                                                </listeners>
                                                                                                                                <sourceConnections/>
                                                                                                                                <targetConnections/>
                                                                                                                                <children>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.InitialStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FinalStateModel"/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                                                  <net.java.amateras.uml.model.NoteModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                  <net.java.amateras.uml.model.NoteModel reference="../../.."/>
                                                                                                                                </children>
                                                                                                                                <filterProperty/>
                                                                                                                              </parent>
                                                                                                                              <listeners serialization="custom">
                                                                                                                                <java.beans.PropertyChangeSupport>
                                                                                                                                  <default>
                                                                                                                                    <source class="net.java.amateras.uml.model.NoteModel" reference="../../../.."/>
                                                                                                                                    <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                                  </default>
                                                                                                                                  <null/>
                                                                                                                                </java.beans.PropertyChangeSupport>
                                                                                                                              </listeners>
                                                                                                                              <constraint>
                                                                                                                                <height>80</height>
                                                                                                                                <width>335</width>
                                                                                                                                <x>308</x>
                                                                                                                                <y>18</y>
                                                                                                                              </constraint>
                                                                                                                              <sourceConnections/>
                                                                                                                              <targetConnections>
                                                                                                                                <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                                                  <showIcon>true</showIcon>
                                                                                                                                  <listeners serialization="custom">
                                                                                                                                    <java.beans.PropertyChangeSupport>
                                                                                                                                      <default>
                                                                                                                                        <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                                                                                        <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                                      </default>
                                                                                                                                      <null/>
                                                                                                                                    </java.beans.PropertyChangeSupport>
                                                                                                                                  </listeners>
                                                                                                                                  <source class="net.java.amateras.uml.activitydiagram.model.ForkNodeModel">
                                                                                                                                    <backgroundColor>
                                                                                                                                      <red>255</red>
                                                                                                                                      <green>255</green>
                                                                                                                                      <blue>206</blue>
                                                                                                                                    </backgroundColor>
                                                                                                                                    <foregroundColor>
                                                                                                                                      <red>0</red>
                                                                                                                                      <green>0</green>
                                                                                                                                      <blue>0</blue>
                                                                                                                                    </foregroundColor>
                                                                                                                                    <showIcon>true</showIcon>
                                                                                                                                    <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel">
                                                                                                                                      <backgroundColor reference="../../backgroundColor"/>
                                                                                                                                      <foregroundColor reference="../../foregroundColor"/>
                                                                                                                                      <showIcon>true</showIcon>
                                                                                                                                      <listeners serialization="custom">
                                                                                                                                        <java.beans.PropertyChangeSupport>
                                                                                                                                          <default>
                                                                                                                                            <source class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../.."/>
                                                                                                                                            <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                                          </default>
                                                                                                                                          <null/>
                                                                                                                                        </java.beans.PropertyChangeSupport>
                                                                                                                                      </listeners>
                                                                                                                                      <sourceConnections/>
                                                                                                                                      <targetConnections/>
                                                                                                                                      <children>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.InitialStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FinalStateModel"/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                                                        <net.java.amateras.uml.model.NoteModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.model.NoteModel reference="../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.model.NoteModel reference="../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.model.NoteModel reference="../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <net.java.amateras.uml.model.NoteModel>
                                                                                                                                          <backgroundColor>
                                                                                                                                            <red>255</red>
                                                                                                                                            <green>255</green>
                                                                                                                                            <blue>206</blue>
                                                                                                                                          </backgroundColor>
                                                                                                                                          <foregroundColor>
                                                                                                                                            <red>0</red>
                                                                                                                                            <green>0</green>
                                                                                                                                            <blue>0</blue>
                                                                                                                                          </foregroundColor>
                                                                                                                                          <showIcon>true</showIcon>
                                                                                                                                          <parent class="net.java.amateras.uml.activitydiagram.model.ActivityModel">
                                                                                                                                            <backgroundColor reference="../../backgroundColor"/>
                                                                                                                                            <foregroundColor reference="../../foregroundColor"/>
                                                                                                                                            <showIcon>true</showIcon>
                                                                                                                                            <listeners serialization="custom">
                                                                                                                                              <java.beans.PropertyChangeSupport>
                                                                                                                                                <default>
                                                                                                                                                  <source class="net.java.amateras.uml.activitydiagram.model.ActivityModel" reference="../../../.."/>
                                                                                                                                                  <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                                                </default>
                                                                                                                                                <null/>
                                                                                                                                              </java.beans.PropertyChangeSupport>
                                                                                                                                            </listeners>
                                                                                                                                            <sourceConnections/>
                                                                                                                                            <targetConnections/>
                                                                                                                                            <children>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.InitialStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FinalStateModel"/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../../../../../../../../../../../../../../net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                                                              <net.java.amateras.uml.model.NoteModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.model.NoteModel reference="../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.model.NoteModel reference="../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.model.NoteModel reference="../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                              <net.java.amateras.uml.model.NoteModel reference="../../.."/>
                                                                                                                                            </children>
                                                                                                                                            <filterProperty/>
                                                                                                                                          </parent>
                                                                                                                                          <listeners serialization="custom">
                                                                                                                                            <java.beans.PropertyChangeSupport>
                                                                                                                                              <default>
                                                                                                                                                <source class="net.java.amateras.uml.model.NoteModel" reference="../../../.."/>
                                                                                                                                                <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                                              </default>
                                                                                                                                              <null/>
                                                                                                                                            </java.beans.PropertyChangeSupport>
                                                                                                                                          </listeners>
                                                                                                                                          <constraint>
                                                                                                                                            <height>84</height>
                                                                                                                                            <width>347</width>
                                                                                                                                            <x>541</x>
                                                                                                                                            <y>127</y>
                                                                                                                                          </constraint>
                                                                                                                                          <sourceConnections/>
                                                                                                                                          <targetConnections>
                                                                                                                                            <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                                                              <showIcon>true</showIcon>
                                                                                                                                              <listeners serialization="custom">
                                                                                                                                                <java.beans.PropertyChangeSupport>
                                                                                                                                                  <default>
                                                                                                                                                    <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                                                                                                    <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                                                  </default>
                                                                                                                                                  <null/>
                                                                                                                                                </java.beans.PropertyChangeSupport>
                                                                                                                                              </listeners>
                                                                                                                                              <source class="net.java.amateras.uml.activitydiagram.model.ForkNodeModel" reference="../../../../../.."/>
                                                                                                                                              <target class="net.java.amateras.uml.model.NoteModel" reference="../../.."/>
                                                                                                                                              <bendpoints/>
                                                                                                                                              <condition>ä»ç»å½æ¥</condition>
                                                                                                                                            </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                                                          </targetConnections>
                                                                                                                                          <children/>
                                                                                                                                          <filterProperty/>
                                                                                                                                          <content>æ¥å£:/wxmp/api/v1/useraccount/phoneLogin&#xd;
åæ°:&#xd;
 phoneData å¾®ä¿¡ææççµè¯å·ç æ°æ®&#xd;
 userData ç¨æ·æ°æ®</content>
                                                                                                                                          <old>æ¥å£:/wxmp/api/v1/useraccount/phoneLogin&#xd;
åæ°:&#xd;
 phoneData å¾®ä¿¡ææççµè¯å·ç æ°æ®&#xd;
 userData </old>
                                                                                                                                        </net.java.amateras.uml.model.NoteModel>
                                                                                                                                        <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../.."/>
                                                                                                                                      </children>
                                                                                                                                      <filterProperty/>
                                                                                                                                    </parent>
                                                                                                                                    <listeners serialization="custom">
                                                                                                                                      <java.beans.PropertyChangeSupport>
                                                                                                                                        <default>
                                                                                                                                          <source class="net.java.amateras.uml.activitydiagram.model.ForkNodeModel" reference="../../../.."/>
                                                                                                                                          <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                                        </default>
                                                                                                                                        <null/>
                                                                                                                                      </java.beans.PropertyChangeSupport>
                                                                                                                                    </listeners>
                                                                                                                                    <constraint>
                                                                                                                                      <height>-1</height>
                                                                                                                                      <width>-1</width>
                                                                                                                                      <x>414</x>
                                                                                                                                      <y>277</y>
                                                                                                                                    </constraint>
                                                                                                                                    <sourceConnections>
                                                                                                                                      <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../.."/>
                                                                                                                                      <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../parent/children/net.java.amateras.uml.model.NoteModel[5]/targetConnections/net.java.amateras.uml.activitydiagram.model.FlowModel"/>
                                                                                                                                    </sourceConnections>
                                                                                                                                    <targetConnections>
                                                                                                                                      <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                                                        <showIcon>true</showIcon>
                                                                                                                                        <listeners serialization="custom">
                                                                                                                                          <java.beans.PropertyChangeSupport>
                                                                                                                                            <default>
                                                                                                                                              <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                                                                                              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                                            </default>
                                                                                                                                            <null/>
                                                                                                                                          </java.beans.PropertyChangeSupport>
                                                                                                                                        </listeners>
                                                                                                                                        <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                                        <target class="net.java.amateras.uml.activitydiagram.model.ForkNodeModel" reference="../../.."/>
                                                                                                                                        <bendpoints/>
                                                                                                                                        <condition>æ¥å£è¯·æ±å¤æ</condition>
                                                                                                                                      </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                                                    </targetConnections>
                                                                                                                                    <children/>
                                                                                                                                    <filterProperty/>
                                                                                                                                  </source>
                                                                                                                                  <target class="net.java.amateras.uml.model.NoteModel" reference="../../.."/>
                                                                                                                                  <bendpoints/>
                                                                                                                                  <condition>ä»éè¯·ç </condition>
                                                                                                                                </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                                              </targetConnections>
                                                                                                                              <children/>
                                                                                                                              <filterProperty/>
                                                                                                                              <content>æ¥å£:/wxmp/api/v1/useraccount/phoneLogin&#xd;
åæ°:&#xd;
 inviteCode éè¯·ç &#xd;
 phoneData å¾®ä¿¡ææççµè¯å·ç æ°æ®</content>
                                                                                                                              <old>æ¥å£:/wxmp/api/v1/useraccount/phoneLogin&#xd;
åæ°:&#xd;
 inviteCode &#xd;
 phoneData å¾®ä¿¡ææççµè¯å·ç æ°æ®</old>
                                                                                                                            </net.java.amateras.uml.model.NoteModel>
                                                                                                                            <net.java.amateras.uml.model.NoteModel reference="../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.model.NoteModel reference="../../../../../../../../../../../../../../../../../.."/>
                                                                                                                            <net.java.amateras.uml.model.NoteModel reference="../net.java.amateras.uml.model.NoteModel[2]/targetConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/source/parent/children/net.java.amateras.uml.model.NoteModel[5]"/>
                                                                                                                            <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../net.java.amateras.uml.model.NoteModel[2]/targetConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/source"/>
                                                                                                                            <net.java.amateras.uml.model.NoteModel reference="../../.."/>
                                                                                                                          </children>
                                                                                                                          <filterProperty/>
                                                                                                                        </parent>
                                                                                                                        <listeners serialization="custom">
                                                                                                                          <java.beans.PropertyChangeSupport>
                                                                                                                            <default>
                                                                                                                              <source class="net.java.amateras.uml.model.NoteModel" reference="../../../.."/>
                                                                                                                              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                            </default>
                                                                                                                            <null/>
                                                                                                                          </java.beans.PropertyChangeSupport>
                                                                                                                        </listeners>
                                                                                                                        <constraint>
                                                                                                                          <height>96</height>
                                                                                                                          <width>354</width>
                                                                                                                          <x>973</x>
                                                                                                                          <y>135</y>
                                                                                                                        </constraint>
                                                                                                                        <sourceConnections/>
                                                                                                                        <targetConnections>
                                                                                                                          <net.java.amateras.uml.model.AnchorModel reference="../../.."/>
                                                                                                                        </targetConnections>
                                                                                                                        <children/>
                                                                                                                        <filterProperty/>
                                                                                                                        <content>æ¥å£:/wxmp/api/v1/useraccount/bindInviteCode&#xd;
åæ°:&#xd;
 inviteCode éè¯·ç &#xd;
 userData ç¨æ·æ°æ®</content>
                                                                                                                        <old>æ¥å£:/wxmp/api/v1/useraccount/bindInviteCode&#xd;
åæ°:&#xd;
 inviteCode&#xd;
 wxData å¾®ä¿¡ææç¨æ·ä¿¡æ¯çå å¯æ°æ®</old>
                                                                                                                      </target>
                                                                                                                      <bendpoints/>
                                                                                                                    </net.java.amateras.uml.model.AnchorModel>
                                                                                                                  </sourceConnections>
                                                                                                                  <targetConnections>
                                                                                                                    <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../.."/>
                                                                                                                  </targetConnections>
                                                                                                                  <children/>
                                                                                                                  <filterProperty/>
                                                                                                                  <actionName>å¡«åéè¯·ç </actionName>
                                                                                                                </target>
                                                                                                                <bendpoints/>
                                                                                                                <condition>æ¯</condition>
                                                                                                              </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                            </sourceConnections>
                                                                                                            <targetConnections>
                                                                                                              <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                                <showIcon>true</showIcon>
                                                                                                                <listeners serialization="custom">
                                                                                                                  <java.beans.PropertyChangeSupport>
                                                                                                                    <default>
                                                                                                                      <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                                                                      <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                                    </default>
                                                                                                                    <null/>
                                                                                                                  </java.beans.PropertyChangeSupport>
                                                                                                                </listeners>
                                                                                                                <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                                <target class="net.java.amateras.uml.activitydiagram.model.DecisionModel" reference="../../.."/>
                                                                                                                <bendpoints/>
                                                                                                                <condition></condition>
                                                                                                              </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                            </targetConnections>
                                                                                                            <children/>
                                                                                                            <filterProperty/>
                                                                                                          </net.java.amateras.uml.activitydiagram.model.DecisionModel>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]/target"/>
                                                                                                          <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                                          <net.java.amateras.uml.model.NoteModel reference="../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                                          <net.java.amateras.uml.model.NoteModel reference="../net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]/target/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.model.NoteModel[2]"/>
                                                                                                          <net.java.amateras.uml.model.NoteModel reference="../../.."/>
                                                                                                        </children>
                                                                                                        <filterProperty/>
                                                                                                      </parent>
                                                                                                      <listeners serialization="custom">
                                                                                                        <java.beans.PropertyChangeSupport>
                                                                                                          <default>
                                                                                                            <source class="net.java.amateras.uml.model.NoteModel" reference="../../../.."/>
                                                                                                            <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                          </default>
                                                                                                          <null/>
                                                                                                        </java.beans.PropertyChangeSupport>
                                                                                                      </listeners>
                                                                                                      <constraint>
                                                                                                        <height>70</height>
                                                                                                        <width>405</width>
                                                                                                        <x>379</x>
                                                                                                        <y>583</y>
                                                                                                      </constraint>
                                                                                                      <sourceConnections/>
                                                                                                      <targetConnections>
                                                                                                        <net.java.amateras.uml.model.AnchorModel reference="../../.."/>
                                                                                                      </targetConnections>
                                                                                                      <children/>
                                                                                                      <filterProperty/>
                                                                                                      <content>æ¥å£:/wxmp/api/v1/useraccount/phoneLogin&#xd;
åæ°:&#xd;
 phoneData å¾®ä¿¡ææççµè¯å·ç æ°æ®</content>
                                                                                                      <old>æ¥å£:/wxmp/api/v1/useraccount/phoneLogin&#xd;
åæ°:&#xd;
 phoneData </old>
                                                                                                    </target>
                                                                                                    <bendpoints/>
                                                                                                  </net.java.amateras.uml.model.AnchorModel>
                                                                                                </sourceConnections>
                                                                                                <targetConnections>
                                                                                                  <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                    <showIcon>true</showIcon>
                                                                                                    <listeners serialization="custom">
                                                                                                      <java.beans.PropertyChangeSupport>
                                                                                                        <default>
                                                                                                          <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                                                          <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                                        </default>
                                                                                                        <null/>
                                                                                                      </java.beans.PropertyChangeSupport>
                                                                                                    </listeners>
                                                                                                    <source class="net.java.amateras.uml.activitydiagram.model.ForkNodeModel" reference="../../../../../../../../../../../.."/>
                                                                                                    <target class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                                                                                    <bendpoints/>
                                                                                                    <condition></condition>
                                                                                                  </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                                </targetConnections>
                                                                                                <children/>
                                                                                                <filterProperty/>
                                                                                                <actionName>ææºå·ç»å½</actionName>
                                                                                              </net.java.amateras.uml.activitydiagram.model.ActionModel>
                                                                                              <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../../../../../net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../../../../../../../../../../../../../.."/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]"/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]/target"/>
                                                                                              <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                              <net.java.amateras.uml.model.NoteModel reference="../../../../../../../../../../../../../../.."/>
                                                                                              <net.java.amateras.uml.model.NoteModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]/target/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.model.NoteModel[2]"/>
                                                                                              <net.java.amateras.uml.model.NoteModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target"/>
                                                                                              <net.java.amateras.uml.model.NoteModel reference="../../.."/>
                                                                                            </children>
                                                                                            <filterProperty/>
                                                                                          </parent>
                                                                                          <listeners serialization="custom">
                                                                                            <java.beans.PropertyChangeSupport>
                                                                                              <default>
                                                                                                <source class="net.java.amateras.uml.model.NoteModel" reference="../../../.."/>
                                                                                                <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                              </default>
                                                                                              <null/>
                                                                                            </java.beans.PropertyChangeSupport>
                                                                                          </listeners>
                                                                                          <constraint>
                                                                                            <height>82</height>
                                                                                            <width>368</width>
                                                                                            <x>624</x>
                                                                                            <y>249</y>
                                                                                          </constraint>
                                                                                          <sourceConnections/>
                                                                                          <targetConnections>
                                                                                            <net.java.amateras.uml.model.AnchorModel reference="../../.."/>
                                                                                          </targetConnections>
                                                                                          <children/>
                                                                                          <filterProperty/>
                                                                                          <content>æ¥å£:/wxmp/api/v1/useraccount/wxLogin&#xd;
åæ°:&#xd;
 wxData å¾®ä¿¡ææç¨æ·ä¿¡æ¯çå å¯æ°æ®</content>
                                                                                          <old>æ¥å£:/wxmp/api/v1/useraccount/wxLogin&#xd;
åæ°:&#xd;
 inviteCode éè¯·ç &#xd;
 wxData å¾®ä¿¡ææç¨æ·ä¿¡æ¯çå å¯æ°æ®</old>
                                                                                        </target>
                                                                                        <bendpoints/>
                                                                                      </net.java.amateras.uml.model.AnchorModel>
                                                                                    </sourceConnections>
                                                                                    <targetConnections>
                                                                                      <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                        <showIcon>true</showIcon>
                                                                                        <listeners serialization="custom">
                                                                                          <java.beans.PropertyChangeSupport>
                                                                                            <default>
                                                                                              <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                                              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                            </default>
                                                                                            <null/>
                                                                                          </java.beans.PropertyChangeSupport>
                                                                                        </listeners>
                                                                                        <source class="net.java.amateras.uml.activitydiagram.model.ForkNodeModel" reference="../../../../../.."/>
                                                                                        <target class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                                                                        <bendpoints/>
                                                                                        <condition></condition>
                                                                                      </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                                    </targetConnections>
                                                                                    <children/>
                                                                                    <filterProperty/>
                                                                                    <actionName>å¾®ä¿¡ç»å½</actionName>
                                                                                  </net.java.amateras.uml.activitydiagram.model.ActionModel>
                                                                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]"/>
                                                                                  <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                                </children>
                                                                                <filterProperty/>
                                                                              </parent>
                                                                              <listeners serialization="custom">
                                                                                <java.beans.PropertyChangeSupport>
                                                                                  <default>
                                                                                    <source class="net.java.amateras.uml.activitydiagram.model.ForkNodeModel" reference="../../../.."/>
                                                                                    <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                  </default>
                                                                                  <null/>
                                                                                </java.beans.PropertyChangeSupport>
                                                                              </listeners>
                                                                              <constraint>
                                                                                <height>-1</height>
                                                                                <width>-1</width>
                                                                                <x>366</x>
                                                                                <y>498</y>
                                                                              </constraint>
                                                                              <sourceConnections>
                                                                                <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/targetConnections/net.java.amateras.uml.activitydiagram.model.FlowModel"/>
                                                                                <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/targetConnections/net.java.amateras.uml.activitydiagram.model.FlowModel"/>
                                                                              </sourceConnections>
                                                                              <targetConnections>
                                                                                <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../.."/>
                                                                              </targetConnections>
                                                                              <children/>
                                                                              <filterProperty/>
                                                                            </target>
                                                                            <bendpoints/>
                                                                            <condition></condition>
                                                                          </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                        </sourceConnections>
                                                                        <targetConnections>
                                                                          <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                            <showIcon>true</showIcon>
                                                                            <listeners serialization="custom">
                                                                              <java.beans.PropertyChangeSupport>
                                                                                <default>
                                                                                  <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                                  <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                                </default>
                                                                                <null/>
                                                                              </java.beans.PropertyChangeSupport>
                                                                            </listeners>
                                                                            <source class="net.java.amateras.uml.activitydiagram.model.ForkNodeModel" reference="../../../../../../../../../../../../../../../../../.."/>
                                                                            <target class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                                                            <bendpoints/>
                                                                            <condition>ç¹å»ç»å½</condition>
                                                                          </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                        </targetConnections>
                                                                        <children/>
                                                                        <filterProperty/>
                                                                        <actionName>è¿å¥ç»å½æµç¨</actionName>
                                                                      </net.java.amateras.uml.activitydiagram.model.ActionModel>
                                                                      <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                      <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]"/>
                                                                      <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]"/>
                                                                      <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                      <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../../../../../../../.."/>
                                                                      <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]"/>
                                                                      <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                      <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]/target"/>
                                                                      <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                                      <net.java.amateras.uml.model.NoteModel reference="../../.."/>
                                                                    </children>
                                                                    <filterProperty/>
                                                                  </parent>
                                                                  <listeners serialization="custom">
                                                                    <java.beans.PropertyChangeSupport>
                                                                      <default>
                                                                        <source class="net.java.amateras.uml.model.NoteModel" reference="../../../.."/>
                                                                        <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                      </default>
                                                                      <null/>
                                                                    </java.beans.PropertyChangeSupport>
                                                                  </listeners>
                                                                  <constraint>
                                                                    <height>142</height>
                                                                    <width>315</width>
                                                                    <x>15</x>
                                                                    <y>556</y>
                                                                  </constraint>
                                                                  <sourceConnections/>
                                                                  <targetConnections>
                                                                    <net.java.amateras.uml.model.AnchorModel reference="../../.."/>
                                                                  </targetConnections>
                                                                  <children/>
                                                                  <filterProperty/>
                                                                  <content>æ¥å£:/wxmp/api/v1/useraccount/getInviteCodeInfo&#xd;
åæ°:&#xd;
 inviteCode</content>
                                                                  <old>æ¥å£:/wxmp/api/v1/useraccount/getInviteCodeInfo&#xd;
åæ°:&#xd;
 inviteCode</old>
                                                                </target>
                                                                <bendpoints/>
                                                              </net.java.amateras.uml.model.AnchorModel>
                                                            </sourceConnections>
                                                            <targetConnections>
                                                              <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                                <showIcon>true</showIcon>
                                                                <listeners serialization="custom">
                                                                  <java.beans.PropertyChangeSupport>
                                                                    <default>
                                                                      <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                                      <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                                    </default>
                                                                    <null/>
                                                                  </java.beans.PropertyChangeSupport>
                                                                </listeners>
                                                                <source class="net.java.amateras.uml.activitydiagram.model.ForkNodeModel" reference="../../../../../../../../../../../.."/>
                                                                <target class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                                                <bendpoints/>
                                                                <condition>è¾å¥éè¯·ç </condition>
                                                              </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                            </targetConnections>
                                                            <children/>
                                                            <filterProperty/>
                                                            <actionName>éè¯·ç éªè¯æå</actionName>
                                                          </net.java.amateras.uml.activitydiagram.model.ActionModel>
                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]"/>
                                                          <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]"/>
                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]"/>
                                                          <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../../.."/>
                                                          <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]"/>
                                                          <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
                                                          <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]/target"/>
                                                        </children>
                                                        <filterProperty/>
                                                      </parent>
                                                      <listeners serialization="custom">
                                                        <java.beans.PropertyChangeSupport>
                                                          <default>
                                                            <source class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../../.."/>
                                                            <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                          </default>
                                                          <null/>
                                                        </java.beans.PropertyChangeSupport>
                                                      </listeners>
                                                      <constraint>
                                                        <height>-1</height>
                                                        <width>-1</width>
                                                        <x>843</x>
                                                        <y>438</y>
                                                      </constraint>
                                                      <sourceConnections>
                                                        <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/targetConnections/net.java.amateras.uml.activitydiagram.model.FlowModel"/>
                                                      </sourceConnections>
                                                      <targetConnections>
                                                        <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]"/>
                                                        <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel"/>
                                                        <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../.."/>
                                                      </targetConnections>
                                                      <children/>
                                                      <filterProperty/>
                                                      <actionName>æ¯å¦éè¦å¡«åéè¯·ç </actionName>
                                                    </target>
                                                    <bendpoints/>
                                                    <condition></condition>
                                                  </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                  <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]/target/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.model.NoteModel[2]/targetConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/source/targetConnections/net.java.amateras.uml.activitydiagram.model.FlowModel"/>
                                                </sourceConnections>
                                                <targetConnections>
                                                  <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                    <showIcon>true</showIcon>
                                                    <listeners serialization="custom">
                                                      <java.beans.PropertyChangeSupport>
                                                        <default>
                                                          <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                                          <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                                        </default>
                                                        <null/>
                                                      </java.beans.PropertyChangeSupport>
                                                    </listeners>
                                                    <source class="net.java.amateras.uml.activitydiagram.model.DecisionModel" reference="../../../../../../../../../../../.."/>
                                                    <target class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                                    <bendpoints/>
                                                    <condition>æ¯</condition>
                                                  </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                                  <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel"/>
                                                  <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel"/>
                                                </targetConnections>
                                                <children/>
                                                <filterProperty/>
                                                <actionName>è¿å¥ç»å®ææºå·é¡µ</actionName>
                                              </net.java.amateras.uml.activitydiagram.model.ActionModel>
                                              <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../../.."/>
                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]"/>
                                              <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]"/>
                                            </children>
                                            <filterProperty/>
                                          </parent>
                                          <listeners serialization="custom">
                                            <java.beans.PropertyChangeSupport>
                                              <default>
                                                <source class="net.java.amateras.uml.activitydiagram.model.ForkNodeModel" reference="../../../.."/>
                                                <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                              </default>
                                              <null/>
                                            </java.beans.PropertyChangeSupport>
                                          </listeners>
                                          <constraint>
                                            <height>-1</height>
                                            <width>-1</width>
                                            <x>89</x>
                                            <y>431</y>
                                          </constraint>
                                          <sourceConnections>
                                            <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/targetConnections/net.java.amateras.uml.activitydiagram.model.FlowModel"/>
                                            <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/targetConnections/net.java.amateras.uml.activitydiagram.model.FlowModel"/>
                                          </sourceConnections>
                                          <targetConnections>
                                            <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../.."/>
                                          </targetConnections>
                                          <children/>
                                          <filterProperty/>
                                        </target>
                                        <bendpoints/>
                                        <condition></condition>
                                      </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                    </sourceConnections>
                                    <targetConnections>
                                      <net.java.amateras.uml.activitydiagram.model.FlowModel>
                                        <showIcon>true</showIcon>
                                        <listeners serialization="custom">
                                          <java.beans.PropertyChangeSupport>
                                            <default>
                                              <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                              <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                            </default>
                                            <null/>
                                          </java.beans.PropertyChangeSupport>
                                        </listeners>
                                        <source class="net.java.amateras.uml.activitydiagram.model.DecisionModel" reference="../../../../../.."/>
                                        <target class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                                        <bendpoints/>
                                        <condition>å¦</condition>
                                      </net.java.amateras.uml.activitydiagram.model.FlowModel>
                                    </targetConnections>
                                    <children/>
                                    <filterProperty/>
                                    <actionName>è¿å¥å¡«åéè¯·ç é¡µ</actionName>
                                  </net.java.amateras.uml.activitydiagram.model.ActionModel>
                                  <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]"/>
                                </children>
                                <filterProperty/>
                              </parent>
                              <listeners serialization="custom">
                                <java.beans.PropertyChangeSupport>
                                  <default>
                                    <source class="net.java.amateras.uml.activitydiagram.model.DecisionModel" reference="../../../.."/>
                                    <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                  </default>
                                  <null/>
                                </java.beans.PropertyChangeSupport>
                              </listeners>
                              <constraint>
                                <height>-1</height>
                                <width>-1</width>
                                <x>222</x>
                                <y>328</y>
                              </constraint>
                              <sourceConnections>
                                <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/targetConnections/net.java.amateras.uml.activitydiagram.model.FlowModel"/>
                                <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/targetConnections/net.java.amateras.uml.activitydiagram.model.FlowModel"/>
                              </sourceConnections>
                              <targetConnections>
                                <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../.."/>
                              </targetConnections>
                              <children/>
                              <filterProperty/>
                            </target>
                            <bendpoints/>
                            <condition></condition>
                          </net.java.amateras.uml.activitydiagram.model.FlowModel>
                        </sourceConnections>
                        <targetConnections>
                          <net.java.amateras.uml.activitydiagram.model.FlowModel>
                            <showIcon>true</showIcon>
                            <listeners serialization="custom">
                              <java.beans.PropertyChangeSupport>
                                <default>
                                  <source class="net.java.amateras.uml.activitydiagram.model.FlowModel" reference="../../../.."/>
                                  <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                                </default>
                                <null/>
                              </java.beans.PropertyChangeSupport>
                            </listeners>
                            <source class="net.java.amateras.uml.activitydiagram.model.DecisionModel" reference="../../../../../.."/>
                            <target class="net.java.amateras.uml.activitydiagram.model.ActionModel" reference="../../.."/>
                            <bendpoints/>
                            <condition>å¦</condition>
                          </net.java.amateras.uml.activitydiagram.model.FlowModel>
                        </targetConnections>
                        <children/>
                        <filterProperty/>
                        <actionName>å¤ææ¯å¦å¸¦æéè¯·ç ä¿¡æ¯</actionName>
                      </net.java.amateras.uml.activitydiagram.model.ActionModel>
                    </children>
                    <filterProperty/>
                  </parent>
                  <listeners serialization="custom">
                    <java.beans.PropertyChangeSupport>
                      <default>
                        <source class="net.java.amateras.uml.activitydiagram.model.DecisionModel" reference="../../../.."/>
                        <propertyChangeSupportSerializedDataVersion>2</propertyChangeSupportSerializedDataVersion>
                      </default>
                      <null/>
                    </java.beans.PropertyChangeSupport>
                  </listeners>
                  <constraint>
                    <height>-1</height>
                    <width>-1</width>
                    <x>223</x>
                    <y>186</y>
                  </constraint>
                  <sourceConnections>
                    <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../parent/children/net.java.amateras.uml.activitydiagram.model.FinalStateModel/targetConnections/net.java.amateras.uml.activitydiagram.model.FlowModel"/>
                    <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/targetConnections/net.java.amateras.uml.activitydiagram.model.FlowModel"/>
                  </sourceConnections>
                  <targetConnections>
                    <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../.."/>
                  </targetConnections>
                  <children/>
                  <filterProperty/>
                </target>
                <bendpoints/>
                <condition>å½åé¡µé¢æ¯å¦ä¸ºååè¯¦æé¡µ</condition>
              </net.java.amateras.uml.activitydiagram.model.FlowModel>
            </sourceConnections>
            <targetConnections>
              <net.java.amateras.uml.activitydiagram.model.FlowModel reference="../../.."/>
            </targetConnections>
            <children/>
            <filterProperty/>
            <actionName>è¿å¥å°ç¨åº</actionName>
          </target>
          <bendpoints/>
          <condition></condition>
        </net.java.amateras.uml.activitydiagram.model.FlowModel>
      </sourceConnections>
      <targetConnections/>
      <children/>
      <filterProperty/>
    </net.java.amateras.uml.activitydiagram.model.InitialStateModel>
    <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
    <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
    <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.FinalStateModel"/>
    <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]"/>
    <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
    <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]"/>
    <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]"/>
    <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
    <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]"/>
    <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]"/>
    <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
    <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]"/>
    <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]"/>
    <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
    <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
    <net.java.amateras.uml.activitydiagram.model.DecisionModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]"/>
    <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
    <net.java.amateras.uml.activitydiagram.model.ActionModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]/target"/>
    <net.java.amateras.uml.activitydiagram.model.FinalStateModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target"/>
    <net.java.amateras.uml.model.NoteModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target"/>
    <net.java.amateras.uml.model.NoteModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]/target/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.model.NoteModel[2]"/>
    <net.java.amateras.uml.model.NoteModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target"/>
    <net.java.amateras.uml.model.NoteModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target"/>
    <net.java.amateras.uml.model.NoteModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]/target/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.model.NoteModel[2]/targetConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/source/parent/children/net.java.amateras.uml.model.NoteModel[5]"/>
    <net.java.amateras.uml.activitydiagram.model.ForkNodeModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]/target/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.model.NoteModel[2]/targetConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/source"/>
    <net.java.amateras.uml.model.NoteModel reference="../net.java.amateras.uml.activitydiagram.model.InitialStateModel/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[2]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[3]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[5]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[6]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[7]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.ActionModel[8]/sourceConnections/net.java.amateras.uml.model.AnchorModel/target/parent/children/net.java.amateras.uml.activitydiagram.model.DecisionModel[4]/sourceConnections/net.java.amateras.uml.activitydiagram.model.FlowModel[2]/target/sourceConnections/net.java.amateras.uml.model.AnchorModel/target"/>
  </children>
  <filterProperty/>
</net.java.amateras.uml.activitydiagram.model.ActivityModel>

			@@ -5,6 +5,7 @@
			import java.io.FileReader;
			import java.io.IOException;
			import java.io.PrintWriter;
			import java.io.UnsupportedEncodingException;
			import java.math.BigDecimal;
			import java.util.ArrayList;
			import java.util.Iterator;
			@@ -40,9 +41,11 @@
			import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
			import com.yeshi.fanli.entity.dynamic.InviteMaterial;
			import com.yeshi.fanli.entity.jd.JDGoods;
			import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
			import com.yeshi.fanli.exception.ActivityException;
			import com.yeshi.fanli.exception.push.PushException;
			import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
			import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.inter.activity.ActivityService;
			import com.yeshi.fanli.service.inter.config.ConfigService;
			@@ -61,6 +64,7 @@
			import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
			import com.yeshi.fanli.util.jd.JDApiUtil;
			import com.yeshi.fanli.util.push.OPPOPushUtil;
			import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
			import com.yeshi.fanli.vo.goods.GoodsDetailVO;

			import net.sf.json.JSONArray;
			@@ -115,8 +119,6 @@

			@Resource
			private UserMoneyExtraService userMoneyExtraService;



			@RequestMapping(value = "kefu")
			public void kefu(HttpServletRequest request, PrintWriter out) {
			@@ -435,5 +437,21 @@
			}
			} catch (Exception e) {
			}
			}
			}

			@RequestMapping("getTBGoodsCate")
			public void getTaoBaoGoodsCat(Long id, PrintWriter out) {
			TaoBaoGoodsBrief goods = null;
			try {
			goods = TaoKeApiUtil.getSimpleGoodsInfo(id);
			} catch (TaobaoGoodsDownException e) {
			e.printStackTrace();
			}
			if (goods == null)
			out.println("ååå·²ä¸æ¶");
			else
			out.println("<html><head><meta charset=utf-8></head><body>"
			+ String.format("cat_name:%s <br> cat_leaf_name:%s", goods.getRootCategoryName(), goods.getLeafName())
			+ "</body></html>");
			}
			}

			@@ -169,10 +169,20 @@
			List<AppVersionInfo> listAndroid = new ArrayList<AppVersionInfo>();
			listAndroid.add(appVersionInfo);
			listAndroid.addAll(list2);
			//å°ç¨åºçæ¬
			List<AppVersionInfo> list3 = appVersionService
			.getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_XCX);
			if (list3 == null) {
			list3 = new ArrayList<AppVersionInfo>();
			}
			List<AppVersionInfo> listWxmp = new ArrayList<AppVersionInfo>();
			listWxmp.add(appVersionInfo);
			listWxmp.addAll(list3);

			JSONObject data = new JSONObject();
			data.put("android", listAndroid);
			data.put("ios", listIOS);
			data.put("wxmp", listWxmp);

			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

			@@ -73,6 +73,7 @@
			JSONObject data = new JSONObject();
			data.put("list", gson.toJson(infoList));
			data.put("count", count);
			data.put("page",page);
			out.print(JsonUtil.loadTrueResult(data));
			} catch (Exception e) {
			out.print(JsonUtil.loadFalseResult(1, "è·åæ°æ®å¤±è´¥"));
			@@ -161,6 +162,7 @@
			Gson gson = gsonBuilder.create();
			JSONObject data = new JSONObject();
			data.put("count", count);
			data.put("page", page);
			data.put("list", gson.toJson(list));
			out.print(JsonUtil.loadTrueResult(data));
			}

			@@ -45,6 +45,7 @@
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
			import com.yeshi.fanli.service.inter.config.ConfigService;
			import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
			import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
			import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;
			import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
			@@ -87,11 +88,8 @@
			@RequestMapping("/wxmp/api/v1/goods")
			public class GoodsController {


			@Resource
			private ConfigService configService;



			@Resource
			private ShamUserService shamUserService;
			@@ -102,11 +100,8 @@
			@Resource
			private HongBaoManageService hongBaoManageService;



			@Resource
			private UserInfoExtraService userInfoExtraService;


			@Resource
			private ScanHistoryV2Service scanHistoryV2Service;
			@@ -131,16 +126,19 @@

			@Resource
			private QrCodeService qrCodeService;


			@Resource
			private ShareGoodsService shareGoodsService;


			@Resource
			private UserShareGoodsRecordService userShareGoodsRecordService;


			@Resource
			private SwiperPictureService swiperPictureService;


			@Resource
			private HongBaoV2CountService hongBaoV2CountService;

			/**
			* ä¸çº§åç±»
			*
			@@ -148,13 +146,38 @@
			* @param out
			*/
			@RequestMapping(value = "getTopCategory", method = RequestMethod.POST)
			public void getTopCategory(WXMPAcceptData acceptData, PrintWriter out) {
			public void getTopCategory(WXMPAcceptData acceptData, Long uid, PrintWriter out) {
			JSONObject data = new JSONObject();
			data.put("list", configService.get(ConfigKeyEnum.jdWXMPClass.getKey()));

			String tips = null;
			if (uid == null \|\| uid <= 0) {
			tips = configService.get(ConfigKeyEnum.tipGuideNewUser.getKey());
			} else {
			long rebateOrder = hongBaoV2CountService.countRebateOrder(uid);
			long shareOrInviteOrder = hongBaoV2CountService.countShareOrInviteOrder(uid);
			if (rebateOrder + shareOrInviteOrder >= 3) {
			// çå®¢ç
			} else if (rebateOrder <= 0 && shareOrInviteOrder <= 0) {
			// æ°äººç
			tips = configService.get(ConfigKeyEnum.tipGuideNewUser.getKey());
			} else if (rebateOrder > 0 && shareOrInviteOrder <= 0) {
			// çé±ç
			tips = configService.get(ConfigKeyEnum.tipGuideSaveMoney.getKey());
			} else {
			// èµé±ç
			tips = configService.get(ConfigKeyEnum.tipGuideShareInvite.getKey());
			}
			}

			if (!StringUtil.isNullOrEmpty(tips)) {
			JSONObject tipData = JSONObject.fromObject(tips);
			data.put("tipData", tipData);
			}

			out.print(JsonUtil.loadTrueResult(data));
			}


			/**
			* ä¸çº§åç±»åå
			*
			@@ -167,7 +190,7 @@
			out.print(JsonUtil.loadFalseResult("åç±»IDä¸ºç©º"));
			return;
			}


			JSONObject data = new JSONObject();
			if (page == 1) {
			// è½®æå¾
			@@ -185,11 +208,10 @@
			params = JSONObject.fromObject(swiper.getParams());
			}
			swiper.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(swiper.getJumpDetail()));
			swiper.setParams(null);
			}
			data.put("bannerList", JsonUtil.getApiCommonGson().toJson(picList));
			}


			JDFilter filterAPI = new JDFilter();
			filterAPI.setPageIndex(page);
			filterAPI.setPageSize(Constant.PAGE_SIZE);
			@@ -197,7 +219,7 @@
			filterAPI.setIsHot(1); // çæ¬¾
			filterAPI.setCid1(cid);
			JDSearchResult result = JDApiUtil.queryByKey(filterAPI);


			long count = 0;
			JSONArray array = new JSONArray();
			if (result != null) {
			@@ -226,21 +248,24 @@
			out.print(JsonUtil.loadTrueResult(data));
			}



			/**
			* è·åååè¯¦æ
			*
			* @param acceptData
			* @param goodsId ååid
			* @param uid
			* @param code éè¯·ç
			* @param goodsType ååç±»å
			* @param from é¡µé¢æ¥æº
			* @param goodsId
			* ååid
			* @param uid
			* @param code
			* éè¯·ç
			* @param goodsType
			* ååç±»å
			* @param from
			* é¡µé¢æ¥æº
			* @param out
			*/
			@RequestMapping(value = "getGoodsDetial", method = RequestMethod.POST)
			public void getGoodsDetial(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from,
			Long uid, PrintWriter out) {
			public void getGoodsDetial(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, Long uid,
			PrintWriter out) {
			if (goodsType == null \|\| goodsType < 2 \|\| goodsType > 3) {
			out.print(JsonUtil.loadFalseResult(1, "è¯·ä¼ éæ£ç¡®å¹³å°åæ°"));
			return;
			@@ -320,9 +345,7 @@
			// ä½¿ç¨å¥å±å¸æé«è¿
			if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
			maxMoneyPlus = "ï¼äº¬ä¸plusè¿Â¥"
			+ JDUtil.getGoodsFanLiMoneyPlus(jdGoods,
			hongBaoManageService.getVIPFanLiRate())
			+ "ï¼";
			+ JDUtil.getGoodsFanLiMoneyPlus(jdGoods, hongBaoManageService.getVIPFanLiRate()) + "ï¼";
			} else
			maxMoneyPlus = "ï¼äº¬ä¸plusæé«è¿Â¥"
			+ fanliMoneyPlus.add(MoneyBigDecimalUtil.mul(fanliMoneyPlus, Constant.MAX_REWARD_RATE))
			@@ -475,10 +498,10 @@
			goodsDetail.setShopInfo(null);
			}
			}


			GoodsDetailExtraVO extraVO = new GoodsDetailExtraVO();
			extraVO.setDetailUrl("http://apph5.banliapp.com/apppage/goods_img_pdd.html?id=" + id);


			String salesTip = pddGoods.getSalesTip();
			if (!StringUtil.isNullOrEmpty(salesTip)) {
			int indexOf = salesTip.indexOf("+");
			@@ -657,20 +680,24 @@
			}
			}


			/**
			* è·åååè¯¦æ
			*
			* @param acceptData
			* @param goodsId ååid
			* @param uid
			* @param code éè¯·ç
			* @param goodsType ååç±»å
			* @param from é¡µé¢æ¥æº
			* @param goodsId
			* ååid
			* @param uid
			* @param code
			* éè¯·ç
			* @param goodsType
			* ååç±»å
			* @param from
			* é¡µé¢æ¥æº
			* @param out
			*/
			@RequestMapping(value = "getBuyLink", method = RequestMethod.POST)
			public void getBuyLink(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from,
			String couponUrl, Long uid, String inviteCode, PrintWriter out) {
			public void getBuyLink(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, String couponUrl,
			Long uid, String inviteCode, PrintWriter out) {
			if (goodsId == null \|\| goodsType == null) {
			out.print(JsonUtil.loadFalseResult(1, "ååä¿¡æ¯ä¼ ééè¯¯"));
			return;
			@@ -678,7 +705,7 @@

			// å¤ææ¯èªè´ è¿æ¯æ ¹æ®éè¯·ç
			boolean share = false;


			String subUnionId = "";
			if (uid != null) {
			UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
			@@ -687,7 +714,7 @@
			return;
			}
			subUnionId = uid.toString();
			} else if ((uid == null \|\| uid < 1) && !StringUtil.isNullOrEmpty(inviteCode) ) {
			} else if ((uid == null \|\| uid < 1) && !StringUtil.isNullOrEmpty(inviteCode)) {
			try {
			UserInfo user = userInfoExtraService.getUserByInviteCode(inviteCode);
			if (user != null && user.getState() == UserInfo.STATE_NORMAL) {
			@@ -697,8 +724,8 @@
			} catch (UserInfoExtraException e) {
			e.printStackTrace();
			}
			}

			}

			String jumpLink = null;
			if (goodsType.intValue() == Constant.SOURCE_TYPE_JD) { // äº¬ä¸
			JDGoods goods = jdGoodsCacheUtil.getGoodsInfo(goodsId);
			@@ -706,7 +733,7 @@
			out.print(JsonUtil.loadFalseResult(2, "ååå·²ä¸æ¶"));
			return;
			}


			String materialId = "https://item.jd.com/" + goodsId + ".html";
			if (StringUtil.isNullOrEmpty(couponUrl)) {
			JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(goods.getCouponInfoList(), goods.getPrice());
			@@ -714,9 +741,8 @@
			couponUrl = couponInfo.getLink();
			}
			}


			long position = JDApiUtil.POSITION_FANLI;

			long position = JDApiUtil.POSITION_FANLI;
			if (share) {
			position = JDApiUtil.POSITION_SHARE;
			}
			@@ -732,7 +758,7 @@
			out.print(JsonUtil.loadFalseResult(2, "ååå·²ä¸æ¶"));
			return;
			}


			String position = PinDuoDuoApiUtil.PID_FANLI;
			if (share) {
			position = PinDuoDuoApiUtil.PID_SHARE;
			@@ -747,17 +773,16 @@
			out.print(JsonUtil.loadFalseResult(1, "åå»ºè´ä¹°ä¿¡æ¯å¤±è´¥"));
			return;
			}


			JSONObject data = new JSONObject();
			data.put("goodsType", goodsType);
			data.put("jumpLink", jumpLink);
			out.print(JsonUtil.loadTrueResult(data));
			}




			/**
			* åäº«ååæµ·æ¥
			*
			* @param acceptData
			* @param goodsId
			* @param goodsType
			@@ -767,36 +792,35 @@
			* @param out
			*/
			@RequestMapping(value = "sharePoster", method = RequestMethod.POST)
			public void sharePoster(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, Integer type,
			public void sharePoster(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, Integer type,
			Long uid, PrintWriter out) {
			if (uid == null \|\| uid < 1) {
			out.print(JsonUtil.loadFalseResult(1, "ç¨æ·æªç»å½"));
			return;
			}


			if (goodsId == null \|\| goodsType == null) {
			out.print(JsonUtil.loadFalseResult(1, "ååä¿¡æ¯ä¼ ééè¯¯"));
			return;
			}


			if (type == null \|\| type < 1 \|\| type > 2) {
			out.print(JsonUtil.loadFalseResult(1, "åäº«ç±»åéè¯¯"));
			return;
			}


			UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
			if (user != null && user.getState() != UserInfo.STATE_NORMAL) {
			out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));
			return;
			}


			String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
			if (StringUtil.isNullOrEmpty(inviteCode)) {
			out.print(JsonUtil.loadFalseResult(1, "éè¯·ç æªæ¿æ´»"));
			return;
			}


			if (goodsType.intValue() == Constant.SOURCE_TYPE_JD) { // äº¬ä¸
			createPosterJD(acceptData, goodsId, goodsType, from, type, user, inviteCode, out);
			} else if (goodsType.intValue() == Constant.SOURCE_TYPE_PDD) { // æ¼å¤å¤
			@@ -805,43 +829,44 @@
			out.print(JsonUtil.loadFalseResult(1, "åæ°ä¼ ééè¯¯"));
			}
			}



			/**
			* åå»ºäº¬ä¸åäº«æµ·æ¥
			*/
			private void createPosterJD(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, Integer type, UserInfo user,
			String inviteCode, PrintWriter out) {
			private void createPosterJD(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, Integer type,
			UserInfo user, String inviteCode, PrintWriter out) {
			JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsId);
			if (jdGoods == null) {
			out.print(JsonUtil.loadFalseResult(2, "ååå·²ä¸æ¶"));
			return;
			}
			ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),acceptData.getVersion());
			ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
			acceptData.getVersion());
			GoodsDetailVO goods = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);

			String scene = goodsType+"#"+goodsId+"#" + inviteCode;

			String scene = goodsType + "#" + goodsId + "#" + inviteCode;
			FileUploadResult uploadResult = null;
			if (type == 1) {
			String erCodeUrl = "https://wxmp.banliapp.com/goods?i="+ scene;
			String erCodeUrl = "https://wxmp.banliapp.com/goods?i=" + scene;
			uploadResult = qrCodeService.drawGoodsPoster(erCodeUrl, user.getPortrait(), goods);
			} else {
			String acessToken = WXUtil.getAcessToken(Constant.WXMP_APP_INFO.getAppId(), Constant.WXMP_APP_INFO.getAppSecret());
			String acessToken = WXUtil.getAcessToken(Constant.WXMP_APP_INFO.getAppId(),
			Constant.WXMP_APP_INFO.getAppSecret());
			InputStream xcxCode = WXXCXUtil.getXCXCode(acessToken, "/pages/goods/goods", scene);
			uploadResult = qrCodeService.drawGoodsPosterXCX(xcxCode, user, goods);
			}


			try {
			userShareGoodsRecordService.saveShareRecord(user.getId(), CommonGoodsFactory.create(jdGoods));
			} catch (UserShareGoodsRecordException e) {
			e.printStackTrace();
			}
			String posterLink = uploadResult.getUrl();


			JSONObject data = new JSONObject();
			data.put("posterLink", posterLink);
			out.print(JsonUtil.loadTrueResult(data));


			com.yeshi.fanli.util.ThreadUtil.run(new Runnable() {
			@Override
			public void run() {
			@@ -862,43 +887,44 @@
			}
			});
			}



			/**
			* åå»ºæ¼å¤å¤åäº«æµ·æ¥
			*/
			private void createPosterPDD(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, Integer type, UserInfo user,
			String inviteCode, PrintWriter out) {
			private void createPosterPDD(WXMPAcceptData acceptData, Long goodsId, Integer goodsType, String from, Integer type,
			UserInfo user, String inviteCode, PrintWriter out) {
			PDDGoodsDetail pddGoods = pinDuoDuoCacheUtil.getGoodsInfo(goodsId);
			if (pddGoods == null) {
			out.print(JsonUtil.loadFalseResult(2, "ååå·²ä¸æ¶"));
			return;
			}
			ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion());
			ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
			acceptData.getVersion());
			GoodsDetailVO goods = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);

			String scene = goodsType+"#"+goodsId+"#" + inviteCode;

			String scene = goodsType + "#" + goodsId + "#" + inviteCode;
			FileUploadResult uploadResult = null;
			if (type == 1) {
			String erCodeUrl = "https://wxmp.banliapp.com/goods?info="+ scene;
			String erCodeUrl = "https://wxmp.banliapp.com/goods?info=" + scene;
			uploadResult = qrCodeService.drawGoodsPoster(erCodeUrl, user.getPortrait(), goods);
			} else {
			String acessToken = WXUtil.getAcessToken(Constant.WXMP_APP_INFO.getAppId(), Constant.WXMP_APP_INFO.getAppSecret());
			String acessToken = WXUtil.getAcessToken(Constant.WXMP_APP_INFO.getAppId(),
			Constant.WXMP_APP_INFO.getAppSecret());
			InputStream xcxCode = WXXCXUtil.getXCXCode(acessToken, "/pages/goods/goods", scene);
			uploadResult = qrCodeService.drawGoodsPosterXCX(xcxCode, user, goods);
			}


			try {
			userShareGoodsRecordService.saveShareRecord(user.getId(), CommonGoodsFactory.create(pddGoods));
			} catch (UserShareGoodsRecordException e) {
			e.printStackTrace();
			}
			String posterLink = uploadResult.getUrl();


			JSONObject data = new JSONObject();
			data.put("posterLink", posterLink);
			out.print(JsonUtil.loadTrueResult(data));


			// å¼æ¥æä½
			com.yeshi.fanli.util.ThreadUtil.run(new Runnable() {
			@Override

			@@ -137,7 +137,6 @@
			params = JSONObject.fromObject(swiper.getParams());
			}
			swiper.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(swiper.getJumpDetail()));
			swiper.setParams(null);
			}

			// åå½¢ä¸é¢
			@@ -157,7 +156,6 @@
			}

			special.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(jumpDetail));
			special.setParams(null);
			}

			// æ´»å¨
			@@ -172,7 +170,6 @@
			params = JSONObject.fromObject(swiper.getParams());
			}
			swiper.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(swiper.getJumpDetail()));
			swiper.setParams(null);
			}

			JSONObject data = new JSONObject();
			@@ -221,6 +218,7 @@
			JSONObject data = new JSONObject();
			data.put("list", new JSONArray());
			data.put("count", 0);
			data.put("page", page);
			out.print(JsonUtil.loadTrueResult(data));
			}
			}
			@@ -260,6 +258,7 @@

			data.put("list", array);
			data.put("count", count);
			data.put("page", page);
			out.print(JsonUtil.loadTrueResult(data));
			}

			@@ -292,6 +291,7 @@
			JSONObject data = new JSONObject();
			data.put("list", array);
			data.put("count", count);
			data.put("page", page);
			out.print(JsonUtil.loadTrueResult(data));
			}

			@@ -1,6 +1,7 @@
			package com.yeshi.fanli.controller.wxmp.v1;

			import java.io.PrintWriter;
			import java.util.ArrayList;
			import java.util.List;
			import java.util.regex.Matcher;
			import java.util.regex.Pattern;
			@@ -24,12 +25,15 @@
			import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
			import com.yeshi.fanli.dto.pdd.PDDGoodsResult;
			import com.yeshi.fanli.dto.pdd.PDDSearchFilter;
			import com.yeshi.fanli.entity.accept.AcceptData;
			import com.yeshi.fanli.entity.bus.search.HotSearch;
			import com.yeshi.fanli.entity.goods.CommonGoods;
			import com.yeshi.fanli.entity.jd.JDGoods;
			import com.yeshi.fanli.entity.system.ConfigKeyEnum;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.inter.brand.BrandInfoService;
			import com.yeshi.fanli.service.inter.config.ConfigService;
			import com.yeshi.fanli.service.inter.config.HotSearchService;
			import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
			import com.yeshi.fanli.service.manger.goods.jd.JDGoodsLinkParseManager;
			import com.yeshi.fanli.tag.PageEntity;
			@@ -66,7 +70,9 @@

			@Resource
			private JDGoodsLinkParseManager jdGoodsLinkParseManager;


			@Resource
			private HotSearchService hotSearchService;

			/**
			* ç²è´´æ¿ä¿¡æ¯æ¨è
			@@ -82,7 +88,7 @@
			out.print(JsonUtil.loadFalseResult("å¼ä¸ºç©º"));
			return;
			}


			// å»é¤ååç©ºæ ¼
			int type = 1;
			text = text.trim();
			@@ -163,7 +169,7 @@
			}
			}
			}


			if (commonGoods == null) {
			out.println(JsonUtil.loadFalseResult("ææªæ¾å°è¯¥ååï¼è¯·ç¨ååè¯ï¼"));
			return;
			@@ -179,17 +185,48 @@
			data.put("goods", goodsJSON);
			out.print(JsonUtil.loadTrueResult(data));
			return;
			}

			}

			JSONObject data = new JSONObject();
			Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
			.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
			data.put("type", type);
			data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, hongBaoManageService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion()))));
			data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods,
			hongBaoManageService.getShowComputeRate(acceptData.getPlatform(), acceptData.getVersion()))));
			out.print(JsonUtil.loadTrueResult(data));
			return;
			}

			/**
			* çé¨æç´¢
			*
			* @param acceptData
			* @param goodsType
			* @param out
			*/
			@RequestMapping(value = "gethotsearch", method = RequestMethod.POST)
			public void getHotSearch(AcceptData acceptData, Integer goodsType, PrintWriter out) {
			// é»è®¤æ·å®
			if (goodsType == null) {
			goodsType = Constant.SOURCE_TYPE_TAOBAO;
			}

			List<HotSearch> list = hotSearchService.getHotSearchCache(goodsType);
			if (list == null \|\| list.size() == 0) {
			out.print(JsonUtil.loadFalseResult("æ²¡ææ°æ®"));
			return;
			}
			List<String> hotSearchList = new ArrayList<String>();
			if(list!=null)
			for (HotSearch hot : list)
			hotSearchList.add(hot.getName());

			JSONObject data = new JSONObject();
			data.put("count", list.size());
			data.put("hotSearchList", hotSearchList);
			data.put("helpLink", configService.get(ConfigKeyEnum.newerGonglue.getKey()));
			out.print(JsonUtil.loadTrueResult(data));
			}

			/**
			* æç´¢åéè¯
			@@ -253,11 +290,11 @@
			out.print(JsonUtil.loadFalseResult(1, "è¯·è¾å¥æç´¢åå®¹"));
			return;
			}


			if (page == null \|\| page < 1) {
			page = 1;
			}


			final String searchkey = key.trim();
			if (searchkey.startsWith("http://") \|\| searchkey.startsWith("https://")) {
			JSONObject data = new JSONObject();
			@@ -279,7 +316,6 @@
			return;
			}
			}


			/**
			* äº¬ä¸

			@@ -239,11 +239,11 @@
			* @param out
			*/
			@UserActive(uid = "#uid")
			@RequestMapping(value = "getUserInfo", method = RequestMethod.POST)
			public void getuserinfoNew(AcceptData acceptData, Long uid, HttpServletRequest requst, PrintWriter out) {
			@RequestMapping(value = "getUserInfo")
			public void getuserinfoNew(WXMPAcceptData acceptData, Long uid, HttpServletRequest requst, PrintWriter out) {
			try {
			BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
			acceptData.getPackages());
			acceptData.getAppId());
			if (system == null) {
			out.print(JsonUtil.loadFalseResult("ç³»ç»ä¸åå¨"));
			return;
			@@ -258,12 +258,12 @@

			// æ·»å ç¨æ·æ´»è·è®°å½
			UserActiveLog userActiveLog = new UserActiveLog();
			userActiveLog.setChannel(acceptData.getChannel());
			userActiveLog.setChannel("wxmp");
			userActiveLog.setIp(requst.getRemoteHost());
			userActiveLog.setUid(userInfo.getId());
			userActiveLog.setVersionCode(acceptData.getVersion());
			userActiveLog.setOsVersion(acceptData.getOsVersion());
			userActiveLog.setDeviceType(acceptData.getDeviceType());
			userActiveLog.setOsVersion(acceptData.getWxVersion());
			userActiveLog.setDeviceType("wxmp");
			userActiveLog.setDevice(acceptData.getDevice());
			userActiveLogService.addUserActiveLog(userActiveLog);

			@@ -150,7 +150,7 @@

			commonMsgList.add(new UserCommonMsgVO(zhuShouMsg.getIcon(), zhuShouMsg.getTitle(),
			zhuShouMsg.getUpdateTime(), UserCommonMsgVO.TYPE_ZHUSHOU, zhuShouMsg.getContent(), read,
			wxmpJumDetail, null, 0));
			wxmpJumDetail, zhuShouMsg.getParams(), 0));


			}

			@@ -15,7 +15,7 @@
			public class AppVersionInfo {
			public final static String PLATFORM_ANDROID = "android";
			public final static String PLATFORM_IOS = "ios";
			public final static String PLATFORM_XCX = "å°ç¨åº";
			public final static String PLATFORM_XCX = "wxmp";

			public AppVersionInfo(Long id) {
			super();

			@@ -166,7 +166,8 @@
			//ææ¡è½¬é¾
			convertDocWebLink("convert_doc_web_link","ææ¡è½¬é¾ç½é¡µ"),
			convertDocHelpLink("convert_doc_help_link","ææ¡è½¬é¾å¸®å©ç½é¡µ"),
			convertDocTip("convert_doc_tip","ææ¡è½¬é¾æ¸©é¦¨æç¤º")
			convertDocTip("convert_doc_tip","ææ¡è½¬é¾æ¸©é¦¨æç¤º"),
			newerGonglue("newer_gonglue_url","æ°ææ»ç¥é¾æ¥")
			;

			private final String key;

			@@ -7,6 +7,7 @@
			taobaoTaoke("æ·å®¢api"),
			taobaoTrade("æ·å®äº¤æï¼åäº«/èªè´ï¼"),
			taobaoAuth("æ·å®ææ"),
			taobaoGoods("æ·å®ååä¿¡æ¯"),
			userLogin("ç¨æ·ç»å½");

			private String desc;

			@@ -22,6 +22,7 @@
			private static final String ANDROID = "ANDROID";
			private static final String IOS = "IOS";
			private static final String WEB = "WEB";
			private static final String WXMP = "WXMP";

			private static final Map<String, Integer> map = new HashMap<String, Integer>();

			@@ -29,6 +30,7 @@
			map.put(ANDROID, 1);
			map.put(IOS, 2);
			map.put(WEB, 3);
			map.put(WXMP, 4);
			}

			@Override

			@@ -45,6 +45,8 @@
			import com.yeshi.fanli.exception.order.CommonOrderException;
			import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.log.LogManager;
			import com.yeshi.fanli.log.LogType;
			import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
			import com.yeshi.fanli.service.inter.config.ConfigService;
			import com.yeshi.fanli.service.inter.config.SystemCouponService;
			@@ -173,7 +175,7 @@
			if (source != null) {
			listSource.add(source);
			}


			return commonOrderMapper.listUserOrder(start, count, uid, state, type, orderState, orderNo, startTime, endTime,
			dateType, listSource);
			}
			@@ -187,12 +189,12 @@

			@Override
			public List<CommonOrderVO> getOrderByUid(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
			Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, List<Integer> listSource)
			throws CommonOrderException, Exception {
			Integer orderState, String orderNo, String startTime, String endTime, Integer dateType,
			List<Integer> listSource) throws CommonOrderException, Exception {

			int pageSize = Constant.PAGE_SIZE;
			List<CommonOrderVO> listOrder = commonOrderMapper.listUserOrder((page - 1) * pageSize, pageSize, uid, state, type,
			orderState, orderNo, startTime, endTime, dateType, listSource);
			List<CommonOrderVO> listOrder = commonOrderMapper.listUserOrder((page - 1) * pageSize, pageSize, uid, state,
			type, orderState, orderNo, startTime, endTime, dateType, listSource);

			// è®¢åä¿¡æ¯ä¸ºç©º
			if (listOrder == null \|\| listOrder.size() == 0) {
			@@ -703,9 +705,9 @@
			return;

			// ä¸åæ¥ææ¯å¦æ¯ç¬¦åä¸çº¿æ¥æ
			long downOrderTime = thirdCreateTime.getTime();
			long downOrderTime = thirdCreateTime.getTime();
			long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
			if (downOrderTime > limitDate) {
			if (downOrderTime > limitDate) {
			// 2.1 å¼å§æ°ç
			rewardCounponLimitTime(order, accountTime);
			} else if (hasRewardCoupon) {
			@@ -877,7 +879,7 @@
			return commonOrderMapper.listBySourceTypeAndOrderNo(sourceType, orderId);
			}

			@Transactional(rollbackFor=Exception.class)
			@Transactional(rollbackFor = Exception.class)
			@Override
			public List<CommonOrderAddResultDTO> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid)
			throws CommonOrderException {
			@@ -914,11 +916,15 @@
			TaoBaoGoodsBrief taoBaoGoods = null;
			try {
			taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());
			LogManager.getLogger(LogType.taobaoGoods).info(String.format("è®¢ååååç±»:%s#%s#%s",
			taoBaoGoods.getAuctionId(), taoBaoGoods.getRootCategoryName(), taoBaoGoods.getLeafName()));
			} catch (TaobaoGoodsDownException e) {
			e.printStackTrace();
			LogHelper.errorDetailInfo(e, "AUCTIONID:" + taoBaoOrder.getAuctionId(), "");
			try {
			taoBaoGoods = TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());
			// è®°å½åååç±»

			} catch (Exception e1) {
			CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(
			taoBaoOrder.getAuctionId(), Constant.SOURCE_TYPE_TAOBAO);
			@@ -939,7 +945,7 @@
			return commonOrderList;
			}

			@Transactional(rollbackFor=Exception.class)
			@Transactional(rollbackFor = Exception.class)
			@Override
			public List<CommonOrderAddResultDTO> addPDDOrder(List<PDDOrder> pddOrderList, Long uid)
			throws CommonOrderException {
			@@ -989,7 +995,7 @@
			return commonOrderList;
			}

			@Transactional(rollbackFor=Exception.class)
			@Transactional(rollbackFor = Exception.class)
			@Override
			public List<CommonOrderAddResultDTO> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException {
			List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();
			@@ -1059,7 +1065,7 @@
			*
			* @param commonOrder
			*/
			@Transactional(rollbackFor=Exception.class)
			@Transactional(rollbackFor = Exception.class)
			private CommonOrderAddResultDTO addCommonOrder(CommonOrder commonOrder) throws CommonOrderException {
			// å¤æååæ¯å¦åå¨
			if (commonOrder == null)
			@@ -1660,16 +1666,15 @@
			public long count24HValidOrderByUid(Long uid, Date minTime) {
			return commonOrderMapper.count24HValidOrderByUid(uid, minTime);
			}



			@Override
			public long countSearchOrderByUid(Long uid, List<ESOrder> list) {
			return commonOrderMapper.countSearchOrderByUid(uid, list);
			}


			@Override
			public List<CommonOrderVO> searchOrderByUid (int page, int size, Long uid, List<ESOrder> list) throws Exception {
			List<CommonOrderVO> listVO = commonOrderMapper.searchOrderByUid((page-1) * size, size, uid, list);
			public List<CommonOrderVO> searchOrderByUid(int page, int size, Long uid, List<ESOrder> list) throws Exception {
			List<CommonOrderVO> listVO = commonOrderMapper.searchOrderByUid((page - 1) * size, size, uid, list);

			// è®¢åä¿¡æ¯ä¸ºç©º
			if (listVO == null \|\| listVO.size() == 0) {
			@@ -1686,11 +1691,10 @@

			// æ°æ®å å·¥éæ°ç»ç»
			orderVOFactoryNew(listVO, listGoods, uid);


			return listVO;
			}



			/**
			* è®¢åä¿¡æ¯å å·¥
			*
			@@ -1699,7 +1703,8 @@
			* @param listGoods
			* @param uid
			*/
			private void orderVOFactoryNew(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid) throws Exception {
			private void orderVOFactoryNew(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid)
			throws Exception {
			List<String> listTB = new ArrayList<String>();
			List<String> listJD = new ArrayList<String>();
			List<String> listPDD = new ArrayList<String>();
			@@ -1896,8 +1901,7 @@
			orderStateContent = "å®åæå";
			WeiQuanInfo weiQuanInfo = new WeiQuanInfo();
			weiQuanInfo.setOldHongBao("Â¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
			weiQuanInfo
			.setWqHongBao("å®åï¼-Â¥" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
			weiQuanInfo.setWqHongBao("å®åï¼-Â¥" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
			hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
			order.setWeiQuanInfo(weiQuanInfo);
			}
			@@ -1941,8 +1945,8 @@
			signList.add(CommonOrder.TYPE_INVITE);

			// è¶çº§ä¼åè¡¥è´´ä¿¡æ¯
			InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid,
			order.getOrderNo(), sourceType);
			InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(),
			sourceType);
			if (orderSubsidy != null) {
			ClientTextStyleVO subsidyInfo = new ClientTextStyleVO();
			subsidyInfo.setContent("(è¡¥è´´Â¥" + orderSubsidy.getMoney() + ")");
			@@ -2055,8 +2059,8 @@
			* @param list
			* @param signList
			*/
			private void couponFactoryNew(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState, Integer hongBaoType,
			List<UserSystemCouponRecord> list, Long uid, boolean vip) throws Exception {
			private void couponFactoryNew(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState,
			Integer hongBaoType, List<UserSystemCouponRecord> list, Long uid, boolean vip) throws Exception {
			// æ¯å¦åååå
			boolean freeOrder = false;
			// æ¯å¦å¥å±æå
			@@ -2153,7 +2157,7 @@
			// ä¸åæ¥ææ¯å¦æ¯ç¬¦åä¸çº¿æ¥æ
			long downOrderTime = thirdCreateTime.getTime();
			long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
			if (downOrderTime > limitDate) {
			if (downOrderTime > limitDate) {
			// 2.1 å¼å§æ°ç
			rewardCounponLimitTime(order, accountTime);
			} else if (hasRewardCoupon) {
			@@ -2179,6 +2183,5 @@
			}
			}
			}


			}

			@@ -114,6 +114,15 @@
			@Resource
			private HongBaoV2SettleTempService hongBaoV2SettleTempService;

			//ä¸çº§è¢«å°ç¦ï¼çº¢åå¤±æ
			private void invalidHongBaoForbidden(Long id) {
			HongBaoV2 updateHongBaoV2 = new HongBaoV2(id);
			updateHongBaoV2.setState(HongBaoV2.STATE_SHIXIAO);
			updateHongBaoV2.setBeizhu("å°ç¦å¤±æ");
			updateHongBaoV2.setUpdateTime(new Date());
			hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBaoV2);
			}

			@Transactional(rollbackFor = Exception.class)
			@Override
			public void inviteSettleTB(Long uid) throws OrderMoneySettleException {
			@@ -145,6 +154,7 @@
			// ä¸çº§ç¨æ·ä¸æ¯æ£å¸¸ç¨æ·ï¼è®¢ååä¸è½å°è´¦
			UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());
			if (userInfo == null \|\| userInfo.getState() != UserInfo.STATE_NORMAL) {
			invalidHongBaoForbidden(item.getId());
			hongBaoList.remove(i);
			i--;
			}
			@@ -210,6 +220,7 @@
			// ä¸çº§ç¨æ·ä¸æ¯æ£å¸¸ç¨æ·ï¼è®¢ååä¸è½å°è´¦
			UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());
			if (userInfo == null \|\| userInfo.getState() != UserInfo.STATE_NORMAL) {
			invalidHongBaoForbidden(item.getId());
			hongBaoList.remove(i);
			i--;
			}
			@@ -269,6 +280,7 @@
			// ä¸çº§ç¨æ·ä¸æ¯æ£å¸¸ç¨æ·ï¼è®¢ååä¸è½å°è´¦
			UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());
			if (userInfo == null \|\| userInfo.getState() != UserInfo.STATE_NORMAL) {
			invalidHongBaoForbidden(item.getId());
			hongBaoList.remove(i);
			i--;
			}
			@@ -479,7 +491,7 @@
			Long uid = its.next();
			if (userSubMoneyMap.get(uid) != null) {
			// åå»ç»´æèµé
			userMoney.put(uid, userMoney.get(uid).subtract(userSubMoneyMap.get(uid)));
			userMoney.put(uid, userMoney.get(uid).subtract(userSubMoneyMap.get(uid)));
			}
			}
			}

			@@ -73,10 +73,10 @@

			@Resource
			private UserMoneyMsgNotificationService userMoneyMsgNotificationService;


			@Resource
			private ConfigService configService;


			@Resource
			private AdminUserService adminUserService;

			@@ -132,7 +132,7 @@
			}
			}

			@Transactional(rollbackFor=Exception.class)
			@Transactional(rollbackFor = Exception.class)
			@Override
			public void payOrderByMoney(Long orderId, BigDecimal money) throws BanLiShopOrderException {
			BanLiShopOrder order = banLiShopOrderService.selectByPrimaryKeyForUpdate(orderId);
			@@ -176,7 +176,7 @@
			*/
			private void paySuccess(BanLiShopOrder order) {
			ThreadUtil.run(new Runnable() {


			@Override
			public void run() {
			long[] targetUids = new long[] { 3L, 4L };
			@@ -191,11 +191,10 @@
			}
			}
			});



			}

			@Transactional(rollbackFor=Exception.class)
			@Transactional(rollbackFor = Exception.class)
			@Override
			public void refund(Long orderId) throws BanLiShopOrderException {
			// è®¢åéæ¬¾
			@@ -392,4 +391,48 @@
			}
			}

			@Transactional(rollbackFor = Exception.class)
			@Override
			public void invalidOrderByOrderId(Long orderId, String stateDesc) throws BanLiShopOrderException {

			BanLiShopOrder order = banLiShopOrderService.selectByPrimaryKeyForUpdate(orderId);
			if (order == null)
			return;
			// éæ¬¾
			if (order.getState() == BanLiShopOrder.STATE_NO_PAY) {// ç¶æè¿æ¯æªæ¯ä»
			// éæ¬¾çº¢å
			if (order.getHongBaoPaymentState() != null
			&& order.getHongBaoPaymentState() == BanLiShopOrder.PAY_STATE_PAID) {
			BanLiShopGoods goods = banLiShopGoodsService.selectByPrimaryKey(order.getGoods().getId());
			BanLiShopGoodsClass goodsClass = banLiShopGoodsClassService
			.selectByPrimaryKey(goods.getGoodsClass().getId());
			BanLiShopGoodsSets set = banLiShopGoodsSetService.selectByPrimaryKey(order.getGoodsSet().getId());
			// çº¢åéæ¬¾
			RedPackDetail detail = null;
			try {
			detail = RedPackDetailFactory.createShopOrderDrawBack(orderId, order.getUid(), goodsClass.getName(),
			set.getName(), order.getHongBaoPayment());
			} catch (RedPackDetailException e) {
			e.printStackTrace();
			}

			if (detail == null)
			throw new BanLiShopOrderException(4, "çº¢åè¯¦æå¤±è´¥");
			try {
			redPackBalanceService.addRedPack(order.getUid(), order.getHongBaoPayment(), detail);
			} catch (RedPackBalanceException e) {
			throw new BanLiShopOrderException(5, "çº¢åéæ¬¾å¤±è´¥");
			}

			BanLiShopOrder update = new BanLiShopOrder(order.getId());
			update.setHongBaoPaymentState(BanLiShopOrder.PAY_STATE_REFUND);
			update.setUpdateTime(new Date());
			banLiShopOrderService.udpateSelectiveByPrimaryKey(update);
			}

			banLiShopOrderService.invalidOrderByOrderId(orderId, stateDesc);
			}

			}

			}

			@@ -91,12 +91,11 @@

			@Resource
			private UserMoneyMsgNotificationService userMoneyMsgNotificationService;


			@Resource
			private RedPackForbidService redPackForbidService;


			@Transactional(rollbackFor=Exception.class)
			@Transactional(rollbackFor = Exception.class)
			@Override
			public void addOrder(BanLiShopOrder order) throws BanLiShopOrderException {
			// æ¥è¯¢å¿è¦çåæ°æ¯å¦æ·»å
			@@ -224,7 +223,7 @@
			banLiShopOrderMapper.updateByPrimaryKeySelective(order);
			}

			@Transactional(rollbackFor=Exception.class)
			@Transactional(rollbackFor = Exception.class)
			@Override
			public void payOrderByHongBao(Long orderId) throws BanLiShopOrderException, RedPackBalanceException {
			BanLiShopOrder order = banLiShopOrderMapper.selectByPrimaryKeyForUpdate(orderId);
			@@ -329,6 +328,7 @@
			return banLiShopOrderMapper.selectByPrimaryKeyForUpdate(id);
			}

			@Transactional(rollbackFor = Exception.class)
			@Override
			public void invalidOrderByOrderId(Long id, String desc) {
			// å¤æè®¢åæ¯å¦åå¨
			@@ -347,8 +347,8 @@
			if (isS)// æ¯ä»æåï¼éæ°åéæ¯ä»æåæ¶æ¯
			{
			BanLiShopOrderMQMsg msg = new BanLiShopOrderMQMsg(order.getId(), order.getUid());
			Message message =MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER,
			OrderTopicTagEnum.banLiShopOrderPaid,msg);
			Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER,
			OrderTopicTagEnum.banLiShopOrderPaid, msg);
			producer.send(message);
			return;
			}
			@@ -379,8 +379,8 @@
			if (order.getState() != BanLiShopOrder.STATE_PAID)
			throw new BanLiShopOrderException(1, "è®¢åæªå¤äºå¾å®¡æ ¸ç¶æ");

			Message message =MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.banLiShopOrderRefund,
			new BanLiShopOrderMQMsg(order.getId(), order.getUid()));
			Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.banLiShopOrderRefund,
			new BanLiShopOrderMQMsg(order.getId(), order.getUid()));
			try {
			orderTransactionProducer.send(message, new LocalTransactionExecuter() {
			@Override
			@@ -440,9 +440,9 @@
			throw new BanLiShopOrderException(22, "ååå·²ä¸çº¿");
			}

			if(redPackForbidService.verifyForbid(uid))
			if (redPackForbidService.verifyForbid(uid))
			throw new BanLiShopOrderException(25, "çº¢ååè½å·²è¢«å°ç¦");


			if (pay.getHongBaoPrice() != null && pay.getHongBaoPrice().compareTo(new BigDecimal(0)) > 0) {
			BigDecimal money = redPackBalanceService.getBalance(uid);
			if (money.compareTo(pay.getHongBaoPrice()) < 0) {

			@@ -45,4 +45,16 @@
			* @throws BanLiShopOrderException
			*/
			public void charge(Long orderId) throws BanLiShopOrderException;


			/**
			* éªè¯è®¢åå¤±æç¶æ
			* @Title: invalidOrderByOrderId
			* @Description:
			* @param orderId
			* @param stateDesc
			* void è¿åç±»å
			* @throws
			*/
			public void invalidOrderByOrderId(Long orderId, String stateDesc) throws BanLiShopOrderException;
			}

			@@ -213,7 +213,7 @@
			} else if (typeSet.size() == 3) {// å£ä»¤+é¾æ¥+ææ¬
			List<String> tokenList = TaoBaoUtil.getTokenListFromText(text);
			List<String> urlList = HttpUtil.getUrlListFromText(text);
			if (text.startsWith("ã") && tokenList != null && tokenList.size() == 1 && urlList != null
			if (text.contains("ã") && tokenList != null && tokenList.size() == 1 && urlList != null
			&& urlList.size() == 1) {// Androidæ·å®é¾æ¥å¤å¶
			CommonGoods goods = null;
			try {
			@@ -222,9 +222,9 @@
			e1.printStackTrace();
			}
			if (goods == null) {
			if (text.trim().indexOf("ã") == 0 && text.trim().indexOf("ã") > 0) {
			if (text.trim().indexOf("ã") > -1 && text.trim().indexOf("ã") > 0) {
			// æªåæ é¢
			String title = text.trim().substring(1, text.trim().lastIndexOf("ã"));
			String title = text.trim().substring(text.trim().indexOf("ã")+1, text.trim().lastIndexOf("ã"));
			goods = new CommonGoods();
			goods.setTitle(title);
			goods.setPicture("http://");

			@@ -39,9 +39,9 @@

			@Override
			public Action consume(Message message, ConsumeContext context) {

			LogHelper.mqInfo("consumer:BanLiShopOrderMessageListener",message.getMsgID(), message.getTopic(), message.getTag(),
			new String(message.getBody()));

			LogHelper.mqInfo("consumer:BanLiShopOrderMessageListener", message.getMsgID(), message.getTopic(),
			message.getTag(), new String(message.getBody()));
			String tag = message.getTag();

			if (MQTopicName.TOPIC_ORDER.name().equalsIgnoreCase(message.getTopic())) {
			@@ -49,9 +49,16 @@
			BanLiShopOrderMQMsg banLiShopOrderMQMsg = new Gson().fromJson(new String(message.getBody()),
			BanLiShopOrderMQMsg.class);
			if (banLiShopOrderMQMsg != null)
			// ä½¿è®¢åå¤±æ
			banLiShopOrderService.invalidOrderByOrderId(banLiShopOrderMQMsg.getOrderId(), "è®¢åå¤±æ-é¿ææªä»æ¬¾");
			return Action.CommitMessage;
			try {
			banLiShopOrderPayService.invalidOrderByOrderId(banLiShopOrderMQMsg.getOrderId(), "è®¢åå¤±æ-é¿ææªä»æ¬¾");
			return Action.CommitMessage;
			} catch (BanLiShopOrderException e) {
			e.printStackTrace();
			return Action.CommitMessage;
			} catch (Exception e) {
			return Action.ReconsumeLater;
			}

			} else if (tag.equalsIgnoreCase(OrderTopicTagEnum.banLiShopOrderPaid.name()))// ååè®¢åä»æ¬¾æå
			{
			BanLiShopOrderMQMsg msg = new Gson().fromJson(new String(message.getBody()), BanLiShopOrderMQMsg.class);
			@@ -71,7 +78,7 @@
			}
			return Action.CommitMessage;
			}


			}
			return Action.CommitMessage;
			}

			@@ -169,6 +169,8 @@
			goods.setPictUrl(item.optString("pict_url"));
			goods.setShopTitle(item.optString("nick"));
			goods.setSellerId(item.optLong("seller_id"));
			goods.setRootCategoryName(item.optString("cat_name"));
			goods.setLeafName(item.optString("cat_leaf_name"));

			String optString = item.optString("shop_dsr");
			if (!StringUtil.isNullOrEmpty(optString)) {
			@@ -206,6 +208,9 @@
			} else
			goods.setMaterialLibType(0);

			goods.setRootCategoryName(item.optString("cat_name"));
			goods.setLeafName(item.optString("cat_leaf_name"));

			goods = loadYuShouInfo(goods, item);
			return goods;
			}

			@@ -1,9 +1,9 @@
			mongo.dbname=flq
			mongo.dbname=flq-wxmp
			mongo.port=27017
			Â
			mongo.host=172.16.16.40
			mongo.username=admin
			mongo.password=123456
			mongo.host=172.16.16.44
			mongo.username=yeshi
			mongo.password=Yeshi2016@
			mongo.connectionsPerHost=8
			mongo.threadsAllowedToBlockForConnectionMultiplier=4
			mongo.connectTimeout=1000

New file
			@@ -0,0 +1,137 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<Configuration status="INFO">

			<properties>
			<property name="LOG_HOME">logs</property>
			</properties>

			<Appenders>
			<Console name="Console" target="SYSTEM_OUT">
			<PatternLayout pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />
			</Console>

			<RollingRandomAccessFile name="running-log"
			fileName="${LOG_HOME}/${FILE_NAME}.log"
			filePattern="${LOG_HOME}/$${date:yyyy-MM}/${FILE_NAME}-%d{yyyy-MM-dd}-%i.log.gz">
			<PatternLayout
			pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />
			<Policies>
			<TimeBasedTriggeringPolicy />
			<SizeBasedTriggeringPolicy size="10 MB" />
			</Policies>
			<DefaultRolloverStrategy max="20" />
			</RollingRandomAccessFile>

			<!-- æ¶æ¯ -->
			<File name="mqSend" fileName="D:/logs/mq/mqSend.log" append="true">
			<PatternLayout
			pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />
			</File>

			<File name="mqConsume" fileName="logs/mq/mqConsume.log" append="true">
			<PatternLayout
			pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />
			</File>

			<!-- æ·å®ç¸å³ -->
			<File name="taobaoTaoke" fileName="logs/taobao/taobaoTaoke.log"
			append="true">
			<PatternLayout
			pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />
			</File>

			<File name="taobaoAuth" fileName="logs/taobao/taobaoAuth.log"
			append="true">
			<PatternLayout
			pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />
			</File>

			<File name="taobaoTrade" fileName="logs/taobao/taobaoTrade.log"
			append="true">
			<PatternLayout
			pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />
			</File>


			<File name="taobaoGoods" fileName="logs/taobao/taobaoGoods.log"
			append="true">
			<PatternLayout
			pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />
			</File>



			<!-- ç¨æ·ç¸å³ -->
			<File name="userLogin" fileName="logs/user/userLogin.log" append="true">
			<PatternLayout
			pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n" />
			</File>

			</Appenders>

			<Loggers>
			<Logger name="mqSend" level="INFO" additivity="true">
			<AppenderRef ref="mqSend" />
			</Logger>
			<Root level="INFO">
			<AppenderRef ref="Console" />
			</Root>
			</Loggers>

			<Loggers>
			<Logger name="mqConsume" level="INFO" additivity="true">
			<AppenderRef ref="mqConsume" />
			</Logger>
			<Root level="INFO">
			<AppenderRef ref="Console" />
			</Root>
			</Loggers>


			<Loggers>
			<Logger name="taobaoTaoke" level="INFO" additivity="true">
			<AppenderRef ref="taobaoTaoke" />
			</Logger>
			<Root level="INFO">
			<AppenderRef ref="Console" />
			</Root>
			</Loggers>

			<Loggers>
			<Logger name="taobaoAuth" level="INFO" additivity="true">
			<AppenderRef ref="taobaoAuth" />
			</Logger>
			<Root level="INFO">
			<AppenderRef ref="Console" />
			</Root>
			</Loggers>

			<Loggers>
			<Logger name="taobaoTrade" level="INFO" additivity="true">
			<AppenderRef ref="taobaoTrade" />
			</Logger>
			<Root level="INFO">
			<AppenderRef ref="Console" />
			</Root>
			</Loggers>

			<Loggers>
			<Logger name="taobaoGoods" level="INFO" additivity="true">
			<AppenderRef ref="taobaoGoods" />
			</Logger>
			<Root level="INFO">
			<AppenderRef ref="Console" />
			</Root>
			</Loggers>

			<Loggers>
			<Logger name="userLogin" level="INFO" additivity="true">
			<AppenderRef ref="userLogin" />
			</Logger>
			<Root level="INFO">
			<AppenderRef ref="Console" />
			</Root>
			</Loggers>


			</Configuration>