diff --git a/ghy-admin/pom.xml b/ghy-admin/pom.xml index 776137e3..3b470cfe 100644 --- a/ghy-admin/pom.xml +++ b/ghy-admin/pom.xml @@ -95,6 +95,12 @@ com.ghy ghy-worker + + + com.ghy + ghy-message + + org.springframework.boot spring-boot-test diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/message/JimUserController.java b/ghy-admin/src/main/java/com/ghy/web/controller/message/JimUserController.java new file mode 100644 index 00000000..c6904f24 --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/controller/message/JimUserController.java @@ -0,0 +1,36 @@ +package com.ghy.web.controller.message; + +import com.ghy.common.core.controller.BaseController; +import com.ghy.common.core.domain.AjaxResult; +import com.ghy.common.utils.ExceptionUtil; +import com.ghy.message.domain.JimUser; +import com.ghy.message.service.JimUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/jim/user") +public class JimUserController extends BaseController { + + @Autowired + private JimUserService jimUserService; + + @PostMapping("/register") + public AjaxResult register(){ + try { + JimUser jimUser = new JimUser(); + jimUser.setUserName("clunt"); + jimUser.setPassword("password"); + jimUserService.registerJimUser(jimUser); + return AjaxResult.success("注册成功!"); + }catch (Exception e){ + e.printStackTrace(); + logger.error(ExceptionUtil.getExceptionMessage(e)); + return AjaxResult.error("注册失败!"); + } + } + +} + diff --git a/ghy-admin/src/main/resources/application.yaml b/ghy-admin/src/main/resources/application.yaml index 4681e8ec..594cfa10 100644 --- a/ghy-admin/src/main/resources/application.yaml +++ b/ghy-admin/src/main/resources/application.yaml @@ -122,9 +122,9 @@ adapay: notifyUrl: 'https://www.opsoul.com/adapay/callback' jim: - appKey: '' - masterSecret: '' - maxRetryTimes: '' + appKey: '110e8830290152d76e2f1d97' + masterSecret: 'ec49918a5d89526722b05924' + maxRetryTimes: '3' # 百度地图应用api baidu: diff --git a/ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java b/ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java index 55fed6be..86e8ce15 100644 --- a/ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java +++ b/ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java @@ -288,6 +288,7 @@ public class ShiroConfig filterChainDefinitionMap.put("/adapay/**", "anon"); filterChainDefinitionMap.put("/system/area/**", "anon"); filterChainDefinitionMap.put("/customer/address/**", "anon"); + filterChainDefinitionMap.put("/jim/**", "anon"); filterChainDefinitionMap.put("/MP_verify_bRFuvYpyQ4WLr0on.txt", "anon"); // 对静态资源设置匿名访问 filterChainDefinitionMap.put("/favicon.ico**", "anon"); diff --git a/ghy-message/src/main/java/com/ghy/message/config/JimConfig.java b/ghy-message/src/main/java/com/ghy/message/config/JimConfig.java index fcac9b07..399aff2b 100644 --- a/ghy-message/src/main/java/com/ghy/message/config/JimConfig.java +++ b/ghy-message/src/main/java/com/ghy/message/config/JimConfig.java @@ -10,9 +10,8 @@ import org.springframework.context.annotation.Configuration; * @author clunt * 极光消息配置文件 */ -//@Configuration -//@ConfigurationProperties(prefix = "jim") -@Data +@Configuration +@ConfigurationProperties(prefix = "jim") public class JimConfig { private String appKey; @@ -21,9 +20,33 @@ public class JimConfig { private String maxRetryTimes; - @Bean - public JMessageClient jMessageClient(){ - return new JMessageClient(appKey,masterSecret,maxRetryTimes); + public String getAppKey() { + return appKey; } + public void setAppKey(String appKey) { + this.appKey = appKey; + } + + public String getMasterSecret() { + return masterSecret; + } + + public void setMasterSecret(String masterSecret) { + this.masterSecret = masterSecret; + } + + public String getMaxRetryTimes() { + return maxRetryTimes; + } + + public void setMaxRetryTimes(String maxRetryTimes) { + this.maxRetryTimes = maxRetryTimes; + } + +// @Bean +// public JMessageClient jMessageClient(){ +// return new JMessageClient(appKey,masterSecret,maxRetryTimes); +// } + } diff --git a/ghy-message/src/main/java/com/ghy/message/domain/JimRegisterInfo.java b/ghy-message/src/main/java/com/ghy/message/domain/JimRegisterInfo.java new file mode 100644 index 00000000..7b587bcd --- /dev/null +++ b/ghy-message/src/main/java/com/ghy/message/domain/JimRegisterInfo.java @@ -0,0 +1,4 @@ +package com.ghy.message.domain; + +public class JimRegisterInfo { +} diff --git a/ghy-message/src/main/java/com/ghy/message/domain/JimUser.java b/ghy-message/src/main/java/com/ghy/message/domain/JimUser.java index 795af115..b4691264 100644 --- a/ghy-message/src/main/java/com/ghy/message/domain/JimUser.java +++ b/ghy-message/src/main/java/com/ghy/message/domain/JimUser.java @@ -10,6 +10,18 @@ import lombok.Data; @Data public class JimUser extends BaseEntity { + // 自增组件 + private Long jimUserId; + + // D101W7 系统编码 + private String sysUser; + + private String userName; + + private String password; + + private String appKey; + } diff --git a/ghy-message/src/main/java/com/ghy/message/mapper/JimUserMapper.java b/ghy-message/src/main/java/com/ghy/message/mapper/JimUserMapper.java new file mode 100644 index 00000000..e0a9e8a0 --- /dev/null +++ b/ghy-message/src/main/java/com/ghy/message/mapper/JimUserMapper.java @@ -0,0 +1,14 @@ +package com.ghy.message.mapper; + +import org.apache.ibatis.annotations.Mapper; + +/** + * 极光推送用户mapper + * @author clunt + */ +@Mapper +public interface JimUserMapper { + + + +} diff --git a/ghy-message/src/main/java/com/ghy/message/service/JimUserService.java b/ghy-message/src/main/java/com/ghy/message/service/JimUserService.java new file mode 100644 index 00000000..b7faeb37 --- /dev/null +++ b/ghy-message/src/main/java/com/ghy/message/service/JimUserService.java @@ -0,0 +1,12 @@ +package com.ghy.message.service; + +import com.ghy.message.domain.JimUser; + +public interface JimUserService { + + /** + * 注册极光推送信息并入库记录 + * */ + int registerJimUser(JimUser jimUser) throws Exception; + +} diff --git a/ghy-message/src/main/java/com/ghy/message/service/impl/JimUserServiceImpl.java b/ghy-message/src/main/java/com/ghy/message/service/impl/JimUserServiceImpl.java new file mode 100644 index 00000000..dbc44ef1 --- /dev/null +++ b/ghy-message/src/main/java/com/ghy/message/service/impl/JimUserServiceImpl.java @@ -0,0 +1,36 @@ +package com.ghy.message.service.impl; + +import cn.jmessage.api.JMessageClient; +import cn.jmessage.api.common.model.RegisterInfo; +import com.ghy.message.config.JimConfig; +import com.ghy.message.domain.JimUser; +import com.ghy.message.service.JimUserService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 极光推送用户impl + * @author clunt + */ +@Slf4j +@Service +public class JimUserServiceImpl implements JimUserService { + + @Resource + private JimConfig jimConfig; + + @Override + public int registerJimUser(JimUser jimUser) throws Exception{ + JMessageClient messageClient = new JMessageClient(jimConfig.getAppKey(),jimConfig.getMasterSecret()); + RegisterInfo.Builder builder = new RegisterInfo.Builder(); + builder.setUsername(jimUser.getUserName()); + builder.setPassword(jimUser.getPassword()); + RegisterInfo [] registerInfos = new RegisterInfo[1]; + registerInfos[0] = builder.build(); + String result = messageClient.registerUsers(registerInfos); + return 0; + } + +} diff --git a/pom.xml b/pom.xml index 929f5f9f..2698500c 100644 --- a/pom.xml +++ b/pom.xml @@ -313,11 +313,11 @@ - - - - - + + com.ghy + ghy-message + ${ghy.version} + @@ -347,7 +347,7 @@ ghy-common ghy-custom ghy-worker - + ghy-message pom