依赖问题修复

spacetech-common-util/pom.xml

@@ -174,6 +174,7 @@
             <groupId>ground</groupId>
             <artifactId>sdk_release_gs1</artifactId>
             <version>1.51.61</version>
+            <optional>true</optional>
         </dependency>
 
         <!-- nacos-client -->

spacetech-service-api/pom.xml

@@ -61,6 +61,11 @@
             <artifactId>resteasy-jaxrs</artifactId>
             <version>3.13.0.Final</version>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-client</artifactId>
+            <version>3.13.0.Final</version>
+        </dependency>
         <!-- tomcat-embed-core -->
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
@@ -74,5 +79,12 @@
             <artifactId>fastjson-jaxrs-json-provider</artifactId>
             <version>0.3.2</version>
         </dependency>
+
+
+        <!-- SpringBoot配置处理器 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

spacetech-service-api/src/main/java/com/spacetech/config/MemcacheConfig.java

 package com.spacetech.config;
 
 
+import com.spacetech.config.property.MemcacheProperties;
 import com.spacetech.framework.SystemContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -9,14 +12,25 @@ import org.springframework.context.annotation.Configuration;
  * 配置Memcache
  */
 @Configuration
+@EnableConfigurationProperties(MemcacheProperties.class)
 public class MemcacheConfig {
 
-
-
+    @Autowired
+    private MemcacheProperties properties;
 
     @Bean(initMethod = "init")
     public SystemContext systemContext(){
-        return new SystemContext();
+        SystemContext systemContext = new SystemContext();
+
+        systemContext.setMemcacheutilIpPort(properties.getServerAddr());
+        systemContext.setMemcacheutilUsername(properties.getUsername());
+        systemContext.setMemcacheutilPassword(properties.getPassword());
+        systemContext.setMemcacheforonecardutilIpPort(properties.getOneCard().getServerAddr());
+        systemContext.setMemcacheforonecardutilUsername(properties.getOneCard().getUsername());
+        systemContext.setMemcacheforonecardutilPassword(properties.getOneCard().getPassword());
+        systemContext.setLocalfileDic(properties.getLocalfileDic());
+        systemContext.setLocalfileInternet(properties.getLocalfileInternet());
+        return systemContext;
     }
 
 }

spacetech-service-api/src/main/java/com/spacetech/config/property/MemcacheProperties.java

