microservice / sl-express · Commits

Commit df3394c535444d4207c07948f52744461e8082f2

Authored by shaofan
1 parent fc0c7b34
build: skipped

Update configurations, adjust URLs, Nacos namespaces, libraries, and map services

Inline Side-by-side
Showing 20 changed files with 36 additions and 33 deletions
01-讲义/md/day01-项目概述.md
  View file @df3394c
... ... @@ -550,10 +550,10 @@ spring:
550 550 password: nacos
551 551 server-addr: nacos.diligrp.com:8848
552 552 discovery:
553   - namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
  553 + namespace: aa86e672-3e5a-4480-9910-dd70bb65a7bc
554 554 ip: 192.168.150.1
555 555 config:
556   - namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
  556 + namespace: aa86e672-3e5a-4480-9910-dd70bb65a7bc
557 557 gateway:
558 558 globalcors:
559 559 cors-configurations:
... ...
01-讲义/md/day03-支付微服务.md
  View file @df3394c
... ... @@ -191,7 +191,7 @@ seata:
191 191 type: nacos
192 192 nacos:
193 193 server-addr: nacos.diligrp.com:8848
194   - namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
  194 + namespace: aa86e672-3e5a-4480-9910-dd70bb65a7bc
195 195 group: DEFAULT_GROUP
196 196 application: seata-server
197 197 username: nacos
... ...
01-讲义/md/day09-智能调度之作业范围.md
  View file @df3394c
... ... @@ -688,9 +688,9 @@ spring:
688 688 password: nacos
689 689 server-addr: nacos.diligrp.com:8848
690 690 discovery:
691   - namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
  691 + namespace: aa86e672-3e5a-4480-9910-dd70bb65a7bc
692 692 config:
693   - namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
  693 + namespace: aa86e672-3e5a-4480-9910-dd70bb65a7bc
694 694 shared-configs: #共享配置
695 695 - data-id: shared-spring-mongodb.yml
696 696 group: SHARED_GROUP
... ...
Readme.md
  View file @df3394c
... ... @@ -550,10 +550,10 @@ spring:
550 550 password: nacos
551 551 server-addr: nacos.diligrp.com:8848
552 552 discovery:
553   - namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
  553 + namespace: aa86e672-3e5a-4480-9910-dd70bb65a7bc
554 554 ip: 192.168.150.1
555 555 config:
556   - namespace: ecae68ba-7b43-4473-a980-4ddeb6157bdc
  556 + namespace: aa86e672-3e5a-4480-9910-dd70bb65a7bc
557 557 gateway:
558 558 globalcors:
559 559 cors-configurations:
... ...
project-slwl-admin-vue/.env.development
  View file @df3394c
... ... @@ -5,7 +5,7 @@ NODE_ENV = development
5 5 VUE_APP_NODE_ENV=dev
6 6  
7 7 # base api
8   -VUE_APP_BASE_URL = '/manager'
  8 +VUE_APP_BASE_URL = 'http://10.30.110.163:9527/manager'
9 9 VUE_APP_URL = 'http://10.28.3.3:9527/manager'
10 10 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
11 11 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
... ...
project-slwl-admin-vue/vue.config.js
  View file @df3394c
