修改一些错误

dgtly-api/pom.xml

@@ -17,14 +17,16 @@
 
 
     <dependencies>
-
         <dependency>
             <groupId>com.dgtly</groupId>
             <artifactId>dgtly-apiframework</artifactId>
             <version>4.0.0</version>
         </dependency>
-
-
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>dgtly-system</artifactId>
+            <version>4.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

dgtly-api/src/main/java/com/dgtly/api/config/WXPayConstants.java

@@ -1,52 +0,0 @@
-package com.dgtly.api.config;
-
-/**
- * 常量
- */
-public class WXPayConstants {
-
-    public enum SignType {
-        MD5, HMACSHA256
-    }
-
-    public static final String DOMAIN_API = "api.mch.weixin.qq.com";
-    public static final String DOMAIN_API2 = "api2.mch.weixin.qq.com";
-    public static final String DOMAIN_APIHK = "apihk.mch.weixin.qq.com";
-    public static final String DOMAIN_APIUS = "apius.mch.weixin.qq.com";
-
-
-    public static final String FAIL     = "FAIL";
-    public static final String SUCCESS  = "SUCCESS";
-    public static final String HMACSHA256 = "HMAC-SHA256";
-    public static final String MD5 = "MD5";
-
-    public static final String FIELD_SIGN = "sign";
-    public static final String FIELD_SIGN_TYPE = "sign_type";
-
-    public static final String MICROPAY_URL_SUFFIX     = "/pay/micropay";
-    public static final String UNIFIEDORDER_URL_SUFFIX = "/pay/unifiedorder";
-    public static final String ORDERQUERY_URL_SUFFIX   = "/pay/orderquery";
-    public static final String REVERSE_URL_SUFFIX      = "/secapi/pay/reverse";
-    public static final String CLOSEORDER_URL_SUFFIX   = "/pay/closeorder";
-    public static final String REFUND_URL_SUFFIX       = "/secapi/pay/refund";
-    public static final String REFUNDQUERY_URL_SUFFIX  = "/pay/refundquery";
-    public static final String DOWNLOADBILL_URL_SUFFIX = "/pay/downloadbill";
-    public static final String REPORT_URL_SUFFIX       = "/payitil/report";
-    public static final String SHORTURL_URL_SUFFIX     = "/tools/shorturl";
-    public static final String AUTHCODETOOPENID_URL_SUFFIX = "/tools/authcodetoopenid";
-
-    // sandbox
-    public static final String SANDBOX_MICROPAY_URL_SUFFIX     = "/sandboxnew/pay/micropay";
-    public static final String SANDBOX_UNIFIEDORDER_URL_SUFFIX = "/sandboxnew/pay/unifiedorder";
-    public static final String SANDBOX_ORDERQUERY_URL_SUFFIX   = "/sandboxnew/pay/orderquery";
-    public static final String SANDBOX_REVERSE_URL_SUFFIX      = "/sandboxnew/secapi/pay/reverse";
-    public static final String SANDBOX_CLOSEORDER_URL_SUFFIX   = "/sandboxnew/pay/closeorder";
-    public static final String SANDBOX_REFUND_URL_SUFFIX       = "/sandboxnew/secapi/pay/refund";
-    public static final String SANDBOX_REFUNDQUERY_URL_SUFFIX  = "/sandboxnew/pay/refundquery";
-    public static final String SANDBOX_DOWNLOADBILL_URL_SUFFIX = "/sandboxnew/pay/downloadbill";
-    public static final String SANDBOX_REPORT_URL_SUFFIX       = "/sandboxnew/payitil/report";
-    public static final String SANDBOX_SHORTURL_URL_SUFFIX     = "/sandboxnew/tools/shorturl";
-    public static final String SANDBOX_AUTHCODETOOPENID_URL_SUFFIX = "/sandboxnew/tools/authcodetoopenid";
-
-}
-

dgtly-api/src/main/java/com/dgtly/api/config/WeixinConfig.java

