Skip to content

Commit ae7e968

Browse files
committed
优化-庆祝国人加入JCP
1 parent c44d888 commit ae7e968

File tree

90 files changed

+625
-681
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+625
-681
lines changed

iBase4J-Biz-Facade/src/main/java/org/ibase4j/service/IMemberService.java renamed to iBase4J-Biz-Facade/src/main/java/org/ibase4j/service/MemberService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
import org.ibase4j.bean.Member;
66
import org.ibase4j.model.TMember;
77

8-
import top.ibase4j.core.base.IBaseService;
8+
import top.ibase4j.core.base.BaseService;
99

1010
/**
1111
* @author ShenHuaJie
1212
* @since 2018年4月24日 上午10:45:11
1313
*/
14-
public interface IMemberService extends IBaseService<TMember> {
14+
public interface MemberService extends BaseService<TMember> {
1515
public Member getBaseInfo(Long id);
1616

1717
public TMember getInfo(Long id);

iBase4J-Biz-Service/src/main/java/org/ibase4j/service/impl/MemberServiceImpl.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
import org.ibase4j.bean.Member;
77
import org.ibase4j.mapper.TMemberMapper;
88
import org.ibase4j.model.TMember;
9-
import org.ibase4j.service.IMemberService;
9+
import org.ibase4j.service.MemberService;
1010
import org.springframework.cache.annotation.CacheConfig;
1111
import org.springframework.transaction.annotation.Transactional;
1212

1313
import com.alibaba.dubbo.config.annotation.Service;
1414
import com.alibaba.fastjson.JSON;
1515
import com.weibo.api.motan.config.springsupport.annotation.MotanService;
1616

17-
import top.ibase4j.core.base.BaseService;
17+
import top.ibase4j.core.base.BaseServiceImpl;
1818
import top.ibase4j.core.util.DataUtil;
1919
import top.ibase4j.core.util.InstanceUtil;
2020
import top.ibase4j.core.util.QrcodeUtil;
@@ -29,9 +29,9 @@
2929
* @since 2017-10-12
3030
*/
3131
@CacheConfig(cacheNames = "member")
32-
@Service(interfaceClass = IMemberService.class)
33-
@MotanService(interfaceClass = IMemberService.class)
34-
public class MemberServiceImpl extends BaseService<TMember, TMemberMapper> implements IMemberService {
32+
@Service(interfaceClass = MemberService.class)
33+
@MotanService(interfaceClass = MemberService.class)
34+
public class MemberServiceImpl extends BaseServiceImpl<TMember, TMemberMapper> implements MemberService {
3535

3636
@Override
3737
@Transactional

iBase4J-Biz-Service/src/main/resources/config/dev/jdbc.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ druid.driverClassName=com.mysql.cj.jdbc.Driver
33
#\u5bc6\u94a5(\u4f7f\u7528\u65b9\u5f0f\u67e5\u770btop.ibase4j.core.config.Configs)
44
druid.key=
55
#\u8bfb
6-
druid.reader.url=jdbc:mysql://127.0.0.1:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false
6+
druid.reader.url=jdbc:mysql://127.0.0.1:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&serverTimezone=PRC&useSSL=false
77
druid.reader.username=root
88
#\u914d\u7f6ePropertiesUtil\u89e3\u5bc6
99
druid.reader.password=68NKG7n1mN8rErEfbag2qM==
1010
#\u5199
11-
druid.writer.url=jdbc:mysql://127.0.0.1:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false
11+
druid.writer.url=jdbc:mysql://127.0.0.1:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&serverTimezone=PRC&useSSL=false
1212
druid.writer.username=root
1313
#\u914d\u7f6ePropertiesUtil\u89e3\u5bc6
1414
druid.writer.password=68NKG7n1mN8rErEfbag2qM==

iBase4J-Biz-Web/src/main/java/org/ibase4j/web/LoginController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.apache.commons.lang3.StringUtils;
1111
import org.apache.commons.net.util.Base64;
1212
import org.ibase4j.model.TMember;
13-
import org.ibase4j.service.IMemberService;
13+
import org.ibase4j.service.MemberService;
1414
import org.springframework.http.MediaType;
1515
import org.springframework.ui.ModelMap;
1616
import org.springframework.web.bind.annotation.PostMapping;
@@ -37,14 +37,14 @@
3737

3838
/**
3939
* 用户登录
40-
*
40+
*
4141
* @author ShenHuaJie
4242
* @version 2016年5月20日 下午3:11:21
4343
*/
4444
@RestController
4545
@RequestMapping("/app/")
4646
@Api(value = "APP登录注册接口", description = "APP-登录注册接口")
47-
public class LoginController extends AppBaseController<TMember, IMemberService> {
47+
public class LoginController extends AppBaseController<TMember, MemberService> {
4848
@PostMapping("secret.api")
4949
@ApiOperation(value = "APP获取私钥", produces = MediaType.APPLICATION_JSON_VALUE)
5050
@ApiImplicitParam(name = "UUID", defaultValue = "1", paramType = "header")

iBase4J-Biz-Web/src/main/java/org/ibase4j/web/SysDicController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import javax.servlet.http.HttpServletRequest;
66

77
import org.ibase4j.model.SysDic;
8-
import org.ibase4j.service.ISysDicService;
8+
import org.ibase4j.service.SysDicService;
99
import org.springframework.http.MediaType;
1010
import org.springframework.stereotype.Controller;
1111
import org.springframework.ui.ModelMap;
@@ -20,14 +20,14 @@
2020

2121
/**
2222
* 字典管理
23-
*
23+
*
2424
* @author ShenHuaJie
2525
* @version 2016年5月20日 下午3:14:34
2626
*/
2727
@Controller
2828
@Api(value = "字典管理", description = "APP-字典接口")
2929
@RequestMapping(value = "/app/dic/")
30-
public class SysDicController extends AppBaseController<SysDic, ISysDicService> {
30+
public class SysDicController extends AppBaseController<SysDic, SysDicService> {
3131
@ApiOperation(value = "查询字典项", produces = MediaType.APPLICATION_JSON_VALUE, response = SysDic.class)
3232
@RequestMapping(value = "query.api", method = {RequestMethod.GET, RequestMethod.POST})
3333
public Object queryList(HttpServletRequest request, String type) {

iBase4J-Biz-Web/src/main/java/org/ibase4j/web/SysMsgController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import javax.servlet.http.HttpServletRequest;
55

66
import org.ibase4j.model.SendMsg;
7-
import org.ibase4j.service.ISendMsgService;
7+
import org.ibase4j.service.SendMsgService;
88
import org.springframework.http.MediaType;
99
import org.springframework.stereotype.Controller;
1010
import org.springframework.ui.ModelMap;
@@ -30,7 +30,7 @@
3030
@Api(value = "APP短信接口", description = "APP-短信接口")
3131
public class SysMsgController extends AbstractController {
3232
@Resource
33-
private ISendMsgService sendMsgService;
33+
private SendMsgService sendMsgService;
3434

3535
@PostMapping("msg.api")
3636
@ApiOperation(value = "发送短信", produces = MediaType.APPLICATION_JSON_VALUE)

iBase4J-Biz-Web/src/main/java/org/ibase4j/web/TMemberController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.ibase4j.bean.Member;
1111
import org.ibase4j.model.MemberPhoto;
1212
import org.ibase4j.model.TMember;
13-
import org.ibase4j.service.IMemberService;
13+
import org.ibase4j.service.MemberService;
1414
import org.springframework.http.MediaType;
1515
import org.springframework.stereotype.Controller;
1616
import org.springframework.ui.ModelMap;
@@ -41,7 +41,7 @@
4141
@Controller
4242
@RequestMapping("/app/member/")
4343
@Api(value = "会员管理接口", description = "APP-个人中心-个人信息管理接口")
44-
public class TMemberController extends AppBaseController<TMember, IMemberService> {
44+
public class TMemberController extends AppBaseController<TMember, MemberService> {
4545
@ApiOperation(value = "获取个人基本信息", produces = MediaType.APPLICATION_JSON_VALUE, response = TMember.class)
4646
@RequestMapping(value = "getUserBaseInfo.api", method = {RequestMethod.GET, RequestMethod.POST})
4747
public Object getBaseInfo(HttpServletRequest request, String id) {

iBase4J-SYS-Facade/src/main/java/org/ibase4j/service/ISchedulerService.java

Lines changed: 0 additions & 43 deletions
This file was deleted.

iBase4J-SYS-Facade/src/main/java/org/ibase4j/service/ISysAuthorizeService.java

Lines changed: 0 additions & 46 deletions
This file was deleted.

iBase4J-SYS-Facade/src/main/java/org/ibase4j/service/ISysDicService.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)