Просмотр исходного кода

Merge branch 'release_toaliyun_real' of https://git.youlane.cn/server/formallProject into release_toaliyun_real

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
f6e68b6c41
13 измененных файлов: 100 добавлений и 22 удалений
  1. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java
  2. +8
    -2
      mallinkAdmin/src/main/resources/application-prod.yml
  3. +4
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java
  4. +8
    -1
      mallinkBApi/src/main/resources/application-prod.yml
  5. +2
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  6. +9
    -1
      mallinkCApi/src/main/resources/application-prod.yml
  7. +8
    -1
      mallinkCallback/src/main/resources/application-prod.yml
  8. +8
    -1
      mallinkMQConsumer/src/main/resources/application-prod.yml
  9. +8
    -1
      mallinkPosApi/src/main/resources/application-prod.yml
  10. +8
    -1
      mallinkSchedule/src/main/resources/application-prod.yml
  11. +17
    -8
      mallinkService/src/main/java/com/iformall/common/TenantThreadLocal.java
  12. +8
    -1
      mallinkSysAdmin/src/main/resources/application-prod.yml
  13. +8
    -1
      mallinkWebSocketServer/src/main/resources/application-prod.yml

+ 4
- 4
mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java Просмотреть файл

@@ -20,16 +20,16 @@ public class PasswordHelper {

}

/*
public static void main(String[] args) {
MallUserInfo user = new MallUserInfo();
user.setUsername("admin");
user.setPassword("admin123");
user.setUsername("sadmin");
user.setPassword("fm2020admin");
PasswordHelper passwordHelper = new PasswordHelper();
passwordHelper.encryptPassword(user);
System.out.println(user);
System.out.println(user.getPassword());
}
*/
}

+ 8
- 2
mallinkAdmin/src/main/resources/application-prod.yml Просмотреть файл

@@ -48,7 +48,13 @@ spring:
regionId: cn-hangzhou
dateFormat: yyyyMMdd
endpointName: cn-hangzhou
oss:
endpoint: oss-cn-beijing.aliyuncs.com
keyid: LTAI4G7ixY4AhvM35F8o3W3V
keysecret: VfWqGb83qIQrS9us45utskl8itd7ry
bucketname: formall
filehost: malinkadmin
filedomain: http://formall.oss-accelerate.aliyuncs.com
# EMAIL
mail:
host: smtp.exmail.qq.com
@@ -79,7 +85,7 @@ spring:
groupId: "GID_P_1"
namesrvAddr: "http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080"
flyway:
enabled: true
enabled: false

aws:
clientRegion: cn-northwest-1


+ 4
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java Просмотреть файл

