From d03e99fad42792e29070dcc02fd6599ee1fbb211 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 18:54:50 +0800
Subject: [PATCH] 提交
---
wechat_staff/pages/homeId/index.js | 10 ++++++----
wechat_staff/utils/config.js | 2 +-
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 9 +++++++--
server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java | 23 +++++++++++++----------
wechat_staff/pages/detailDis/product.wxss | 1 +
5 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java b/server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java
index 15c94e1..eb36ce5 100644
--- a/server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java
+++ b/server/service/src/main/java/com/doumee/core/utils/GeneratePicUtil.java
@@ -395,6 +395,9 @@
private static BufferedImage getImgIO(InputStream is) {
if(is ==null){
log.error("=============================qrcode error 灏忕▼搴忕爜涓虹┖");
+ }else{
+
+ log.error("=============================qrcode okay 灏忕▼搴忕爜鏈夋湁鏁告摎");
}
try {
return ImageIO.read(is);
@@ -405,7 +408,7 @@
return null;
}
- public static InputStream generateShareImg(String imgurl, InputStream mpCode, String title) {
+ public static InputStream generateShareImg(String imgurl, InputStream mpCode1, String title) {
BufferedImage bi = new BufferedImage(750, 976, BufferedImage.TYPE_INT_RGB);
//寰楀埌瀹冪殑缁樺埗鐜(杩欏紶鍥剧墖鐨勭瑪)
@@ -445,8 +448,9 @@
g2.drawString("鏌ョ湅鏇村绮惧僵鍐呭", 40,820+th);
- BufferedImage img3 = getImgIO(mpCode);
+ BufferedImage img3 = getImgIO(mpCode1);
if(img3!=null){
+ g2.setColor(Color.white);
g2.drawImage(img3, 530, 736, 180, 180, null);
}
InputStream inputStream = bufferedImageToInputStream(bi);
@@ -536,16 +540,15 @@
g2.drawImage(setRadius(img1,img1.getWidth(),0,0), (int)(20*rate), (int)(h-68*rate), (int)(48*rate) ,(int)(48*rate), null);
}
- Font font =new Font("榛戜綋", Font.PLAIN, (int)(28 * rate));
- FontMetrics fontMetrics = g2.getFontMetrics(font);
- int textWidth = fontMetrics.stringWidth(name);
-
+ g2.setColor(Color.white);
+ g2.setFont(new Font("榛戜綋", Font.PLAIN, (int)(28 * rate)));
+ g2.drawString(name, (int) (80*rate),h-(int)((64-th)*rate));
+ Font font =new Font("榛戜綋", Font.PLAIN, (int)(24 * rate));
g2.setColor(Color.white);
g2.setFont(font);
- g2.drawString(name, (int) (80*rate),h-(int)((64-th)*rate));
- g2.setColor(Color.white);
- g2.setFont(new Font("榛戜綋", Font.PLAIN, (int)(24* rate)));
- g2.drawString("鎵弿鐪嬫洿澶�", (int)(w -(textWidth+30*rate)),h-(int)(rate*(50-th)));
+ FontMetrics fontMetrics = g2.getFontMetrics(font);
+ int textWidth = fontMetrics.stringWidth("鎵爜鐪嬫洿澶�");
+ g2.drawString("鎵爜鐪嬫洿澶�", (int)(w -(textWidth+20*rate)),h-(int)(rate*(50-th)));
BufferedImage img3 = getImgIO(mpCode);
if(img3!=null){
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
index c0e13d1..a80c6a7 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
@@ -45,6 +45,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.interfaces.MPJBaseJoin;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.slf4j.Slf4j;
import okhttp3.Response;
import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
@@ -78,6 +79,7 @@
* @date 2024/07/04 14:40
*/
@Service
+@Slf4j
public class UsersServiceImpl implements UsersService {
@@ -676,6 +678,7 @@
@Override
public String getContentShareImg(Users users, ContentShareImgDto param){
+ log.error("======================start===========:娴锋姤寮�濮�"+JSONObject.toJSONString(param));
users = usersMapper.selectById(users.getId());
this.getUsersDetail(users);
if(StringUtils.isBlank(param.getImgurl())){
@@ -727,18 +730,20 @@
private String dealShareImgNoUser(ContentShareImgDto param, Users users, String shareFolder, String path) {
String url =null;
- //鍐呭鍒嗕韩娴锋姤鍥剧墖
- //鍐呭鍒嗕韩娴锋姤鍥剧墖
+ log.error("======================start===========:娴锋姤寮�濮�");
InputStream mpCode = Constants.generateWxMiniImgStream(systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG, Constants.WX_TOKEN_CUSTOMER).getCode(),
//"userId="+users.getId()+"&articleId="+param.getArticleId(),
param.getArticleId()+"_"+users.getId(),
param.getPageUrl());//灏忕▼搴�
+ log.error("======================mpcode===========:鑾峰彇灏忕▼搴忕爜寮�濮�");
String title = systemDictDataBiz.queryByCode(Constants.WEIXIN_DEFAULT_IMGS, Constants.SHARE_HAIBAO_HEADER_TITLE).getCode();
InputStream inputStream = GeneratePicUtil.generateShareImg(
param.getImgurl()
,mpCode
,title);
+
+ log.error("======================huatu===========:鐢诲浘缁撴潫");
TyyZosUtil obs = new TyyZosUtil( systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.ENDPOINT).getCode(),
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.ACCESS_ID).getCode(),
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.ACCESS_KEY).getCode());
diff --git a/wechat_staff/pages/detailDis/product.wxss b/wechat_staff/pages/detailDis/product.wxss
index 0f4017a..0a94bed 100644
--- a/wechat_staff/pages/detailDis/product.wxss
+++ b/wechat_staff/pages/detailDis/product.wxss
@@ -61,6 +61,7 @@
margin-bottom: 26rpx;
}
.main_content .text {
+ line-height: 36rpx;
font-size: 26rpx;
color: #555555;
margin-bottom: 40rpx;
diff --git a/wechat_staff/pages/homeId/index.js b/wechat_staff/pages/homeId/index.js
index 4f403de..0a7dded 100644
--- a/wechat_staff/pages/homeId/index.js
+++ b/wechat_staff/pages/homeId/index.js
@@ -53,11 +53,11 @@
itemClick(e) {
const item = e.currentTarget.dataset.item
console.log('item', item);
- actionDo({actionType: 'view',id: item.id})
if(item.contentType == 'video'){
wx.previewMedia({
sources: [{ url: item.content, type: 'video' }]
- })
+ })
+ actionDo({actionType: 'view',id: item.id})
}
if(item.contentType == 'link'){
wx.navigateTo({
@@ -66,13 +66,15 @@
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
res.eventChannel.emit('data',{link:item.content} );
}
- })
+ })
+ actionDo({actionType: 'view',id: item.id})
}
if(item.contentType == 'page'){
getApp().globalData.catalogCode=item.content
wx.switchTab({
url: '/pages/discover/discover'
- })
+ })
+ actionDo({actionType: 'view',id: item.id})
}
},
cateClick(e) {
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index a150c8d..869ceec 100644
--- a/wechat_staff/utils/config.js
+++ b/wechat_staff/utils/config.js
@@ -1,4 +1,4 @@
-export const baseUrl = 'http://192.168.0.135:10027'
+export const baseUrl = 'http://192.168.0.107:10027'
// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // 鏈湴
// export const baseUrl = 'http://zbtest.ahapp.net/zbom_interface/jx/wechat/' //娴嬭瘯鏈嶅姟鍣�
--
Gitblit v1.9.3