小程序管理后台端修改

kmall-common/src/main/java/com/kmall/common/dao/SysSmsLogDao.java

@@ -1,6 +1,7 @@
 package com.kmall.common.dao;
 
 import com.kmall.common.entity.SysSmsLogEntity;
+import org.springframework.stereotype.Component;
 
 /**
  * Dao
@@ -8,6 +9,7 @@ import com.kmall.common.entity.SysSmsLogEntity;
  * @author Scott
  * @date 2017-12-16 23:38:05
  */
+@Component
 public interface SysSmsLogDao extends BaseDao<SysSmsLogEntity> {
 
     SysSmsLogEntity querySmsCodeByUserId(Long userId);

kmall-common/src/main/java/com/kmall/common/dao/TemplateConfDao.java

@@ -1,6 +1,7 @@
 package com.kmall.common.dao;
 
 import com.kmall.common.entity.TemplateConfVo;
+import org.springframework.stereotype.Component;
 
 /**
  * 微信模板消息日志Dao
@@ -9,6 +10,7 @@ import com.kmall.common.entity.TemplateConfVo;
  * @email
  * @date 2017-12-02 16:49:29
  */
+@Component
 public interface TemplateConfDao extends BaseDao<TemplateConfVo> {
 
     TemplateConfVo queryByTypeId(Integer templateType);

kmall-common/src/main/java/com/kmall/common/entity/SysSmsLogEntity.java

@@ -76,6 +76,17 @@ public class SysSmsLogEntity implements Serializable {
      */
     private String userName;
 
+
+    private String smsCode;
+
+    public String getSmsCode() {
+        return smsCode;
+    }
+
+    public void setSmsCode(String smsCode) {
+        this.smsCode = smsCode;
+    }
+
     /**
      * 设置：主键
      */

kmall-common/src/main/java/com/kmall/common/service/impl/SysSmsLogServiceImpl.java

@@ -111,6 +111,8 @@ public class SysSmsLogServiceImpl implements SysSmsLogService {
         if (null == smsLog.getStime()) {
             smsLog.setStime(new Date());
         }
+        smsLog.setMobile(smsLog.getMobile());
+        smsLog.setSmsCode(smsLog.getSmsCode());
         //保存发送记录
         save(smsLog);
         return smsLog;

kmall-common/src/main/java/com/kmall/common/utils/redis/JedisUtil.java

@@ -1,7 +1,6 @@
 package com.kmall.common.utils.redis;
 
 import com.google.common.collect.Sets;
-import com.mysql.jdbc.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -599,7 +598,7 @@ public class JedisUtil {
                 value = new HashMap<String, Object>();
                 Map<byte[], byte[]> map = jedis.hgetAll(getBytesKey(key));
                 for (Map.Entry<byte[], byte[]> e : map.entrySet()) {
-                    value.put(StringUtils.toString(e.getKey()),
+                    value.put(String.valueOf(e.getKey()),
                             toObject(e.getValue()));
                 }
                 logger.debug("getObjectMap {} ", key, value);
@@ -955,7 +954,8 @@ public class JedisUtil {
      */
     public static byte[] getBytesKey(Object object) {
         if (object instanceof String) {
-            return StringUtils.getBytes((String) object);
+            String ob =(String) object;
+            return ob.getBytes();
         } else {
             return ObjectUtils.serialize(object);
         }
@@ -969,7 +969,7 @@ public class JedisUtil {
      */
     public static Object getObjectKey(byte[] key) {
         try {
-            return StringUtils.toString(key);
+            return String.valueOf(key);
         } catch (UnsupportedOperationException uoe) {
             try {
                 return JedisUtil.toObject(key);

kmall-common/src/main/java/com/kmall/common/utils/wechat/WechatUtil.java

@@ -275,7 +275,7 @@ public class WechatUtil {
 
         StringEntity postEntity = new StringEntity(data, "UTF-8");
         httpPost.addHeader("Content-Type", "text/xml");
-        httpPost.addHeader("User-Agent", "wxpay sdk java v1.0 " + ResourceUtil.getConfigByName("\\conf\\wx-mp", "wx.mchId"));
+        httpPost.addHeader("User-Agent", "wxpay sdk java v1.0 " + ResourceUtil.getConfigByName("\\conf\\wx-mp", "wx.dev.mchId"));
         httpPost.setEntity(postEntity);
 
         try {

kmall-common/src/main/resources/mybatis/mapper/SysSmsLogDao.xml

@@ -18,6 +18,7 @@
         <result property="successNum" column="success_num"/>
         <result property="blackNum" column="black_num"/>
         <result property="returnMsg" column="return_msg"/>
+        <result property="smsode" column="sms_code"/>
     </resultMap>
 
     <select id="queryObject" resultType="com.kmall.common.entity.SysSmsLogEntity">
@@ -35,7 +36,8 @@
 			`invalid_num`,
 			`success_num`,
 			`black_num`,
-			`return_msg`
+			`return_msg`,
+			sms_code
 		from sys_sms_log
 		where id = #{id}
 	</select>
@@ -56,6 +58,7 @@
         sys_sms_log.success_num,
         sys_sms_log.black_num,
         sys_sms_log.return_msg,
+        sys_sms_log.sms_code,
         sys_user.username user_name
         from sys_sms_log
         LEFT JOIN sys_user ON sys_user.user_id = sys_sms_log.user_id
@@ -99,6 +102,7 @@
 			`invalid_num`,
 			`success_num`,
 			`black_num`,
+			 sms_code,
 			`return_msg`)
 		values(
 			#{id},
@@ -114,6 +118,7 @@
 			#{invalidNum},
 			#{successNum},
 			#{blackNum},
+			#{smsCode},
 			#{returnMsg})
 	</insert>
 
@@ -132,6 +137,7 @@
             <if test="invalidNum != null">`invalid_num` = #{invalidNum},</if>
             <if test="successNum != null">`success_num` = #{successNum},</if>
             <if test="blackNum != null">`black_num` = #{blackNum},</if>
+            <if test="smsCode != null">`sms_code` = #{smsCode},</if>
             <if test="returnMsg != null">`return_msg` = #{returnMsg}</if>
         </set>
         where id = #{id}
@@ -163,7 +169,8 @@
         a.invalid_num,
         a.success_num,
         a.black_num,
-        a.return_msg
+        a.return_msg,
+        a.sms_code
 		from sys_sms_log a
 		left join sys_sms_log b on a.user_id = b.user_id and b.stime > a.stime
 		where a.user_id = #{user_id} and b.id is null