parent: ec59428e | patch | commit | ignore whitespace
姜友瑶
2022-08-09 41f67399e4e9e7f1df9ae910c1fb2ccb475435c7 
Merge branch 'developer'
1 files added
2 files modified
185 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java 2 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java 8 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/config/application-xcshop.properties 175 ●●●●● patch | view | raw | blame | history 
 zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java


@@ -2,7 +2,6 @@




import com.matrix.component.asyncmessage.AsyncMessageManager;


import com.matrix.core.constance.MatrixConstance;


import com.matrix.core.exception.GlobleException;


import com.matrix.core.pojo.AjaxResult;


import com.matrix.core.pojo.PaginationVO;


import com.matrix.core.tools.WebUtil;


@@ -87,6 +86,7 @@


    @RequestMapping(value = "/cz")


    public @ResponseBody


    AjaxResult cz(@RequestBody CzXkVo czVo) {


        czVo.setGiftMoney(0D);//充值接口不支持充赠送金额，这里赋值的时候前台赋值了原始金额，所以设置为0


        SysOrder order=  orderService.updateAddCardMoney(czVo);


        AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, "充值成功");






 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java


@@ -20,7 +20,6 @@




import javax.servlet.http.HttpServletRequest;


import javax.servlet.http.HttpServletResponse;


import java.util.Arrays;


import java.util.List;


import java.util.Objects;




@@ -108,8 +107,11 @@


            oldeUser.setPhoto(loginUser.getAvatarUrl());


            oldeUser.setAvatarUrl(loginUser.getAvatarUrl());


            sysVipInfoDao.update(oldeUser);


            LogUtil.info("绑定手机号码删除会员。。"+ JSON.toJSONString(loginUser));


            sysVipInfoDao.deleteLogicByIds(Arrays.asList(loginUser.getId()));


            LogUtil.info("绑定手机号码删除老会员openId。。"+ JSON.toJSONString(loginUser));


//            sysVipInfoDao.deleteLogicByIds(Arrays.asList(loginUser.getId()));


            loginUser.setOpenId("--");


            loginUser.setPhone("--");


            sysVipInfoDao.update(loginUser);


            String token = userCacheManager.saveUserInfo(oldeUser);


            AjaxResult result =   AjaxResult.buildSuccessInstance("绑定成功");


            result.putInMap("token",token);




 zq-erp/src/main/resources/config/application-xcshop.properties


New file


@@ -0,0 +1,175 @@


evn=lhx


server.port=8080




spring.datasource.username=xc_shop


spring.datasource.password=xc_shop123!@#


spring.datasource.url=jdbc:mysql://121.37.162.173/xc_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8




spring.datasource.type=com.alibaba.druid.pool.DruidDataSource


spring.datasource.initialSize=3


spring.datasource.minIdle=3


spring.datasource.maxActive=20


spring.datasource.maxWait=60000


spring.datasource.timeBetweenEvictionRunsMillis=60000


spring.datasource.minEvictableIdleTimeMillis=300000


spring.datasource.validationQuery=SELECT 1 FROM DUAL


spring.datasource.testWhileIdle=true


spring.datasource.testOnBorrow=true


spring.datasource.testOnReturn=true


spring.datasource.filters=stat,wall,log4j


spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000


spring.thymeleaf.prefix: classpath:/templates/views/


spring.thymeleaf.cache=false


mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml


mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml




#设置全局时间返回格式 第三行设置为true表示返回时间戳


#spring.jackson.date-format=yyyy-MM-dd


#spring.jackson.time-zone=GMT+8


#spring.jackson.serialization.write-dates-as-timestamps=true


#文件上传时的大小限制 单位M


spring.servlet.multipart.max-file-size=100MB


spring.servlet.multipart.max-request-size=100MB


#--------------------------------------






#rabbitMQ配置


rabbitmq.host=47.111.134.136


rabbitmq.port=5672


rabbitmq.username=hivequeue


rabbitmq.password=hivequeueadmin


useRabbit=false




server.session.timeout=120




ali.sms.accessKeyId=LTAI4FrjY9R9iDfC6YQTHfne


ali.sms.accessKeySecret=eSvQslpHpDSGlI9Hxm4y5MynNgLbCp


ali.sms.regionId=cn-hangzhou


ali.sms.signName=\u80bd\u598d




#hour


activities.groupBuy.limit=24


#minute


groupBuy.pay.timeLimit=30




#定时任务


scheduling.enabled=false




swagger.enable=true


swagger.security.username=admin


swagger.security.password=admin






#默认头像


default.vip.photo.woman=https://filehive2.jyymatrix.cc/uploadeFile/20210125/db53552e688040afb286686f081e1e68f3fe946f75624598828f01898635152e.png


default.vip.photo.man=https://filehive2.jyymatrix.cc/uploadeFile/20210125/3642f1d827c44c76832fea106c85e0f89e089c16cbcc4dd0a82bb52b9ac700f4.png


#是否启用debug模式


debug=false


# 日志文件保存地址


log_path=/mnt/xcshop/log




# 系统语言环境 zh中文，us英文


system_language=zh




# 错误密码允许输入的次数，大于五次后账号锁定,0表示不锁账号


error_password_times=5


# 默认密码


default_password=123




#nginx静态资源访问地址


static_resource_url=http://xcshop.csxuncong.com/uploadfile/


#文件保存地址


file_storage_path=/mnt/xcshop/uploadfile/


#文件上传大小字节为单位  10MB


maxUploadSize=10485760