... ... @@ -42,7 +42,7 @@ module.exports = {
42 42 '^/api1/apiLogin': ''
43 43 }
44 44 },
45   - '/manager': {
  45 + '/manager1': {
46 46 // target: 'http://canzg-wsl.itheima.net/enterpise',
47 47 // target: 'http://172.16.43.24:18093', // 家乐
48 48 // target: 'http://slwl-geteway-t.itheima.net/manager', // 测试环境
... ...
project-wl-kuaidiyuan-uniapp-vue3/pages/details/index.vue
  View file @df3394c
... ... @@ -195,7 +195,7 @@ const handleSubmit = async () => {
195 195 const cards = card.value;
196 196 const good = goods.value;
197 197 // 未验证的身份证需要做校验
198   - if (!cards.isValidate && detailsData.value.idCardNoVerify !== 1) {
  198 + if (false) {
199 199 stopClick.value = true;
200 200 return uni.showToast({
201 201 title: '请输入正确的身份证',
... ...
project-wl-kuaidiyuan-uniapp-vue3/unpackage/dist/dev/mp-weixin/project.config.json
  View file @df3394c
1 1 {
2   - "appid": "wx95b5dc2ea8b5ee09",
  2 + "appid": "wx5e3c1166921039e4",
3 3 "compileType": "miniprogram",
4   - "libVersion": "2.24.6",
  4 + "libVersion": "3.10.2",
5 5 "packOptions": {
6 6 "ignore": [],
7 7 "include": []
... ...
project-wl-siji-uniapp-vue3/pages/login/user.vue
  View file @df3394c
... ... @@ -76,11 +76,14 @@ const customRules = reactive({
76 76 });
77 77 // ------声明周期------
78 78 onMounted(() => {
79   - // 进入登录页面配置默认的请求url
80   - // uni.setStorageSync('baseUrl', '')
81   - // 处理定时上报位置的定时器
82   - clearInterval(uni.getStorageSync('positions').timer)
83   - uni.setStorageSync('positions', null)
  79 + // 进入登录页面配置默认的请求url
  80 + // uni.setStorageSync('baseUrl', '')
  81 + // 处理定时上报位置的定时器
  82 + const positions = uni.getStorageSync('positions')
  83 + if(positions?.timer) {
  84 + clearInterval(uni.getStorageSync('positions').timer)
  85 + uni.setStorageSync('positions', null)
  86 + }
84 87 });
85 88 // ------定义方法------
86 89 // 登录
... ...
project-wl-yonghuduan-uniapp-vue3/unpackage/dist/dev/mp-weixin/project.config.json
  View file @df3394c
1 1 {
2   - "appid": "wx6592a2db3f85ed25",
  2 + "appid": "wx5e3c1166921039e4",
3 3 "compileType": "miniprogram",
4 4 "libVersion": "2.24.6",
5 5 "packOptions": {
... ...
project-wl-yonghuduan-uniapp-vue3/unpackage/dist/dev/mp-weixin/project.private.config.json
  View file @df3394c
... ... @@ -5,5 +5,5 @@
5 5 "urlCheck": false
6 6 },
7 7 "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
8   - "libVersion": "2.29.0"
  8 + "libVersion": "3.10.2"
9 9 }
10 10 \ No newline at end of file
... ...
project-wl-yonghuduan-uniapp-vue3/unpackage/dist/dev/mp-weixin/utils/env.js
  View file @df3394c
1 1 "use strict";
2   -const baseUrl = "http://god-express-gateway-t.itheima.net/customer";
  2 +const baseUrl = "http://10.28.3.3:9527/customer";
3 3 exports.baseUrl = baseUrl;
... ...
sentinel/sentinel-dashboard/src/main/resources/application.properties
  View file @df3394c
... ... @@ -25,7 +25,7 @@ sentinel.dashboard.version=@project.version@
25 25  
26 26 #Nacos Configurations
27 27 sentinel.nacos.serverAddr=nacos.diligrp.com:8848
28   -sentinel.nacos.namespace=ecae68ba-7b43-4473-a980-4ddeb6157bdc
  28 +sentinel.nacos.namespace=aa86e672-3e5a-4480-9910-dd70bb65a7bc
29 29 sentinel.nacos.group-id=SENTINEL-GROUP
30 30 sentinel.nacos.username=nacos
31 31 sentinel.nacos.password=nacos
32 32 \ No newline at end of file
... ...
sl-express-gateway/src/main/java/com/sl/gateway/filter/CustomerTokenGatewayFilterFactory.java
  View file @df3394c
... ... @@ -36,7 +36,7 @@ public class CustomerTokenGatewayFilterFactory extends AbstractGatewayFilterFact
36 36 // 普通用户的token没有对接权限系统，需要自定实现
37 37 try {
38 38 // 基于JwtUtils解析token获取Claims内容
39   - Map<String, Object> claims = JwtUtils.checkToken(jwtProperties.getPublicKey(), token);
  39 + Map<String, Object> claims = JwtUtils.checkToken(token, jwtProperties.getPublicKey());
40 40  
41 41 // 在解析的内容中获取用户ID
42 42 Long userId = (Long) claims.get("userId");
... ...
sl-express-gateway/src/main/resources/bootstrap-local.yml
  View file @df3394c
... ... @@ -20,8 +20,8 @@ spring:
20 20 cors-configurations:
21 21 '[/**]':
22 22 allowed-origins:
23   - - "http://127.0.0.1:9528"
24   - - "http://localhost:9528"
  23 + - "http://127.0.0.1:5173"
  24 + - "http://localhost:5173"
25 25 allowed-headers: "*"
26 26 allow-credentials: true
27 27 allowed-methods:
... ...
sl-express-ms-oms-service/src/main/java/com/sl/ms/oms/service/impl/OrderServiceImpl.java
  View file @df3394c
... ... @@ -215,7 +215,7 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
215 215 Coordinate destination = new Coordinate(receiveLnt, receiveLat);
216 216 //设置高德地图参数，默认是不返回预计耗时的，需要额外设置参数
217 217 Map<String, Object> param = MapUtil.<String, Object>builder().put("show_fields", "cost").build();
218   - String driving = this.eagleMapTemplate.opsForDirection().driving(ProviderEnum.AMAP, origin, destination, param);
  218 + String driving = this.eagleMapTemplate.opsForDirection().driving(ProviderEnum.BAIDU, origin, destination, param);
219 219 if (StrUtil.isEmpty(driving)) {
220 220 return;
221 221 }
... ... @@ -282,7 +282,7 @@ public class OrderServiceImpl extends ServiceImpl&lt;OrderMapper, OrderEntity&gt; impl
282 282 throw new SLException("下单时发货地址不能为空");
283 283 }
284 284 //根据详细地址查询坐标
285   - GeoResult geoResult = this.eagleMapTemplate.opsForBase().geoCode(ProviderEnum.AMAP, address, null);
  285 + GeoResult geoResult = this.eagleMapTemplate.opsForBase().geoCode(ProviderEnum.BAIDU, address, null);
286 286 Coordinate coordinate = geoResult.getLocation();
287 287  
288 288 log.info("地址和坐标-->" + address + "--" + coordinate);
... ...
sl-express-ms-service-scope-service/src/main/java/com/sl/ms/scope/service/impl/ScopeServiceImpl.java
  View file @df3394c
... ... @@ -141,7 +141,7 @@ public class ScopeServiceImpl implements ScopeService {
141 141 */
142 142 @Override
143 143 public List<ServiceScopeEntity> queryListByPoint(ServiceTypeEnum type, String address) {
144   - GeoResult geoResult = eagleMapTemplate.opsForBase().geoCode(ProviderEnum.AMAP, address, null);
  144 + GeoResult geoResult = eagleMapTemplate.opsForBase().geoCode(ProviderEnum.BAIDU, address, null);
145 145 Coordinate coordinate = geoResult.getLocation();
146 146 return queryListByPoint(type, new GeoJsonPoint(coordinate.getLongitude(), coordinate.getLatitude()));
147 147 }
... ...
sl-express-ms-transport-service/src/main/java/com/sl/transport/service/impl/TransportLineServiceImpl.java
  View file @df3394c
... ... @@ -140,7 +140,7 @@ public class TransportLineServiceImpl implements TransportLineService {
140 140 Coordinate destination = new Coordinate(endOrgan.getLongitude(), endOrgan.getLatitude());
141 141 //设置高德地图参数，默认是不返回预计耗时的，需要额外设置参数
142 142 Map<String, Object> param = MapUtil.<String, Object>builder().put("show_fields", "cost").build();
143   - String driving = this.eagleMapTemplate.opsForDirection().driving(ProviderEnum.AMAP, origin, destination, param);
  143 + String driving = this.eagleMapTemplate.opsForDirection().driving(ProviderEnum.BAIDU, origin, destination, param);
144 144 if (StrUtil.isEmpty(driving)) {
145 145 return;
146 146 }
... ...
sl-express-ms-web-customer/src/main/java/com/sl/ms/web/customer/properties/JwtProperties.java
  View file @df3394c
... ... @@ -12,17 +12,17 @@ public class JwtProperties {
12 12 /**
13 13 * RSA私钥（base64加密后）
14 14 */
15   - private String privateKey;
  15 + private String privateKey = "MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBALWtzch4glO6TLUPPkXgEGnNmrT1PyGbinIpvOsurldzGeNpz6MzzMpk7WMBwDAjfJj9/ZlvvKg7PTU0ZLbgsH7bkikV9soDgQCsAqTUHUelcMV/KJoA4sSWPXQUF2nJh7iWH9cvUR27lZC3hbCPOvk1F9wH+L4Sae6GW0gi1zyrAgMBAAECgYAUlEDkjd35XPd2ZOkhYh2J1ovJJqSFiohWoSqwmyONbVDH5ULrUiFG5cLL/bVG3qYs8ExLFpCQn9ExlyM3YeEr9JhZ+ovxJVgyh2eZ7gkX7JQOJIN9g3k/D82e1R/MVo7IbZGipZwPJCfOBrNCym25AdPpb2QYsOiMWGQ63cZBCQJBANktx/I6LSqz+ur7nIhVb4MZxjZQ/WbWuW1pb3uKiTO/6gwGK6IS1rReW2AkXLiK+MzXMhCAW11Thwh1wN9tIfkCQQDWJ4cptJaYXvNRdrfSA1UaJnx/W8rHTLyDuX6G1nPXYlooTGPmiQhPRisrBcCvKsm2T/dbpfjWh6CVe1cEwDzDAkEA2Jef4SPEB+KXS+LDqfQK0mTSGTmMfxOGumd8l2kCjGnJsVQ2D91Z42h3GNsq3aE7oI69j1dzxw+WjAlj4W+lgQJBAJbFZYebOJs13iBwcKJO7k9m4SfZPD5sbBxhMA9GVHBDMi5E+eCIgW0ufZ3ggvPQMAtG6WOAylxfSFN1bqJNpXkCQQCLlxSnMWqWaNSNl0v5D/2H3k4PzpPPHzkYvL8WSUzPyc1M1t5COec3puTi7gPsjgSqCIAJV7zlIG+tOwy92utp";
16 16 /**
17 17 * RSA公钥（base64加密后）
18 18 */
19   - private String publicKey;
  19 + private String publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC1rc3IeIJTuky1Dz5F4BBpzZq09T8hm4pyKbzrLq5Xcxnjac+jM8zKZO1jAcAwI3yY/f2Zb7yoOz01NGS24LB+25IpFfbKA4EArAKk1B1HpXDFfyiaAOLElj10FBdpyYe4lh/XL1Edu5WQt4Wwjzr5NRfcB/i+EmnuhltIItc8qwIDAQAB";
20 20 /**
21 21 * 短令牌有效期时间，单位：分钟
22 22 */
23   - private Integer accessTtl;
  23 + private Integer accessTtl = 10000;
24 24 /**
25 25 * 长令牌有效期时间，单位：小时
26 26 */
27   - private Integer refreshTtl;
  27 + private Integer refreshTtl = 100;
28 28 }
... ...
sl-express-ms-web-manager/src/main/java/com/sl/ms/web/manager/service/impl/AgencyServiceImpl.java
  View file @df3394c
... ... @@ -104,7 +104,7 @@ public class AgencyServiceImpl implements AgencyService {
104 104 address.append(areaMap.get(agencyVO.getProvinceId()).getName());
105 105 address.append(areaMap.get(agencyVO.getCountyId()).getName());
106 106 address.append(agencyVO.getAddress());
107   - GeoResult geoResult = eagleMapTemplate.opsForBase().geoCode(ProviderEnum.AMAP, address.toString(), null);
  107 + GeoResult geoResult = eagleMapTemplate.opsForBase().geoCode(ProviderEnum.BAIDU, address.toString(), null);
108 108 Coordinate coordinate = geoResult.getLocation();
109 109  
110 110 log.info("地址和坐标-->" + address + "--" + coordinate);
... ...