Explorar el Código

添加mq启动配置

joenyliang hace 3 meses
padre
commit
a2739e43cb

+ 6 - 0
framework/pom.xml

@@ -445,6 +445,12 @@
             <artifactId>easyexcel</artifactId>
             <version>3.0.5</version>
         </dependency>
+
+        <!-- Add explicit dependency for spring-beans to fix annotation issues -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
     </dependencies>
 
 

+ 4 - 2
module-erp/src/main/java/com/hys/app/controller/base/SiteShowBaseController.java

@@ -1,5 +1,4 @@
 package com.hys.app.controller.base;
-
 import com.hys.app.framework.util.JsonUtil;
 import com.hys.app.model.base.SettingGroup;
 import com.hys.app.model.system.vo.SiteSetting;
@@ -30,6 +29,9 @@ public class SiteShowBaseController {
     @ApiOperation(value = "获取站点设置")
     public SiteSetting getSiteSetting(){
         String siteJson = settingManager.get(SettingGroup.SITE);
-        return JsonUtil.jsonToObject(siteJson,SiteSetting.class);
+        if (siteJson == null || siteJson.isEmpty()) {
+            return new SiteSetting();
+        }
+        return JsonUtil.jsonToObject(siteJson, SiteSetting.class);
     }
 }

+ 6 - 0
module-erp/src/main/java/com/hys/app/controller/system/UploaderManagerController.java

@@ -64,6 +64,12 @@ public class UploaderManagerController {
         return null;
     }
 
+    @ApiOperation(value = "切换到OSS存储方案", response = String.class)
+    @GetMapping("/switch-to-oss")
+    public String switchToOSS() {
+        this.uploaderManager.openUploader("ossPlugin");
+        return "已成功切换到OSS存储方案";
+    }
 
     @ApiOperation(value = "获取存储方案的配置", response = String.class)
     @GetMapping("/{bean}")

+ 5 - 3
module-erp/src/main/java/com/hys/app/service/base/plugin/upload/MinIOPlugin.java

