init project

jeesharp-module/api-gateway/src/main/java/com/jeesharp/modules/api/app/login/LoginWeChatApiController.java

@@ -1,178 +0,0 @@
-package com.jeesharp.modules.api.app.login;
-
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
-import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
-import com.jeesharp.common.constant.ResponseCode;
-import com.jeesharp.common.json.AjaxResult;
-import com.jeesharp.common.utils.EmojiRecoveryUtils;
-import com.jeesharp.common.utils.PasswordUtils;
-import com.jeesharp.core.web.BaseController;
-import com.jeesharp.modules.member.utils.VerifyCodeUtils;
-import com.jeesharp.modules.member.constant.LoginType;
-import com.jeesharp.modules.member.utils.ApiUserUtils;
-import com.jeesharp.modules.member.entity.Member;
-import com.jeesharp.modules.member.service.MemberService;
-import com.jeesharp.modules.wechat.api.WeixinOpenService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import me.chanjar.weixin.common.error.WxErrorException;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * 
- * @author qiyuan
- */
-@Controller
-@Api(tags = "用户登录")
-@RequestMapping("/apiApp/{code}/wechat")
-public class LoginWeChatApiController extends BaseController {
-
-    private final MemberService memberService;
-    private final WeixinOpenService weixinOpenService;
-
-    public LoginWeChatApiController(MemberService memberService , WeixinOpenService weixinOpenService){
-        this.memberService = memberService;
-        this.weixinOpenService = weixinOpenService;
-    }
-
-    /***
-     * 小程序登录：类型值：3:没有关联开放平台的小程序登录 4:关联开放平台的小程序登录
-     * @param code 账号
-     * @param type 密码
-     * @param encryptedData 小程序返回的
-     * @param ivStr 小程序返回的
-     * @return
-     */
-    @ResponseBody
-    @ApiOperation("2.2 小程序登录")
-    @PostMapping("login")
-    public AjaxResult login(String code, String type, String encryptedData, String ivStr, String appid){
-        Member member = null;
-        if(LoginType.MINI_LOGIN_NOAUTO.getCode().equals(type)){
-            WxMaService wxMaService = weixinOpenService.getMiniService(appid);
-            try {
-                WxMaJscode2SessionResult session = wxMaService.jsCode2SessionInfo(code);
-                WxMaUserInfo wxMaUserInfo = wxMaService.getUserService().getUserInfo(session.getSessionKey(), encryptedData, ivStr);
-                member = memberService.getByMiniOpenid(wxMaUserInfo.getOpenId());
-                if (member == null) {
-                    member = new Member();
-                    member.setName(EmojiRecoveryUtils.emojiConvert(wxMaUserInfo.getNickName()));
-                    member.setSex(wxMaUserInfo.getGender());
-                    member.setMiniOpenid(wxMaUserInfo.getOpenId());
-                    memberService.saveApiMember(member);
-                }
-            } catch (WxErrorException e){
-
-            }
-        } else if(LoginType.MINI_LOGIN_AUTH.getCode().equals(type)){
-            WxMaService wxMaService = weixinOpenService.getMiniService(appid);
-            try {
-                WxMaJscode2SessionResult session = wxMaService.jsCode2SessionInfo(code);
-                WxMaUserInfo wxMaUserInfo = wxMaService.getUserService().getUserInfo(session.getSessionKey(), encryptedData, ivStr);
-                member = memberService.getByUnionid(wxMaUserInfo.getOpenId());
-                if (member == null) {
-                    member = new Member();
-                    member.setUnionid(wxMaUserInfo.getUnionId());
-                    member.setName(EmojiRecoveryUtils.emojiConvert(wxMaUserInfo.getNickName()));
-                    member.setSex(wxMaUserInfo.getGender());
-                    member.setMiniOpenid(wxMaUserInfo.getOpenId());
-                    memberService.saveApiMember(member);
-                }
-            } catch (WxErrorException e){
-
-            }
-        }
-        return AjaxResult.createBySuccess(ApiUserUtils.createLoginResponse(member));
-    }
-
-    /***
-     * 小程序登录隐形登录，有则返回用户信息，没的话就不要处理
-     * @param code
-     * @return
-     */
-    @ResponseBody
-    @ApiOperation("2.4 小程序登录隐形登录")
-    @PostMapping("miniLogin")
-    public AjaxResult miniLogin(@RequestBody Map<String,String> param) throws WxErrorException{
-        /** code登录 */
-        if (StringUtils.isBlank(param.get("code"))) {
-            return AjaxResult.createByErrorMessge("empty jscode");
-        }
-        WxMaService wxMaService = weixinOpenService.getMiniService(param.get("appId"));
-        WxMaJscode2SessionResult result = wxMaService.jsCode2SessionInfo(param.get("code"));
-        Member member = memberService.getByUnionid(result.getUnionid());
-        /**说明没有关注公众号  或者 用户直接进入小程序的*/
-        if (member == null) {
-            member = memberService.getByMiniOpenid(result.getOpenid());
-        }
-        if (member == null) {
-            return AjaxResult.createByErrorCodeMessage(ResponseCode.OTHER.getCode()
-                    ,ResponseCode.OTHER.getName());
-        }
-        return AjaxResult.createBySuccess(ApiUserUtils.createLoginResponse(member));
-    }
-
-
-    @ResponseBody
-    @PostMapping("getOpenid")
-    public AjaxResult getOpenid(@RequestBody Map<String,String> param) throws WxErrorException{
-        /** code登录 */
-        if (StringUtils.isBlank(param.get("code"))) {
-            return AjaxResult.failMsg("empty jscode");
-        }
-        WxMaService wxMaService = weixinOpenService.getMiniService(param.get("appId"));
-        WxMaJscode2SessionResult result = wxMaService.jsCode2SessionInfo(param.get("code"));
-        return AjaxResult.okData(result);
-    }
-
-
-    /***
-     * 退出
-     * @return
-     * @throws IOException
-     */
-    @ApiOperation(notes = "logout", httpMethod = "POST", value = "2.3 用户退出")
-    @GetMapping(value = "logout")
-    public AjaxResult logout(){
-        ApiUserUtils.apiUserLogout();
-        return AjaxResult.createBySuccess();
-    }
-
-
-    /***
-     * 忘记密码
-     * @param phone
-     * @param code
-     * @param newPwd
-     * @return
-     */
-    @ApiOperation("2.1 忘记密码")
-    @PostMapping(value = "forgetPwd")
-    public AjaxResult forgetPwd(String phone, String code , String newPwd) throws Exception{
-        if (StringUtils.isBlank(phone)) {
-            return AjaxResult.failMsg("手机号码不能为空");
-        }
-        if (StringUtils.isBlank(code)) {
-            return AjaxResult.failMsg("验证码不能为空");
-        }
-        if (StringUtils.isBlank(newPwd)) {
-            return AjaxResult.failMsg("密码不能为空");
-        }
-        if (!code.equals(VerifyCodeUtils.getSmsCode(phone))) {
-            return AjaxResult.failMsg("验证码不正确");
-        }
-        Member member = memberService.getByMobile(phone);
-        if (member != null) {
-            member.setPassword(PasswordUtils.encryptPassword(newPwd));
-            memberService.saveApiMember(member);
-            return AjaxResult.failMsg("修改成功");
-        }
-        return AjaxResult.failMsg("用户不存在");
-    }
-}

