Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/controller/AuthController.java

@@ -181,7 +181,7 @@ public class AuthController {
             if(result==null){
                 data.put("status",1001);
             }else {
-                String token=appAuthService.getToken(String.valueOf(data.get("username")),data.getInteger("userId"));
+                String token=appAuthService.getToken(String.valueOf(result.get("username")),result.getInteger("userId"));
                 data.put("token",token);
             }
         }
@@ -199,7 +199,7 @@ public class AuthController {
             if(result==null){
                 data.put("status",1001);
             }else {
-                String token=appAuthService.getToken(String.valueOf(data.get("username")),data.getInteger("userId"));
+                String token=appAuthService.getToken(String.valueOf(result.get("username")),result.getInteger("userId"));
                 data.put("token",token);
             }
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/AdminBootstrap.java

@@ -8,6 +8,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import tk.mybatis.spring.annotation.MapperScan;
@@ -29,6 +30,7 @@ import tk.mybatis.spring.annotation.MapperScan;
 @EnableAceCache
 @EnableTransactionManagement
 @MapperScan("com.github.wxiaoqi.security.admin.mapper")
+@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
 //@EnableSwagger2Doc
 public class AdminBootstrap {
     public static void main(String[] args) {

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
@@ -67,7 +68,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
             baseUserMember.setBuyCount(userMemberVo.getBuyCount()+1);
             baseUserMember.setTotalNumber(totalNumber);
             baseUserMember.setRentFreeDays(freeDays);
-            updateSelectiveById(baseUserMember);
+            getMyBiz().updateSelectiveById(baseUserMember);
         }
         AppUserVo userVo= detailBiz.getUserInfoById(userId);
         if(userVo!=null&&(userVo.getIsMember()==null||userVo.getIsMember()==0)){
@@ -106,7 +107,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
                 if(freeDays>0&&freeDays>=days){
                     freeDays=freeDays-days;
                     baseUserMember.setRentFreeDays(freeDays);
-                    updateSelectiveById(baseUserMember);
+                    getMyBiz().updateSelectiveById(baseUserMember);
                     num=freeDays;
                 }
             }else if(type==2){
@@ -122,17 +123,17 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
                 Integer payCount=userMemberVo.getPayCount()==null?0:userMemberVo.getPayCount();
                 payCount=payCount+1;
                 baseUserMember.setPayCount(payCount);
-                updateSelectiveById(baseUserMember);
+                getMyBiz().updateSelectiveById(baseUserMember);
                 num=freeDays;
             }else {
                 /*lockDays=lockDays>0?(lockDays-days)>0?(lockDays-days):0:0;
                 baseUserMember.setLockDays(lockDays);
-                updateSelectiveById(baseUserMember);
+                getMyBiz().updateSelectiveById(baseUserMember);
                 num=freeDays-lockDays;*/
                 freeDays=(freeDays+days)>0?(freeDays+days):0;
                 freeDays=freeDays>totalNumber?totalNumber:freeDays;
                 baseUserMember.setRentFreeDays(freeDays);
-                updateSelectiveById(baseUserMember);
+                getMyBiz().updateSelectiveById(baseUserMember);
                 num=freeDays;
             }
 
@@ -140,7 +141,9 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
         return  num;
     }
 
-
+    private BaseUserMemberBiz getMyBiz() {
+        return AopContext.currentProxy() != null ? (BaseUserMemberBiz) AopContext.currentProxy() : this;
+    }
 
 
 }
\ No newline at end of file