@@ -1,49 +0,0 @@
-package com.dgtly.api.config;
-
-import cn.binarywang.wx.miniapp.config.WxMaConfig;
-import cn.binarywang.wx.miniapp.config.WxMaInMemoryConfig;
-import com.github.binarywang.wxpay.config.WxPayConfig;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class WeixinConfig {
-
-    public static final String WX_AppId = "wxc802e1b339075bb3";
-    public static final String WX_Secret = "d855dceccd00ef41360fa2d9387582e6";
-
-    public static final String WX_Token = "";
-    public static final String WX_AesKey = "";
-    public static final String WX_MsgDataFormat = "JSON";
-
-
-    public static final String WX_MchId = "1408172302";
-    public static final String WX_MchKey = "r4re3redsw3e5tg9oi87hy65tbvgt5ws";
-    public static final String WX_KeyPath = "";
-
-    @Bean
-    public WxMaConfig wxMaConfig() {
-        WxMaInMemoryConfig config = new WxMaInMemoryConfig();
-        config.setAppid(WX_AppId);
-        config.setSecret(WX_Secret);
-        config.setToken(WX_Token);
-        config.setAesKey(WX_AesKey);
-        config.setMsgDataFormat(WX_MsgDataFormat);
-
-        return config;
-    }
-
-
-    @Bean
-    public WxPayConfig wxPayConfig() {
-        WxPayConfig payConfig = new WxPayConfig();
-        payConfig.setAppId(WX_AppId);
-        payConfig.setMchId(WX_MchId);
-        payConfig.setMchKey(WX_MchKey);
-        payConfig.setSubAppId(null);
-        payConfig.setSubMchId(null);
-        payConfig.setKeyPath(WX_KeyPath);
-
-        return payConfig;
-    }
-}

dgtly-api/src/main/java/com/dgtly/api/config/WxMaConfiguration.java

@@ -1,115 +0,0 @@
-package com.dgtly.api.config;
-
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
-import cn.binarywang.wx.miniapp.bean.WxMaKefuMessage;
-import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage;
-import cn.binarywang.wx.miniapp.config.WxMaConfig;
-import cn.binarywang.wx.miniapp.config.WxMaInMemoryConfig;
-import cn.binarywang.wx.miniapp.message.WxMaMessageHandler;
-import cn.binarywang.wx.miniapp.message.WxMaMessageRouter;
-import com.google.common.collect.Lists;
-import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
-import me.chanjar.weixin.common.exception.WxErrorException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.io.File;
-
-/**
- * @author <a href="https://github.com/binarywang">Binary Wang</a>
- */
-@Configuration
-@ConditionalOnClass(WxMaService.class)
-@EnableConfigurationProperties(WxMaProperties.class)
-public class WxMaConfiguration {
-    private static final WxMaMessageHandler templateMsgHandler = (wxMessage, context, service, sessionManager) ->
-            service.getMsgService().sendTemplateMsg(WxMaTemplateMessage.builder()
-                    .templateId("此处更换为自己的模板id")
-                    .formId("自己替换可用的formid")
-                    .data(Lists.newArrayList(
-                            new WxMaTemplateMessage.Data("keyword1", "339208499", "#173177")))
-                    .toUser(wxMessage.getFromUser())
-                    .build());
-
-    private final WxMaMessageHandler logHandler = (wxMessage, context, service, sessionManager) -> {
-        System.out.println("收到消息：" + wxMessage.toString());
-        service.getMsgService().sendKefuMsg(WxMaKefuMessage.newTextBuilder().content("收到信息为：" + wxMessage.toJson())
-                .toUser(wxMessage.getFromUser()).build());
-    };
-
-    private final WxMaMessageHandler textHandler = (wxMessage, context, service, sessionManager) ->
-            service.getMsgService().sendKefuMsg(WxMaKefuMessage.newTextBuilder().content("回复文本消息")
-                    .toUser(wxMessage.getFromUser()).build());
-
-    private final WxMaMessageHandler picHandler = (wxMessage, context, service, sessionManager) -> {
-        try {
-            WxMediaUploadResult uploadResult = service.getMediaService()
-                    .uploadMedia("image", "png",
-                            ClassLoader.getSystemResourceAsStream("tmp.png"));
-            service.getMsgService().sendKefuMsg(
-                    WxMaKefuMessage
-                            .newImageBuilder()
-                            .mediaId(uploadResult.getMediaId())
-                            .toUser(wxMessage.getFromUser())
-                            .build());
-        } catch (WxErrorException e) {
-            e.printStackTrace();
-        }
-    };
-
-    private final WxMaMessageHandler qrcodeHandler = (wxMessage, context, service, sessionManager) -> {
-        try {
-            final File file = service.getQrcodeService().createQrcode("123", 430);
-            WxMediaUploadResult uploadResult = service.getMediaService().uploadMedia("image", file);
-            service.getMsgService().sendKefuMsg(
-                    WxMaKefuMessage
-                            .newImageBuilder()
-                            .mediaId(uploadResult.getMediaId())
-                            .toUser(wxMessage.getFromUser())
-                            .build());
-        } catch (WxErrorException e) {
-            e.printStackTrace();
-        }
-    };
-    @Autowired
-    private WxMaProperties properties;
-
-    @Bean
-    @ConditionalOnMissingBean
-    public WxMaConfig config() {
-        WxMaInMemoryConfig config = new WxMaInMemoryConfig();
-        config.setAppid(this.properties.getAppid());
-        config.setSecret(this.properties.getSecret());
-        config.setToken(this.properties.getToken());
-        config.setAesKey(this.properties.getAesKey());
-        config.setMsgDataFormat(this.properties.getMsgDataFormat());
-
-        return config;
-    }
-
-    @Bean
-    @ConditionalOnMissingBean
-    public WxMaService wxMaService(WxMaConfig config) {
-        WxMaService service = new WxMaServiceImpl();
-        service.setWxMaConfig(config);
-        return service;
-    }
-
-    @Bean
-    public WxMaMessageRouter router(WxMaService service) {
-        final WxMaMessageRouter router = new WxMaMessageRouter(service);
-        router
-                .rule().handler(logHandler).next()
-                .rule().async(false).content("模板").handler(templateMsgHandler).end()
-                .rule().async(false).content("文本").handler(textHandler).end()
-                .rule().async(false).content("图片").handler(picHandler).end()
-                .rule().async(false).content("二维码").handler(qrcodeHandler).end();
-        return router;
-    }
-
-}

