diff --git a/src/main/java/com/szxgl/pars2021/controller/RankingController.java b/src/main/java/com/szxgl/pars2021/controller/RankingController.java index 70db3ff..1fb309e 100644 --- a/src/main/java/com/szxgl/pars2021/controller/RankingController.java +++ b/src/main/java/com/szxgl/pars2021/controller/RankingController.java @@ -97,16 +97,13 @@ public class RankingController { //用户点赞数 int i = redisUtil.score(RANKING, openid).intValue(); userWork.setPraiseno(i); - //获取用户当天排行榜的点赞状态 - Integer praiseId = praiseService.getPraiseStatus(openid,userWork.getId()); - userWork.setPraiseStatus(praiseId); } } Set> set = null; List list = new ArrayList<>(); if(redisUtil.hasKey(RANKING)){ - set = redisUtil.rangeWithScores(RANKING, 0, 30); + set = redisUtil.rangeWithScores(RANKING, 0, -1); for (ZSetOperations.TypedTuple objectTypedTuple : set) { Long aLong = redisUtil.reverseRank(RANKING, objectTypedTuple.getValue()); //判断redis中是否有用户信息 @@ -122,16 +119,15 @@ public class RankingController { System.out.println(Integer.getInteger(Objects.requireNonNull(objectTypedTuple.getScore()).toString())); //返回索引值+1 = 排序值 userWorks.setRank(aLong+1); - //获取用户当天排行榜的点赞状态 - Integer result = praiseService.getPraiseStatus(Objects.requireNonNull(objectTypedTuple.getValue()).toString(),userWorks.getId()); - userWorks.setPraiseStatus(result); list.add(userWorks); } - } } //list按分数升序 list.sort(Comparator.comparing(UserWorks::getRank)); + if(list.size() > 30){ + list = list.subList(0,30); + } //返回排行榜滚动信息 List list2 = new ArrayList<>(); //获取所有排行榜用户信息 @@ -238,9 +234,6 @@ public class RankingController { url = bucketDomain + "/" +url; userWorks.setUrl(url); } - //获取用户当天排行榜的点赞状态 - Integer praiseId = praiseService.getPraiseStatus(openid,worksId); - userWorks.setPraiseStatus(praiseId); HashMap map = new HashMap<>(); //用户是否上传过作品 diff --git a/src/main/java/com/szxgl/pars2021/controller/WorksController.java b/src/main/java/com/szxgl/pars2021/controller/WorksController.java index 433c976..f9b0832 100644 --- a/src/main/java/com/szxgl/pars2021/controller/WorksController.java +++ b/src/main/java/com/szxgl/pars2021/controller/WorksController.java @@ -110,7 +110,6 @@ public class WorksController { worksDao.setCreate_time(new Date()); worksService.saveWorks(worksDao); - //把openid存入redis （排行榜的value） redisUtil.addZSet(RANKING,openid,0); } catch (IOException e) { diff --git a/src/main/java/com/szxgl/pars2021/filter/WebAuthFilter.java b/src/main/java/com/szxgl/pars2021/filter/WebAuthFilter.java index 31f3a06..6bd09b0 100644 --- a/src/main/java/com/szxgl/pars2021/filter/WebAuthFilter.java +++ b/src/main/java/com/szxgl/pars2021/filter/WebAuthFilter.java @@ -2,10 +2,8 @@ package com.szxgl.pars2021.filter; import com.alibaba.fastjson.JSONObject; import com.szxgl.pars2021.entity.Record; -import com.szxgl.pars2021.entity.UserDO; import com.szxgl.pars2021.entity.WxMpUser; import com.szxgl.pars2021.service.UserService; -import com.szxgl.pars2021.service.WorksService; import com.szxgl.pars2021.utils.URIUtil; import com.szxgl.pars2021.utils.Utility; import lombok.extern.slf4j.Slf4j; @@ -13,7 +11,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Component; import org.springframework.web.context.support.WebApplicationContextUtils; import javax.servlet.*; @@ -37,10 +34,10 @@ public class WebAuthFilter implements Filter { private String default_appid = "wx35766a64d73d08a9"; //@Value("${wx.auth-code}") - private String key = "1a9caed163104e2e9056c58b989347b9"; + private String key = "fbc35e02df8a4fae9f9f827156acd91e"; //@Value("${wx.project-id}") - private String projectId = "20202000200020002"; + private String projectId = "20210001000100011"; //@Value("${wx.auth-scope}") private String default_scope = "snsapi_userinfo"; diff --git a/src/main/java/com/szxgl/pars2021/mapper/PraiseMapper2.java b/src/main/java/com/szxgl/pars2021/mapper/PraiseMapper2.java index 427cc9a..a2267b3 100644 --- a/src/main/java/com/szxgl/pars2021/mapper/PraiseMapper2.java +++ b/src/main/java/com/szxgl/pars2021/mapper/PraiseMapper2.java @@ -1,12 +1,14 @@ package com.szxgl.pars2021.mapper; +import com.szxgl.pars2021.entity.PraiseDao; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface PraiseMapper2 { - Integer getPraiseStatus(@Param("openid") String openid, - @Param("worksId") Integer worksId); - + List getPraise(@Param("openid") String openid, + @Param("worksId") Integer worksId); } diff --git a/src/main/java/com/szxgl/pars2021/service/PraiseService.java b/src/main/java/com/szxgl/pars2021/service/PraiseService.java index 51f5413..0e77472 100644 --- a/src/main/java/com/szxgl/pars2021/service/PraiseService.java +++ b/src/main/java/com/szxgl/pars2021/service/PraiseService.java @@ -3,6 +3,4 @@ package com.szxgl.pars2021.service; public interface PraiseService { void savePraise(String openid, Integer worksId); - - Integer getPraiseStatus(String openid,Integer worksId); } diff --git a/src/main/java/com/szxgl/pars2021/service/impl/PraiseServiceImpl.java b/src/main/java/com/szxgl/pars2021/service/impl/PraiseServiceImpl.java index b259844..1bc5dd0 100644 --- a/src/main/java/com/szxgl/pars2021/service/impl/PraiseServiceImpl.java +++ b/src/main/java/com/szxgl/pars2021/service/impl/PraiseServiceImpl.java @@ -12,6 +12,7 @@ import com.szxgl.pars2021.service.PraiseService; import com.szxgl.pars2021.utils.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; import java.util.Date; @@ -40,39 +41,28 @@ public class PraiseServiceImpl implements PraiseService { @Override + @Transactional public void savePraise(String openid, Integer worksId) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("works_id",worksId); - wrapper.eq("openid",openid); - List praiseDaos = praiseMapper.selectList(wrapper); - System.out.println(praiseDaos); - - PraiseDao praiseDao = new PraiseDao(); - praiseDao.setOpenid(openid); - praiseDao.setWorksId(worksId); - praiseDao.setCreateTime(new Date()); - + List praiseDaos = praiseMapper2.getPraise(openid,worksId); //该用户没有点过赞 - if(praiseDaos == null){ + if(praiseDaos.size() == 0){ + PraiseDao praiseDao = new PraiseDao(); + praiseDao.setOpenid(openid); + praiseDao.setWorksId(worksId); + praiseDao.setCreateTime(new Date()); praiseMapper.insert(praiseDao); //更新作品点赞总数 worksMapper2.updatePraiseNo(worksId); }else { - String oldTime = ""; - for (int i = 0; i < praiseDaos.size(); i++) { - if(i == praiseDaos.size()-1){ - //判断该用户是否今天已点赞 - oldTime = new SimpleDateFormat("yyyyMMdd").format(praiseDaos.get(i).getCreateTime()).replaceAll("-",""); - } - } - - String newTime = new SimpleDateFormat("yyyyMMdd").format(new Date()).replaceAll("-",""); - - if(newTime.equals(oldTime)){ - //今天已点赞 - throw new ParameterException("您今天已点过赞,请明天再来点赞!"); + if(praiseDaos.size() >= 5){ + //今天已点赞5次 + throw new ParameterException("您今天已点赞5次,请明天再来点赞!"); }else { //今天未点赞 + PraiseDao praiseDao = new PraiseDao(); + praiseDao.setOpenid(openid); + praiseDao.setWorksId(worksId); + praiseDao.setCreateTime(new Date()); praiseMapper.insert(praiseDao); //更新作品点赞总数 worksMapper2.updatePraiseNo(worksId); @@ -91,10 +81,4 @@ public class PraiseServiceImpl implements PraiseService { } - @Override - public Integer getPraiseStatus(String openid,Integer worksId) { - return praiseMapper2.getPraiseStatus(openid,worksId); - } - - } diff --git a/src/main/java/com/szxgl/pars2021/service/impl/WorksServiceImpl.java b/src/main/java/com/szxgl/pars2021/service/impl/WorksServiceImpl.java index 6403ea0..fcfe6c9 100644 --- a/src/main/java/com/szxgl/pars2021/service/impl/WorksServiceImpl.java +++ b/src/main/java/com/szxgl/pars2021/service/impl/WorksServiceImpl.java @@ -8,6 +8,7 @@ import com.szxgl.pars2021.mapper.WorksMapper2; import com.szxgl.pars2021.service.WorksService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -23,6 +24,7 @@ public class WorksServiceImpl implements WorksService { @Override + @Transactional public void saveWorks(WorksDao worksDao) { worksMapper.insert(worksDao); } diff --git a/src/main/java/com/szxgl/pars2021/utils/BCrypt.java b/src/main/java/com/szxgl/pars2021/utils/BCrypt.java deleted file mode 100644 index f06444c..0000000 --- a/src/main/java/com/szxgl/pars2021/utils/BCrypt.java +++ /dev/null @@ -1,777 +0,0 @@ -// Copyright (c) 2006 Damien Miller -// -// Permission to use, copy, modify, and distribute this software for any -// purpose with or without fee is hereby granted, provided that the above -// copyright notice and this permission notice appear in all copies. -// -// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -package com.szxgl.pars2021.utils; - -import java.io.UnsupportedEncodingException; -import java.security.SecureRandom; - -/** - * BCrypt implements OpenBSD-style Blowfish password hashing using - * the scheme described in "A Future-Adaptable Password Scheme" by - * Niels Provos and David Mazieres. - *

- * This password hashing system tries to thwart off-line password - * cracking using a computationally-intensive hashing algorithm, - * based on Bruce Schneier's Blowfish cipher. The work factor of - * the algorithm is parameterised, so it can be increased as - * computers get faster. - *

- * Usage is really simple. To hash a password for the first time, - * call the hashpw method with a random salt, like this: - *

- * - * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt());
- * - *

