admin/.env.production | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
server/admin/src/main/java/com/doumee/config/MySlf4jImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
server/admin/src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
server/admin/src/main/resources/logback-spring.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
wechat_jiaxuan/app.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
wechat_jiaxuan/components/disCase/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
wechat_jiaxuan/components/disProduct/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
wechat_jiaxuan/components/disRealpic/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
wechat_jiaxuan/utils/config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
wechat_staff/utils/config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
admin/.env.production
@@ -1,4 +1,4 @@ # ç产ç¯å¢é ç½® NODE_ENV = 'production' VUE_APP_BASE_API = 'https://dmtest.ahapp.net/admin_interface' VUE_APP_BASE_API = 'https://dmdev.zhibang.com:8443/admin_interface' server/admin/src/main/java/com/doumee/config/MySlf4jImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,51 @@ package com.doumee.config; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.logging.Log; @Slf4j public class MySlf4jImpl implements Log { public MySlf4jImpl(String clazz) { // Do Nothing } @Override public boolean isDebugEnabled() { // return log.isDebugEnabled(); // å°debug级å«è¾åºæéæ¹æinfoçº§å« return log.isInfoEnabled(); } @Override public boolean isTraceEnabled() { return log.isTraceEnabled(); } @Override public void error(String s, Throwable e) { log.error(s); } @Override public void error(String s) { log.error(s); } @Override public void debug(String s) { log.debug(s); } @Override public void trace(String s) { log.trace(s); } @Override public void warn(String s) { log.warn(s); } } server/admin/src/main/resources/application.yml
@@ -1,6 +1,6 @@ # 项ç®ä¿¡æ¯é ç½® project: name: å¿é¦ä¸ç»©æ°ååèµè½åå°ç³»ç» name: å¿é¦ä¸ç»©æ°ååèµè½å°ç¨åº version: 1.0.0 env: development # env: production @@ -30,6 +30,7 @@ map-underscore-to-camel-case: true log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # ç¼åå 容设置 cache: session: @@ -45,6 +46,7 @@ smart: true # æé¤è·è¸ªçURLæ£å exclude-patterns: .+/list[a-zA-Z0-9\-\_]*$, .+/tree[a-zA-Z0-9\-\_]*$, .+/page[a-zA-Z0-9\-\_]*$, .+/all[a-zA-Z0-9\-\_]*$, /swagger-resources.* # æ¥å¿é ç½® logback: @@ -67,9 +69,10 @@ compression: enabled: true mime-types: application/json port: 10028 tomcat: max-swallow-size: -1 servlet: session: timeout: PT3H #表示12å°æ¶ timeout: PT3H #表示12å°æ¶ server/admin/src/main/resources/logback-spring.xml
@@ -30,7 +30,7 @@ <appender name="fileErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender"> <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> <level>DEBUG</level> <level>ERROR</level> </filter> <encoder> <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern> server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -277,7 +277,8 @@ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"è·åopenid失败ï¼è¯·è系管çå"); } // String openId = code; Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId).last(" limit 1 ")); Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId) .last(" limit 1 ")); Users users = null; if(StringUtils.isNotBlank(userId)){ users = usersMapper.selectById(userId); @@ -507,6 +508,34 @@ ZTUserGetTokenResponse ztUserGetTokenResponse = (ZTUserGetTokenResponse) userUpdateInfo.getData(); return ztUserGetTokenResponse; } public static ZTUserGetTokenResponse syncZhongTaiUserNew(Member member,SystemDictDataBiz systemDictDataBiz,ZbomZhongTaiService zbomZhongTaiService){ ZTUserInfoUpdateRequest ztUserInfoUpdateRequest = new ZTUserInfoUpdateRequest(); ztUserInfoUpdateRequest.setOpenId(member.getOpenid()); String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode(); ztUserInfoUpdateRequest.setAppId(appId); ztUserInfoUpdateRequest.setPlatform(Constants.PLATFORM); ztUserInfoUpdateRequest.setPhone(member.getPhone()); ztUserInfoUpdateRequest.setName(member.getName()); ztUserInfoUpdateRequest.setNickname(member.getNickname()); // ztUserInfoUpdateRequest.setAddress(member.getProvinceName()+member.getCityName()+member.getAreaName()); ztUserInfoUpdateRequest.setFullAddress(member.getAddress()); String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode(); if(StringUtils.isNotBlank(member.getImgurl())){ ztUserInfoUpdateRequest.setAvatarUrl(prefix + member.getImgurl()); } ztUserInfoUpdateRequest.setUptown(member.getDistrict()); if(Objects.nonNull(member.getHousearea())){ ztUserInfoUpdateRequest.setHouseArea(member.getHousearea().toString()); } ztUserInfoUpdateRequest.setHouseLayout(Constants.getHouseLayout(member.getHousetype())); ZTBaseResponse userUpdateInfo = zbomZhongTaiService.userUpdateInfo(ztUserInfoUpdateRequest); if(Objects.isNull(userUpdateInfo)||userUpdateInfo.getCode()!=200){ return null; } ZTUserGetTokenResponse ztUserGetTokenResponse = (ZTUserGetTokenResponse) userUpdateInfo.getData(); return ztUserGetTokenResponse; } @Override public Member getMemberInfo(Long memberId){ @@ -550,7 +579,8 @@ String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode(); param.setAppId(appId); param.setOpenId(member.getOpenid()); ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param); ZTUserGetTokenResponse ztUserGetTokenResponse = syncZhongTaiUserNew(member,systemDictDataBiz,zbomZhongTaiService); // ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param); if(Objects.nonNull(ztUserGetTokenResponse)){ // Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000)); member.setToken(ztUserGetTokenResponse.getToken()); wechat_jiaxuan/app.js
@@ -30,14 +30,13 @@ var userId = null if (op.query.scene) { let temp = op.query.scene.split('_') userId = temp[2] userId = temp[2] } if (res.code) { //åèµ·ç½ç»è¯·æ± wxLoginCustomer({ code: res.code, userId userId }).then(res => { wx.setStorageSync('token', res.data.token) this.globalData.token = res.data.token @@ -63,9 +62,7 @@ fail(err) { console.log(err) } }) }) } }) wechat_jiaxuan/components/disCase/index.js
@@ -31,6 +31,13 @@ const dataList = this.data.dataList dataList.forEach(item => { if(item.id === info.id){ if(item.isCollection != info.isCollection){ if(!item.isCollection){ item.collectCount = (item.collectCount || 0)+1 }else if(item.collectCount >0){ item.collectCount = (item.collectCount || 0)-1 } } item.isCollection = info.isCollection item.viewCount ++ } wechat_jiaxuan/components/disProduct/index.js
@@ -34,8 +34,17 @@ const datalist = this.data.datalist datalist.forEach(item => { if(item.id === info.id){ console.log(item) console.log(info) if(item.isCollection != info.isCollection){ if(!item.isCollection){ item.collectCount = (item.collectCount || 0)+1 }else if(item.collectCount >0){ item.collectCount = (item.collectCount || 0)-1 } } item.isCollection = info.isCollection item.viewCount ++ item.viewCount =(item.viewCount||0) +1 } }) this.setData({ datalist }) wechat_jiaxuan/components/disRealpic/index.js
@@ -30,6 +30,13 @@ const dataList = this.data.dataList dataList.forEach(item => { if(item.id === info.id){ if(item.isCollection != info.isCollection){ if(!item.isCollection){ item.collectCount = (item.collectCount || 0)+1 }else if(item.collectCount >0){ item.collectCount = (item.collectCount || 0)-1 } } item.isCollection = info.isCollection item.viewCount ++ } wechat_jiaxuan/utils/config.js
@@ -2,7 +2,7 @@ // export const baseUrl = 'http://192.168.0.135:10027' // æ¬å° export const baseUrl = 'https://dmtest.ahapp.net/web_interface' //æµè¯æå¡å¨ export const baseUrl = 'https://dmdev.zhibang.com:8443/web_interface' //æµè¯æå¡å¨ // export const imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/' wechat_staff/utils/config.js
@@ -1,5 +1,5 @@ export const baseUrl = 'http://192.168.0.135:10027' // export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // æ¬å° // export const baseUrl = 'http://192.168.0.135:10027' export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // æ¬å° // export const baseUrl = 'http://zbtest.ahapp.net/zbom_interface/jx/wechat/' //æµè¯æå¡å¨ // export const imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/'