Merge branch 'main' of http://121.37.111.42:3000/ThbTech/gis-bi

core/core-backend/src/main/java/io/gisbi/license/server/LicenseServer.java

@@ -0,0 +1,23 @@
+package io.gisbi.license.server;
+
+import io.gisbi.api.license.LicenseApi;
+import io.gisbi.api.license.bo.F2CLicResult;
+import io.gisbi.api.license.dto.LicenseRequest;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/license")
+public class LicenseServer implements LicenseApi {
+
+    @Override
+    public F2CLicResult validate(LicenseRequest request) {
+        F2CLicResult result = new F2CLicResult();
+        return result;
+    }
+
+    @Override
+    public String version() {
+        return "1.0.0";
+    }
+}

core/core-frontend/tsconfig.json

@@ -21,3 +21,4 @@
   "include": ["src/**/*", "electron-main/**/*.ts", "types/**/*.d.ts", "types"],
   "exclude": ["dist", "lib", "node_modules"]
 }
+

sdk/api/api-base/src/main/java/io/gisbi/api/ai/AiComponentApi.java

@@ -1,14 +0,0 @@
-package io.gisbi.api.ai;
-
-import org.springframework.web.bind.annotation.GetMapping;
-
-import java.util.Map;
-
-/**
- * @author : WangJiaHao
- * @date : 2024/3/27 09:44
- */
-public interface AiComponentApi {
-    @GetMapping("findTargetUrl")
-    Map<String, String> findTargetUrl();
-}

sdk/api/api-base/src/main/java/io/gisbi/api/license/LicenseApi.java

@@ -1,5 +1,6 @@
 package io.gisbi.api.license;
 
+import io.gisbi.api.license.bo.F2CLicResult;
 import io.gisbi.api.license.dto.LicenseRequest;
 
 import org.springframework.web.bind.annotation.GetMapping;
@@ -8,12 +9,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 public interface LicenseApi {
 
-
-//    @PostMapping("/update")
-//    F2CLicResult update(@RequestBody LicenseRequest request);
-//
-//    @PostMapping("/validate")
-//    F2CLicResult validate(@RequestBody LicenseRequest request);
+    @PostMapping("/validate")
+    F2CLicResult validate(@RequestBody LicenseRequest request);
 
     @GetMapping("/version")
     String version();

sdk/api/api-base/src/main/java/io/gisbi/api/license/bo/F2CLicResult.java

@@ -0,0 +1,57 @@
+package io.gisbi.api.license.bo;
+
+import java.io.Serializable;
+
+public class F2CLicResult implements Serializable {
+    private String message;
+    private F2CLicense license;
+    private static final long serialVersionUID = -2285934203104231711L;
+    private Status status;
+
+
+
+    public void setLicense(F2CLicense var1) {
+
+    }
+
+    public F2CLicResult expired() {
+
+        return this;
+    }
+
+    public Status getStatus() {
+        return this.status;
+    }
+
+    public void setStatus(Status var1) {
+
+    }
+
+    public static F2CLicResult invalid(String var0) {
+        F2CLicResult a = new F2CLicResult();
+        return a;
+
+    }
+
+    public F2CLicense getLicense() {
+        return this.license;
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+
+    public F2CLicResult() {
+    }
+
+    public void setMessage(String var1) {
+
+    }
+
+    public static enum Status {
+        no_record,
+        expired,
+        invalid,
+        valid;
+    }
+}

sdk/api/api-base/src/main/java/io/gisbi/api/license/bo/F2CLicense.java

@@ -0,0 +1,28 @@
+package io.gisbi.api.license.bo;
+
+import java.io.Serializable;
+
+public class F2CLicense implements Serializable {
+    private String ext;
+    private String product;
+    private String licenseVersion;
+    private static final long serialVersionUID = -5264927171691944304L;
+    private String remark;
+    private Long count;
+    private Long generateTime;
+    private String edition;
+    private String isv;
+    private String expired;
+    private String serialNo;
+    private String corporation;
+
+    public String getCorporation() {
+        return this.corporation;
+    }
+
+    public String getRemark() {
+        return this.remark;
+    }
+
+
+}

sdk/common/src/main/java/io/gisbi/i18n/Translator.java

@@ -131,7 +131,7 @@ public class Translator {
 
             Class<?> objectClass = javaObject.getClass();
             String packageName = objectClass.getPackageName();
-            if (StringUtils.startsWith(packageName, "io.dataease")) {
+            if (StringUtils.startsWith(packageName, "io.gisbi")) {
                 try {
                     Field[] declaredFields = objectClass.getDeclaredFields();
                     for (Field field : declaredFields) {