- * To check whether a plaintext password matches one that has been - * hashed previously, use the checkpw method: - *

- * - * if (BCrypt.checkpw(candidate_password, stored_hash))
- *     System.out.println("It matches");
- * else
- *     System.out.println("It does not match");
- * - *

- * The gensalt() method takes an optional parameter (log_rounds) - * that determines the computational complexity of the hashing: - *

- * - * String strong_salt = BCrypt.gensalt(10)
- * String stronger_salt = BCrypt.gensalt(12)
- * - *

- * The amount of work increases exponentially (2**log_rounds), so - * each increment is twice as much work. The default log_rounds is - * 10, and the valid range is 4 to 30. - * - * @author Damien Miller - * @version 0.2 - */ -public class BCrypt { - // BCrypt parameters - private static final int GENSALT_DEFAULT_LOG2_ROUNDS = 10; - private static final int BCRYPT_SALT_LEN = 16; - - // Blowfish parameters - private static final int BLOWFISH_NUM_ROUNDS = 16; - - // Initial contents of key schedule - private static final int P_orig[] = { - 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, - 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, - 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c, - 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, - 0x9216d5d9, 0x8979fb1b - }; - private static final int S_orig[] = { - 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, - 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99, - 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, - 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, - 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, - 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013, - 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, - 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e, - 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60, - 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, - 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce, - 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a, - 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, - 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677, - 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, - 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, - 0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88, - 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239, - 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, - 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0, - 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, - 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98, - 0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88, - 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe, - 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6, - 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d, - 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b, - 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7, - 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, - 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463, - 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, - 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09, - 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3, - 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, - 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279, - 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8, - 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, - 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82, - 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db, - 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, - 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0, - 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b, - 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, - 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8, - 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, - 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, - 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7, - 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c, - 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, - 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1, - 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, - 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, - 0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477, - 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf, - 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, - 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af, - 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, - 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5, - 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, - 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915, - 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, - 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915, - 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, - 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a, - 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, - 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266, - 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1, - 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, - 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6, - 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1, - 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, - 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1, - 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737, - 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, - 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff, - 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, - 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, - 0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7, - 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, - 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, - 0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf, - 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af, - 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, - 0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87, - 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, - 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, - 0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16, - 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd, - 0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, - 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509, - 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, - 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, - 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f, - 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a, - 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, - 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960, - 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66, - 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, - 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802, - 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84, - 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, - 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf, - 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14, - 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, - 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50, - 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, - 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, - 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281, - 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, - 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, - 0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128, - 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73, - 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, - 0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0, - 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, - 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, - 0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3, - 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285, - 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, - 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061, - 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, - 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e, - 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, - 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc, - 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, - 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340, - 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, - 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7, - 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, - 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068, - 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, - 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, - 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, - 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504, - 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, - 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb, - 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee, - 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, - 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42, - 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, - 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, - 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb, - 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, - 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b, - 0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33, - 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, - 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, - 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc, - 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, - 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564, - 0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, - 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115, - 0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922, - 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728, - 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, - 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e, - 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, - 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d, - 0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804, - 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b, - 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, - 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, - 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d, - 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c, - 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, - 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9, - 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a, - 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, - 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d, - 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc, - 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, - 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61, - 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, - 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9, - 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2, - 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, - 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, - 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633, - 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, - 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, - 0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, - 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, - 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5, - 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62, - 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, - 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76, - 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, - 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc, - 0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, - 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c, - 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, - 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0, - 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, - 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe, - 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b, - 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, - 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, - 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6, - 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, - 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22, - 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, - 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, - 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9, - 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59, - 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, - 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51, - 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, - 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, - 0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b, - 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28, - 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, - 0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd, - 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, - 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319, - 0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, - 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f, - 0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, - 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32, - 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680, - 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166, - 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, - 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb, - 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, - 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47, - 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370, - 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, - 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, - 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048, - 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, - 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd, - 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9, - 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, - 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38, - 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f, - 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, - 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525, - 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, - 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, - 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964, - 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e, - 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, - 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d, - 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, - 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, - 0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02, - 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc, - 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, - 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a, - 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, - 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b, - 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, - 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060, - 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, - 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9, - 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, - 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6 - }; - - // bcrypt IV: "OrpheanBeholderScryDoubt". The C implementation calls - // this "ciphertext", but it is really plaintext or an IV. We keep - // the name to make code comparison easier. - static private final int bf_crypt_ciphertext[] = { - 0x4f727068, 0x65616e42, 0x65686f6c, - 0x64657253, 0x63727944, 0x6f756274 - }; - - // Table for Base64 encoding - static private final char base64_code[] = { - '.', '/', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', - 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', - 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', - 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', - 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', - '6', '7', '8', '9' - }; - - // Table for Base64 decoding - static private final byte index_64[] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 0, 1, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, -1, -1, - -1, -1, -1, -1, -1, 2, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, - -1, -1, -1, -1, -1, -1, 28, 29, 30, - 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 53, -1, -1, -1, -1, -1 - }; - - // Expanded Blowfish key - private int P[]; - private int S[]; - - /** - * Encode a byte array using bcrypt's slightly-modified base64 - * encoding scheme. Note that this is *not* compatible with - * the standard MIME-base64 encoding. - * - * @param d the byte array to encode - * @param len the number of bytes to encode - * @return base64-encoded string - * @exception IllegalArgumentException if the length is invalid - */ - private static String encode_base64(byte d[], int len) - throws IllegalArgumentException { - int off = 0; - StringBuffer rs = new StringBuffer(); - int c1, c2; - - if (len <= 0 || len > d.length) - throw new IllegalArgumentException ("Invalid len"); - - while (off < len) { - c1 = d[off++] & 0xff; - rs.append(base64_code[(c1 >> 2) & 0x3f]); - c1 = (c1 & 0x03) << 4; - if (off >= len) { - rs.append(base64_code[c1 & 0x3f]); - break; - } - c2 = d[off++] & 0xff; - c1 |= (c2 >> 4) & 0x0f; - rs.append(base64_code[c1 & 0x3f]); - c1 = (c2 & 0x0f) << 2; - if (off >= len) { - rs.append(base64_code[c1 & 0x3f]); - break; - } - c2 = d[off++] & 0xff; - c1 |= (c2 >> 6) & 0x03; - rs.append(base64_code[c1 & 0x3f]); - rs.append(base64_code[c2 & 0x3f]); - } - return rs.toString(); - } - - /** - * Look up the 3 bits base64-encoded by the specified character, - * range-checking againt conversion table - * @param x the base64-encoded value - * @return the decoded value of x - */ - private static byte char64(char x) { - if ((int)x < 0 || (int)x > index_64.length) - return -1; - return index_64[(int)x]; - } - - /** - * Decode a string encoded using bcrypt's base64 scheme to a - * byte array. Note that this is *not* compatible with - * the standard MIME-base64 encoding. - * @param s the string to decode - * @param maxolen the maximum number of bytes to decode - * @return an array containing the decoded bytes - * @throws IllegalArgumentException if maxolen is invalid - */ - private static byte[] decode_base64(String s, int maxolen) - throws IllegalArgumentException { - StringBuffer rs = new StringBuffer(); - int off = 0, slen = s.length(), olen = 0; - byte ret[]; - byte c1, c2, c3, c4, o; - - if (maxolen <= 0) - throw new IllegalArgumentException ("Invalid maxolen"); - - while (off < slen - 1 && olen < maxolen) { - c1 = char64(s.charAt(off++)); - c2 = char64(s.charAt(off++)); - if (c1 == -1 || c2 == -1) - break; - o = (byte)(c1 << 2); - o |= (c2 & 0x30) >> 4; - rs.append((char)o); - if (++olen >= maxolen || off >= slen) - break; - c3 = char64(s.charAt(off++)); - if (c3 == -1) - break; - o = (byte)((c2 & 0x0f) << 4); - o |= (c3 & 0x3c) >> 2; - rs.append((char)o); - if (++olen >= maxolen || off >= slen) - break; - c4 = char64(s.charAt(off++)); - o = (byte)((c3 & 0x03) << 6); - o |= c4; - rs.append((char)o); - ++olen; - } - - ret = new byte[olen]; - for (off = 0; off < olen; off++) - ret[off] = (byte)rs.charAt(off); - return ret; - } - - /** - * Blowfish encipher a single 64-bit block encoded as - * two 32-bit halves - * @param lr an array containing the two 32-bit half blocks - * @param off the position in the array of the blocks - */ - private final void encipher(int lr[], int off) { - int i, n, l = lr[off], r = lr[off + 1]; - - l ^= P[0]; - for (i = 0; i <= BLOWFISH_NUM_ROUNDS - 2;) { - // Feistel substitution on left word - n = S[(l >> 24) & 0xff]; - n += S[0x100 | ((l >> 16) & 0xff)]; - n ^= S[0x200 | ((l >> 8) & 0xff)]; - n += S[0x300 | (l & 0xff)]; - r ^= n ^ P[++i]; - - // Feistel substitution on right word - n = S[(r >> 24) & 0xff]; - n += S[0x100 | ((r >> 16) & 0xff)]; - n ^= S[0x200 | ((r >> 8) & 0xff)]; - n += S[0x300 | (r & 0xff)]; - l ^= n ^ P[++i]; - } - lr[off] = r ^ P[BLOWFISH_NUM_ROUNDS + 1]; - lr[off + 1] = l; - } - - /** - * Cycically extract a word of key material - * @param data the string to extract the data from - * @param offp a "pointer" (as a one-entry array) to the - * current offset into data - * @return the next word of material from data - */ - private static int streamtoword(byte data[], int offp[]) { - int i; - int word = 0; - int off = offp[0]; - - for (i = 0; i < 4; i++) { - word = (word << 8) | (data[off] & 0xff); - off = (off + 1) % data.length; - } - - offp[0] = off; - return word; - } - - /** - * Initialise the Blowfish key schedule - */ - private void init_key() { - P = (int[])P_orig.clone(); - S = (int[])S_orig.clone(); - } - - /** - * Key the Blowfish cipher - * @param key an array containing the key - */ - private void key(byte key[]) { - int i; - int koffp[] = { 0 }; - int lr[] = { 0, 0 }; - int plen = P.length, slen = S.length; - - for (i = 0; i < plen; i++) - P[i] = P[i] ^ streamtoword(key, koffp); - - for (i = 0; i < plen; i += 2) { - encipher(lr, 0); - P[i] = lr[0]; - P[i + 1] = lr[1]; - } - - for (i = 0; i < slen; i += 2) { - encipher(lr, 0); - S[i] = lr[0]; - S[i + 1] = lr[1]; - } - } - - /** - * Perform the "enhanced key schedule" step described by - * Provos and Mazieres in "A Future-Adaptable Password Scheme" - * http://www.openbsd.org/papers/bcrypt-paper.ps - * @param data salt information - * @param key password information - */ - private void ekskey(byte data[], byte key[]) { - int i; - int koffp[] = { 0 }, doffp[] = { 0 }; - int lr[] = { 0, 0 }; - int plen = P.length, slen = S.length; - - for (i = 0; i < plen; i++) - P[i] = P[i] ^ streamtoword(key, koffp); - - for (i = 0; i < plen; i += 2) { - lr[0] ^= streamtoword(data, doffp); - lr[1] ^= streamtoword(data, doffp); - encipher(lr, 0); - P[i] = lr[0]; - P[i + 1] = lr[1]; - } - - for (i = 0; i < slen; i += 2) { - lr[0] ^= streamtoword(data, doffp); - lr[1] ^= streamtoword(data, doffp); - encipher(lr, 0); - S[i] = lr[0]; - S[i + 1] = lr[1]; - } - } - - /** - * Perform the central password hashing step in the - * bcrypt scheme - * @param password the password to hash - * @param salt the binary salt to hash with the password - * @param log_rounds the binary logarithm of the number - * of rounds of hashing to apply - * @param cdata the plaintext to encrypt - * @return an array containing the binary hashed password - */ - public byte[] crypt_raw(byte password[], byte salt[], int log_rounds, - int cdata[]) { - int rounds, i, j; - int clen = cdata.length; - byte ret[]; - - if (log_rounds < 4 || log_rounds > 30) - throw new IllegalArgumentException ("Bad number of rounds"); - rounds = 1 << log_rounds; - if (salt.length != BCRYPT_SALT_LEN) - throw new IllegalArgumentException ("Bad salt length"); - - init_key(); - ekskey(salt, password); - for (i = 0; i != rounds; i++) { - key(password); - key(salt); - } - - for (i = 0; i < 64; i++) { - for (j = 0; j < (clen >> 1); j++) - encipher(cdata, j << 1); - } - - ret = new byte[clen * 4]; - for (i = 0, j = 0; i < clen; i++) { - ret[j++] = (byte)((cdata[i] >> 24) & 0xff); - ret[j++] = (byte)((cdata[i] >> 16) & 0xff); - ret[j++] = (byte)((cdata[i] >> 8) & 0xff); - ret[j++] = (byte)(cdata[i] & 0xff); - } - return ret; - } - - /** - * Hash a password using the OpenBSD bcrypt scheme - * @param password the password to hash - * @param salt the salt to hash with (perhaps generated - * using BCrypt.gensalt) - * @return the hashed password - */ - public static String hashpw(String password, String salt) { - BCrypt B; - String real_salt; - byte passwordb[], saltb[], hashed[]; - char minor = (char)0; - int rounds, off = 0; - StringBuffer rs = new StringBuffer(); - - if (salt.charAt(0) != '$' || salt.charAt(1) != '2') - throw new IllegalArgumentException ("Invalid salt version"); - if (salt.charAt(2) == '$') - off = 3; - else { - minor = salt.charAt(2); - if (minor != 'a' || salt.charAt(3) != '$') - throw new IllegalArgumentException ("Invalid salt revision"); - off = 4; - } - - // Extract number of rounds - if (salt.charAt(off + 2) > '$') - throw new IllegalArgumentException ("Missing salt rounds"); - rounds = Integer.parseInt(salt.substring(off, off + 2)); - - real_salt = salt.substring(off + 3, off + 25); - try { - passwordb = (password + (minor >= 'a' ? "\000" : "")).getBytes("UTF-8"); - } catch (UnsupportedEncodingException uee) { - throw new AssertionError("UTF-8 is not supported"); - } - - saltb = decode_base64(real_salt, BCRYPT_SALT_LEN); - - B = new BCrypt(); - hashed = B.crypt_raw(passwordb, saltb, rounds, - (int[])bf_crypt_ciphertext.clone()); - - rs.append("$2"); - if (minor >= 'a') - rs.append(minor); - rs.append("$"); - if (rounds < 10) - rs.append("0"); - if (rounds > 30) { - throw new IllegalArgumentException( - "rounds exceeds maximum (30)"); - } - rs.append(Integer.toString(rounds)); - rs.append("$"); - rs.append(encode_base64(saltb, saltb.length)); - rs.append(encode_base64(hashed, - bf_crypt_ciphertext.length * 4 - 1)); - return rs.toString(); - } - - /** - * Generate a salt for use with the BCrypt.hashpw() method - * @param log_rounds the log2 of the number of rounds of - * hashing to apply - the work factor therefore increases as - * 2**log_rounds. - * @param random an instance of SecureRandom to use - * @return an encoded salt value - */ - public static String gensalt(int log_rounds, SecureRandom random) { - StringBuffer rs = new StringBuffer(); - byte rnd[] = new byte[BCRYPT_SALT_LEN]; - - random.nextBytes(rnd); - - rs.append("$2a$"); - if (log_rounds < 10) - rs.append("0"); - if (log_rounds > 30) { - throw new IllegalArgumentException( - "log_rounds exceeds maximum (30)"); - } - rs.append(Integer.toString(log_rounds)); - rs.append("$"); - rs.append(encode_base64(rnd, rnd.length)); - return rs.toString(); - } - - /** - * Generate a salt for use with the BCrypt.hashpw() method - * @param log_rounds the log2 of the number of rounds of - * hashing to apply - the work factor therefore increases as - * 2**log_rounds. - * @return an encoded salt value - */ - public static String gensalt(int log_rounds) { - return gensalt(log_rounds, new SecureRandom()); - } - - /** - * Generate a salt for use with the BCrypt.hashpw() method, - * selecting a reasonable default for the number of hashing - * rounds to apply - * @return an encoded salt value - */ - public static String gensalt() { - return gensalt(GENSALT_DEFAULT_LOG2_ROUNDS); - } - - /** - * Check that a plaintext password matches a previously hashed - * one - * @param plaintext the plaintext password to verify - * @param hashed the previously-hashed password - * @return true if the passwords match, false otherwise - */ - public static boolean checkpw(String plaintext, String hashed) { - byte hashed_bytes[]; - byte try_bytes[]; - try { - String try_pw = hashpw(plaintext, hashed); - hashed_bytes = hashed.getBytes("UTF-8"); - try_bytes = try_pw.getBytes("UTF-8"); - } catch (UnsupportedEncodingException uee) { - return false; - } - if (hashed_bytes.length != try_bytes.length) - return false; - byte ret = 0; - for (int i = 0; i < try_bytes.length; i++) - ret |= hashed_bytes[i] ^ try_bytes[i]; - return ret == 0; - } -} diff --git a/src/main/java/com/szxgl/pars2021/utils/UploadFileToOssUtil.java b/src/main/java/com/szxgl/pars2021/utils/UploadFileToOssUtil.java index f4653d4..93dad58 100644 --- a/src/main/java/com/szxgl/pars2021/utils/UploadFileToOssUtil.java +++ b/src/main/java/com/szxgl/pars2021/utils/UploadFileToOssUtil.java @@ -24,15 +24,15 @@ public class UploadFileToOssUtil { * @return */ - private static final String endpoint = "oss-cn-hangzhou.aliyuncs.com"; + private static final String endpoint = "oss-cn-shenzhen.aliyuncs.com"; - private static final String accessKeyId = "LTAI4G88mJUn3YzWo2eFmxVG"; + private static final String accessKeyId = "sSJ5t0yC1CaKhPJ4"; - private static final String accessKeySecret = "iWNQskqvXC7Rm0au2W2u3AGNFEgYMl"; + private static final String accessKeySecret = "PsbdUTexU95BkiqO4ADELXpIaYdWGk"; - private static final String bucketName = "h5buckets"; + private static final String bucketName = "qiween"; - private static final String bucketDomain = "h5buckets.oss-cn-hangzhou.aliyuncs.com"; + private static final String bucketDomain = "qiween.oss-cn-hangzhou.aliyuncs.com"; @@ -63,7 +63,7 @@ public class UploadFileToOssUtil { //String objectName = "h5-in/"+folderName + "/" + fileMainName + extensionName; //使用目录、文件主体名称、文件扩展名称拼接得到对象名称 （普通输入路径） - String objectName = "h5-upload/"+folderName + "/" + fileMainName + extensionName; + String objectName = "kaimh/"+folderName + "/" + fileMainName + extensionName; log.info("输入路径："+objectName); System.out.println(objectName); diff --git a/src/main/java/com/szxgl/pars2021/utils/Utility.java b/src/main/java/com/szxgl/pars2021/utils/Utility.java deleted file mode 100644 index d7beb02..0000000 --- a/src/main/java/com/szxgl/pars2021/utils/Utility.java +++ /dev/null @@ -1,1446 +0,0 @@ -package com.szxgl.pars2021.utils; - -import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.codec.digest.UnixCrypt; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; - -import javax.imageio.ImageIO; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.awt.image.BufferedImage; -import java.io.*; -import java.math.BigDecimal; -import java.net.HttpURLConnection; -import java.net.URL; -import java.net.URLDecoder; -import java.net.URLEncoder; -import java.security.SecureRandom; -import java.sql.PreparedStatement; -import java.text.DecimalFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - - -public class Utility implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * cookie默认保存时长 （1天） - */ - private static final int COOKIE_DEFAULT_MAXAGE = 3600 * 24 * 1; - - protected static Utility instance = null; - - /** - * 用户密码正则表达式 (必须由数字和字母组成, 长度为6-18位) - * ^ 匹配一行的开头位置 - * (?![0-9]+$) 预测该位置后面不全是数字 - * (?![a-zA-Z]+$) 预测该位置后面不全是字母 - * [0-9A-Za-z]{6,18} 由6-18位数字或者字母组成 - * $ 匹配行结尾位置 - */ - public static String REGEX_USERPWD = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,18}$"; - - public static synchronized void setInstance(boolean clear) { - if (clear) - instance = null; - else if (instance == null) - instance = new Utility(); - } - - public static Utility getUtilityInstance() { - if (instance == null) - setInstance(false); - return instance; - } - - protected Utility() { - instance = null; - } - - - /** - * Convert integer string array into integer array - * @param array - * @return - * @throws Exception - */ - public static int[] toIntArray(String[] array) { - int[] result = new int[array.length]; - int count = 0; - for (int i = 0; i < array.length; i++) { - if (array[i] != null && !array[i].trim().equals("") && !array[i].trim().equals("undefined")) - result[count++] = Integer.parseInt(array[i]); - } - return result; - } - - /** - * Convert integer arraylist into integer array - * @param array - * @return - * @throws Exception - */ - public static int[] toIntArray(ArrayList array) throws Exception { - int[] result = new int[array.size()]; - int count = 0; - for (int i = 0; i < array.size(); i++) { - String item = array.get(i); - if (item != null && !item.trim().equals("")) - result[count++] = Integer.parseInt(item); - } - return result; - } - - public static int[] toIntArray(String str){ - if(str == null || str.equals("")) return null; - int[] result; - if(str.indexOf(",")!=-1){ - String[] strArr = str.split(","); - result =toIntArray(strArr); - }else{ - result = new int[]{Integer.parseInt(str)}; - } - - return result; - } - - public static long[] toLongArray(String str){ - if(str == null || str.equals("")) return null; - long[] result; - if(str.indexOf(",")!=-1){ - String[] strArr = str.split(","); - result =toLongArray(strArr); - }else{ - result = new long[]{Long.parseLong(str)}; - } - return result; - } - - public static long[] toLongArray(String[] array) { - long[] result = new long[array.length]; - int count = 0; - for (int i = 0; i < array.length; i++) { - if (array[i] != null && !array[i].trim().equals("") && !array[i].trim().equals("undefined")) - result[count++] = Long.parseLong(array[i]); - } - return result; - } - - /** - * This function will convert the string to a unicode string. (e.g. "\u7f51") - * - * @param value - * @return - */ - public static String encodeDec(String value) throws Exception { - // Set the contant type as "UTF8". - // - if (value == null || value.equals("")) - return value; - - String buffer = value; - //buffer = new String(buffer.getBytes("ISO8859_1"), "UTF8"); - buffer = URLEncoder.encode(buffer, "Unicode"); - - // Sometime the language in reverse encodeing - boolean reverse = false; - if (buffer.startsWith("%FE%FF")) - reverse = true; - - StringBuffer sb = new StringBuffer(); - String[] sc = buffer.split(!reverse ? "%FF%FE" : "%FE%FF"); - // for each of unicode set - for (int i = 0; i < sc.length; i++) { - String si = sc[i]; - // for each of char in unicode line - for (int j = 0; j < si.length(); j++) { - char ch = si.charAt(j); - if (ch == '%') { - sb.append("&#"); - if (!reverse) { - sb.append(Integer.parseInt(si.substring(j + 4, j + 6).toLowerCase() - + si.substring(j + 1, j + 3).toLowerCase(), 16)); - } else { - sb.append(Integer.parseInt(si.substring(j + 1, j + 3).toLowerCase() - + si.substring(j + 4, j + 6).toLowerCase(), 16)); - } - sb.append(";"); - j += 5; - } else { - String ss = si.substring(j, j + 1); - if (ss.equals("+")) - ss = " "; - sb.append(ss); - } - } - } - return sb.toString(); - } - - public static String decodeDec(String value) throws Exception { - // Back to unicode from string contains unicode string (i.e. \u4e09) - boolean fffe = false; - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < value.length(); i++) { - if (value.charAt(i) == '&' && value.charAt(i + 1) == '#') { - if (!fffe) { - sb.append("%FF%FE"); - fffe = true; - } - int nexti = value.indexOf(';', i + 2); - String code = value.substring(i + 2, nexti); - String hex = "0000" + Integer.toHexString(Integer.parseInt(code)); - hex = hex.substring(hex.length() - 4); - sb.append("%" + hex.substring(2, 4)); - sb.append("%" + hex.substring(0, 2)); - i = nexti; - } else { - fffe = false; - if (value.charAt(i) == ' ') - sb.append('+'); - else - sb.append(value.charAt(i)); - } - } - return URLDecoder.decode(sb.toString(), "Unicode"); - } - - public static String decodeISO(String value) throws Exception { - if (value == null) - return ""; - return new String(value.getBytes("ISO8859_1"), "UTF8"); - } - - public static String decodeISO(String value, String sourceCharSet) throws Exception { - if (value == null) - return ""; - if (sourceCharSet == null) return value; - if (sourceCharSet.trim().equals("")) return value; - return new String(value.getBytes(sourceCharSet), "UTF8"); - } - - public static String encodeHTML(String value) { - if (value == null) - return ""; - value = value.replaceAll("\"", """).replaceAll("'", "'"); - value = value.replaceAll("<", "<").replaceAll(">", ">"); - return value; - } - - public static String decodeHTML(String value) { - if (value == null) - return ""; - value = value.replaceAll(""", "\"").replaceAll("'", "'"); - value = value.replaceAll("<", "<").replaceAll(">", ">"); - return value; - } - - /** - * This function will convert the string to a unicode string. (e.g. "\u7f51") - * - * @param value - * @return - */ - public static String toUnicodeString(String value) throws Exception { - // Set the contant type as "UTF8". - // - if (value == null || value.equals("")) - return value; - - String buffer = value; - buffer = new String(buffer.getBytes("ISO8859_1"), "UTF8"); - buffer = URLEncoder.encode(buffer, "Unicode"); - - StringBuffer sb = new StringBuffer(); - String[] sc = buffer.split("%FF%FE"); - // for each of unicode set - for (int i = 0; i < sc.length; i++) { - String si = sc[i]; - // for each of char in unicode line - for (int j = 0; j < si.length(); j++) { - char ch = si.charAt(j); - if (ch == '%') { - sb.append('\\').append('u'); - sb.append(si.substring(j + 4, j + 6).toLowerCase()); - sb.append(si.substring(j + 1, j + 3).toLowerCase()); - j += 5; - } else { - String ss = si.substring(j, j + 1); - if (ss.equals("+")) - ss = " "; - sb.append(ss); - } - } - } - return sb.toString(); - } - - /** - * Create a instance from a class - * - * @param service - * @return @throws - * ClassNotFoundException - * @throws InstantiationException - * @throws IllegalAccessException - */ - public static Object instantiate(String service) throws ClassNotFoundException, InstantiationException, - IllegalAccessException { - ClassLoader classloader = Thread.currentThread().getContextClassLoader(); - Class instance = classloader.loadClass(service); - return instance.newInstance(); - } - - public static double getRoundUp(double d, int scale) { - double result = d; - BigDecimal bd = new BigDecimal(d); - result = bd.setScale(scale, BigDecimal.ROUND_HALF_UP).doubleValue(); - return result; - } - - public static float getRoundUp(float d, int scale) { - float result = d; - BigDecimal bd = new BigDecimal(d); - result = bd.setScale(scale, BigDecimal.ROUND_HALF_UP).floatValue(); - return result; - } - - public static Calendar getCalendar(Date date) throws Exception { - Calendar result = Calendar.getInstance(); - result.setTime(date); - return result; - } - - public static Calendar getCalendar(long milliseconds) throws Exception { - Calendar result = Calendar.getInstance(); - result.setTimeInMillis(milliseconds); - return result; - } - - public static String getTimeStampWithMillis() { - return getTimeStampWithMillis(Calendar.getInstance()); - } - - public static String getTimeStampWithMillis(Calendar calendar) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS"); - String result = sdf.format(calendar.getTime()); - return result; - } - - /** - * Convert a string with format "yyyyMMddHHmmss" into Calendar object - * @param date - * @return - * @throws Exception - */ - public static Calendar getCalendar(String date) throws Exception { - if (date == null || date.trim().equals("")) - return null; - - for (int i = date.length(); i < 14; i++) - date += "0"; - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); - Calendar result = Calendar.getInstance(); - - try { - result.setTime(sdf.parse(date)); - } catch (ParseException e) { - result = null; - } - return result; - } - - public static Calendar getCalendar(String date, String format) throws Exception { - if (date == null || date.trim().equals("")) - return null; - - SimpleDateFormat sdf = new SimpleDateFormat(format); - Calendar result = Calendar.getInstance(); - - try { - result.setTime(sdf.parse(date)); - } catch (ParseException e) { - result = null; - } - return result; - } - - public static String getDateString(Calendar date) throws Exception { - if (date == null) return ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); - return sdf.format(date.getTime()); - } - - public static String getDateString(Calendar date, String format){ - if (date == null) return ""; - SimpleDateFormat sdf = new SimpleDateFormat(format); - return sdf.format(date.getTime()); - } - // 12 to 24 - public static String TimeFormat(String time){ - if(time==null || time.trim().equals("")) return null; - - if(time.indexOf("PM")!=-1 || time.indexOf("pm")!=-1){ - String[] strarr = time.split(":"); - int HH=Integer.parseInt(strarr[0]); - if(HH==1){ - HH=13; - }else if(HH==2){ - HH=14; - }else if(HH==3){ - HH=15; - }else if(HH==4){ - HH=16; - }else if(HH==5){ - HH=17; - }else if(HH==6){ - HH=18; - }else if(HH==7){ - HH=19; - }else if(HH==8){ - HH=20; - }else if(HH==9){ - HH=21; - }else if(HH==10){ - HH=22; - }else if(HH==11){ - HH=23; - }else if(HH==12){ - HH=00; - } - time = HH+":"+strarr[1]; - - } - return time; - } - - public static String getHttpContent(String urlStr, String encoding) throws Exception { - URL url = new URL(urlStr); - InputStream is = null; - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - try { - if (connection.getResponseCode() != 200) { - //return "Error: " + connection.getResponseCode() + " " + connection.getResponseMessage(); - is = connection.getErrorStream(); - } else { - is = connection.getInputStream(); - } - - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - byte[] buffer = new byte[16384]; - int count; - while ((count = is.read(buffer)) != -1) { - bos.write(buffer, 0, count); - } - return bos.toString(encoding); - } finally { - connection.disconnect(); - } - } - - public static byte[] objectToByteArray(Object obj) throws Exception { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - ObjectOutputStream oos = new ObjectOutputStream(bos); - oos.writeObject(obj); - oos.flush(); - oos.close(); - return bos.toByteArray(); - } - - public static byte[] InputStreamToByteArray(InputStream is) throws Exception { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - byte[] buffer = new byte[16384]; - int count; - while ((count = is.read(buffer)) != -1) { - bos.write(buffer, 0, count); - } - return bos.toByteArray(); - } - - - public static Object byteArrayToObject(byte[] array) throws Exception { - ByteArrayInputStream bis = new ByteArrayInputStream(array); - ObjectInputStream ois = new ObjectInputStream(bis); - return ois.readObject(); - } - - public static void byteArrayToFile(byte[] content, String filename) throws Exception { - FileOutputStream out = new FileOutputStream(filename); - out.write(content); - out.flush(); - out.close(); - } - - public static byte[] fileToByteArray(String filename) throws Exception { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - FileInputStream fos = new FileInputStream(filename); - byte[] buffer = new byte[10240]; - int count; - while ((count = fos.read(buffer)) != -1) - bos.write(buffer, 0, count); - fos.close(); - return bos.toByteArray(); - } - - public URL getWebInfURL() throws Exception { - URL url = getClass().getResource(""); - if (url != null) { - return new URL(url.getProtocol(), url.getHost(), url.getFile().substring(0, - url.getFile().indexOf("WEB-INF/classes")) - + "WEB-INF"); - } else { - String classesPath = getClass().getClassLoader().getResource("").toString(); - String location = classesPath.substring(0, classesPath.indexOf("/classes")); - return new URL(location); - } - } - - public static String getRegExpContent(String content, String pattern, int index) throws Exception { - Pattern p = Pattern.compile(pattern); - Matcher m = p.matcher(content); - if (m.find()) { - return m.group(index); - } - return ""; - } - - public static int[] getIntegerArray(String values) throws Exception { - String[] slice = values.split(","); - int[] result = new int[slice.length]; - for (int i = 0; i < slice.length; i++) - result[i] = Integer.parseInt(slice[i]); - return result; - } - - /** - * Return the file name without extension - * @param filename - * @return - * @throws Exception - */ - public static String getFileName(String filename) throws Exception { - int i = filename.lastIndexOf('.'); - if (i == -1) - return filename; - return filename.substring(0, i); - } - - /** - * Return the file extension only - * @param filename - * @return - * @throws Exception - */ - public static String getFileExtension(String filename) throws Exception { - int i = filename.lastIndexOf('.'); - if (i == -1) - return ""; - return filename.substring(i + 1); - } - - public static String getRandomFileName() throws Exception { - Random rand = new Random((Calendar.getInstance()).getTimeInMillis()); - return "_" + Math.abs(rand.nextInt()) + ".tmp"; - } - - public static String encodeCDATA(String str) { - return str.replaceAll("<", "A1X78D2L").replaceAll(">", "B8N62K09").replaceAll("&", "C19PWK8B").replaceAll("\"","7HU3G1Z6"); - } - - public static String decodeCDATA(String str) { - return str.replaceAll("A1X78D2L", "<").replaceAll("B8N62K09", ">").replaceAll("C19PWK8B", "&").replaceAll("7HU3G1Z6", "\""); - } - - public static String getQuotedString(String str) { - return str.replaceAll("\"", "\\\\\""); - } - /* - public static String getValidPassword(String password) { - if (password == null) return Constant.pwdSuffix; - else if (password.trim().length() < 4) return password.trim() + Constant.pwdSuffix; - else return password.trim(); - } -*/ - public static String getFormatedDate(Calendar date) { - return getFormatedDate(date, "yyyy-MM-dd HH:mm:ss"); - } - - public static String getFormatedDate(Date date) { - if(date==null)return null; - Calendar c = Calendar.getInstance(); - c.setTime(date); - return getFormatedDate(c); - } - - public static String getFormatedDate(Calendar date, String format) { - if (date == null) - return ""; - SimpleDateFormat sdf = new SimpleDateFormat(format); - return sdf.format(date.getTime()); - } - - public static String getFormatedTimeStamp() { - return getFormatedTimeStamp(Calendar.getInstance()); - } - - public static String getFormatedTimeStamp(Calendar calendar) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS"); - return sdf.format(calendar.getTime()); - } - - public static String getTimeStamp() { - Calendar calendar = Calendar.getInstance(); - return getTimeStamp(calendar); - } - - public static String getTimeStamp(Calendar calendar) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); - String result = sdf.format(calendar.getTime()); - result = result + "000"; - return result; - } - - - public static String getFormatedFileSize(long value) { - double kb = value / 1024.00; - DecimalFormat df = new DecimalFormat("#0.00"); - return df.format(kb); - } - - public static String getFormatedDecimal(double value) { - return getFormatedDecimal(value, "#0.00"); - } - - public static String getFormatedDecimal(double value, int decimal) { - String format = "#0."; - if (decimal == 0) format = "#0"; - else { - for (int i = 1; i <= decimal; i++) format += "0"; - } - return getFormatedDecimal(value, format); - } - - public static String getFormatedDecimal(double value, String format) { - DecimalFormat df = new DecimalFormat(format); - return df.format(value); - } - - public static Date getMonthLastDay(int year, int month) { - Calendar calendar = Calendar.getInstance(); - calendar.set(year, month, 1); - calendar.add(Calendar.DATE, -1); - return calendar.getTime(); - } - - public static String getDateFormat(Date date, String format) { - if (date == null) return ""; - SimpleDateFormat dateFormat = new SimpleDateFormat(format, Locale.US); - return dateFormat.format(date); - } - - public static java.sql.Date UtilDateToSQLDate(Date utilDate) { - if (utilDate == null) return null; - return new java.sql.Date(utilDate.getTime()); - } - - public static java.sql.Timestamp UtilDateToSQLTimeStamp(Date utilDate) { - if (utilDate == null) return null; - return new java.sql.Timestamp(utilDate.getTime()); - } - - public static Date SQLDateToUtilDate(java.sql.Date SQLDate) { - if (SQLDate == null) return null; - return new Date(SQLDate.getTime()); - } - - public static Date SQLDateToUtilDate(java.sql.Timestamp SQLDate) { - if (SQLDate == null) return null; - return new Date(SQLDate.getTime()); - } - - public static Date parseDate(String strDate, String pattern) throws Exception { - if (strDate == null || strDate.trim().equals("")) return null; - SimpleDateFormat format = new SimpleDateFormat(pattern); - Date date = format.parse(strDate); - return date; - } - - public static String getSearchFormat(String pattern) { - if (pattern == null) return "%"; - pattern = pattern.trim(); // format maybe : A, A%, %A%, A%B%, %A"B - if (pattern.equals("")) { - pattern = "%"; - } else if (pattern.indexOf("%") == -1) { - pattern = "%" + pattern + "%"; - } - return pattern; - } - - public static String getLeadingZero(int intValue, int maxLength) { - String result = String.valueOf(intValue); - if (result.length() < maxLength) { - while (result.length() < maxLength) { - result = "0" + result; - } - } - return result; - } - - public static String getQuantityAsString(float qty) { - DecimalFormat df = new DecimalFormat("#0.00"); - return df.format(qty); - } - - public static String getQuantityAsString(double qty) { - DecimalFormat df = new DecimalFormat("#0.00"); - return df.format(qty); - } - - public static String getQuantityAsString(float amt, String pattern) { - DecimalFormat df = new DecimalFormat(pattern); - return df.format(amt); - } - - public static String getQuantityAsString(double amt, String pattern) { - DecimalFormat df = new DecimalFormat(pattern); - return df.format(amt); - } - - public static String getInvoiceAsString(float amt) { - DecimalFormat df = new DecimalFormat("#,##0.00"); - return df.format(amt); - } - - public static String getAmountAsString(float amt, String pattern) { - DecimalFormat df = new DecimalFormat(pattern); - return df.format(amt); - } - - public static String getAmountAsString(double amt, String pattern) { - DecimalFormat df = new DecimalFormat(pattern); - return df.format(amt); - } - - public static String getFloatFormat(float f, String pattern) { - DecimalFormat df = new DecimalFormat(pattern); - return df.format(f); - } - - public static String getDoubleFormat(double d, String pattern) { - DecimalFormat df = new DecimalFormat(pattern); - return df.format(d); - } - - public static Date parseExcelDate(String Date) { - Calendar calendar = Calendar.getInstance(); - long millis = (long) (Integer.parseInt(Date) - 25569)*24*60*60*1000; - calendar.setTimeInMillis(millis); - return calendar.getTime(); - } - - public static double mul(double d1, double d2) { - BigDecimal b1 = new BigDecimal(String.valueOf(d1)); - BigDecimal b2 = new BigDecimal(String.valueOf(d2)); - - return b1.multiply(b2).doubleValue(); - } - - public static double mul(BigDecimal b1, double d2) { - BigDecimal b2 = new BigDecimal(String.valueOf(d2)); - - return b1.multiply(b2).doubleValue(); - } - - public static double round(double d, int scale) { - if(scale<0){ - throw new IllegalArgumentException("The scale must be a positive integer or zero"); - } - BigDecimal b = new BigDecimal(String.valueOf(d)); - BigDecimal one = new BigDecimal("1"); - - return b.divide(one, scale, BigDecimal.ROUND_HALF_UP).doubleValue(); - } - - public static String getIDAsString(ArrayList idList, int idFrom, int idTo) { - String IDs = null; - if (idList != null && idList.size() > 0) { - if (idFrom < 0) idFrom = 0; - if (idTo > idList.size()) idTo = idList.size(); - int lp; - IDs = idList.get(idFrom).toString(); - if (idList.size() > 1 && idTo > idFrom) { - for (lp = idFrom+1; lp < idTo; lp ++) IDs += "," + idList.get(lp).toString(); - } - } - return IDs; - } - - public static String getPreparedParameterList(int fromID, int toID) { - String result = ""; - for (int i = fromID; i <= toID; i++) { - if (i == fromID) result += "?"; - else result += ",?"; - } - return result; - } - - public static void setPreparedParameterList(PreparedStatement stmt, int startParamIndex, ArrayList idList, int fromID, int toID) throws Exception { - int idx = startParamIndex; - for (int i = fromID; i <= toID; i++) { - stmt.setInt(idx, idList.get(i).intValue()); - idx ++; - } - } - - public static String replaceMailAddress(String mailAddress, String oldPattern, String newPattern) { - if (mailAddress == null || mailAddress.trim().equals("") || oldPattern == null || newPattern == null) - return mailAddress; - else { - return mailAddress.trim().replaceAll(oldPattern, newPattern); - } - } - - public static String getValidMailAddress(String mailAddress, String defaultAddress) { - if (mailAddress != null && !mailAddress.trim().equals("")) - return mailAddress; - else - return defaultAddress; - } - - public static String getValidString(String str) { - if (str == null) return ""; - else return str; - } - - public static String[] getMailTo(String to) { - String[] toAC = null; - if (to != null && to.indexOf("@") != -1) { - if (to.indexOf(",") != -1) toAC = to.split(","); - else if (to.indexOf(";") != -1) toAC = to.split(";"); - else if (to.indexOf(" ") != -1) toAC = to.split(" "); - else { - toAC = new String[1]; - toAC[0] = to; - } - } - return toAC; - } - - public static int getASCII(String str) { - int result = 48; - if (str != null && !str.trim().equals("")) { - result = 48 + Integer.parseInt(str); - } - return result; - } - - public static void getKeyAsVector(String s_key, Vector v_key) { - int idx; - if (s_key != null && !s_key.trim().equals("")) { - if (s_key.startsWith(".")) s_key = s_key.substring(1); - while (s_key.length() > 0) { - idx = s_key.indexOf("."); - if (idx != -1) { - v_key.addElement(s_key.substring(0, idx)); - s_key = s_key.substring(idx+1); - } else { - v_key.addElement(s_key); - s_key = ""; - } - } - } - } - - public static String getNameFromAscII(String s_key, int startIndex, int length) { - Vector v_key = new Vector(); - Utility.getKeyAsVector(s_key, v_key); - String result = getNameFromAscII(v_key, startIndex, length); - v_key = null; - return result; - } - - public static String getNameFromAscII(Vector v_key, int startIndex, int length) { - String result = ""; - if (length > v_key.size() - startIndex) length = v_key.size() - startIndex; - for (int i = startIndex; i < startIndex + length; i++) { - result += (char)Integer.parseInt(v_key.elementAt(i)); - } - return result; - } - - public static String NameToASCII(String str) { - String result = null; - char[] ch = str.toCharArray(); - for (int i = 0; i < ch.length; i++) { - if (result == null) result = String.valueOf((int)ch[i]); - else result = result + "." + String.valueOf((int)ch[i]); - } - return result; - } - - public static void writeLog(String log) { - try { - System.out.println(getFormatedTimeStamp() + " : " + log); - } catch (Exception e) { - } - } - - public static String getLoggerCommandShellPath() throws Exception { - String LoggerCommandShellPath = "classes"; - - URL webInf = Utility.getUtilityInstance().getWebInfURL(); - URL url = new URL(webInf.getProtocol(), webInf.getHost(), webInf.getFile() + "/" + LoggerCommandShellPath); - LoggerCommandShellPath = url.getHost() + url.getFile(); - - File file = new File(LoggerCommandShellPath); - if (!file.exists()) file.mkdirs(); - return file.getCanonicalPath(); - } - - public static String intToHex(int i) { - String result = Integer.toHexString(i).trim(); - if (result.length() == 0) result = "00"; - if (result.length() == 1) result = "0" + result; - return result; - } - - public static int HexToInt(String s) { - return Integer.parseInt(Integer.valueOf(s, 16).toString()); - } - - public static ArrayList str2List(String str){ - ArrayList list = new ArrayList<>(); - if(str!=null && str.trim().length()>0){ - if(str.indexOf(",")!=-1){ - String[] arr = str.split(","); - for (String string : arr) { - list.add(string); - } - }else{ - list.add(str); - } - } - return list; - } - - public static String getUUID(){ - return java.util.UUID.randomUUID().toString(); - } - - public static String getFileSuffix(String filename){ - String suffix=""; - if(filename!=null && filename.indexOf(".")!=-1)suffix=filename.substring(filename.lastIndexOf(".")); - return suffix; - } - - public static String getFileSuffix(File file){ - String fileName=file.getName(); - return getFileSuffix(fileName); - } - /* - public static String getPorjectPath(){ - String nowpath = System.getProperty("user.dir"); - nowpath=nowpath.replace("bin", "webapps"); //把bin 文件夹变到 webapps文件里面 - nowpath+=File.separator+Constant.ProjectName; //拼成D:\java\software\apache-tomcat-6.0.14\webapps\sz_pro - return nowpath; - } - */ - public static String getClientIPAddr(HttpServletRequest request) { - String ip = request.getHeader("x-forwarded-for"); - if (!StringUtils.isBlank(ip) && !"unknown".equalsIgnoreCase(ip)) { - // 多次反向代理后会有多个IP值，第一个为真实IP。 - int index = ip.indexOf(','); - if (index != -1) { - ip = ip.substring(0, index); - } - } - if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("PRoxy-Client-IP"); - } - if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("WL-Proxy-Client-IP"); - } - if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("X-Real-IP"); - } - if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getRemoteAddr(); - } - return ip; - } - - public static String trimExtension(String filename) { - if ((filename != null) && (filename.length() > 0)) { - int i = filename.lastIndexOf('.'); - if ((i >-1) && (i < (filename.length()))) { - return filename.substring(0, i); - } - } - return filename; - } - - public static String listToString(List stringList){ - if (stringList==null) { - return null; - } - StringBuilder result=new StringBuilder(); - boolean flag=false; - for (Object string : stringList) { - if (flag) { - result.append(","); - }else { - flag=true; - } - result.append(String.valueOf(string)); - } - return result.toString(); - } - - public static boolean strIsEqual(String str1, String str2){ - if(str1 == null)str1=""; - if(str2 == null)str2=""; - if(str1.equals(str2) || str1.trim().equals(str2.trim()))return true; - else return false; - } - - /** - * 判断是否是整数 - * @param str - * @return - */ - public static boolean isNumber(String str){ - if(StringUtils.isEmpty(str))return false; - try { - Long.parseLong(str); - return true; - } catch (Exception e) { - return false; - } - } - - /** - * 判断是否是浮点数 - * @param str - * @return - */ - public static boolean isDouble(String str){ - if(StringUtils.isEmpty(str))return false; - try { - Double.parseDouble(str); - return true; - } catch (Exception e) { - return false; - } - } - - /** - * 密码加密方法 - * @param pwd - * @return - */ - public static String encryptPwd(String pwd){ - if(StringUtils.isEmpty(pwd))return null; - else return UnixCrypt.crypt(pwd, DigestUtils.sha256Hex(pwd)); - } - - /** - * 优惠码的生成, 默认6为长度 - * @return - */ - public static String getCode() { - return getCode(6); - } - - public static String getCode(int length) { - char[] chs = { 'a', 'b', 'c', '1', '2', '3', '4', '5', 'd', 'e', 'f', - 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', - 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '6', '7', '8', '9' }; - SecureRandom random = new SecureRandom(); - final char[] value = new char[length]; - for (int i = 0; i < length; i++) { - value[i] = chs[random.nextInt(chs.length)]; - } - final String code = new String(value); - return code; - } - - /** - * 通过正则验证手机号码是否正确 - * @param str - * @return - */ - public static boolean isMobile(String str) { - boolean b = false; - Pattern p=Pattern.compile("^1(3|4|5|7|8)\\d{9}$"); - Matcher m = p.matcher(str); - b = m.matches(); - return b; - } - - /** - * 使用urlencode对链接进行编码 - * @param url - * @return - */ - public static String urlEncode(String url){ - if(url == null || url.trim().equals(""))return null; - try { - return URLEncoder.encode(url, "UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - return null; - } - } - - /** - * 使用UrlDecode对链接进行解码 - * @param url - * @return - */ - public static String urlDecode(String url){ - if(url == null || url.trim().equals(""))return null; - try { - return URLDecoder.decode(url, "UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - return null; - } - } - - - public static boolean isEmpty(String str){ - return (str == null || "".equals(str.trim())); - } - - public static boolean isNotEmpty(String str){ - return (str != null && str.trim().length() > 0); - } - - /** - * 判断文件是否是图片 - * @param file - * @return - */ - public static boolean isImage(File file){ - if(file == null)return false; - boolean flag = false; - try { - InputStream inputStream = new FileInputStream(file); - flag = isImage(inputStream); - inputStream.close(); - } catch (Exception e) { - } - return flag; - } - - /** - * 判断输入流是否是图片 - * @param inputStream - * @return - */ - public static boolean isImage(InputStream inputStream){ - boolean flag = false; - try { - BufferedImage Image=ImageIO.read(inputStream); - if(null == Image) { - return flag; - } - Image.flush(); - flag = true; - } catch (Exception e){ - } - return flag; - } - - public static String getDate4Chinese(long timeInMillis){ - long year_milliseconds = 31536000000L; - long day_milliseconds = 86400000L; - long hour_milliseconds = 3600000L; - - String returnValue=""; - Date now = new Date(); - long leftTime=now.getTime()-timeInMillis; - - long year = leftTime / year_milliseconds; // 这里必须加L，否则结果不对 - leftTime -= year*year_milliseconds; - - long day=leftTime/day_milliseconds; - leftTime -= day*day_milliseconds; - - long hour=leftTime/hour_milliseconds; - leftTime -= hour*hour_milliseconds; - - long minutes=(leftTime/(60*1000)); - leftTime -= minutes*60*1000; - - long second = leftTime/1000; - - if(year > 0){ - returnValue = year+"年"; - } - if(day > 0){ - returnValue += day+"天"; - } - - if(StringUtils.isBlank(returnValue) && hour > 0){ - returnValue = hour+"小时"; - } - if(StringUtils.isBlank(returnValue) && minutes > 0){ - returnValue = minutes+"分钟"; - } - if(StringUtils.isBlank(returnValue)){ - returnValue = second+"秒"; - } - - return returnValue; - } - - /** - * 将输入流转成字符串 - * @param request - * @return - * @throws IOException - */ - public static String parseHttpData(HttpServletRequest request) throws IOException{ - //从request中取得输入流 - InputStream inputStream=request.getInputStream(); - String result = IOUtils.toString(inputStream, "UTF-8"); - return result; - } - - /** - * 获取客户端请求真实IP地址 - */ - public static String getReqIpAddr(HttpServletRequest request) { - String ip=""; - if(request!=null){ - ip = request.getHeader("x-forwarded-for"); - if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("Proxy-Client-IP"); - } - if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("WL-Proxy-Client-IP"); - } - if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getRemoteAddr(); - } - } - return ip; - } - - - /** - * 向URL中添加参数(有则修改，无则添加) - * @param url - * @param ParamName - * @param ParamValue - * @return - */ - public static String addParamValue(String url, String ParamName, String ParamValue) { - if(StringUtils.isNotBlank(url) && StringUtils.isNotBlank(ParamName) && StringUtils.isNotBlank(ParamValue)) { - if(url.contains(ParamName+"=")){ - url = replaceParamValue(url, ParamName, ParamValue); - }else{ - if(url.contains("?") || url.contains("\\?")){ - url += "&"+ParamName+"=" + ParamValue; - }else{ - url += "?"+ParamName+"=" + ParamValue; - } - } - } - return url; - } - - /** - * 替换URL参数的值 - * @param url - * @param ParamName - * @param ParamValue - * @return - */ - public static String replaceParamValue(String url, String ParamName, String ParamValue) { - if(StringUtils.isNotBlank(url) && StringUtils.isNotBlank(ParamName) && StringUtils.isNotBlank(ParamValue)) { - url = url.replaceAll("(\\?" + ParamName +"=[^&]*)", "?"+ParamName + "=" + ParamValue); - url = url.replaceAll("(\\&" + ParamName +"=[^&]*)", "&"+ParamName + "=" + ParamValue); - } - return url; - } - - /** - * 删除URL中的参数 - * @param url - * @param ParamName - * @return - */ - public static String removeParamValue(String url, String ParamName) { - if(StringUtils.isNotBlank(url) && StringUtils.isNotBlank(ParamName)) { - while(url.contains("?"+ParamName+"=") || url.contains("%3f"+ParamName+"%3d") || url.contains("%3F"+ParamName+"%3D") - || url.contains("&"+ParamName+"=") || url.contains("%26"+ParamName+"%3d") || url.contains("%26"+ParamName+"%3D")){ - url = url.replaceAll("(\\?" + ParamName +"=[^&]*)", ""); - url = url.replaceAll("(%3f" + ParamName +"%3d[^&]*)", ""); - url = url.replaceAll("(%3F" + ParamName +"%3D[^&]*)", ""); - - url = url.replaceAll("(\\&" + ParamName +"=[^&]*)", ""); - url = url.replaceAll("(%26" + ParamName +"%3d[^&]*)", ""); - url = url.replaceAll("(%26" + ParamName +"%3D[^&]*)", ""); - } - } - return url; - } - - /** - * 判断两域名是否是同一域下 - * @param domain - * @param url - * @return - */ - public static boolean checkDomainMatched(String domain, String url){ - boolean result = false; - if(StringUtils.isBlank(domain) || StringUtils.isBlank(url))return result; - domain = domain.trim(); - url = url.trim(); - domain = domain.replace("/templates/index.html", "").replace("/index.htm", "").replace("templates/index.html", "").replace("index.htm", ""); - - if(domain.startsWith("http://")){ - domain = domain.substring(7); - } - if(domain.startsWith("https://")){ - domain = domain.substring(8); - } - - if(url.startsWith("http://")){ - url = url.substring(7); - } - if(url.startsWith("https://")){ - url = url.substring(8); - } - - result = url.startsWith(domain); - return result; - } - - /** - * http链接转https - * @param url - * @return - */ - public static String httpTohttps(String url) { - if(StringUtils.isBlank(url))return url; - url = url.trim(); - if(url.startsWith("https:") || url.startsWith("HTTPS:"))return url; - url = "https"+url.substring(4); - return url; - } - - /** - * 使用BCrypt对密码进行加密 - * @param password - * @return - */ - public static String encryptPwdByBCrypt(String password){ - return BCrypt.hashpw(password, BCrypt.gensalt()); - } - - /** - * BCrypt 密码验证 - * @param password 明文 - * @param ciphertext 密文 - * @return if equal ? true : false - */ - public static boolean checkPwdByBCrypt(String password, String ciphertext){ - return BCrypt.checkpw(password, ciphertext); - } - - /** - * 往cookie存值 - * @param response - * @param name - * @param value - */ - public static void addCookie(HttpServletRequest request, HttpServletResponse response, String name, String value){ - addCookie(request, response, name, value, COOKIE_DEFAULT_MAXAGE); - } - - /** - * 往cookie存值 - * @param response - * @param name - * @param value - * @param maxage - */ - public static void addCookie(HttpServletRequest request, HttpServletResponse response, String name, String value, int maxage){ - String basePath = request.getContextPath(); - Cookie cookie = new Cookie(name, value); - cookie.setPath(StringUtils.isBlank(basePath) ? "/" : basePath); - cookie.setMaxAge(maxage > 0 ? maxage : COOKIE_DEFAULT_MAXAGE); - response.addCookie(cookie); - } - - /** - * 从cookie取值 - * @param request - * @param cookieName - * @return - */ - public static String getValueFromCookie(HttpServletRequest request, String cookieName) { - if(cookieName==null || cookieName.trim().equals(""))return null; - Cookie[] cookies = request.getCookies(); - if (cookies != null && cookies.length > 0) { - for (int i = 0; i < cookies.length; i++) { - Cookie item = cookies[i]; - String name = item.getName(); - if (cookieName.equals(name)) { - return item.getValue(); - } - } - } - return null; - } - - /** - * 输出错误信息到页面 - * @param response - * @param title 网页title - * @param result 内容 - */ - public static void outPrintError(HttpServletResponse response, String title, String result){ - response.setCharacterEncoding("UTF-8"); - response.setContentType("text/html; charset=UTF-8"); - PrintWriter out = null; - try { - if(StringUtils.isBlank(title))title = "Error"; - String html = ""; - html += ""+title+""; - html += ""; - html += ""; - html += ""; - html+="

"; - html += result; - html+="
"; - out = response.getWriter(); - out.print(html); - } catch (IOException e) { - e.printStackTrace(); - throw new RuntimeException("IO工作流出现异常!"); - } finally { - if(out!=null){ - out.close(); - out = null; - } - } - } - - public static void main(String[] args) { - String url = httpTohttps("http://wx.qlogo.cn/mmopen/tolX9TNpO"); - System.out.println("url = "+url); - } - -} diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index c53c6d9..9c2ef80 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -3,7 +3,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://rm-wz9vza84pe0hb338kbo.mysql.rds.aliyuncs.com:3306/2021_vote?autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=GMT%2B8&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true + url: jdbc:mysql://rm-wz9vza84pe0hb338kbo.mysql.rds.aliyuncs.com:3306/2021_weixih5?autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=GMT%2B8&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true username: root password: 'lyg8266@Qiween#com' initial-size: 5 @@ -38,9 +38,9 @@ spring: redis: open: false # 是否开启redis缓存 true开启 false关闭 database: 0 - host: localhost - port: 6379 - password: '' # 密码 + host: r-wz97jov3cc4roi3b1ppd.redis.rds.aliyuncs.com + port: 19088 + password: 'Xfhd@2020' # 密码 timeout: 6000ms # 连接超时时长（毫秒） jedis: pool: @@ -56,19 +56,14 @@ wx: api-domain: https://wx.xfhd.net/thirdparty #授权域名 auth-code: fbc35e02df8a4fae9f9f827156acd91e #授权码 auth-scope: snsapi_userinfo #scope -activity: - setting: - begin-date: '2021-11-05 00:00' #投票开始时间 - end-date: '2021-11-10 00:00' #投票结束时间 - times: 1 #投票次数限制 oss: #阿里云 OSS #地域节点 - endpoint: oss-cn-hangzhou.aliyuncs.com - keyid: LTAI4G88mJUn3YzWo2eFmxVG - keysecret: iWNQskqvXC7Rm0au2W2u3AGNFEgYMl + endpoint: oss-cn-shenzhen.aliyuncs.com + keyid: sSJ5t0yC1CaKhPJ4 + keysecret: PsbdUTexU95BkiqO4ADELXpIaYdWGk #Bucket 名字 - bucketname: h5buckets + bucketname: qiween #Bucket 域名 - bucketDomain: h5buckets.oss-cn-hangzhou.aliyuncs.com + bucketDomain: qiween.oss-cn-shenzhen.aliyuncs.com diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 53d171e..0a5d173 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -3,9 +3,9 @@ spring: type: com.alibaba.druid.pool.DruidDataSource druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://120.25.121.117:3306/2021_weixih5?autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=GMT%2B8&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true + url: jdbc:mysql://rm-wz9vza84pe0hb338kbo.mysql.rds.aliyuncs.com:3306/2021_weixih5?autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=GMT%2B8&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true username: root - password: 'szxgl@2001B' + password: 'lyg8266@Qiween#com' initial-size: 5 max-active: 500 min-idle: 10 @@ -60,10 +60,10 @@ wx: oss: #阿里云 OSS #地域节点 - endpoint: oss-cn-hangzhou.aliyuncs.com - keyid: LTAI4G88mJUn3YzWo2eFmxVG - keysecret: iWNQskqvXC7Rm0au2W2u3AGNFEgYMl + endpoint: oss-cn-shenzhen.aliyuncs.com + keyid: sSJ5t0yC1CaKhPJ4 + keysecret: PsbdUTexU95BkiqO4ADELXpIaYdWGk #Bucket 名字 - bucketname: h5buckets + bucketname: qiween #Bucket 域名 - bucketDomain: h5buckets.oss-cn-hangzhou.aliyuncs.com + bucketDomain: qiween.oss-cn-shenzhen.aliyuncs.com diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ea54598..94e51c7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,7 +10,7 @@ spring: jmx: default-domain: pars-h5-2021 profiles: - active: test + active: prod # mvc: # static-path-pattern: /** # web: diff --git a/src/main/resources/mapper/PraiseMapper2.xml b/src/main/resources/mapper/PraiseMapper2.xml index db12f60..fb20146 100644 --- a/src/main/resources/mapper/PraiseMapper2.xml +++ b/src/main/resources/mapper/PraiseMapper2.xml @@ -2,12 +2,15 @@ - SELECT - IFNULL( id, NULL ) + * FROM praise - where TO_DAYS(create_time) = TO_DAYS(NOW()) and openid = #{openid} and works_id = #{worksId} + WHERE + works_id = #{worksId} + AND openid = #{openid} + AND DATE_FORMAT(create_time,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d')