dgtly-api/src/main/java/com/dgtly/api/config/WxMaProperties.java

@@ -1,81 +0,0 @@
-package com.dgtly.api.config;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * @author <a href="https://github.com/binarywang">Binary Wang</a>
- */
-@ConfigurationProperties(prefix = "wechat.miniapp")
-public class WxMaProperties {
-    /**
-     * 设置微信小程序的appid
-     */
-    private String appid;
-
-    /**
-     * 设置微信小程序的Secret
-     */
-    private String secret;
-
-    /**
-     * 设置微信小程序的token
-     */
-    private String token;
-
-    /**
-     * 设置微信小程序的EncodingAESKey
-     */
-    private String aesKey;
-
-    /**
-     * 消息格式，XML或者JSON
-     */
-    private String msgDataFormat;
-
-    public String getAppid() {
-        return this.appid;
-    }
-
-    public void setAppid(String appid) {
-        this.appid = appid;
-    }
-
-    public String getSecret() {
-        return this.secret;
-    }
-
-    public void setSecret(String secret) {
-        this.secret = secret;
-    }
-
-    public String getToken() {
-        return this.token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getAesKey() {
-        return this.aesKey;
-    }
-
-    public void setAesKey(String aesKey) {
-        this.aesKey = aesKey;
-    }
-
-    public String getMsgDataFormat() {
-        return msgDataFormat;
-    }
-
-    public void setMsgDataFormat(String msgDataFormat) {
-        this.msgDataFormat = msgDataFormat;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
-    }
-}

dgtly-api/src/main/java/com/dgtly/api/config/WxPayConfiguration.java

@@ -1,46 +0,0 @@
-package com.dgtly.api.config;
-
-import com.github.binarywang.wxpay.config.WxPayConfig;
-import com.github.binarywang.wxpay.service.WxPayService;
-import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Binary Wang
- */
-@Configuration
-@ConditionalOnClass(WxPayService.class)
-@EnableConfigurationProperties(WxPayProperties.class)
-public class WxPayConfiguration {
-  @Autowired
-  private WxPayProperties properties;
-
-  @Bean
-  @ConditionalOnMissingBean
-  public WxPayConfig config() {
-    WxPayConfig payConfig = new WxPayConfig();
-    payConfig.setAppId(this.properties.getAppId());
-    payConfig.setMchId(this.properties.getMchId());
-    payConfig.setMchKey(this.properties.getMchKey());
-    payConfig.setSubAppId(StringUtils.trimToNull(this.properties.getSubAppId()));
-    payConfig.setSubMchId(StringUtils.trimToNull(this.properties.getSubMchId()));
-    payConfig.setKeyPath(this.properties.getKeyPath());
-
-    return payConfig;
-  }
-
-  @Bean
-  //@ConditionalOnMissingBean
-  public WxPayService wxPayService(WxPayConfig payConfig) {
-    WxPayService wxPayService = new WxPayServiceImpl();
-    wxPayService.setConfig(payConfig);
-    return wxPayService;
-  }
-
-}

dgtly-api/src/main/java/com/dgtly/api/config/WxPayProperties.java

@@ -1,97 +0,0 @@
-package com.dgtly.api.config;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * wxpay pay properties
- *
- * @author Binary Wang
- */
-@ConfigurationProperties(prefix = "wechat.pay")
-public class WxPayProperties {
-  /**
-   * 设置微信公众号的appid
-   */
-  private String appId;
-
-  /**
-   * 微信支付商户号
-   */
-  private String mchId;
-
-  /**
-   * 微信支付商户密钥
-   */
-  private String mchKey;
-
-  /**
-   * 服务商模式下的子商户公众账号ID，普通模式请不要配置，请在配置文件中将对应项删除
-   */
-  private String subAppId;
-
-  /**
-   * 服务商模式下的子商户号，普通模式请不要配置，最好是请在配置文件中将对应项删除
-   */
-  private String subMchId;
-
-  /**
-   * apiclient_cert.p12文件的绝对路径，或者如果放在项目中，请以classpath:开头指定
-   */
-  private String keyPath;
-
-  public String getAppId() {
-    return this.appId;
-  }
-
-  public void setAppId(String appId) {
-    this.appId = appId;
-  }
-
-  public String getMchId() {
-    return mchId;
-  }
-
-  public void setMchId(String mchId) {
-    this.mchId = mchId;
-  }
-
-  public String getMchKey() {
-    return mchKey;
-  }
-
-  public void setMchKey(String mchKey) {
-    this.mchKey = mchKey;
-  }
-
-  public String getSubAppId() {
-    return subAppId;
-  }
-
-  public void setSubAppId(String subAppId) {
-    this.subAppId = subAppId;
-  }
-
-  public String getSubMchId() {
-    return subMchId;
-  }
-
-  public void setSubMchId(String subMchId) {
-    this.subMchId = subMchId;
-  }
-
-  public String getKeyPath() {
-    return this.keyPath;
-  }
-
-  public void setKeyPath(String keyPath) {
-    this.keyPath = keyPath;
-  }
-
-  @Override
-  public String toString() {
-    return ToStringBuilder.reflectionToString(this,
-        ToStringStyle.MULTI_LINE_STYLE);
-  }
-}

dgtly-api/src/main/java/com/dgtly/api/controller/WxAuthController.java

@@ -1,146 +0,0 @@
-package com.dgtly.api.controller;
-
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
-import com.alibaba.fastjson.JSONObject;
-import com.dgtly.common.annotation.ApiNoCheckSign;
-import com.dgtly.common.core.controller.BaseController;
-import com.dgtly.common.core.domain.AjaxResult;
-import com.dgtly.common.core.domain.ResultType;
-import com.dgtly.common.utils.security.EncryptPassWordClass;
-import com.dgtly.system.domain.SysUser;
-import com.dgtly.system.service.ISysUserService;
-import com.dgtly.wxsystem.domain.WxappSysuser;
-import com.dgtly.wxsystem.service.IWxappSysuserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-@ApiNoCheckSign
-@Api(tags = "微信api登录相关接口")
-@RestController
-public class WxAuthController extends BaseController {
-
-    @Autowired
-    private WxMaService wxService;
-
-    @Autowired
-    private IWxappSysuserService wxappSysuserService;
-
-    @Autowired
-    private ISysUserService sysUserService;
-    /**
-     * 微信登录
-     */
-    @ApiOperation("微信登录")
-    @ApiImplicitParam(name = "json",paramType="body",required = true
-            ,value = "请求的json示例{code:1},返回值301未绑定用户")
-    @PostMapping("login_by_weixin")
-    public Object loginByWeixin() {
-        try {
-        Map<String,Object> param = this.getJsonMap();
-        if(!param.containsKey("code")){
-            return AjaxResult.error(ResultType.LESSPARAM);
-        }
-        String code = param.get("code").toString();
-            String sessionKey = null;
-            String openId = null;
-            WxMaJscode2SessionResult resultData = this.wxService.getUserService().getSessionInfo(code);
-            sessionKey = resultData.getSessionKey();
-            openId = resultData.getOpenid();
-            if(sessionKey == null || openId == null){
-                return AjaxResult.error();
-            }
-            //利用微信openid查询相关用户信息。
-            WxappSysuser wxappSysuser = wxappSysuserService.selectWxappSysuserById(openId);
-            //若微信用户不存在
-            if(wxappSysuser==null||wxappSysuser.getUserId()==null){
-                //新增微信小程序用户，并返回前端要求绑定账户密码
-                return AjaxResult.error(301,"微信用户未绑定相关人员").putKV("openId",openId);
-            }
-            SysUser sysUser =sysUserService.selectUserById(wxappSysuser.getUserId());
-
-            try{
-                if(param.containsKey("userInfo")){
-                    WxappSysuser paramWxuser = ((JSONObject)param.get("userInfo")).toJavaObject(WxappSysuser.class);
-                    wxappSysuser.setAvatarUrl(paramWxuser.getAvatarUrl());
-                    wxappSysuser.setGender(paramWxuser.getGender());
-                    wxappSysuser.setNickname(paramWxuser.getNickname());
-                    if(sysUser.getAvatar()==null||sysUser.getAvatar().equals("")){
-                        sysUser.setAvatar(wxappSysuser.getAvatarUrl());
-                        sysUserService.updateUserInfo(sysUser);
-                    }
-                    wxappSysuserService.updateWxappSysuser(wxappSysuser);
-
-                }
-            }catch (Exception e){
-                logger.error("微信登录时更新用户信息发生异常",e);
-            }
-            return AjaxResult.success(sysUser);
-        }  catch (Exception e) {
-            e.printStackTrace();
-           logger.error("微信登录发生错误",e);
-        }
-        return AjaxResult.error();
-    }
-
-
-    @ApiOperation("微信信息与系统信息绑定")
-    @ApiImplicitParam(name = "json",paramType="body",required = true
-            ,value = "请求的json示例：" +
-            "{username:13311111111,password:13311111111,openId:,userInfo}" +
-            "错误码303 账号不存在 302账号密码错误")
-    @PostMapping("bind_by_weixin")
-    public Object bindByWeixin() {
-        try {
-            Map<String,Object> param = this.getJsonMap();
-            if(!param.containsKey("openId")&&
-                    !param.containsKey("username")&&
-                    !param.containsKey("password")&&
-                    !param.containsKey("userInfo")){
-                return AjaxResult.error(ResultType.LESSPARAM);
-            }
-            String username=param.get("username").toString();
-            String password=param.get("password").toString();
-            SysUser sysUser = sysUserService.selectUserByLoginName(username);
-            if(sysUser==null){
-                return AjaxResult.error(303,"账号不存在");
-            }
-            if(!sysUser.getPassword().equals(EncryptPassWordClass.encryptPassword(username,password,sysUser.getSalt()))){
-                return AjaxResult.error(302,"账号或密码错误");
-            }
-            String openid=param.get("openId").toString();
-            WxappSysuser wxappSysuser = new WxappSysuser();
-            wxappSysuser.setOpenId(openid);
-            wxappSysuser.setUserId(sysUser.getUserId());
-            wxappSysuserService.insertWxappSysuser(wxappSysuser);
-
-
-            try{
-                if(param.containsKey("userInfo")){
-                    WxappSysuser paramWxuser = ((JSONObject)param.get("userInfo")).toJavaObject(WxappSysuser.class);
-                    wxappSysuser.setAvatarUrl(paramWxuser.getAvatarUrl());
-                    wxappSysuser.setGender(paramWxuser.getGender());
-                    wxappSysuser.setNickname(paramWxuser.getNickname());
-                    if(sysUser.getAvatar()==null||sysUser.getAvatar().equals("")){
-                        sysUser.setAvatar(wxappSysuser.getAvatarUrl());
-                        sysUserService.updateUserInfo(sysUser);
-                    }
-                    wxappSysuserService.updateWxappSysuser(wxappSysuser);
-
-                }
-            }catch (Exception e){
-                logger.error("微信登录时更新用户信息发生异常",e);
-            }
-
-            return AjaxResult.success(sysUser);
-        }  catch (Exception e) {
-            e.printStackTrace();
-            logger.error("微信登录发生错误",e);
-        }
-        return AjaxResult.error();
-    }
-}

dgtly-api/src/main/java/com/dgtly/api/controller/WxappSysuserController.java

@@ -1,34 +0,0 @@
-package com.dgtly.api.controller;
-
-
-import com.dgtly.common.core.domain.AjaxResult;
-import com.dgtly.system.service.ISysModelLayoutService;
-import com.dgtly.wxsystem.domain.WxappSysuser;
-import com.dgtly.wxsystem.service.IWxappSysuserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("user")
-public class WxappSysuserController {
-
-    @Autowired
-    private IWxappSysuserService wxappSysuserService;
-
-    @GetMapping("getUserInfo")
-    public Object get(WxappSysuser wxappSysuser){
-        List<WxappSysuser> users = wxappSysuserService.selectWxappSysuserList(wxappSysuser);
-        WxappSysuser user = users.get(0);
-        AjaxResult result = AjaxResult.success();
-        result.putKV("user",user);
-        return result;
-    }
-
-
-
-
-}