wuyongyi před 1 rokem
rodič
revize
f9ee389f19
27 změnil soubory, kde provedl 270 přidání a 207 odebrání
  1. 1 1
      .idea/compiler.xml
  2. 6 0
      consumer/target/classes/META-INF/build-info.properties
  3. 18 0
      consumer/target/classes/application.yml
  4. 1 1
      glasses-platform-service-base/target/classes/META-INF/build-info.properties
  5. 10 10
      glasses-platform-service-common/src/main/java/com/ywt/config/AppConfigurer.java
  6. 6 21
      glasses-platform-service-common/src/main/java/com/ywt/config/Beans.java
  7. 1 1
      glasses-platform-service-common/src/main/java/com/ywt/config/Datasources.java
  8. 1 1
      glasses-platform-service-common/src/main/java/com/ywt/config/DomainConfigurer.java
  9. 0 38
      glasses-platform-service-common/src/main/java/com/ywt/config/ServiceGrpcStubBeans.java
  10. 0 61
      glasses-platform-service-common/src/main/java/com/ywt/config/configs/jpa/YwtCenterConfig.java
  11. 0 26
      glasses-platform-service-common/src/main/java/com/ywt/config/db/Datasources.java
  12. 2 1
      glasses-platform-service-common/src/main/java/com/ywt/params/mg/order/ConfirmPaymentRequest.java
  13. 1 1
      glasses-platform-service-common/target/classes/META-INF/build-info.properties
  14. 6 0
      glasses-platform-service-web/target/classes/META-INF/build-info.properties
  15. 4 0
      glasses-platform-service/pom.xml
  16. 51 0
      glasses-platform-service/src/main/java/com/ywt/jpa/Beans.java
  17. 62 0
      glasses-platform-service/src/main/java/com/ywt/jpa/Datasources.java
  18. 18 0
      glasses-platform-service/src/main/java/com/ywt/jpa/DomainConfigurer.java
  19. 2 2
      glasses-platform-service/src/main/java/com/ywt/jpa/GlassesConfig.java
  20. 24 24
      glasses-platform-service/src/main/java/com/ywt/jpa/YwtCenterConfig.java
  21. 6 5
      glasses-platform-service/src/main/java/com/ywt/service/AuthService.java
  22. 3 2
      glasses-platform-service/src/main/java/com/ywt/service/MgGoodsOrdersService.java
  23. 3 2
      glasses-platform-service/src/main/java/com/ywt/service/common/OrderCenterService.java
  24. 6 0
      glasses-platform-service/target/classes/META-INF/build-info.properties
  25. 31 0
      glasses-platform-service/target/classes/application.yml
  26. 6 9
      pom.xml
  27. 1 1
      target/classes/META-INF/build-info.properties

+ 1 - 1
.idea/compiler.xml

@@ -38,7 +38,7 @@
       <module name="glasses-platform-service-common" options="-parameters" />
       <module name="glasses-platform-service-web" options="-parameters" />
       <module name="ywt-demo" options="" />
-      <module name="ywt-platform-glasses-parent" options="-parameters" />
+      <module name="ywt-platform-glasses-parent" options="" />
     </option>
   </component>
 </project>

+ 6 - 0
consumer/target/classes/META-INF/build-info.properties

@@ -0,0 +1,6 @@
+build.artifact=consumer
+build.encoding=UTF-8
+build.group=com.ywt
+build.name=consumer
+build.time=2023-10-30T10\:30
+build.version=1.0.0-SNAPSHOT

+ 18 - 0
consumer/target/classes/application.yml

@@ -0,0 +1,18 @@
+server:
+  port: 8888
+spring:
+  application:
+    name: consumer
+dubbo: #统一配置
+  application:
+    logger: slf4j
+    qos-enable: false
+  registry:
+    address: nacos://${nacos.address:127.0.0.1}:8848
+  protocol:  #协议  消费者端可不配置
+    name: tri  #远triple协议
+    port: 20881  #端口
+  consumer:
+    #远程服务调用重试次数,不包括第一次调用,不需要重试请设为0
+    retries: 2
+    check: false

