main
黄海 12 months ago
parent 652f79c0e0
commit 8f8e8d9c93

@ -176,7 +176,7 @@ taskapi:
#mgrapi: #mgrapi:
# ribbon: # ribbon:
# listOfServers: http://i100c.3322.org:30115 # listOfServers: http://ms-saas-mgr:7026
#excelapi: #excelapi:
# ribbon: # ribbon:

@ -176,7 +176,7 @@ taskapi:
#mgrapi: #mgrapi:
# ribbon: # ribbon:
# listOfServers: http://i100c.3322.org:30115 # listOfServers: http://ms-saas-mgr:7026
#excelapi: #excelapi:
# ribbon: # ribbon:

@ -1,7 +1,9 @@
package com.charge.station.controller; package com.charge.station.controller;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.charge.station.bo.CompanyBO; import com.charge.station.bo.CompanyBO;
import com.charge.station.bo.NearbyStationBO;
import com.charge.station.model.CompanyEquipmentPricingRuleTimeDO; import com.charge.station.model.CompanyEquipmentPricingRuleTimeDO;
import com.charge.station.model.UserDO; import com.charge.station.model.UserDO;
import com.charge.station.service.SaasCompanyService; import com.charge.station.service.SaasCompanyService;
@ -14,9 +16,7 @@ import com.charge.util.I100cResponse;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Arrays; import java.util.Arrays;
@ -240,7 +240,7 @@ public class SaasCompanyController {
String companyMinChargeBalance, String companyMinChargeBalance,
Integer enableOnlineRefund) { Integer enableOnlineRefund) {
try { try {
String msg = companyService.batchSaasAddCompanyUser(companyId, isPersonalAccpunt, isCard, names, phones, enableOnlineRecharge, companyMinChargeBalance,enableOnlineRefund); String msg = companyService.batchSaasAddCompanyUser(companyId, isPersonalAccpunt, isCard, names, phones, enableOnlineRecharge, companyMinChargeBalance, enableOnlineRefund);
return I100cResponse.success(msg); return I100cResponse.success(msg);
} catch (Exception e) { } catch (Exception e) {
log.error("batchSaasAddCompanyUser 异常,原因:", e); log.error("batchSaasAddCompanyUser 异常,原因:", e);
@ -284,5 +284,14 @@ public class SaasCompanyController {
return I100cResponse.success(companyService.queryCompanyInfoList()); return I100cResponse.success(companyService.queryCompanyInfoList());
} }
/**
* 使POST
* @param jo
* @return
*/
@RequestMapping(value = "/HuangHaiTestPost")
public CommonResponse HuangHaiTestPost(@RequestBody JSONObject jo){
System.out.println(jo);
return null;
}
} }

@ -35,35 +35,33 @@ aliyun:
secretKey: PMXAuT3fiknhtM3YlR59SfW9BFXu62 secretKey: PMXAuT3fiknhtM3YlR59SfW9BFXu62
namesrvAddr: http://MQ_INST_1003084411458690_Bcazi6ow.mq-internet-access.mq-internet.aliyuncs.com:80 namesrvAddr: http://MQ_INST_1003084411458690_Bcazi6ow.mq-internet-access.mq-internet.aliyuncs.com:80
# 不知道啥意思
protocolapi: protocolapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:7019 listOfServers: http://ms-protocol:7024
openapi: openapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:31301 listOfServers: http://ms-openapi:7016
#listOfServers: 127.0.0.1:7016
distributeapi: distributeapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:31636 listOfServers: http://ms-distribute:7012
financeapi: financeapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:32134 listOfServers: http://ms-finance:7014
mgrapi: mgrapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:30115 listOfServers: http://ms-saas-mgr:7026
userapi: userapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:32150 listOfServers: http://ms-user:7022
orderbkapi: orderbkapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:30313 listOfServers: http://ms-order:7017
logging: logging:
level: level:

@ -35,35 +35,33 @@ aliyun:
secretKey: PMXAuT3fiknhtM3YlR59SfW9BFXu62 secretKey: PMXAuT3fiknhtM3YlR59SfW9BFXu62
namesrvAddr: http://MQ_INST_1003084411458690_Bcazi6ow.mq-internet-access.mq-internet.aliyuncs.com:80 namesrvAddr: http://MQ_INST_1003084411458690_Bcazi6ow.mq-internet-access.mq-internet.aliyuncs.com:80
# 不知道啥意思
protocolapi: protocolapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:7019 listOfServers: http://ms-protocol:7024
openapi: openapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:31301 listOfServers: http://ms-openapi:7016
#listOfServers: 127.0.0.1:7016
distributeapi: distributeapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:31636 listOfServers: http://ms-distribute:7012
financeapi: financeapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:32134 listOfServers: http://ms-finance:7014
mgrapi: mgrapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:30115 listOfServers: http://ms-saas-mgr:7026
userapi: userapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:32150 listOfServers: http://ms-user:7022
orderbkapi: orderbkapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:30313 listOfServers: http://ms-order:7017
logging: logging:
level: level:

@ -63,10 +63,10 @@ logging:
properties: properties:
config: debug config: debug
# 这块没看懂,待完善,此处用户管理是业务模块,它调用了别人吗?
financeapi: financeapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:32134 listOfServers: http://ms-finance:7014
cheweiapi: cheweiapi:
ribbon: ribbon:
@ -79,7 +79,7 @@ orderapi:
listOfServers: http://i100c.3322.org:30258 listOfServers: http://i100c.3322.org:30258
mgrapi: mgrapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:30115 listOfServers: http://ms-saas-mgr:7026
aliyunvinapi: aliyunvinapi:
ribbon: ribbon:

@ -63,10 +63,10 @@ logging:
properties: properties:
config: debug config: debug
# 这块没看懂,待完善,此处用户管理是业务模块,它调用了别人吗?
financeapi: financeapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:32134 listOfServers: http://ms-finance:7014
cheweiapi: cheweiapi:
ribbon: ribbon:
@ -79,7 +79,7 @@ orderapi:
listOfServers: http://i100c.3322.org:30258 listOfServers: http://i100c.3322.org:30258
mgrapi: mgrapi:
ribbon: ribbon:
listOfServers: http://i100c.3322.org:30115 listOfServers: http://ms-saas-mgr:7026
aliyunvinapi: aliyunvinapi:
ribbon: ribbon:

Loading…
Cancel
Save