@@ -160,10 +160,12 @@ public class MinIOPlugin implements Uploader {
 
     @Override
     public String getThumbnailUrl(String url, Integer width, Integer height) {
-        // 缩略图全路径
-//        String thumbnailPah = url + "_" + width + "x" + height;
-        // 返回缩略图全路径
+        // 根据需求,我们需要保持URL不变,因此直接返回原URL
+        // 前端可以通过CSS控制图片显示尺寸
         return url;
+
+        // 如果MinIO配置了图片处理服务,可以取消注释以下代码
+        // return url + "?width=" + width + "&height=" + height;
     }
 
     @Override

+ 6 - 4
module-erp/src/main/java/com/hys/app/service/base/plugin/upload/OSSPlugin.java

@@ -122,10 +122,12 @@ public class OSSPlugin implements Uploader {
 
 	@Override
 	public String getThumbnailUrl(String url, Integer width, Integer height) {
-		// 缩略图全路径
-//		String thumbnailPah = url + "_" + width + "x" + height;
-		// 返回缩略图全路径
-		return url;
+		// 使用OSS图片处理服务的参数方式获取缩略图
+		// 格式: https://example.com/image.jpg?x-oss-process=image/resize,m_fill,h_100,w_100
+		if (url == null) {
+			return null;
+		}
+		return url + "?x-oss-process=image/resize,m_fill,h_" + height + ",w_" + width;
 	}
 
 	@Override

+ 5 - 0
module-erp/src/main/java/com/hys/app/service/erp/impl/GoodsManagerImpl.java

@@ -74,6 +74,10 @@ public class GoodsManagerImpl extends BaseServiceImpl<GoodsMapper, GoodsDO> impl
         this.goodsGalleryManager.add(goodsDTO.getImageList(), goodsDO.getId());
         GoodsGalleryDO goodsGallery = goodsGalleryManager.getGoodsGallery(goodsDTO.getImageList().get(0).getOriginal());
         goodsDO.setImageSmallList(goodsGallery.getSmall());
+        goodsDO.setImages(goodsGallery.getOriginal());
+        // 更新保存图片信息
+        super.updateById(goodsDO);
+        
         bean.forEach(item ->{
             item.setGoodsId(goodsDO.getId());
             item.setName(goodsDTO.getName());
@@ -117,6 +121,7 @@ public class GoodsManagerImpl extends BaseServiceImpl<GoodsMapper, GoodsDO> impl
         this.goodsGalleryManager.add(goodsDTO.getImageList(), goodsDO.getId());
         GoodsGalleryDO goodsGallery = goodsGalleryManager.getGoodsGallery(goodsDTO.getImageList().get(0).getOriginal());
         goodsDO.setImageSmallList(goodsGallery.getSmall());
+        goodsDO.setImages(goodsGallery.getOriginal());
         updateById(goodsDO);
         bean.forEach(item ->{
             item.setGoodsId(goodsDO.getId());

+ 19 - 29
server/src/main/resources/application-local.yml

@@ -8,38 +8,30 @@ spring:
       ds0:
         type: com.alibaba.druid.pool.DruidDataSource
         driver-class-name: com.mysql.jdbc.Driver
-        url: jdbc:mysql://120.46.190.49:3306/erp-standard?useUnicode=true&characterEncoding=utf8&autoReconnect=true&rewriteBatchedStatements=true&useSSL=false
+        url: jdbc:mysql://1.94.136.108:3306/erp-standard?useUnicode=true&characterEncoding=utf8&autoReconnect=true&rewriteBatchedStatements=true&useSSL=false
         username: root
-        #password: root
-        password: Gd8XCWEef72GerxE
+        password: 406054755e8f8bc5
 
   #rabbitmq
   rabbitmq:
-    host: 120.46.190.49
+    host: 1.94.136.108
     port: 5672
     username: admin
-    password: Gd8XCWEef72GerxE
-    virtual-host: /v3studio
-    listener:
-      simple:
-        # 设置为manual时,如果队列不存在会自动创建
-        auto-startup: true
-        acknowledge-mode: auto
-        # 是否自动创建队列
-        missing-queues-fatal: false
+    password: 85d98a89
+    virtual-host: /
 
 #redis 配置
 redis:
   type: standalone
   config:
     type: manual
-  host: 120.46.190.49
-  password: Iayq@742295
+  host: 121.36.251.245
   port: 6379
+  password: Iayq@742295
   maxIdle: 500
   maxTotal: 500
   maxWaitMillis: -1
-  database: 14
+  database: 1
 
 # 开发环境日志为debug
 logging:
@@ -49,7 +41,7 @@ logging:
 xxl:
   job:
     admin:
-      addresses:  http://120.46.190.49:8484/xxl-job-admin
+      addresses:  http://1.94.136.108:8080/xxl-job-admin
     executor:
       appname: erp-job-executer
       ip:
@@ -58,12 +50,10 @@ xxl:
       logretentiondays: -1
     accessToken:
 
-
-
 kuaidianiao:
-  id: 1663339
-  key: 0b15b75c-94b4-482b-a462-fd21e45a50f5
-  apiUrl: http://183.62.170.46:38092/tcpapi/orderdist
+  id: 1844388
+  key: 9dc8ced0-8079-4b01-9c16-32a6e8b46677
+  apiUrl: https://api.kdniao.com/tcpapi/orderdist
   kuaidi:
     id: 1844388
     key: 9dc8ced0-8079-4b01-9c16-32a6e8b46677
@@ -71,13 +61,13 @@ kuaidianiao:
 
 alipay:
   #APPID
-  appId: 2021004150628230
+  appId: 2021004155640040
   #沙箱应用-->应用信息-->开发信息-->接口加签方式-->系统默认密钥-->公钥模式-->查看-->应用私钥
-  appPrivateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCAg9tPZe2hPnUSIqF+hb9CP+D5pZ+dm1kbFsHrEEP1Vj7rDotaJz1clyjuewvUzXUbBVRUk2zViseze9msoZbz58W9ormvUSivczBx/+rfIAV6CPdNIXa+UpSZLnaumIAoT4CtiTZwnm5QzIhJZdlM7ZVf70ye61/9uWQV74x+d6TsQxQ6iUlyeq6BfSO0LI/7S3iTEUVoJM4szo4bSe44COyExMG2csqdSVwEgmiJVUTocXbOElAsogqHMfl7hj0A/wXBKH9922N1OXTxlhhuEV5oHPUXBmCs+yEfFgh/KkKez584rOoch+6scZLAlqgr5uzl0Wh6yIOsq/9i72EdAgMBAAECggEAVDcTxenjWGCXUvUCouh+Nqmpga649AzSzV+SX7le7yw/OsVjKAbCvSQJHI3haOfiL3zEkE+zaBPzXXhxYiDZzKc6+1PhHjOu15pCStILVX+kVx39ALxHFd0Dp4W9HBivErtWdWGPHSmU3LnLLV3ikfi2hBFKQnG3i4qrPXymslBDN85HWZhdSctUXxNRCbwnee8XOffYt+NNHAwI6pveOW5HnXOaUzjRcoepYXOBBkDIrwx/5W1hgaUv4jIu5v4LG35C2IEy1d+6fHvvjQhK2y29eEpJ889n9Gb1lrvsuqHS/knDiFq66GaTSzIl/qJjMpYLEcNcefpIqB/bmw9dgQKBgQC1yBvpaprNDcE1i5hZANvdjryIkXKwfMi6XO5IXxHLqxNYXQV1KSLABA8PzBtCWYFnlGXiNh+06QxPnCRRrB6YgVQYi4d7rjHVaKegHkPHHR3/hMm8CXQwKpjLutEMu3QVprtZl4wPT/VU6ggnhxUpi36YfD5SwOrzRLVVTmqPkQKBgQC0/E0JT/N/8fvmjnwOir/o2/EVgaegWqakquY3OO4bS1mMygJ394GuLvkDgHEmGtWNSQvQMRnxgFK1L/lGO+OSFQF6WU+jvNupIm6XASBpvErWj3GWLL0lSroda4JNHdaX+tQiCqv57rhfBXbS7dKyLuc3kwlZYxTCSPy7+DLKzQKBgQCGgDC+zYUKkdHSd55axHrp/RHcjpnoofu3gMlCPS2in8sph3JhVPWEU7x9OM02k5le9XtJHDjrl7/nK6Xn1E2zE4YQvzSYu7PdrpjQrXQC4LVweWT2v5v7g5kYrPq+y/hBiON4j9wu/D+O+7ba4GU1HySlWNCYVGvDYaQ2IVZRMQKBgAasu2aZhUB1uzWQkbCzm0pKOkTxyC3YygaOqvjkZ5uoFsBjft3Pyf+TiemAJiwilzejtwTRmsRWWDaIc2gMs2Li1XAetRozz+IX+/4js39Sy2vIVIcWVU93xw9otKCFdjGatZIf1KHeFPykJfK3hKq/ohVhndmnFs/ngzKnf7ANAoGAJ6obEOg3StqXvKATsXNClHYbqSEi73rMSUhvfj5StxfXiMwta99zq5R5nLXWXI6DqCsVstIugqNbDsWQmffzHl+MSUnBWnkZYl5EzBhoz6w0Q/16Gn20dqvLCdkVADnHowzVnT8tWCif6kcD5NG89kwCkdUN7GESc/Y1+9t+OWI=
+  appPrivateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCjRsNI6yggSofwaLTy01jQe5Tp/uT55E+jw95yqqMtx1IrtTscLzaBUETcsYHeH4qy9NWAGgs4FtYDBUBhrNXpK6ipPszFWZ81oYB6pYf53n/fEfgj/DeEpoumIilenpyGCKs9RVbjokXyRHdtbg4gH639msg/WP5Z+Z6VNqjClp3pz7LJIuqbNZL6mc8SwIr/V2MOLN1m4k/t9JIWCC/h2HxC3KeqDmhtVbwjYD7Cpa2ko/EZlvRyQ8QOktlB3wpDCCgypBO+PPOJEHPZaFy8p7b5Wd5a7KuKrr0mk1JlnworOoDXGfm2eEb89xPm4ffF4SeGhP/SAh1O51aE8/7TAgMBAAECggEACCge1WO6C3Ltu5rff0oDo9aop8/uDHXVbK76S+wuXrkYZ8qT+2J4bJlf905+2GPm/+2vRMkISnMJmfkHMFn8Dbv6nwneHPXPOFSrIHVoh5kP9krlhJazB1NyoogOXQW7eA6yz0rJfnG64NF+zd6zofMzM/opitCdVE1eGMI0SBQ9VZUaeeY49Y1I0fMpWmgcY7iwDY9JZoSassA2m8n0ImmN1f4XbLZyRuN8vOnTG+9QrOB5XKtb8mxjJrRJGzb+PyNM5MRj7pgOGVLMK1Eg494/deJ19OZhV/IvELEmT84W4tuTUcK0jc4HUWzyAsvbaTzMWk2fQ9jN7hwTps440QKBgQD5k1CW0ZYvcO45j2feh19amwl8VAdnrmH8GNoIE/ZCGDUaVfCTWSIRdmb/KtZELMneN4PjlGwmCmFQOF7GDNQmpNSY7olqWvZepEGmFFXCzWl8HTzEDn/XNWxryWKk6Hc2rDBUhTx101vK66wFbfs8Q4jlJVdSWkQ/vQrRgG0rTwKBgQCner5InUMB3kHYxl5ALW9bkRon63V0BAjBWfVesIzaNglTQshQJe2DbfV96ru1A3NMXJ10LMEK8Xndd3qebX0/Z6iwQfiD72V9zC99ESFJAZt8r9z/c1aamhrUgFwS6D86yrF9YOBONSrIvPtYTjgJJW+/tpDbzH8ESAw8OvVDPQKBgA672K0esGwakaXKRoqHmWSC9JtnZoyDaft1CCIj84zRWwkz+6DnSTCYudnkkIOz1TMOOfYMhBn20OnoegfdKAUkA/0HUAt8VUEfF1UTrEB02f5ex4CXjoqI996hI/ayVp9eqPfEad5W3Pts0Fn9tTBImGNWwgH1nEPbCDF4EHnXAoGBAIY7g62RlfY2XFJRU5NelyUt3GfoeV/+J8JIxrgZCxuOOdUo7oIGlCJGDH/alo3TcSLgDDbj8+lAd6tAqt+146/g9jwm8/dS9eZotBsqkqIADs5V6ew4Vk5de2mcY6+nw53sfWt/LOiiBmOTzGQPdSwnfDSNL/drJNaapGvV2WQFAoGAX4ok9ttdC9OlzjwWx0x1dKGPxqyePN1qkOPkyDccFdyCON+ECaZQ28XoPOHdkryA0f/idrr0IaFwE5WT25Qx00Ns0YBaOGRQWpaN52wJpIUxrMtVZ4vdgKfLvRcgFSqQ3BjGfDAW5mSsi8YxV/yJlrKC/HEDDuPIKpYsgKMe86E=
   #沙箱应用-->应用信息-->开发信息-->接口加签方式-->系统默认密钥-->公钥模式-->查看-->支付宝公钥
-  alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwjbDKtCtW9OHHGfOfbDV0Jn5cVSjTZglJpbRqmVLnWs1U51QQuOoB1ilriqWJDpmd0YApslxw13eGCAgdIuSwo2fBJiDdG8fLYzHuopQVNxIENK1WNL8ispnBuo8z+HrwheR2sTfFPXxEqTYyMQdtkbNu1PJ9GJD1EuJRXlvCkieFFlNklulzCCmOtzR2gFRoDaccTqBddbI8E4fpTAK9vDkrinRAbQsoWs6vdfth0qfMZFyvQFQtSRiX8JPfsMVgNsqOErPu0HqFrKPvhf3ZLJylRkEiY5+AzRO91OxsmhmQcNsdz+fpFCz2hJ5igVhssG0hHWn3o6cH5nqw4E7MwIDAQAB
+  alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiZ3laUc7WzVtOMA2Yj7I9lw3SJioIlDUQCdumDE+rH6e9QbDkLjL4Jj0KUOSiCo9ZoWEA9pethIlAMbb1m/T9y3kfkLQktqSk/dCSIb8DYbBfaOxnJMLobBoaaudak8I3Nu10c0Qy9WClItji3vPDG/gSVLLTBT6+e/BqPW3+2xPCluUBH4zA5nd2LPXC2idG235sMIggeIBfzqRM+mhpNUc3+rnXP9fIzQDeskSUZlWwMEYWRTMM50BRKoIGyctQmNkwRMlNAMbGc8d2JmeaFH/4a4mZwNQXAj/TGs908mf5bOuo+i41ZKUJaSSyRoCLqZYrESDr8W1kBXL+sJOFwIDAQAB
   #回调地址
-  notifyUrl: http://529920wmvp80.vicp.fun:52722/admin/erp/pay/aliReturnCall
+  notifyUrl: https://apidoc.raycos.net/admin/erp/pay/aliReturnCall
   #网关地址
   serverUrl: https://openapi.alipay.com/gateway.do
   #数据格式,推荐:json
@@ -93,7 +83,7 @@ wxpay:
   mchKey: tt9teerjiwer930i4t54u5894irhjehf
   keyPath: /apiclient_cert.p12
   apiV3Key: tt9teerjiwer930i4t54u5894irhjehf
-  notifyUrl: https://api.raycos.net/index.html
-  subMchId: 1639506733
+  notifyUrl: https://apidoc.raycos.net/admin/erp/pay/wxpay/notify
+  subMchId: 1648546606
   secret: 13803c1b0d911e023c7da0b300cbce89
-  oAuth2Url: https://api.raycos.net/admin/erp/pay/weixin/callback/openidCode
+  oAuth2Url:

+ 3 - 3
server/src/main/resources/application-prod.yml

@@ -16,8 +16,8 @@ spring:
   rabbitmq:
     host: 127.0.0.1
     port: 5672
-    username: guest
-    password: guest
+    username: admin
+    password: 85d98a89
     virtual-host: /
 
 #redis 配置
@@ -86,4 +86,4 @@ wxpay:
   notifyUrl: https://apidoc.raycos.net/admin/erp/pay/wxpay/notify
   subMchId: 1648546606
   secret: 13803c1b0d911e023c7da0b300cbce89
-  oAuth2Url:
+  oAuth2Url:

+ 1 - 1
server/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9994
+  port: 9999
 spring:
   application:
     name: erp-server