+ 1 - 1
glasses-platform-service-base/target/classes/META-INF/build-info.properties

@@ -2,5 +2,5 @@ build.artifact=glasses-platform-service-base
 build.encoding=UTF-8
 build.group=com.ywt
 build.name=glasses-platform-service-base
-build.time=2023-10-27T15\:18
+build.time=2023-10-30T10\:30
 build.version=1.0.0-SNAPSHOT

+ 10 - 10
glasses-platform-service-common/src/main/java/com/ywt/config/AppConfigurer.java

@@ -4,19 +4,19 @@ package com.ywt.config;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import redis.clients.jedis.ShardedJedisPool;
+//import redis.clients.jedis.ShardedJedisPool;
 
 @Configuration
 public class AppConfigurer {
 
-    @Value("${redis.address}")
-    private String redisAddress;
-
-    @Bean(name = "jedisPool")
-    public ShardedJedisPool getJedisPool() throws Exception {
-        ShardedJedisPoolFactory shardedJedisPoolFactory = new ShardedJedisPoolFactory();
-        shardedJedisPoolFactory.setHostAndPorts(redisAddress);
-        return shardedJedisPoolFactory.getObject();
-    }
+//    @Value("${redis.address}")
+//    private String redisAddress;
+//
+//    @Bean(name = "jedisPool")
+//    public ShardedJedisPool getJedisPool() throws Exception {
+//        ShardedJedisPoolFactory shardedJedisPoolFactory = new ShardedJedisPoolFactory();
+//        shardedJedisPoolFactory.setHostAndPorts(redisAddress);
+//        return shardedJedisPoolFactory.getObject();
+//    }
 
 }

+ 6 - 21
glasses-platform-service-common/src/main/java/com/ywt/config/Beans.java

@@ -1,10 +1,7 @@
 package com.ywt.config;
 
 import com.ywt.core.SqlHelper;
