diff --git a/mallinkAdmin/pom.xml b/mallinkAdmin/pom.xml
index e692e554e..43afbdba7 100644
--- a/mallinkAdmin/pom.xml
+++ b/mallinkAdmin/pom.xml
@@ -28,28 +28,12 @@
mybatis-multi-tenancy
1.0
-
- com.github.binarywang
- weixin-java-mp
- ${weixin-java-mp.version}
-
-
- com.github.binarywang
- weixin-java-open
- ${weixin-java-open.version}
-
commons-fileupload
commons-fileupload
1.3.3
-
- com.google.zxing
- core
- 3.3.3
-
-
diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml
index 445a98188..2a40736d2 100644
--- a/mallinkAdmin/src/main/resources/application-dev.yml
+++ b/mallinkAdmin/src/main/resources/application-dev.yml
@@ -57,27 +57,6 @@ aws:
access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=)
secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=)
-wechat:
- open:
- componentAppId: "wx897e4673286c915d"
- componentSecret: "cdfdfda65c45689beb6766c4c427eed2"
- componentToken: "formall2018"
- componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
- redis:
- host: 202.165.179.86
- port: 6379
- password: ENC(aYJ3Wr2UWtkORRQjjrWWpz2ZeTISsHOA)
- timeout: 3600
- expire: 1800 #30分钟
- database: 1
- defaultExpiration: 2592000 # 默认生命周期30天
- jedis:
- pool:
- max-active: 100
- max-idle: 500
- max-wait: -1
- min-idle: 10
-
jasypt:
encryptor:
password: oRqdnDbK5pj3eMmB
diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml
index 65e4a613e..ea4b08fe5 100644
--- a/mallinkAdmin/src/main/resources/application-prod.yml
+++ b/mallinkAdmin/src/main/resources/application-prod.yml
@@ -53,29 +53,6 @@ aws:
access: ENC(a6SN1sZ1enNL49ypiOXkg/pPPAnZD8H4buQFTTKN08s=)
secret: ENC(5P5ff4bTMJUbXVR4ZsM03UHzOKZ4+Zg5Iutcdkyp/Quny/oXg+A4KpfwEyGarlLu3vQMJahGP5M=)
-
-wechat:
- open:
- componentAppId: "wx897e4673286c915d"
- componentSecret: "cdfdfda65c45689beb6766c4c427eed2"
- componentToken: "formall2018"
- componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
- redis:
- host: 127.0.0.1
- port: 6379
- password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=)
- timeout: 3600
- expire: 1800 #30分钟
- database: 1
- defaultExpiration: 2592000 # 默认生命周期30天
- jedis:
- pool:
- max-active: 100
- max-idle: 100
- max-wait: -1
- min-idle: 10
-
-
fm:
exception: true
diff --git a/mallinkAdmin/src/main/resources/application-test.yml b/mallinkAdmin/src/main/resources/application-test.yml
index 62dca6087..ff190301e 100644
--- a/mallinkAdmin/src/main/resources/application-test.yml
+++ b/mallinkAdmin/src/main/resources/application-test.yml
@@ -53,27 +53,6 @@ aws:
access: ENC(NCLcmjwKpAWdn/abD17OKIY7yKepVLWzEpqRYUlURCw=)
secret: ENC(TRcZqql0Rq5PExlMeH/4WiZ/i02b8FXKmLTBChJmbluTa1uoLS9LrHyNEMrqe1DK+QgOAdvqGBo=)
-wechat:
- open:
- componentAppId: "wx897e4673286c915d"
- componentSecret: "cdfdfda65c45689beb6766c4c427eed2"
- componentToken: "formall2018"
- componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN"
- redis:
- host: 127.0.0.1
- port: 6379
- password: ENC(QFwqv3NshvvGhFPiP8rwhvbnxk+rFSqhJi8Pw6TogSg=)
- timeout: 3600
- expire: 1800 #30分钟
- database: 1
- defaultExpiration: 2592000 # 默认生命周期30天
- jedis:
- pool:
- max-active: 100
- max-idle: 100
- max-wait: -1
- min-idle: 10
-
fm:
exception: true
diff --git a/mallinkWechatOpen/pom.xml b/mallinkWechatOpen/pom.xml
new file mode 100644
index 000000000..49d563723
--- /dev/null
+++ b/mallinkWechatOpen/pom.xml
@@ -0,0 +1,55 @@
+
+
+ 4.0.0
+
+
+ mallink
+ com.iformall
+ 1.0
+
+
+ mallinkWechatOpen
+
+
+ 3.3.0
+ 3.3.0
+
+
+
+
+ com.iformall
+ mallinkService
+ 1.0
+
+
+ com.github.binarywang
+ weixin-java-open
+ ${weixin-java-open.version}
+
+
+ com.github.binarywang
+ weixin-java-mp
+ ${weixin-java-mp.version}
+
+
+ com.google.zxing
+ core
+ 3.3.3
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+ true
+
+
+
+
+
+
\ No newline at end of file
diff --git a/mallinkWechatOpen/src/main/java/com/iformall/WechatOpenApplication.java b/mallinkWechatOpen/src/main/java/com/iformall/WechatOpenApplication.java
new file mode 100644
index 000000000..65f505c8a
--- /dev/null
+++ b/mallinkWechatOpen/src/main/java/com/iformall/WechatOpenApplication.java
@@ -0,0 +1,33 @@
+package com.iformall;
+
+import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import tk.mybatis.spring.annotation.MapperScan;
+
+/**
+ * @author stormeye
+ * @date 2019-01-14
+ */
+@SpringBootApplication
+@MapperScan(basePackages = {"com.iformall.mapper"})
+@EnableSwagger2
+@EnableEncryptableProperties
+public class WechatOpenApplication {
+
+ @Value("${fm.exception}")
+ private boolean fmException;
+
+ @Bean
+ public boolean isFmException() {
+ return fmException;
+ }
+
+
+ public static void main(String[] args) {
+ SpringApplication.run(WechatOpenApplication.class, args);
+ }
+}
diff --git a/mallinkWechatOpen/src/main/java/com/iformall/config/AwsProperty.java b/mallinkWechatOpen/src/main/java/com/iformall/config/AwsProperty.java
new file mode 100644
index 000000000..0329f1d6d
--- /dev/null
+++ b/mallinkWechatOpen/src/main/java/com/iformall/config/AwsProperty.java
@@ -0,0 +1,52 @@
+package com.iformall.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Stormeye
+ */
+@Component
+@ConfigurationProperties(prefix = "aws")
+public class AwsProperty {
+ // AWS ACCESS KEY
+ private String access;
+
+ private String secret;
+
+ private String clientRegion;
+
+ private String bucketName;
+
+ public String getAccess() {
+ return access;
+ }
+
+ public void setAccess(String access) {
+ this.access = access;
+ }
+
+ public String getSecret() {
+ return secret;
+ }
+
+ public void setSecret(String secret) {
+ this.secret = secret;
+ }
+
+ public String getClientRegion() {
+ return clientRegion;
+ }
+
+ public void setClientRegion(String clientRegion) {
+ this.clientRegion = clientRegion;
+ }
+
+ public String getBucketName() {
+ return bucketName;
+ }
+
+ public void setBucketName(String bucketName) {
+ this.bucketName = bucketName;
+ }
+}
diff --git a/mallinkWechatOpen/src/main/java/com/iformall/config/PayProperty.java b/mallinkWechatOpen/src/main/java/com/iformall/config/PayProperty.java
new file mode 100644
index 000000000..5cb7f4915
--- /dev/null
+++ b/mallinkWechatOpen/src/main/java/com/iformall/config/PayProperty.java
@@ -0,0 +1,24 @@
+package com.iformall.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Stormeye
+ */
+@Component
+@ConfigurationProperties(prefix = "pay")
+public class PayProperty {
+ /**
+ * 真实支付
+ */
+ private boolean real;
+
+ public boolean isReal() {
+ return real;
+ }
+
+ public void setReal(boolean real) {
+ this.real = real;
+ }
+}
diff --git a/mallinkWechatOpen/src/main/java/com/iformall/config/RedisConfig.java b/mallinkWechatOpen/src/main/java/com/iformall/config/RedisConfig.java
new file mode 100644
index 000000000..2e6e9bc63
--- /dev/null
+++ b/mallinkWechatOpen/src/main/java/com/iformall/config/RedisConfig.java
@@ -0,0 +1,112 @@
+package com.iformall.config;
+
+import com.iformall.domain.po.PushLimit;
+import com.iformall.domain.po.WxScoreRules;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.cache.RedisCacheWriter;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Created by Stormeye on 2018/10/1.
+ */
+@Configuration
+@EnableCaching
+public class RedisConfig extends CachingConfigurerSupport {
+
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ //缓存管理器
+ @Bean
+ public CacheManager cacheManager(RedisConnectionFactory connectionFactory) {
+ /*
+ //user信息缓存配置
+ RedisCacheConfiguration userCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig().entryTtl(Duration.ofSeconds(10)).disableCachingNullValues().prefixKeysWith("user");
+ Map redisCacheConfigurationMap = new HashMap<>();
+ redisCacheConfigurationMap.put("user", userCacheConfiguration);
+ //初始化一个RedisCacheWriter
+ RedisCacheWriter redisCacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(connectionFactory);
+ // 设置CacheManager的值序列化方式为JdkSerializationRedisSerializer,但其实RedisCacheConfiguration默认就是使用StringRedisSerializer序列化key,JdkSerializationRedisSerializer序列化value,所以以下注释代码为默认实现
+ // ClassLoader loader = this.getClass().getClassLoader();
+ // JdkSerializationRedisSerializer jdkSerializer = new JdkSerializationRedisSerializer(loader);
+ // RedisSerializationContext.SerializationPair