#Matser\u7684ip\u5730\u5740


redis.hostname=120.27.238.55


#\u7AEF\u53E3\u53F7


redis.port=6379


#\u5982\u679C\u6709\u5BC6\u7801


redis.password=xcong123


#\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000


redis.timeout=10000  


redis.database=2


redis_time_out=1800000


cookie_time_out=36000




#APP登录公钥


login_public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWvK6UWCtSp/8qnTqyUfO0wbg4CuxOe7IeiDSAmATfHnWqBPnbZ73qQ4A90vGowB7mp5XnmBvgTwfXtDh08yd4btlHwSD3ShbRyGfGfV8lc47ZTLiJH0xuuN2iHfnfj8zQ5kcqijeotggo2rF8Uu7KSR3HxVyN9mO22C6p1r5wVQIDAQAB


#APP登录秘钥


login_private_key=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJa8rpRYK1Kn/yqdOrJR87TBuDgK7E57sh6INICYBN8edaoE+dtnvepDgD3S8ajAHuanleeYG+BPB9e0OHTzJ3hu2UfBIPdKFtHIZ8Z9XyVzjtlMuIkfTG643aId+d+PzNDmRyqKN6i2CCjasXxS7spJHcfFXI32Y7bYLqnWvnBVAgMBAAECgYBNzQFGq+NgfDllo1WCaG4jI8GTm3+wWoPq4l5G6S/KgYw1vu+/YOJTIZf1UQVOFitc3a6vpIDu25uup+Rj6IS8B4V8NDfc8P+iMNwdIKqqBj8wHu0/SaxYdW1uqlU5+XkJMxsNMgNRRGPSIQhla5OPHtBzIa7t4lmypETMZtXEmQJBAMsa1OIQzAKU05GweCnNNSoqo/nAQLqp8zfbJypxRx24uaCyS7C+KxN+O4FyaYmM9n0X+cgkr+RYHAIa7mg3gccCQQC9/nJvRBum8+4TINnz6QrvTmTlhi8QKW/CiRYpGgmo5PtQYw4BkRQbYO8ktFDM2yeO75XBv09qnGQaivDCeL0DAkEAisFg8LSy+4x7YcvivAQirxUEg2qRjjTvIZjKEBflkuuRfbRxO2Uf/qg9tPjaGwu/lcScc9yEggaj09hcSbyqHwJAN8QLiqUPCL3oTy0BTBpG316/Nq9f+Ppwl0TtgDroQu6S5VFttwACStb02m0imj5pKgcgibHBeaVVrITDjhEqSQJAaCHD/ytTzgtgLoVVyZZxOB272W7PI3mnzL8qQSldx1/QOBs1NmmEZuo7ELFMrfTmlxa1qR4gsq/ImfIdUdXewQ==




#日志文件清理阈值  单位：MB


log_max=20


#日志清理天数


log_clear_day=5






wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code


xcx_appid =wx5cc58f796224af61


xcx_secret =facea088aae414e5c2ee86b459887721


gzh_appid=wx57e6335559bdbda6


gzh_secret=ecb408af170e3890e6544290cad33760




#微信支付调试开关


wx_pay_debug_onoff = false




#快递鸟用户id


logistics.eBusinessID=1530881


#快递鸟密钥


logistics.appKey=f1cf9777-26fb-4e3f-a14d-896075e6384e


#快递鸟接口地址


logistics.url=http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx


#快递鸟接口指令


logistics.requestType=1002




#发送短信配置


crm.request_url = http://192.168.1.248


sms.request_url = http://smssh1.253.com


sms.login_account = M7315130


sms.login_password = J7FAoehPkv63e3


sms.login_accountNe = N4617160


sms.login_passwordNe = rb1cxLitRB83e0




#接入统一登录平台配置


platform_app_code = wx_shop


platform_secret_key = b21e309f07964e4fae5b156d74b5d66z


#platform_verity_url = http://localhost:8080/platform/getUserInfo


platform_verity_url = http://stg1-xcerp-ca.xc.jyymatrix.cc/platform/getUserInfo




qrcodeBackgroundImgPath=/mnt/xcshop/webresource/static/xcxresource/bj1.png


qrcodeFrontImgPath=/mnt/xcshop/webresource/static/xcxresource/qj2.png




#hive仓库地址


hive.service=http://localhost:8082/meidu-crm/








#是否启用异常上报


is_open_exception_report=true


showExcptionUrl=http://xcshop.csxuncong.com/showException






#百度编辑器，覆盖默认配置


ueditor.imageUrlPrefix=http://xcshop.csxuncong.com/uploadfile


ueditor.imagePathFormat=/image/{yyyy}{mm}{dd}/{time}{rand:6}




ueditor.scrawlPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}


ueditor.scrawlUrlPrefix=http://xcshop.csxuncong.com/uploadfile




ueditor.snapscreenPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}


ueditor.snapscreenUrlPrefix=http://xcshop.csxuncong.com/uploadfile




ueditor.catcherPathFormat=/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}


ueditor.catcherUrlPrefix=http://xcshop.csxuncong.com/uploadfile




ueditor.videoPathFormat=/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}


ueditor.videoUrlPrefix=http://127.0.0.1:1088/uploadeFile/




ueditor.filePathFormat=/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}


ueditor.fileUrlPrefix=http://127.0.0.1:1088/uploadeFile/




ueditor.imageManagerListPath=http://127.0.0.1:1088/uploadeFile/


ueditor.fileManagerListPath=http://127.0.0.1:1088/uploadeFile/