Merge branch 'wei_master' into '105'

update

See merge request !16

src/main/java/com/server/web/common/service/Impl/UserServiceImpl.java

@@ -42,6 +42,7 @@ public class UserServiceImpl implements UserService {
         if (loginUser == null || loginUser.getId() == null) {
             return ResultMapUtil.returnMap("0", "请先登录!", null);
         }
+        loginUser = tKzyUserMapper.selectByPrimaryKey(loginUser.getId());
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         if (loginUser.getLastSignDt() != null && simpleDateFormat.format(loginUser.getLastSignDt()).equals(simpleDateFormat.format(new Date()))) {
             return ResultMapUtil.returnMap("0", "您已签到!", null);

src/main/resources/servers/local/application.properties

@@ -41,9 +41,12 @@ rest.api.charset=utf-8
 rest.api.secretkey=FoK28EsYrxuiM3ohnAurFGm2uGAHyijL
 
 
+#wx.account=yiyangkeji666666
+#wx.app.id=wx310b45cf0f4ed5b0
+#wx.app.secret=594eccaaf75fc623ec9aa4ed6afaec6e
 wx.account=yiyangkeji666666
-wx.app.id=wx310b45cf0f4ed5b0
-wx.app.secret=594eccaaf75fc623ec9aa4ed6afaec6e
+wx.app.id=wxe37f12b1fa076c1a
+wx.app.secret=57e45975dff8f558163e5e9f2ac78e87
 
 
 wx.http.url=http://kzy-wx.jimijiayuan.cn
@@ -53,6 +56,6 @@ upyun.bucket=yxvzb
 upyun.username=liuruichao
 upyun.password=liuruichao123
 upyun.baseDir=/images/
-wx.tocken=12324432342
+wx.tocken=64be1d2d249a460bb5c39d565f013d90
 
 wx.http.danmu.url=http://192.168.0.105:8383