重构包名

ruoyi-admin/src/main/java/com/ruoyi/web/controller/score/ScoreController.java

@@ -1,11 +1,11 @@
-package com.ruoyi.web.controller.score;
+package com.ruoyi.web.controller.my;
 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.sooka.jnb.score.domain.ScoreOperate;
-import com.sooka.jnb.score.service.IScoreService;
+import com.sooka.jnb.my.domain.ScoreOperate;
+import com.sooka.jnb.my.service.IScoreService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -14,6 +14,7 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.exception.user.*;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.MessageUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.ip.IpUtils;
 import com.ruoyi.framework.manager.AsyncManager;
@@ -21,10 +22,10 @@ import com.ruoyi.framework.manager.factory.AsyncFactory;
 import com.ruoyi.framework.security.context.AuthenticationContextHolder;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
-import com.sooka.jnb.score.domain.ScoreOperate;
-import com.sooka.jnb.score.service.IScoreService;
-import com.sooka.jnb.wxUser.mapper.WxUserMapper;
+import com.sooka.jnb.my.domain.ScoreOperate;
+import com.sooka.jnb.my.service.IScoreService;
 import com.sooka.jnb.utils.WechatUtil;
+import com.sooka.jnb.wxUser.mapper.WxUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -33,8 +34,8 @@ import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-
-import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import static com.ruoyi.common.constant.CacheConstants.SYS_CONFIG_KEY;
 
@@ -78,7 +79,7 @@ public class SysLoginService
      * @param code 微信验证码
      * @return 结果
      */
-    public String wxlogin(String code)
+    public Map<String, String> wxlogin(String code)
     {
         Authentication authentication = null;
         // 1.接收小程序发送的code
@@ -115,7 +116,11 @@ public class SysLoginService
         LoginUser loginUser = createLoginWxUser(user);
 //        SecurityUtils.getUserId()
         // 生成token
-        return wxtokenService.createToken(loginUser);
+        String token = wxtokenService.createToken(loginUser);
+        Map<String, String> resultMap = new HashMap<>();
+        resultMap.put(Constants.TOKEN, token);
+        resultMap.put("userId", SecurityUtils.getUserId().toString());
+        return resultMap;
     }
     /**
      * 登录验证

sooka-jnb/src/main/java/com/sooka/jnb/score/domain/ScoreOperate.java

@@ -1,14 +1,10 @@
-package com.sooka.jnb.score.domain;
+package com.sooka.jnb.my.domain;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import org.apache.ibatis.type.Alias;
 
-import java.math.BigInteger;
-import java.util.Date;
-
 /**
  * 积分以及流水实体类
  *

sooka-jnb/src/main/java/com/sooka/jnb/score/mapper/ScoreMapper.java

@@ -1,6 +1,6 @@
-package com.sooka.jnb.score.mapper;
+package com.sooka.jnb.my.mapper;
 
-import com.sooka.jnb.score.domain.ScoreOperate;
+import com.sooka.jnb.my.domain.ScoreOperate;
 
 import java.util.List;
 import java.util.Map;

sooka-jnb/src/main/java/com/sooka/jnb/score/service/IScoreService.java

@@ -1,6 +1,6 @@
-package com.sooka.jnb.score.service;
+package com.sooka.jnb.my.service;
 
-import com.sooka.jnb.score.domain.ScoreOperate;
+import com.sooka.jnb.my.domain.ScoreOperate;
 
 import java.util.List;
 

sooka-jnb/src/main/java/com/sooka/jnb/score/service/impl/ScoreServiceImpl.java

@@ -1,8 +1,8 @@
-package com.sooka.jnb.score.service.impl;
+package com.sooka.jnb.my.service.impl;
 
-import com.sooka.jnb.score.domain.ScoreOperate;
-import com.sooka.jnb.score.mapper.ScoreMapper;
-import com.sooka.jnb.score.service.IScoreService;
+import com.sooka.jnb.my.domain.ScoreOperate;
+import com.sooka.jnb.my.mapper.ScoreMapper;
+import com.sooka.jnb.my.service.IScoreService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

sooka-jnb/src/main/resources/mapper/score/ScoreMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!--suppress ALL -->
-<mapper namespace="com.sooka.jnb.score.mapper.ScoreMapper">
+<mapper namespace="com.sooka.jnb.my.mapper.ScoreMapper">
     
     <resultMap id="scoreOperateResult" type="scoreOperate">
         <id property="id" column="id"/>