dengsixing 1 ano atrás
pai
commit
26df15a6bc

+ 37 - 10
pom.xml

@@ -10,6 +10,12 @@
         <relativePath/>
     </parent>
 
+<!--    <parent>-->
+<!--        <groupId>com.chinatower.cloud</groupId>-->
+<!--        <artifactId>spring-cloud-chinatower-platform</artifactId>-->
+<!--        <version>3.0.6.0</version>-->
+<!--    </parent>-->
+
     <groupId>com.fdkankan</groupId>
     <artifactId>4dkankan-center-scene</artifactId>
     <version>2.0.0-SNAPSHOT</version>
@@ -27,6 +33,10 @@
             <id>nexus-aliyun</id>
             <url>http://maven.aliyun.com/nexus/content/groups/public</url>
         </repository>
+<!--        <repository>-->
+<!--            <id>chinatower</id>-->
+<!--            <url>http://10.38.77.5:8081/repository/maven-public/</url>-->
+<!--        </repository>-->
     </repositories>
 
     <properties>
@@ -150,11 +160,11 @@
             <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-test</artifactId>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -234,6 +244,17 @@
 <!--            <version>1.0.0</version>-->
 <!--        </dependency>-->
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>com.chinatower.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-chinatower-nacos-discovery</artifactId>-->
+<!--            <version>3.0.6.0</version>-->
+<!--        </dependency>-->
+
     </dependencies>
 
     <dependencyManagement>
@@ -316,11 +337,11 @@
                 <version>${protobuf-java.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${commons-lang3.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.apache.commons</groupId>-->
+<!--                <artifactId>commons-lang3</artifactId>-->
+<!--                <version>${commons-lang3.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-pool2</artifactId>
@@ -338,6 +359,12 @@
                 <version>2.17.0</version>
             </dependency>
 
+<!--            <dependency>-->
+<!--                <groupId>com.chinatower.cloud</groupId>-->
+<!--                <artifactId>spring-cloud-chinatower-platform</artifactId>-->
+<!--                <version>3.0.6.0</version>-->
+<!--            </dependency>-->
+
         </dependencies>
     </dependencyManagement>
 

+ 1 - 1
src/main/java/com/fdkankan/scene/SceneApplication.java

@@ -11,7 +11,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 //@EnableTransactionManagement//开启事务
 //@EnableDiscoveryClient
 @EnableScheduling
-@ComponentScan(basePackages = {"com.fdkankan.*"})
+@ComponentScan(basePackages = {"com.fdkankan.*"})//,
 @MapperScan("com.fdkankan.**.mapper")
 @ForestScan(basePackages = "com.fdkankan.scene.httpclient")
 public class SceneApplication {

+ 12 - 13
src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -1,17 +1,15 @@
 package com.fdkankan.scene.controller;
 
 
-import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.SceneInfoReqType;
-import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.scene.service.ISceneCustomService;
-import com.fdkankan.web.response.ResultData;
 import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.IScenePlusService;
 import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
 import com.fdkankan.scene.vo.SceneInfoParamVO;
 import com.fdkankan.scene.vo.SceneInfoVO;
 import com.fdkankan.web.controller.BaseController;
+import com.fdkankan.web.response.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -35,6 +33,8 @@ public class SceneController extends BaseController {
     private IScenePlusService scenePlusService;
     @Autowired
     private ISceneCustomService sceneService;
+//    @Resource
+//    UserTokenApi userTokenApi;
 
     /**
      * <p>
@@ -47,16 +47,15 @@ public class SceneController extends BaseController {
      **/
     @GetMapping(value = "/getInfo")
     public SceneInfoVO getInfo(@Validated SceneInfoParamVO param) throws Exception{
-        String token = this.getToken();
-        String sysCode = null;
-        String acctId = null;
-        String RSP = "0";
-        // TODO: 2024/6/5 调用统一认证api,如果出参中返回的
-
-        if(!RSP.equals("0")){
-            throw new BusinessException(ErrorCode.AUTH_FAIL);
-        }
-
+//        String token = param.getToken();
+//        String sysCode = param.getSyscode();
+//        String acctId = param.getAcctId();
+//        String RSP = "-1";
+//        // TODO: 2024/6/5 调用统一认证api,如果出参中返回的
+//        JSONObject jsonObject = userTokenApi.checkProwadaToken(sysCode, acctId, token);
+//        if(Objects.isNull(jsonObject) || !"0".equals(jsonObject.getString("RSP"))){
+//            throw new BusinessException(ErrorCode.AUTH_FAIL);
+//        }
         param.setReqType(SceneInfoReqType.VIEW.code());
         return sceneEditInfoService.getSceneInfo(param);
     }

+ 4 - 0
src/main/java/com/fdkankan/scene/vo/SceneInfoParamVO.java

@@ -34,5 +34,9 @@ public class SceneInfoParamVO {
 
     private String acctId;
 
+    private String token;
+
+    private String syscode;
+
 
 }

+ 32 - 4
src/main/resources/application-test.yml

@@ -1,10 +1,10 @@
 spring:
   application:
-    name: 4dkankan-center-scene
+    name: chntzcgl-vr
   datasource:
-    url: jdbc:oracle:thin:@//8.135.106.227:1521/helowin
-    username: FDKK
-    password: qawsed@123.
+    url: jdbc:oracle:thin:@//10.180.41.39:1521/resdb
+    username: RES_VR
+    password: IDCqawsed@123.
     driver-class-name: oracle.jdbc.OracleDriver
   redis:
     host: 10.180.22.54
@@ -35,6 +35,34 @@ fyun:
   endPoint:
   host: /oss/
 
+#app:
+#  product:
+#    client:
+#      4a:
+#        requestUrl: http://10.180.22.22:8097
+## 注册中心
+#register:
+#  url: http://10.180.22.9:8761/eureka/
+#  token: xxx #注册令牌,验收、准生产需由质量经理签发服务注册令牌,生产由维护经理签发
+
+#eureka:
+#  instance:
+#    #服务之间,运行以ip地址的形式找到对方,默认是application.name的形式寻找对方的.
+#    prefer-ip-address: true
+#    # 实例ID 区分同一服务中不同实例的唯一标识
+#    instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port}
+#    #实例的名称
+#    hostname: ${spring.cloud.client.ip-address}
+#    #实例状态页相对url
+#    statusPageUrlPath: /swagger-ui.html #${management.contextPath:}/info
+#    healthCheckUrlPath: ${management.contextPath:}/health
+#  client:
+#    register-with-eureka: false #是否向注册中心注册自己
+#    fetchRegistry: true #是否从注册中心抓取已有的注册信息 默认true,集群必须设置为true
+#    authToken: ${register.token}
+#    serviceUrl:
+#      defaultZone: ${register.url}
+