+package com.spacetech.config.property;
+
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "memcache")
+public class MemcacheProperties {
+
+
+    private String serverAddr;
+    private String username;
+    private String password;
+
+    private Boolean internalOss = false;
+
+    private Boolean saveLocalfile = false;
+    private String localfileDic = "";
+    private String localfileInternet;
+
+    private OnecardProperties oneCard = new OnecardProperties();
+
+    public String getServerAddr() {
+        return serverAddr;
+    }
+
+    public void setServerAddr(String serverAddr) {
+        this.serverAddr = serverAddr;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public Boolean getInternalOss() {
+        return internalOss;
+    }
+
+    public void setInternalOss(Boolean internalOss) {
+        this.internalOss = internalOss;
+    }
+
+    public OnecardProperties getOneCard() {
+        return oneCard;
+    }
+
+    public void setOneCard(OnecardProperties oneCard) {
+        this.oneCard = oneCard;
+    }
+
+    public Boolean getSaveLocalfile() {
+        return saveLocalfile;
+    }
+
+    public void setSaveLocalfile(Boolean saveLocalfile) {
+        this.saveLocalfile = saveLocalfile;
+    }
+
+    public String getLocalfileDic() {
+        return localfileDic;
+    }
+
+    public void setLocalfileDic(String localfileDic) {
+        this.localfileDic = localfileDic;
+    }
+
+    public String getLocalfileInternet() {
+        return localfileInternet;
+    }
+
+    public void setLocalfileInternet(String localfileInternet) {
+        this.localfileInternet = localfileInternet;
+    }
+
+    public static class OnecardProperties{
+        private String serverAddr;
+        private String username;
+        private String password;
+
+        public String getServerAddr() {
+            return serverAddr;
+        }
+
+        public void setServerAddr(String serverAddr) {
+            this.serverAddr = serverAddr;
+        }
+
+        public String getUsername() {
+            return username;
+        }
+
+        public void setUsername(String username) {
+            this.username = username;
+        }
+
+        public String getPassword() {
+            return password;
+        }
+
+        public void setPassword(String password) {
+            this.password = password;
+        }
+    }
+}

spacetech-service-api/src/main/java/com/spacetech/framework/SystemContext.java

 package com.spacetech.framework;
 
-import java.net.InterfaceAddress;
-import java.net.NetworkInterface;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-
 import com.alibaba.fastjson.JSONObject;
 import com.spacetech.common.ConstantVar;
 import com.spacetech.common.utils.FileUtil;
@@ -14,6 +8,13 @@ import com.spacetech.provider.ApiProvider;
 import com.spacetech.util.MemCacheForOnecardUtil;
 import com.spacetech.util.MemCacheUtil;
 
+import javax.annotation.PostConstruct;
+import java.net.InterfaceAddress;
+import java.net.NetworkInterface;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+
 /**
  * 
  * @author wm web工程上下文
@@ -37,6 +38,7 @@ public final class SystemContext {
 
 	public static String SERVER_IP_ADDRESS = "";
 
+
 	public void init() {
 
 		// 初始化参数配置
@@ -48,9 +50,7 @@ public final class SystemContext {
 			throw new RuntimeException("Zookeeper未配置本地存储目录路径");
 		}
 		FileUtil.makeDir(localfileDic);
-		if (saveLocalfile && StringUtil.isNullOrEmpty(localfileInternet)) {
-			throw new RuntimeException("Zookeeper未配置本地访问路径");
-		}
+
 		baseParams.put("saveLocalfile", saveLocalfile);
 		baseParams.put("localfileDic", localfileDic);
 		baseParams.put("localfileInternet", localfileInternet);

spacetech-service-api/src/main/java/com/spacetech/service/ApiHub.java

@@ -8,7 +8,7 @@ import java.util.Arrays;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import jdk.nashorn.internal.ir.annotations.Reference;
+import org.apache.dubbo.config.annotation.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -112,7 +112,7 @@ public class ApiHub {
 	@Reference
 	private TokenApiHub tokenApiHub;
 
-	@Reference
+	@Autowired
 	private ProviderService providerService;
 
 	@Reference

spacetech-service-api/src/main/resources/application.yml

@@ -67,6 +67,17 @@ dubbo:
   scan:
     base-packages: com.spacetech.service
   cloud:
-    subscribed-services: service-growth,service-basedata
+    subscribed-services: '*'
   consumer:
     check: false
+memcache:
+  server-addr: 10.10.10.190:33332
+  username: spaceplaceholder
+  password: spaceplaceholder
+  one-card:
+    server-addr: 10.10.10.190:33333
+    username: spaceplaceholder
+    password: spaceplaceholder
+  internal-oss: false
+  localfile-dic: /mnt/work/weixtshare/
+  localfile-internet: http://weixt.spacetech.com.cn:8090/weixtshare/
\ No newline at end of file

spacetech-service-growth/pom.xml

@@ -52,11 +52,15 @@
             </exclusions>
         </dependency>
 -->
-
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxrs</artifactId>
+            <version>3.13.0.Final</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter</artifactId>
         </dependency>
 
         <dependency>

spacetech-service-growth/src/main/java/com/spacetech/util/MemCacheForOnecardUtil.java

@@ -76,7 +76,7 @@ public class MemCacheForOnecardUtil {
 	/**
 	 * 设置aeskey
 	 * 
-	 * @param aesKey
+	 * @param
 	 */
 	public static String getAesKeyDataSafe() {
 		String result = "";

spacetech-service-growth/src/main/resources/bootstrap.yml

 spring:
   application:
-    name: service-growth
+    name: growth
   cloud:
     nacos:
       # nacos 服务发现

spacetech-service-interface/pom.xml

@@ -23,6 +23,12 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.ws.rs</groupId>
+                    <artifactId>jsr311-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--sentinel 流控-->