-import com.ywt.mg.core.SqlHelper;
-import com.ywt.mg.core.redis.RedisCacheManager;
-import com.ywt.mg.core.redis.ShardedJedisProxy;
-import com.ywt.rpc.core.RestCaller;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -12,19 +9,17 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
-import redis.clients.jedis.BinaryJedisCommands;
-import redis.clients.jedis.JedisCommands;
+
 
 import java.lang.reflect.Proxy;
 
 @Component
 public class Beans {
 
-    @Value("${service.agent.rest.addr}")
-    private String restServiceAgent;
+//    @Value("${service.agent.rest.addr}")
+//    private String restServiceAgent;
+
 
-    @Autowired
-    private RedisCacheManager redisCacheManager;
 
     /**
      * 引用 ywt_center 库的 JdbcTemplate
@@ -41,12 +36,7 @@ public class Beans {
     private JdbcTemplate glassesJdbcTemplate;
 
 
-    @Bean(name = "jedisCommandsClient")
-    public JedisCommands getjedisCommands() {
-        ShardedJedisProxy shardedJedisProxy = new ShardedJedisProxy(redisCacheManager);
-        JedisCommands jedisProxyInstance = (JedisCommands) Proxy.newProxyInstance(shardedJedisProxy.getClass().getClassLoader(), new Class[]{JedisCommands.class, BinaryJedisCommands.class}, shardedJedisProxy);
-        return jedisProxyInstance;
-    }
+
 
     @Bean(name = "sqlHelperYwtCenter")
     public SqlHelper getSqlHelperYwtCenter() {
@@ -63,9 +53,4 @@ public class Beans {
         return new SqlHelper(glassesJdbcTemplate);
     }
 
-    @Bean(name = "restCaller")
-    public RestCaller restCaller(){
-        return new RestCaller(restServiceAgent);
-    }
-
 }

+ 1 - 1
glasses-platform-service-common/src/main/java/com/ywt/config/Datasources.java

@@ -1,8 +1,8 @@
 package com.ywt.config;
 
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;

+ 1 - 1
glasses-platform-service-common/src/main/java/com/ywt/config/DomainConfigurer.java

@@ -1,7 +1,7 @@
 package com.ywt.config;
 
 import com.ywt.core.utils.Checker;
-import com.ywt.mg.core.utils.Checker;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 

+ 0 - 38
glasses-platform-service-common/src/main/java/com/ywt/config/ServiceGrpcStubBeans.java

@@ -1,38 +0,0 @@
-package com.ywt.config;
-
-import com.ywt.gapi.base.file.FileServiceGrpc;
-import com.ywt.gapi.base.wechat.WeChatServiceGrpc;
-import com.ywt.gapi.message.WeChatMessageServiceGrpc;
-import com.ywt.gapi.ordercenter.OrderCenterServiceGrpc;
-import io.grpc.Channel;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-
-@Component
-public class ServiceGrpcStubBeans {
-
-    @Resource(name = "agentChannel")
-    private Channel agentChannel;
-
-
-    @Bean(name = "fileServiceBlockingStub")
-    public FileServiceGrpc.FileServiceBlockingStub getFileServiceBlockingStub() {
-        return FileServiceGrpc.newBlockingStub(agentChannel);
-    }
-
-    @Bean(name = "orderCenterServiceBlockingStub")
-    public OrderCenterServiceGrpc.OrderCenterServiceBlockingStub getOrderCenterServiceBlockingStub() {
-        return OrderCenterServiceGrpc.newBlockingStub(agentChannel);
-    }
-
-    @Bean(name = "weChatMessageServiceBlockingStub")
-    public WeChatMessageServiceGrpc.WeChatMessageServiceBlockingStub getWeChatMessageServiceBlockingStub() {
-        return WeChatMessageServiceGrpc.newBlockingStub(agentChannel);
-    }
-    @Bean(name = "weChatServiceBlockingStub")
-    public WeChatServiceGrpc.WeChatServiceBlockingStub getWeChatServiceBlockingStub() {
-        return WeChatServiceGrpc.newBlockingStub(agentChannel);
-    }
-}

+ 0 - 61
glasses-platform-service-common/src/main/java/com/ywt/config/configs/jpa/YwtCenterConfig.java

@@ -1,61 +0,0 @@
-package com.ywt.config.configs.jpa;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
-import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import javax.persistence.EntityManager;
-import javax.sql.DataSource;
-import java.util.Map;
-
-/**
- * ywt_center数据库配置
- * @author dyh
- */
-@Configuration
-@EnableTransactionManagement
-@EnableJpaRepositories(
-        entityManagerFactoryRef = "entityManagerFactoryBase",
-        transactionManagerRef = "transactionManagerBase",
-        basePackages = {"com.ywt.mg.domain.centerEntities"}
-)
-public class YwtCenterConfig {
-    @Autowired
-    @Qualifier("ywtCenterDataSource")
-    private DataSource ywtCenterDataSource;
-
-    @Bean(name = "entityManagerBase")
-    public EntityManager entityManager(EntityManagerFactoryBuilder builder) {
-        return entityManagerFactory(builder).getObject().createEntityManager();
-    }
-
-    @Bean(name = "entityManagerFactoryBase")
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory (EntityManagerFactoryBuilder builder) {
-        return builder
-                .dataSource(ywtCenterDataSource)
-                .properties(getVendorProperties(ywtCenterDataSource))
-                .packages("com.ywt.mg.domain.centerEntities") //设置实体类所在位置
-                .persistenceUnit("ywtCenterBasePersistenceUnit")
-                .build();
-    }
-
-    @Autowired
-    private JpaProperties jpaProperties;
-
-    private Map<String, String> getVendorProperties(DataSource dataSource) {
-        return jpaProperties.getHibernateProperties(dataSource);
-    }
-
-    @Bean(name = "transactionManagerBase")
-    public PlatformTransactionManager transactionManager(EntityManagerFactoryBuilder builder) {
-        return new JpaTransactionManager(entityManagerFactory(builder).getObject());
-    }
-}

+ 0 - 26
glasses-platform-service-common/src/main/java/com/ywt/config/db/Datasources.java

@@ -1,26 +0,0 @@
-package com.ywt.config.db;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.jdbc.DataSourceBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
-import javax.sql.DataSource;
-
-/**
- * Created by huangguoping.
- */
-@Configuration
-public class Datasources {
-    @Bean(name = "glassesDataSource")
-    @Qualifier("glassesDataSource")
-    @ConfigurationProperties(prefix="spring.datasource.glasses")
-    @Primary
-    public DataSource ywtCenterDataSource(){
-        return DataSourceBuilder.create().build();
-    }
-
-
-}

+ 2 - 1
glasses-platform-service-common/src/main/java/com/ywt/params/mg/order/ConfirmPaymentRequest.java

@@ -1,6 +1,7 @@
 package com.ywt.params.mg.order;
 
-import com.ywt.mg.params.PageRequest;
+
+import com.ywt.params.PageRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

+ 1 - 1
glasses-platform-service-common/target/classes/META-INF/build-info.properties

@@ -2,5 +2,5 @@ build.artifact=glasses-platform-service-common
 build.encoding=UTF-8
 build.group=com.ywt
 build.name=glasses-platform-service-common
-build.time=2023-10-27T18\:40
+build.time=2023-10-30T10\:48
 build.version=1.0.0-SNAPSHOT

+ 6 - 0
glasses-platform-service-web/target/classes/META-INF/build-info.properties

@@ -0,0 +1,6 @@
+build.artifact=glasses-platform-service-web
+build.encoding=UTF-8
+build.group=com.ywt
+build.name=glasses-platform-service-web
+build.time=2023-10-30T10\:30
+build.version=1.0.0-SNAPSHOT

+ 4 - 0
glasses-platform-service/pom.xml

@@ -27,6 +27,10 @@
             <artifactId>glasses-platform-service-common</artifactId>
             <version>${service.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.ywt</groupId>
+            <artifactId>ywt-platform-order-base</artifactId>
+        </dependency>
 
         <!-- 自动装配dubbo-->
         <dependency>

+ 51 - 0
glasses-platform-service/src/main/java/com/ywt/jpa/Beans.java

@@ -0,0 +1,51 @@
+package com.ywt.jpa;
+
+import com.ywt.core.SqlHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+@Component
+public class Beans {
+
+//    @Value("${service.agent.rest.addr}")
+//    private String restServiceAgent;
+
+
+
+    /**
+     * 引用 ywt_center 库的 JdbcTemplate
+     */
+    @Autowired
+    @Qualifier("ywtCenterJdbcTemplate")
+    private JdbcTemplate ywtCenterJdbcTemplate;
+
+    /**
+     * 引用 glasses 库的 JdbcTemplate
+     */
+    @Autowired
+    @Qualifier("glassesJdbcTemplate")
+    private JdbcTemplate glassesJdbcTemplate;
+
+
+
+
+    @Bean(name = "sqlHelperYwtCenter")
+    public SqlHelper getSqlHelperYwtCenter() {
+        return new SqlHelper(ywtCenterJdbcTemplate);
+    }
+
+    /**
+     * 优先使用 glasses 库
+     * @return
+     */
+    @Bean(name = "sqlHelperGlasses")
+    @Primary
+    public SqlHelper getSqlHelperGlasses() {
+        return new SqlHelper(glassesJdbcTemplate);
+    }
+
+}

+ 62 - 0
glasses-platform-service/src/main/java/com/ywt/jpa/Datasources.java

@@ -0,0 +1,62 @@
+package com.ywt.jpa;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import javax.sql.DataSource;
+
+/**
+ * Created by huangguoping.
+ */
+@Configuration
+public class Datasources {
+    /**
+     * glasses 数据库的配置
+     */
+    @Bean(name = "glassesDataSource")
+    @Qualifier("glassesDataSource")
+    @ConfigurationProperties(prefix="spring.datasource.glasses")
+    @Primary
+    public DataSource glassesDataSource(){
+        return DataSourceBuilder.create().build();
+    }
+
+
+    /**
+     * ywt_center 数据库的配置
+     */
+    @Bean(name = "ywtCenterDataSource")
+    @Qualifier("ywtCenterDataSource")
+    @ConfigurationProperties(prefix="spring.datasource.ywtcenter")
+    public DataSource ywtCenterDataSource(){
+        return DataSourceBuilder.create().build();
+    }
+
+
+    /**
+     * 注入 glasses 数据库
+     * @param dataSource
+     * @return
+     */
+    @Bean(name = "glassesJdbcTemplate")
+    public JdbcTemplate glassesJdbcTemplate(@Qualifier("glassesDataSource") DataSource dataSource) {
+        return new JdbcTemplate(dataSource);
+    }
+
+    /**
+     * 注入 ywt_center 数据库
+     * @param dataSource
+     * @return
+     */
+    @Bean(name = "ywtCenterJdbcTemplate")
+    public JdbcTemplate ywtCenterJdbcTemplate(@Qualifier("ywtCenterDataSource") DataSource dataSource) {
+        return new JdbcTemplate(dataSource);
+    }
+
+
+}

+ 18 - 0
glasses-platform-service/src/main/java/com/ywt/jpa/DomainConfigurer.java

@@ -0,0 +1,18 @@
+package com.ywt.jpa;
+
+import com.ywt.core.utils.Checker;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DomainConfigurer {
+
+    @Value("${ywt.glasses.domain}")
+    private String ywtGlasses;
+
+
+    public String getYwtGlasses() {
+        return Checker.getStringValue("https://" + this.ywtGlasses);
+    }
+
+}

+ 2 - 2
glasses-platform-service-common/src/main/java/com/ywt/config/configs/jpa/GlassesConfig.java → glasses-platform-service/src/main/java/com/ywt/jpa/GlassesConfig.java

@@ -1,4 +1,4 @@
-package com.ywt.config.configs.jpa;
+package com.ywt.jpa;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -26,7 +26,7 @@ import java.util.Map;
 @EnableJpaRepositories(
         entityManagerFactoryRef = "entityManagerFactory",
         transactionManagerRef = "transactionManager",
-        basePackages = {"com.ywt.mg.domain.entities"}
+        basePackages = {"com.ywt.mg.domain.entity.glasses"}
 )
 public class GlassesConfig {
     @Autowired

+ 24 - 24
glasses-platform-service-common/src/main/java/com/ywt/config/db/Ywtcenter.java → glasses-platform-service/src/main/java/com/ywt/jpa/YwtCenterConfig.java

@@ -1,4 +1,4 @@
-package com.ywt.config.db;
+package com.ywt.jpa;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -9,7 +9,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
@@ -18,53 +17,54 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import javax.persistence.EntityManager;
 import javax.sql.DataSource;
+import java.util.Map;
 
 /**
- * Created by huangguoping.
+ * ywt_center数据库配置
+ * @author dyh
  */
 @Configuration
 @EnableTransactionManagement
 @EnableJpaRepositories(
-        entityManagerFactoryRef = "entityManagerFactory",
-        transactionManagerRef = "transactionManager",
-        basePackages = {"com.ywt.domain.entity.glasses"}
+        entityManagerFactoryRef = "entityManagerFactoryBase",
+        transactionManagerRef = "transactionManagerBase",
+        basePackages = {"com.ywt.mg.domain.entity.center"}
 )
-public class Ywtcenter {
+
+public class YwtCenterConfig {
     @Autowired
-    @Qualifier("glassesDataSource")
+    @Qualifier("ywtCenterDataSource")
     private DataSource ywtCenterDataSource;
 
-    @Primary
-    @Bean(name = "entityManager")
-    public EntityManager entityManager(EntityManagerFactoryBuilder builder,@Qualifier("ywtLogJpaProperties") JpaProperties jpaProperties) {
+    @Bean(name = "entityManagerBase")
+    public EntityManager entityManager(EntityManagerFactoryBuilder builder,@Qualifier("ywtCenterJpaProperties") JpaProperties jpaProperties) {
         return entityManagerFactory(builder,jpaProperties).getObject().createEntityManager();
     }
 
-    @Primary
-    @Bean(name = "entityManagerFactory")
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory (EntityManagerFactoryBuilder builder, @Qualifier("ywtLogJpaProperties") JpaProperties jpaProperties) {
+    @Bean(name = "entityManagerFactoryBase")
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory (EntityManagerFactoryBuilder builder,  @Qualifier("ywtCenterJpaProperties") JpaProperties jpaProperties) {
         return builder
                 .dataSource(ywtCenterDataSource)
                 .properties(jpaProperties.getProperties())
                 .properties(new HibernateProperties()
                         .determineHibernateProperties(
                                 jpaProperties.getProperties(), new HibernateSettings()))
-                .packages("com.ywt.domain.entity.glasses") //设置实体类所在位置
-                .persistenceUnit("ywtGlassesPersistenceUnit")
+                .packages("com.ywt.mg.domain.entity.center") //设置实体类所在位置
+                .persistenceUnit("askcenterPersistenceUnit")
                 .build();
     }
 
-    @Bean(name = "ywtGlassesJpaProperties")
-    @ConfigurationProperties(prefix = "spring.jpa.glasses")
+    @Autowired
+    private JpaProperties jpaProperties;
+
+    @Bean(name = "ywtCenterJpaProperties")
+    @ConfigurationProperties(prefix = "spring.jpa.ywtcenter")
     public JpaProperties jpaProperties() {
         return new JpaProperties();
     }
 
-
-
-    @Primary
-    @Bean(name = "transactionManager")
-    public PlatformTransactionManager transactionManager(EntityManagerFactoryBuilder builder,@Qualifier("ywtLogJpaProperties") JpaProperties jpaProperties) {
-        return new JpaTransactionManager(entityManagerFactory(builder,jpaProperties).getObject());
+    @Bean(name = "transactionManagerBase")
+    public PlatformTransactionManager transactionManager(EntityManagerFactoryBuilder builder) {
+        return new JpaTransactionManager(entityManagerFactory(builder, jpaProperties()).getObject());
     }
 }

+ 6 - 5
glasses-platform-service/src/main/java/com/ywt/service/AuthService.java

@@ -1,10 +1,11 @@
 package com.ywt.service;
 
-import com.ywt.mg.core.MGRightTypeDef;
-import com.ywt.mg.core.utils.Checker;
-import com.ywt.mg.domain.centerEntities.MGAdminsRepository;
-import com.ywt.mg.domain.centerEntities.MgAdminMenusView;
-import com.ywt.mg.domain.centerEntities.MgAdminRightView;
+
+import com.ywt.core.MGRightTypeDef;
+import com.ywt.core.utils.Checker;
+import com.ywt.domain.entity.center.MGAdminsRepository;
+import com.ywt.domain.entity.center.MgAdminMenusView;
+import com.ywt.domain.entity.center.MgAdminRightView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 3 - 2
glasses-platform-service/src/main/java/com/ywt/service/MgGoodsOrdersService.java

@@ -12,6 +12,7 @@ import com.ywt.domain.entity.center.SnsUserInfoRepository;
 import com.ywt.domain.entity.glasses.*;
 import com.ywt.domain.models.ConstantDef;
 import com.ywt.domain.models.enums.*;
+
 import com.ywt.gapi.ResultCode;
 import com.ywt.gapi.ordercenter.RefundResponse;
 import com.ywt.params.mg.order.*;
@@ -55,7 +56,7 @@ public class MgGoodsOrdersService extends ServiceBase {
     @Autowired
     private HospitalRepository hospitalRepository;
 
-    @DubboReference
+    @Autowired
     private OrderCenterService orderCenterService;
 
     @Autowired
@@ -280,7 +281,7 @@ public class MgGoodsOrdersService extends ServiceBase {
 
 
     private void invokeCreateOrders(GoodsOrders orders) {
-       CreateOrderResponse response = orderCenterService.createOrder(OrderTypeEnum.GLASSES.getValue(),
+       com.ywt.gapi.ordercenter.CreateOrderResponse response = orderCenterService.createOrder(OrderTypeEnum.GLASSES.getValue(),
                 orders.getId(),
                 "",
                 "rest://com.ywt.GlassesApiService/mg/order/paymentCallback",

+ 3 - 2
glasses-platform-service/src/main/java/com/ywt/service/common/OrderCenterService.java

@@ -5,6 +5,7 @@ import com.ywt.core.BaseResponse;
 import com.ywt.gapi.ordercenter.*;
 import com.ywt.params.mg.order.CreateOrderResponse;
 import com.ywt.service.ServiceResult;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,13 +16,13 @@ import java.net.InetAddress;
 import java.util.HashMap;
 import java.util.Map;
 
-@DubboService
+
 @Service
 public class OrderCenterService {
 
     private final Logger logger = LoggerFactory.getLogger(OrderCenterService.class);
 
-    @Autowired
+    @DubboReference
     private com.ywt.gapi.ordercenter.OrderCenterService orderCenterServiceBlockingStub;
 
     public ServiceResult wechatPayment(String body, String spbillCreateIp, String openid, int amount,

+ 6 - 0
glasses-platform-service/target/classes/META-INF/build-info.properties

@@ -0,0 +1,6 @@
+build.artifact=glasses-platform-service
+build.encoding=UTF-8
+build.group=com.ywt
+build.name=glasses-platform-service
+build.time=2023-10-30T10\:29
+build.version=1.0.0-SNAPSHOT

+ 31 - 0
glasses-platform-service/target/classes/application.yml

@@ -0,0 +1,31 @@
+spring:
+  application:
+    name: demo-rpc
+  datasource:
+    glasses:
+      url:${db.glasses.url}
+      username:${db.ywtcenter.username}
+      password:${db.ywtcenter.password}
+      driver-class-name:com.mysql.jdbc.Driver
+    center:
+      url:${db.ywtcenter.url}
+      username:${db.ywtcenter.username}
+      password:${db.ywtcenter.password}
+      driver-class-name:com.mysql.jdbc.Driver
+
+
+dubbo:
+  application:
+    logger: slf4j
+    qos-enable: false
+    register-mode: instance    # all interface  dubbo3.0支持 注册服务模式
+  registry:
+    address: nacos://${nacos.address:127.0.0.1}:8848
+  protocol:  #协议
+    name: tri  #远triple协议
+    port: 20880  #端口
+  consumer:
+    #远程服务调用重试次数,不包括第一次调用,不需要重试请设为0
+    retries: 2
+    check: false
+

+ 6 - 9
pom.xml

@@ -19,6 +19,7 @@
     <properties>
         <service.version>1.0.0-SNAPSHOT</service.version>
         <anytxn-biz-common.version>1.0.0-SNAPSHOT</anytxn-biz-common.version>
+        <ywt-platform-order-base.version>1.0.0-SNAPSHOT</ywt-platform-order-base.version>
     </properties>
 
     <repositories>
@@ -49,24 +50,20 @@
         <dependencies>
             <dependency>
                 <groupId>com.ywt</groupId>
-                <artifactId>demo-platform-service-base</artifactId>
+                <artifactId>glasses-platform-service-base</artifactId>
                 <version>${service.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.ywt</groupId>
-                <artifactId>demo-platform-service-common</artifactId>
+                <artifactId>glasses-platform-service-common</artifactId>
                 <version>${service.version}</version>
             </dependency>
-<!--            <dependency>-->
-<!--                <groupId>com.ywt</groupId>-->
-<!--                <artifactId>demo-platform-service-common</artifactId>-->
-<!--                <version>${service.version}</version>-->
-<!--            </dependency>-->
             <dependency>
                 <groupId>com.ywt</groupId>
-                <artifactId>anytxn-biz-common</artifactId>
-                <version>${anytxn-biz-common.version}</version>
+                <artifactId>ywt-platform-order-base</artifactId>
+             <version>${ywt-platform-order-base.version}</version>
             </dependency>
+
             <dependency>
                 <groupId>com.ywt</groupId>
                 <artifactId>ywt-biz-common</artifactId>

+ 1 - 1
target/classes/META-INF/build-info.properties

@@ -2,5 +2,5 @@ build.artifact=ywt-platform-glasses-parent
 build.encoding=UTF-8
 build.group=com.ywt
 build.name=ywt-platform-glasses-parent
-build.time=2023-10-27T14\:27
+build.time=2023-10-30T10\:48
 build.version=1.0.0-SNAPSHOT