@@ -7,6 +7,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
import com.alibaba.fastjson.JSONObject;
import com.iformall.annotation.AuthIgnore;
import com.iformall.annotation.TenantIgnore;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
@@ -75,6 +76,7 @@ public class WxInfoController extends BaseController {
WxMerchantBUserService merchantBUserService;

@AuthIgnore
@TenantIgnore
@ApiOperation("获取OPENID")
@PostMapping("getOpenId")
public ResultData getOpenId(@RequestBody Map<String,String> param) {
@@ -223,6 +225,7 @@ public class WxInfoController extends BaseController {
}

@AuthIgnore
@TenantIgnore
@ApiOperation("获取超管OPENID")
@PostMapping("getSuperOpenId")
public ResultData getSuperOpenId(@RequestBody Map<String,String> param) {
@@ -330,6 +333,7 @@ public class WxInfoController extends BaseController {
* @return
*/
@AuthIgnore
@TenantIgnore
@PostMapping("/getUserPhone")
@ApiOperation(value = "授权后获取用户的手机号", notes="{\"appId\":\"string\",\"encryptedData\":\"string\",\"iv\":\"string\",\"openId\":\"string\",\"session_key\":\"string\"}")
public ResultData getUserPhone(@RequestBody Map<String, String> map) {


+ 8
- 1
mallinkBApi/src/main/resources/application-prod.yml Просмотреть файл

@@ -46,7 +46,14 @@ spring:
domain: dysmsapi.aliyuncs.com
regionId: cn-hangzhou
dateFormat: yyyyMMdd
endpointName: cn-hangzhou
endpointName: cn-hangzhou
oss:
endpoint: oss-cn-beijing.aliyuncs.com
keyid: LTAI4G7ixY4AhvM35F8o3W3V
keysecret: VfWqGb83qIQrS9us45utskl8itd7ry
bucketname: formall
filehost: malinkadmin
filedomain: http://formall.oss-accelerate.aliyuncs.com
# EMAIL
mail:
host: smtp.exmail.qq.com


+ 2
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Просмотреть файл

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.iformall.annotation.AuthIgnore;
import com.iformall.annotation.RedisCache;
import com.iformall.annotation.TenantIgnore;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
@@ -132,6 +133,7 @@ public class WxUserGrantController extends BaseController {
* @return
*/
@AuthIgnore
@TenantIgnore
@PostMapping("/login")
@ApiOperation(value = "用户登录", notes = "{\"appId\":\"string\",\"code\":\"string\",\"scene\":\"string\",\"sceneAddress\":\"string\",\"latitude\":\"string\",\"longitude\":\"string\",\"systemInfo\":\"string\"}")
public ResultData userLogin(@RequestBody Map<String, String> map) {


+ 9
- 1
mallinkCApi/src/main/resources/application-prod.yml Просмотреть файл

@@ -45,7 +45,15 @@ spring:
domain: dysmsapi.aliyuncs.com
regionId: cn-hangzhou
dateFormat: yyyyMMdd
endpointName: cn-hangzhou
endpointName: cn-hangzhou
oss:
endpoint: oss-cn-beijing.aliyuncs.com
keyid: LTAI4G7ixY4AhvM35F8o3W3V
keysecret: VfWqGb83qIQrS9us45utskl8itd7ry
bucketname: formall
filehost: malinkadmin
filedomain: http://formall.oss-accelerate.aliyuncs.com
# EMAIL
mail:
host: smtp.exmail.qq.com


+ 8
- 1
mallinkCallback/src/main/resources/application-prod.yml Просмотреть файл

@@ -46,7 +46,14 @@ spring:
domain: dysmsapi.aliyuncs.com
regionId: cn-hangzhou
dateFormat: yyyyMMdd
endpointName: cn-hangzhou
endpointName: cn-hangzhou
oss:
endpoint: oss-cn-beijing.aliyuncs.com
keyid: LTAI4G7ixY4AhvM35F8o3W3V
keysecret: VfWqGb83qIQrS9us45utskl8itd7ry
bucketname: formall
filehost: malinkadmin
filedomain: http://formall.oss-accelerate.aliyuncs.com
# EMAIL
mail:


+ 8
- 1
mallinkMQConsumer/src/main/resources/application-prod.yml Просмотреть файл

@@ -46,7 +46,14 @@ spring:
domain: dysmsapi.aliyuncs.com
regionId: cn-hangzhou
dateFormat: yyyyMMdd
endpointName: cn-hangzhou
endpointName: cn-hangzhou
oss:
endpoint: oss-cn-beijing.aliyuncs.com
keyid: LTAI4G7ixY4AhvM35F8o3W3V
keysecret: VfWqGb83qIQrS9us45utskl8itd7ry
bucketname: formall
filehost: malinkadmin
filedomain: http://formall.oss-accelerate.aliyuncs.com
# EMAIL
mail:
host: smtp.exmail.qq.com


+ 8
- 1
mallinkPosApi/src/main/resources/application-prod.yml Просмотреть файл

@@ -45,7 +45,14 @@ spring:
domain: dysmsapi.aliyuncs.com
regionId: cn-hangzhou
dateFormat: yyyyMMdd
endpointName: cn-hangzhou
endpointName: cn-hangzhou
oss:
endpoint: oss-cn-beijing.aliyuncs.com
keyid: LTAI4G7ixY4AhvM35F8o3W3V
keysecret: VfWqGb83qIQrS9us45utskl8itd7ry
bucketname: formall
filehost: malinkadmin
filedomain: http://formall.oss-accelerate.aliyuncs.com
# EMAIL
mail:
host: smtp.exmail.qq.com


+ 8
- 1
mallinkSchedule/src/main/resources/application-prod.yml Просмотреть файл

@@ -46,7 +46,14 @@ spring:
domain: dysmsapi.aliyuncs.com
regionId: cn-hangzhou
dateFormat: yyyyMMdd
endpointName: cn-hangzhou
endpointName: cn-hangzhou
oss:
endpoint: oss-cn-beijing.aliyuncs.com
keyid: LTAI4G7ixY4AhvM35F8o3W3V
keysecret: VfWqGb83qIQrS9us45utskl8itd7ry
bucketname: formall
filehost: malinkadmin
filedomain: http://formall.oss-accelerate.aliyuncs.com
# EMAIL
mail:
host: smtp.exmail.qq.com


+ 17
- 8
mallinkService/src/main/java/com/iformall/common/TenantThreadLocal.java Просмотреть файл

@@ -1,26 +1,35 @@
package com.iformall.common;

import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;

public class TenantThreadLocal {

private static ThreadLocal<String> local = new ThreadLocal<String>();
private static ThreadLocal<String> parentLocal = new ThreadLocal<String>();
//private static ThreadLocal<String> local = new ThreadLocal<String>();
//private static ThreadLocal<String> parentLocal = new ThreadLocal<String>();
public static void setCurrentThreadTenant(String tenantId,String parentId) {
local.set(tenantId);
parentLocal.set(parentId);
RequestContextHolder.currentRequestAttributes().setAttribute("tenaneId", tenantId, RequestAttributes.SCOPE_REQUEST);
RequestContextHolder.currentRequestAttributes().setAttribute("parentTenaneId", parentId, RequestAttributes.SCOPE_REQUEST);
//local.set(tenantId);
//parentLocal.set(parentId);
}
public static String getTenantId() {
return local.get();
return (String)RequestContextHolder.currentRequestAttributes().getAttribute("tenaneId", RequestAttributes.SCOPE_REQUEST);
//return local.get();
}
public static String getParentTenantId() {
return parentLocal.get();
return (String)RequestContextHolder.currentRequestAttributes().getAttribute("parentTenaneId", RequestAttributes.SCOPE_REQUEST);
//return parentLocal.get();
}
public static void remove() {
local.remove();
parentLocal.remove();
RequestContextHolder.currentRequestAttributes().removeAttribute("tenaneId", RequestAttributes.SCOPE_REQUEST);
RequestContextHolder.currentRequestAttributes().removeAttribute("parentTenaneId", RequestAttributes.SCOPE_REQUEST);
//local.remove();
//parentLocal.remove();
}
}

+ 8
- 1
mallinkSysAdmin/src/main/resources/application-prod.yml Просмотреть файл

@@ -46,7 +46,14 @@ spring:
domain: dysmsapi.aliyuncs.com
regionId: cn-hangzhou
dateFormat: yyyyMMdd
endpointName: cn-hangzhou
endpointName: cn-hangzhou
oss:
endpoint: oss-cn-beijing.aliyuncs.com
keyid: LTAI4G7ixY4AhvM35F8o3W3V
keysecret: VfWqGb83qIQrS9us45utskl8itd7ry
bucketname: formall
filehost: malinkadmin
filedomain: http://formall.oss-accelerate.aliyuncs.com
# EMAIL
mail:
host: smtp.exmail.qq.com


+ 8
- 1
mallinkWebSocketServer/src/main/resources/application-prod.yml Просмотреть файл

@@ -46,7 +46,14 @@ spring:
domain: dysmsapi.aliyuncs.com
regionId: cn-hangzhou
dateFormat: yyyyMMdd
endpointName: cn-hangzhou
endpointName: cn-hangzhou
oss:
endpoint: oss-cn-beijing.aliyuncs.com
keyid: LTAI4G7ixY4AhvM35F8o3W3V
keysecret: VfWqGb83qIQrS9us45utskl8itd7ry
bucketname: formall
filehost: malinkadmin
filedomain: http://formall.oss-accelerate.aliyuncs.com
# EMAIL
mail:
host: smtp.exmail.qq.com


Загрузка…
Отмена
Сохранить