jeesharp-module/api-gateway/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>api-gateway</id>
+
+	<classpath>
+		<dir name="D:/javaproject/lemon_cloud/jeesharp-module/api-gateway/target/classes">
+		</dir>
+	</classpath>
+
+</application>

jeesharp-module/jeesharp-front/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>jeesharp-front</id>
+
+	<classpath>
+		<dir name="D:/javaproject/lemon_cloud/jeesharp-module/jeesharp-front/target/classes">
+		</dir>
+	</classpath>
+
+</application>

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/AddressService.java

@@ -18,20 +18,5 @@ import java.util.List;
 
 public interface AddressService extends BaseInterface<Address> {
 
-    /**
-    * 获取单条数据
-    */
-    Address get(String id);
-    /**
-    * 获取集合数据
-    */
-    List<Address> findList(Address address) ;
-    /**
-    * 获取分页数据
-    */
-    Page<Address> findPage(Page<Address> page, Address address) ;
-    
-    void save(Address address) ;
-    void delete(Address address) ;
-    
+
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/AddressServiceImpl.java

@@ -22,26 +22,5 @@ import com.jeesharp.modules.member.entity.Address;
 @Transactional(readOnly = true)
 public class AddressServiceImpl extends CrudService<AddressMapper, Address> implements AddressService {
 
-	public Address get(String id) {
-		return super.get(id);
-	}
-	
-	public List<Address> findList(Address address) {
-		return super.findList(address);
-	}
-	
-	public Page<Address> findPage(Page<Address> page, Address address) {
-		return super.findPage(page, address);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(Address address) {
-		super.save(address);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(Address address) {
-		super.delete(address);
-	}
-	
+
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/AppGroupService.java

@@ -14,58 +14,5 @@ import com.jeesharp.core.service.BaseInterface;
  */
 public interface AppGroupService extends BaseInterface<AppGroup> {
 
-    /**
-     * 获取单条数据
-     * @param id 数据ID
-     * @return
-     */
-    @Override
-    AppGroup get(String id);
-    
-    /**
-     * 获取集合数据
-     * @param appGroup
-     * @return
-     */
-    @Override
-    List<AppGroup> findList(AppGroup appGroup) ;
-    
-    /**
-     * 获取app端集合数据
-     * @param appGroup
-     * @return
-     */
-    List<AppGroup> findApiList(AppGroup appGroup) ;
-    
-    /**
-     * 获取分页数据
-     * @param page   分页对象
-     * @param appGroup
-     * @return
-     */
-    @Override
-    Page<AppGroup> findPage(Page<AppGroup> page, AppGroup appGroup) ;
-    
-    /**
-     * 获取app端分页数据
-     * @param page
-     * @param appGroup
-     * @return
-     */
-    Page<AppGroup> findApiPage(Page<AppGroup> page, AppGroup appGroup) ;
-    
-    /**
-     * 保存对象
-     * @param appGroup
-     */
-    @Override
-    void save(AppGroup appGroup) ;
-    
-    /**
-     * 逻辑删除对象
-     * @param appGroup
-    */
-    @Override
-    void delete(AppGroup appGroup) ;
-    
+
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/AppGroupServiceImpl.java

@@ -23,42 +23,5 @@ import com.jeesharp.modules.member.mapper.AppGroupMapper;
 @Transactional(readOnly = true)
 public class AppGroupServiceImpl extends CrudService<AppGroupMapper, AppGroup> implements AppGroupService {
 
-    @Override
-	public AppGroup get(String id) {
-		return super.get(id);
-	}
-	
-	@Override
-	public List<AppGroup> findList(AppGroup appGroup) {
-		return super.findList(appGroup);
-	}
-	
-	@Override
-	public List<AppGroup> findApiList(AppGroup appGroup) {
-		return mapper.findApiList(appGroup);
-	}
-	
-	@Override
-	public Page<AppGroup> findPage(Page<AppGroup> page, AppGroup appGroup) {
-		return super.findPage(page, appGroup);
-	}
-	
-	@Override
-	public Page<AppGroup> findApiPage(Page<AppGroup> page, AppGroup appGroup) {
-		page.setList(mapper.findApiList(appGroup));
-		return page;
-	}
-	
-	@Transactional(readOnly = false)
-	@Override
-	public void save(AppGroup appGroup) {
-		super.save(appGroup);
-	}
-	
-	@Transactional(readOnly = false)
-	@Override
-	public void delete(AppGroup appGroup) {
-		super.delete(appGroup);
-	}
-	
+
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/AppMenuService.java

@@ -17,22 +17,6 @@ import com.jeesharp.core.service.BaseInterface;
 
 public interface AppMenuService extends BaseInterface<AppMenu> {
 
-    /**
-    * 获取单条数据
-    */
-    AppMenu get(String id);
-    /**
-    * 获取集合数据
-    */
-    List<AppMenu> findList(AppMenu appMenu) ;
-    /**
-    * 获取分页数据
-    */
-    Page<AppMenu> findPage(Page<AppMenu> page, AppMenu appMenu) ;
-    
-    void save(AppMenu appMenu) ;
-    void delete(AppMenu appMenu) ;
-    
     List<AppMenu> getChildren(String parentId);
     
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/AppMenuServiceImpl.java

@@ -22,25 +22,4 @@ import com.jeesharp.modules.member.mapper.AppMenuMapper;
 @Transactional(readOnly = true)
 public class AppMenuServiceImpl extends TreeService<AppMenuMapper, AppMenu> implements AppMenuService {
 
-	public AppMenu get(String id) {
-		return super.get(id);
-	}
-	
-	public List<AppMenu> findList(AppMenu appMenu) {
-		if (StringUtils.isNotBlank(appMenu.getParentIds())){
-			appMenu.setParentIds(","+appMenu.getParentIds()+",");
-		}
-		return super.findList(appMenu);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(AppMenu appMenu) {
-		super.save(appMenu);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(AppMenu appMenu) {
-		super.delete(appMenu);
-	}
-	
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/AppOfficeService.java

@@ -17,22 +17,6 @@ import com.jeesharp.core.service.BaseInterface;
 
 public interface AppOfficeService extends BaseInterface<AppOffice> {
 
-    /**
-    * 获取单条数据
-    */
-    AppOffice get(String id);
-    /**
-    * 获取集合数据
-    */
-    List<AppOffice> findList(AppOffice appOffice) ;
-    /**
-    * 获取分页数据
-    */
-    Page<AppOffice> findPage(Page<AppOffice> page, AppOffice appOffice) ;
-    
-    void save(AppOffice appOffice) ;
-    void delete(AppOffice appOffice) ;
-    
     List<AppOffice> getChildren(String parentId);
     
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/AppOfficeServiceImpl.java

@@ -22,29 +22,5 @@ import com.jeesharp.modules.member.mapper.AppOfficeMapper;
 @Transactional(readOnly = true)
 public class AppOfficeServiceImpl extends TreeService<AppOfficeMapper, AppOffice> implements AppOfficeService {
 
-	@Override
-	public AppOffice get(String id) {
-		return super.get(id);
-	}
-	
-	@Override
-	public List<AppOffice> findList(AppOffice appOffice) {
-		if (StringUtils.isNotBlank(appOffice.getParentIds())){
-			appOffice.setParentIds(","+appOffice.getParentIds()+",");
-		}
-		return super.findList(appOffice);
-	}
-	
-	@Override
-	@Transactional(readOnly = false)
-	public void save(AppOffice appOffice) {
-		super.save(appOffice);
-	}
-	
-	@Override
-	@Transactional(readOnly = false)
-	public void delete(AppOffice appOffice) {
-		super.delete(appOffice);
-	}
-	
+
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/CompanyMemberServiceImpl.java

@@ -39,43 +39,6 @@ public class CompanyMemberServiceImpl extends CrudService<CompanyMemberMapper, C
 		this.companyService = companyService;
 	}
 
-	@Override
-	public CompanyMember get(String id) {
-		CompanyMember companyMember = super.get(id);
-		if (companyMember!= null) {
-			companyMember.setMember(memberService.get(companyMember.getMemberId()));
-		}
-		return companyMember;
-	}
-
-	@Override
-	public List<CompanyMember> findList(CompanyMember companyMember) {
-		return super.findList(companyMember);
-	}
-
-	@Override
-	public Page<CompanyMember> findPage(Page<CompanyMember> page, CompanyMember companyMember) {
-		page = super.findPage(page, companyMember);
-		for (CompanyMember member : page.getList()) {
-			member.setMember(memberService.get(member.getMemberId()));
-		}
-		return page;
-	}
-
-	@Override
-	@Transactional(readOnly = false)
-	public void save(CompanyMember companyMember) {
-		super.save(companyMember);
-	}
-
-
-	@Override
-	@Transactional(readOnly = false)
-	public void delete(CompanyMember companyMember) {
-		super.delete(companyMember);
-	}
-
-
 	@Override
 	public void updateDisabled(String id) {
 		mapper.updateDisabled(id);

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/EnterpriseService.java

@@ -19,24 +19,5 @@ import java.util.List;
 
 public interface EnterpriseService extends BaseInterface<Enterprise> {
 
-    /**
-     * 获取单条数据
-     */
-    Enterprise get(String id);
-
-    /**
-     * 获取集合数据
-     */
-    List<Enterprise> findList(Enterprise enterprise);
-
-    /**
-     * 获取分页数据
-     */
-    Page<Enterprise> findPage(Page<Enterprise> page, Enterprise enterprise);
-
-    void save(Enterprise enterprise);
-
-    void delete(Enterprise enterprise);
-
     List<String> selectFirstLetter(String memberId);
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/EnterpriseServiceImpl.java

@@ -22,27 +22,6 @@ import com.jeesharp.core.service.CrudService;
 @Transactional(readOnly = true)
 public class EnterpriseServiceImpl extends CrudService<EnterpriseMapper, Enterprise> implements EnterpriseService {
 
-	public Enterprise get(String id) {
-		return super.get(id);
-	}
-	
-	public List<Enterprise> findList(Enterprise enterprise) {
-		return super.findList(enterprise);
-	}
-	
-	public Page<Enterprise> findPage(Page<Enterprise> page, Enterprise enterprise) {
-		return super.findPage(page, enterprise);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(Enterprise enterprise) {
-		super.save(enterprise);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(Enterprise enterprise) {
-		super.delete(enterprise);
-	}
 
 	public List<String> selectFirstLetter(String memberId){
 		return mapper.selectFirstLetter(memberId);

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/IndustryService.java

@@ -17,22 +17,7 @@ import com.jeesharp.core.service.BaseInterface;
 
 public interface IndustryService extends BaseInterface<Industry> {
 
-    /**
-    * 获取单条数据
-    */
-    Industry get(String id);
-    /**
-    * 获取集合数据
-    */
-    List<Industry> findList(Industry industry) ;
-    /**
-    * 获取分页数据
-    */
-    Page<Industry> findPage(Page<Industry> page, Industry industry) ;
-    
-    void save(Industry industry) ;
-    void delete(Industry industry) ;
-    
+
     List<Industry> getChildren(String parentId);
     
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/IndustryServiceImpl.java

@@ -22,25 +22,5 @@ import com.jeesharp.modules.member.mapper.IndustryMapper;
 @Transactional(readOnly = true)
 public class IndustryServiceImpl extends TreeService<IndustryMapper, Industry> implements IndustryService {
 
-	public Industry get(String id) {
-		return super.get(id);
-	}
-	
-	public List<Industry> findList(Industry industry) {
-		if (StringUtils.isNotBlank(industry.getParentIds())){
-			industry.setParentIds(","+industry.getParentIds()+",");
-		}
-		return super.findList(industry);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(Industry industry) {
-		super.save(industry);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(Industry industry) {
-		super.delete(industry);
-	}
-	
+
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/IntegralDetailServiceImpl.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeesharp.org/">jeesharp</a> All rights reserved.
+ */
+package com.jeesharp.modules.member.service;
+
+import com.jeesharp.modules.member.entity.IntegralDetaile;
+import com.jeesharp.modules.member.mapper.IntegralDetaileMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.jeesharp.core.service.CrudService;
+
+/**
+ * 会员积分明细Service
+ *
+ * @author zj
+ * @version 2019-12-19
+ */
+@Service
+@Transactional(readOnly = true)
+public class IntegralDetailServiceImpl extends CrudService<IntegralDetaileMapper, IntegralDetaile> implements IntegralDetaileService {
+
+    public Integer findTotalScore(IntegralDetaile integralDetaile) {
+        return mapper.findTotalScore(integralDetaile);
+    }
+
+}

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/IntegralDetaileService.java

@@ -19,24 +19,4 @@ import java.util.List;
 
 public interface IntegralDetaileService extends BaseInterface<IntegralDetaile> {
 
-    /**
-     * 获取单条数据
-     */
-    IntegralDetaile get(String id);
-
-    /**
-     * 获取集合数据
-     */
-    List<IntegralDetaile> findList(IntegralDetaile integralDetaile);
-
-    /**
-     * 获取分页数据
-     */
-    Page<IntegralDetaile> findPage(Page<IntegralDetaile> page, IntegralDetaile integralDetaile);
-
-    void save(IntegralDetaile integralDetaile);
-
-    void delete(IntegralDetaile integralDetaile);
-
-    Integer findTotalScore(IntegralDetaile integralDetaile);
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/IntegralDetaileServiceImpl.java

@@ -1,52 +0,0 @@
-/**
- * Copyright &copy; 2015-2020 <a href="http://www.jeesharp.org/">jeesharp</a> All rights reserved.
- */
-package com.jeesharp.modules.member.service;
-
-import java.util.List;
-
-import com.jeesharp.modules.member.entity.IntegralDetaile;
-import com.jeesharp.modules.member.mapper.IntegralDetaileMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.jeesharp.core.persistence.Page;
-import com.jeesharp.core.service.CrudService;
-
-/**
- * 会员积分明细Service
- *
- * @author zj
- * @version 2019-12-19
- */
-@Service
-@Transactional(readOnly = true)
-public class IntegralDetaileServiceImpl extends CrudService<IntegralDetaileMapper, IntegralDetaile> implements IntegralDetaileService {
-
-    public IntegralDetaile get(String id) {
-        return super.get(id);
-    }
-
-    public List<IntegralDetaile> findList(IntegralDetaile integralDetaile) {
-        return super.findList(integralDetaile);
-    }
-
-    public Page<IntegralDetaile> findPage(Page<IntegralDetaile> page, IntegralDetaile integralDetaile) {
-        return super.findPage(page, integralDetaile);
-    }
-
-    @Transactional(readOnly = false)
-    public void save(IntegralDetaile integralDetaile) {
-        super.save(integralDetaile);
-    }
-
-    @Transactional(readOnly = false)
-    public void delete(IntegralDetaile integralDetaile) {
-        super.delete(integralDetaile);
-    }
-
-    public Integer findTotalScore(IntegralDetaile integralDetaile) {
-        return mapper.findTotalScore(integralDetaile);
-    }
-
-}

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/MemberAttentionService.java

@@ -18,20 +18,5 @@ import java.util.List;
 
 public interface MemberAttentionService extends BaseInterface<MemberAttention> {
 
-    /**
-    * 获取单条数据
-    */
-    MemberAttention get(String id);
-    /**
-    * 获取集合数据
-    */
-    List<MemberAttention> findList(MemberAttention memberAttention) ;
-    /**
-    * 获取分页数据
-    */
-    Page<MemberAttention> findPage(Page<MemberAttention> page, MemberAttention memberAttention) ;
-    
-    void save(MemberAttention memberAttention) ;
-    void delete(MemberAttention memberAttention) ;
-    
+
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/MemberAttentionServiceImpl.java

@@ -15,6 +15,7 @@ import com.jeesharp.modules.member.entity.MemberAttention;
 
 /**
  * 店铺关注Service
+ *
  * @author zj
  * @version 2019-12-17
  */
@@ -22,26 +23,4 @@ import com.jeesharp.modules.member.entity.MemberAttention;
 @Transactional(readOnly = true)
 public class MemberAttentionServiceImpl extends CrudService<MemberAttentionMapper, MemberAttention> implements MemberAttentionService {
 
-	public MemberAttention get(String id) {
-		return super.get(id);
-	}
-	
-	public List<MemberAttention> findList(MemberAttention memberAttention) {
-		return super.findList(memberAttention);
-	}
-	
-	public Page<MemberAttention> findPage(Page<MemberAttention> page, MemberAttention memberAttention) {
-		return super.findPage(page, memberAttention);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(MemberAttention memberAttention) {
-		super.save(memberAttention);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(MemberAttention memberAttention) {
-		super.delete(memberAttention);
-	}
-	
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/MemberLevelServiceImpl.java

@@ -21,26 +21,5 @@ import java.util.List;
 @Transactional(readOnly = true)
 public class MemberLevelServiceImpl extends CrudService<MemberLevelMapper, MemberLevel> implements MemberLevelService {
 
-	public MemberLevel get(String id) {
-		return super.get(id);
-	}
-	
-	public List<MemberLevel> findList(MemberLevel memberLevel) {
-		return super.findList(memberLevel);
-	}
-	
-	public Page<MemberLevel> findPage(Page<MemberLevel> page, MemberLevel memberLevel) {
-		return super.findPage(page, memberLevel);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(MemberLevel memberLevel) {
-		super.save(memberLevel);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(MemberLevel memberLevel) {
-		super.delete(memberLevel);
-	}
-	
+
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/MemberMessageCategoryService.java

@@ -18,20 +18,5 @@ import java.util.List;
 
 public interface MemberMessageCategoryService extends BaseInterface<MemberMessageCategory> {
 
-    /**
-    * 获取单条数据
-    */
-    MemberMessageCategory get(String id);
-    /**
-    * 获取集合数据
-    */
-    List<MemberMessageCategory> findList(MemberMessageCategory memberMessageCategory) ;
-    /**
-    * 获取分页数据
-    */
-    Page<MemberMessageCategory> findPage(Page<MemberMessageCategory> page, MemberMessageCategory memberMessageCategory) ;
-    
-    void save(MemberMessageCategory memberMessageCategory) ;
-    void delete(MemberMessageCategory memberMessageCategory) ;
-    
+
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/MemberMessageCategoryServiceImpl.java

@@ -22,26 +22,5 @@ import com.jeesharp.core.service.CrudService;
 @Transactional(readOnly = true)
 public class MemberMessageCategoryServiceImpl extends CrudService<MemberMessageCategoryMapper, MemberMessageCategory> implements MemberMessageCategoryService {
 
-	public MemberMessageCategory get(String id) {
-		return super.get(id);
-	}
-	
-	public List<MemberMessageCategory> findList(MemberMessageCategory memberMessageCategory) {
-		return super.findList(memberMessageCategory);
-	}
-	
-	public Page<MemberMessageCategory> findPage(Page<MemberMessageCategory> page, MemberMessageCategory memberMessageCategory) {
-		return super.findPage(page, memberMessageCategory);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(MemberMessageCategory memberMessageCategory) {
-		super.save(memberMessageCategory);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(MemberMessageCategory memberMessageCategory) {
-		super.delete(memberMessageCategory);
-	}
-	
+
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/MemberMessageService.java

@@ -18,20 +18,5 @@ import java.util.List;
 
 public interface MemberMessageService extends BaseInterface<MemberMessage> {
 
-    /**
-    * 获取单条数据
-    */
-    MemberMessage get(String id);
-    /**
-    * 获取集合数据
-    */
-    List<MemberMessage> findList(MemberMessage memberMessage) ;
-    /**
-    * 获取分页数据
-    */
-    Page<MemberMessage> findPage(Page<MemberMessage> page, MemberMessage memberMessage) ;
-    
-    void save(MemberMessage memberMessage) ;
-    void delete(MemberMessage memberMessage) ;
-    
+
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/MemberMessageServiceImpl.java

@@ -22,26 +22,5 @@ import com.jeesharp.modules.member.entity.MemberMessage;
 @Transactional(readOnly = true)
 public class MemberMessageServiceImpl extends CrudService<MemberMessageMapper, MemberMessage> implements MemberMessageService {
 
-	public MemberMessage get(String id) {
-		return super.get(id);
-	}
-	
-	public List<MemberMessage> findList(MemberMessage memberMessage) {
-		return super.findList(memberMessage);
-	}
-	
-	public Page<MemberMessage> findPage(Page<MemberMessage> page, MemberMessage memberMessage) {
-		return super.findPage(page, memberMessage);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(MemberMessage memberMessage) {
-		super.save(memberMessage);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(MemberMessage memberMessage) {
-		super.delete(memberMessage);
-	}
-	
+
 }

jeesharp-module/jeesharp-member/src/main/java/com/jeesharp/modules/member/service/MemberServiceImpl.java

@@ -64,8 +64,8 @@ public class MemberServiceImpl extends CrudService<MemberMapper, Member> impleme
 	@Override
 	@Transactional(readOnly = false)
 	@CacheEvict(cacheNames = CacheUtils.MEMBER_CACHE, key = "'CacheUtils.MEMBER_CACHE_ID_' + #id")
-	public void save(Member member) {
-		super.save(member);
+	public boolean save(Member member) {
+		return super.save(member);
 	}
 
 	@Override

jeesharp-module/jeesharp-member/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>jeesharp-member</id>
+
+	<classpath>
+		<dir name="D:/javaproject/lemon_cloud/jeesharp-module/jeesharp-member/target/classes">
+		</dir>
+	</classpath>
+
+</application>

jeesharp-module/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jeesharp</groupId>
         <artifactId>jeesharp</artifactId>
-        <version>${jeesharp.version}</version>
+        <version>2.0.1.RELEASE</version>
     </parent>
 
     <groupId>org.jeesharp.module</groupId>

jeesharp-web/pom.xml

@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.jeesharp</groupId>
+        <artifactId>jeesharp</artifactId>
+        <version>2.0.1.RELEASE</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>jeesharp-web</artifactId>
+    <packaging>war</packaging>
+
+    <name>jeesharp-web</name>
+    <description>starter</description>
+
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <lib.path>${basedir}/src/main/webapp/WEB-INF/lib</lib.path>
+
+        <!-- 最终jar包名字  -->
+        <package.name>jeesharp</package.name>
+        <!-- docker私有仓库地址-->
+        <docker.repostory.url>registry.cn-hangzhou.aliyuncs.com</docker.repostory.url>
+        <!-- docker私有仓库名称 -->
+        <docker.repostory.store>zhenlian</docker.repostory.store>
+        <!-- docker私有仓库登录账号 -->
+        <docker.repostory.loginName>山西振联科技有限公司</docker.repostory.loginName>
+        <!-- docker私有仓库登录密码 -->
+        <docker.repostory.password>zhenlian@ZL8888</docker.repostory.password>
+        <!-- docker远程地址-->
+        <docker.host></docker.host>
+    </properties>
+
+    <dependencies>
+        <!-- 系统核心的组建  开始  -->
+        <dependency>
+            <groupId>org.jeesharp.platform</groupId>
+            <artifactId>jeesharp-admin</artifactId>
+            <version>2.0.1.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jeesharp.platform</groupId>
+            <artifactId>jeesharp-admin-pro</artifactId>
+            <version>2.0.1.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jeesharp.plugins</groupId>
+            <artifactId>jeesharp-logback</artifactId>
+            <version>${jeesharp.plugins.version}</version>
+        </dependency>
+        <!--  项目打成jar，同时把本地jar包也引入进去  -->
+        <!--短信验证码-->
+        <dependency>
+            <groupId>aliyun-java-sdk-core</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>aliyun-java-sdk-dysmsapi</groupId>
+            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <!--  -->
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>${snakeyaml.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>oracle-jdbc</groupId>
+            <artifactId>oracle-jdbc</artifactId>
+            <version>4-10.2.0.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jeesharp.plugins</groupId>
+            <artifactId>jeesharp-mail</artifactId>
+            <version>2.0.1.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jeesharp.module</groupId>
+            <artifactId>jeesharp-member</artifactId>
+            <version>2.0.1.RELEASE</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.jeesharp.plugins</groupId>
+            <artifactId>jeesharp-monitor</artifactId>
+            <version>2.0.1.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jeesharp.module</groupId>
+            <artifactId>api-gateway</artifactId>
+            <version>2.0.1.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.incode.module.minio</groupId>
+            <artifactId>incode-module-minio-minioclient</artifactId>
+            <version>1.17.0</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${package.name}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>true</fork>
+                    <!-- 指定该Main Class为全局的唯一入口 -->
+                    <mainClass>com.jeesharp.JeesharpWebApplication</mainClass>
+                    <!--  项目打成jar，同时把本地jar包也引入进去  -->
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>UTF-8</encoding>
+                    <compilerArguments>
+                        <extdirs>lib</extdirs>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+
+            <!--将target目录下打包好的项目war包发送到远端服务器，并在远端服务器拉取Tomcat镜像，将war包整合到容器中。发布为一个Docker镜像文件-->
+            <!--<plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.4.10</version>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <goals>
+                            &lt;!&ndash;如果package时不想用docker打包,就注释掉这个goal&ndash;&gt;
+                            &lt;!&ndash;<goal>build</goal>&ndash;&gt;
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <contextDirectory>${basedir}</contextDirectory>
+                    <repository>${docker.repostory.url}/${project.artifactId}</repository>
+                    <tag>${project.version}</tag>
+                    <buildArgs>
+                        &lt;!&ndash;提供参数向Dockerfile传递&ndash;&gt;
+                        <JAR_FILE>${project.build.finalName}.${packaging}</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
+-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/webapp</directory>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+
+</project>

jeesharp-web/src/main/java/com/jeesharp/config/AppInit.java

@@ -40,7 +40,6 @@ public class AppInit implements CommandLineRunner {
         InputStream inputStream = this.getClass().getResourceAsStream("/ip2region.db");
         String dbPath = JeesharpProperites.newInstance().getUserfilesBaseDir() + File.separator + "ip2region.db";
         cn.hutool.core.io.FileUtil.writeFromStream(inputStream,dbPath);
-
     }
 }
 

jeesharp-web/src/main/java/com/jeesharp/config/ShiroConfig.java

@@ -71,7 +71,7 @@ public class ShiroConfig {
      * @param adminPath
      * @param kickoutSessionControlFilter
      * @param formAuthenticationFilter
-     * @param sysApiAuthenticationFilter
+     * @param jwtFilter
      * @param securityManager
      * @param webConfigBean
      * @return

jeesharp-web/src/main/resources/application-fileupload.yml

@@ -16,4 +16,11 @@ fdfs:
     height: 60
   tracker-list: # tracker地址
     - 10.10.10.226:22122
-  httpurl: https://file.sxzltech.com/
+  httpurl: https://file.sxzltech.com/
+minio:
+  endpoint: http:10.8.8.191:9000
+  access_key: minioadmin
+  secret_key: minioadmin
+  bucket_name: constr-documents-test
+  public_domain: https://fs-zhsw.oss-cn-beijing.aliyuncs.com/
+  callback_url: http://kxh.vaiwan.com/api/oss/callback

jeesharp-web/src/main/resources/application-workflow.yml

@@ -0,0 +1,3 @@
+workflow:
+  baseurl: http://localhost:30303/cws/api/inner
+  domain: 0efc1d51c1904f36b9583361f84e89f9

jeesharp-web/src/main/resources/application.yml

@@ -36,7 +36,7 @@ spring:
     restart:
       enabled: false
   profiles:
-    active: dev,rabbitmq,seller,fileupload,ueditorupload,wx-pay,webconfig,rabbitmq,api,guacamole
+    active: kafka,dev,rabbitmq,seller,fileupload,ueditorupload,wx-pay,webconfig,rabbitmq,api,guacamole
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
@@ -66,14 +66,14 @@ spring:
         p6spy: false # 默认false,线上必须关闭。开发阶段可以打开调试输出mybatis语句，但是有许多莫名其妙的bug，以及严重的性能问题，所以正式环境必须关闭。
         datasource:
           master:
-            url: @sql.url@?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+            url: @sql.url@
             driver-class-name: @sql.driver@
             username: @sql.username@
             password: @sql.password@
             druid:
               # mysql中为 select 'x'
               # oracle中为 select 1 from dual
-              validation-query: SELECT 'x'
+              validation-query: select 1 from dual
               filter:
                 config:
                   enabled: true # 开启Config过滤器，否则无法解密
@@ -92,6 +92,18 @@ spring:
     port: @redis.port@
     password: @redis.password@
     expireTime: 3600000 #单位秒
+
+#mongodb
+  data:
+    mongodb:
+      host: 10.8.8.9
+      port: 27017
+      database: construction
+#      username:
+#      password:
+#      uri: mongodb://10.8.8.9:27017/construction
+#      uri=mongodb://name:pass@10.8.8.9:27017/construction，其中name是用户名，pass是密码:
+
   mvc:
     static-path-pattern: /static/**
     servlet:
@@ -133,6 +145,7 @@ mybatis-plus:
   configuration:
     # 是否开启自动驼峰命名规则（camel case）映射，即从经典数据库列名 A_COLUMN（下划线命名） 到经典 Java 属性名 aColumn（驼峰命名） 的类似映射
     map-underscore-to-camel-case: true
+    jdbc-type-for-null: 'null' #注意：单引号
     # 全局地开启或关闭配置文件中的所有映射器已经配置的任何缓存，默认为 true
     cache-enabled: true
     #懒加载
@@ -172,6 +185,10 @@ kisso:
 beetlsql:
   enabled: false
 
+diboot:
+  core:
+    init-sql: false
+
 #============================#
 #===== System settings ======#
 #============================#
@@ -253,4 +270,10 @@ jeesharp:
     key: ejGet6yO$mQfUi2*
   rsa:    # 对系统中敏感数据加解密
     private_key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJFBnk78A4CN5gBpIV/pGOGqi/CzvwjvXoj2gYXtbEIg+ZxpRrVi7Is6dwIK4+xrDr35ExaN1s4GnyF3g88z93iYpM5URhQTRJ/GGENNlozkLNARRdTJfLuJxBMZHnAGOtuNTXIcIo5/k8klllBYHTqG6xIVnjRN0vsV2UGlnW7VAgMBAAECgYBMoT9xD8aRNUrXgJ7YyFIWCzEUZN8tSYqn2tPt4ZkxMdA9UdS5sFx1/vv1meUwPjJiylnlliJyQlAFCdYBo7qzmib8+3Q8EU3MDP9bNlpxxC1go57/q/TbaymWyOk3pK2VXaX+8vQmllgRZMQRi2JFBHVoep1f1x7lSsf2TpipgQJBANJlO+UDmync9X/1YdrVaDOi4o7g3w9u1eVq9B01+WklAP3bvxIoBRI97HlDPKHx+CZXeODx1xj0xPOK3HUz5FECQQCwvdagPPtWHhHx0boPF/s4ZrTUIH04afuePUuwKTQQRijnl0eb2idBe0z2VAH1utPps/p4SpuT3HI3PJJ8MlVFAkAFypuXdj3zLQ3k89A5wd4Ybcdmv3HkbtyccBFALJgs+MPKOR5NVaSuF95GiD9HBe4awBWnu4B8Q2CYg54F6+PBAkBKNgvukGyARnQGc6eKOumTTxzSjSnHDElIsjgbqdFgm/UE+TJqMHmXNyyjqbaA9YeRc67R35HfzgpvQxHG8GN5AkEAxSKOlfACUCQ/CZJovETMmaUDas463hbrUznp71uRMk8RP7DY/lBnGGMeUeeZLIVK5X2Ngcp9nJQSKWCGtpnfLQ==
-    public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRQZ5O/AOAjeYAaSFf6Rjhqovws78I716I9oGF7WxCIPmcaUa1YuyLOncCCuPsaw69+RMWjdbOBp8hd4PPM/d4mKTOVEYUE0SfxhhDTZaM5CzQEUXUyXy7icQTGR5wBjrbjU1yHCKOf5PJJZZQWB06husSFZ40TdL7FdlBpZ1u1QIDAQAB
+    public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRQZ5O/AOAjeYAaSFf6Rjhqovws78I716I9oGF7WxCIPmcaUa1YuyLOncCCuPsaw69+RMWjdbOBp8hd4PPM/d4mKTOVEYUE0SfxhhDTZaM5CzQEUXUyXy7icQTGR5wBjrbjU1yHCKOf5PJJZZQWB06husSFZ40TdL7FdlBpZ1u1QIDAQAB
+
+workflow:
+  baseurl: http://localhost:30303/cws/api/inner
+  domain: 0efc1d51c1904f36b9583361f84e89f9
+
+

jeesharp-web/src/main/resources/banner.txt

@@ -1,20 +0,0 @@
-
---------------------------------------------           -----------------------------------
-
-${AnsiColor.RED}　　　★★★★★★★★　　　　${AnsiColor.GREEN}　　　　　★★★★★　　　　${AnsiColor.BLUE}　　　★★★　★★★　★★★　　${AnsiColor.YELLOW}　　　★★★★★★★★★　　　${AnsiColor.WHITE}　　　★★★★★★★★　　　　
-${AnsiColor.RED}　　　　　★★　　★★　　　　${AnsiColor.GREEN}　　　　★★★　★★★　　　${AnsiColor.BLUE}　　　　★★　　★★　　★★　　${AnsiColor.YELLOW}　　　　　★★　　★★★　　　${AnsiColor.WHITE}　　　　　★★　★★★　　　　
-${AnsiColor.RED}　　　　　★　　　★★★　　　${AnsiColor.GREEN}　　　　★★　　　★★　　　${AnsiColor.BLUE}　　　　★★　　★★　　★　　　${AnsiColor.YELLOW}　　　　　★　　　★★★　　　${AnsiColor.WHITE}　　　　　★　　　★★★　　　
-${AnsiColor.RED}　　　　　★　　　★★★　　　${AnsiColor.GREEN}　　　　★★　　　★★★　　${AnsiColor.BLUE}　　　　★★★★★★★★★　　　${AnsiColor.YELLOW}　　　　　★　　　★　　　　　${AnsiColor.WHITE}　　　　　★　　　★★　　　　
-${AnsiColor.RED}　　　　　★★★★★★　　　　${AnsiColor.GREEN}　　　★★★　　　★★★　　${AnsiColor.BLUE}　　　　　★★★★★★★★　　　${AnsiColor.YELLOW}　　　　　★★★★★　　　　　${AnsiColor.WHITE}　　　　　★★★★★★　　　　
-${AnsiColor.RED}　　　　　★　　　　　　　　　${AnsiColor.GREEN}　　　　★★　　　★★★　　${AnsiColor.BLUE}　　　　　★★★　★★★　　　　${AnsiColor.YELLOW}　　　　　★　　　★　　　　　${AnsiColor.WHITE}　　　　　★★　★★★　　　　
-${AnsiColor.RED}　　　　　★　　　　　　　　　${AnsiColor.GREEN}　　　　★★　　　★★　　　${AnsiColor.BLUE}　　　　　★★★　★★★　　　　${AnsiColor.YELLOW}　　　　　★　　　★　★　　　${AnsiColor.WHITE}　　　　　★　　　★★　　　　
-${AnsiColor.RED}　　　　　★　　　　　　　　　${AnsiColor.GREEN}　　　　★★　　★★★　　　${AnsiColor.BLUE}　　　　　　★★　　★★　　　　${AnsiColor.YELLOW}　　　　　★★　　　★★　　　${AnsiColor.WHITE}　　　　　★　　　★★★　　　
-${AnsiColor.RED}　　　★★★★★　　　　　　　${AnsiColor.GREEN}　　　　　★★★★★　　　　${AnsiColor.BLUE}　　　　　　★　　　★★　　　　${AnsiColor.YELLOW}　　　★★★★★★★★★　　　${AnsiColor.WHITE}　　　★★★★★　★★★　　　
-　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　
-　　　　　　　　　　　　　
-
-
-${AnsiColor.BRIGHT_BLUE}:: power 🤓  :: Running Spring Boot ${spring-boot.version} ::
-:: https://www.sxzltech.com ::${AnsiColor.DEFAULT}
-
-公司格言 :: NO EXECUTIVE POWER, EVERYTHING IS EMPTY TALK

jeesharp-web/src/main/resources/beetl.properties

@@ -2,4 +2,4 @@ ENGINE=org.beetl.core.engine.DefaultTemplateEngine
 
 #是否检测文件变化
 RESOURCE.autoCheck = TRUE
-WEBAPP_EXT = com.jeesharp.config.BeetlExt
+WEBAPP_EXT = com.jeesharp.config.CodeBeetlExt

jeesharp-web/src/test/java/T.java

@@ -0,0 +1,13 @@
+import com.alibaba.druid.filter.config.ConfigTools;
+import com.jeesharp.common.utils.DruidUtils;
+
+public class T {
+
+    public static void main(String[] args) throws Exception {
+        String password = "WX_OFFICAL_ACCOUNT";
+        String[] arr = ConfigTools.genKeyPair(512);
+        System.out.println("privateKey:" + arr[0]);
+        System.out.println("publicKey:" + arr[1]);
+        System.out.println("password:" + ConfigTools.encrypt(arr[0], password));
+    }
+}

pom.xml

@@ -52,7 +52,7 @@
                 <!-- 项目端口 -->
                 <server.port>9527</server.port>
                 <!--数据库-->
-                <sql.url></sql.url>
+                <sql.url>jdbc:mysql://10.8.8.9:3306/ningmengyun</sql.url>
                 <sql.driver>com.mysql.cj.jdbc.Driver</sql.driver>
                 <sql.username>ningmengyun</sql.username>
                 <sql.driver>com.mysql.cj.jdbc.Driver</sql.driver>
@@ -94,7 +94,7 @@
                 <!-- 项目端口 -->
                 <server.port>9527</server.port>
                 <!--数据库-->
-                <sql.url></sql.url>
+                <sql.url>jdbc:mysql://10.8.8.9:3306/ningmengyun</sql.url>
                 <sql.driver>com.mysql.cj.jdbc.Driver</sql.driver>
                 <sql.username>ningmengyun</sql.username>
                 <sql.password>bMy+ItDFRg1Ta+6/3lVcNMxrG9QndabVc62++GbqbQNJ4rRtLh5KRnhNxkjUkc5UxvBCbP8ZWRBiefk4L4QAjQ==</sql.password>
@@ -281,11 +281,6 @@
         </dependency>
 
         <!-- 核心 -->
-        <dependency>
-            <groupId>org.jeesharp.platform</groupId>
-            <artifactId>jeesharp-base</artifactId>
-            <version>${jeesharp.platform.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.jeesharp.platform</groupId>
             <artifactId>jeesharp-core</artifactId>