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

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